added fPIC patch and cleaned up ebuilds; stable bump for sparc and x86

(Portage version: 2.0.53_rc6)

8 files changed, 193 insertions, 85 deletions

diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog
index 0326852ca17d..0bbbaa3eb49a 100644
--- a/sci-libs/ogdi/ChangeLog
+++ b/sci-libs/ogdi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/ogdi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.17 2005/08/03 22:16:13 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.18 2005/11/01 07:41:27 nerdboy Exp $
+
+  01 Nov 2005; Steve Arnold <nerdboy@gentoo.org>
+  +files/ogdi-3.1.4-fpic.patch, -ogdi-3.1.1-r1.ebuild, ogdi-3.1.4-r1.ebuild,
+  -ogdi-3.1.5.ebuild:
+  added fPIC patch and cleaned up ebuilds; stable bump for sparc and x86.
 
   03 Aug 2005; Herbie Hopkins <herbs@gentoo.org> ogdi-3.1.1-r1.ebuild,
   ogdi-3.1.4-r1.ebuild, ogdi-3.1.5.ebuild, ogdi-3.1.5-r1.ebuild:
diff --git a/sci-libs/ogdi/files/digest-ogdi-3.1.1-r1 b/sci-libs/ogdi/files/digest-ogdi-3.1.1-r1
deleted file mode 100644
index 1b16d04c56ad..000000000000
--- a/sci-libs/ogdi/files/digest-ogdi-3.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff7ee9f2ed68699ca13d568ab8e3393d ogdi-3.1.1.tar.gz 907842
diff --git a/sci-libs/ogdi/files/digest-ogdi-3.1.5 b/sci-libs/ogdi/files/digest-ogdi-3.1.5
deleted file mode 100644
index b2bb76f1964a..000000000000
--- a/sci-libs/ogdi/files/digest-ogdi-3.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ccf8202b63875a68ded23588bd49544 ogdi-3.1.5.tar.gz 913902
diff --git a/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch
new file mode 100644
index 000000000000..33fb56103193
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch
@@ -0,0 +1,177 @@
+Only in ogdi-3.1.5.orig: bin
+Only in ogdi-3.1.5.orig/config: Linux.mak
+Only in ogdi-3.1.5.orig: config.cache
+Only in ogdi-3.1.5.orig: config.log
+Only in ogdi-3.1.5.orig: config.status
+Only in ogdi-3.1.5.orig/external/expat: OBJ.Linux
+diff -ur ogdi-3.1.5/external/expat/makefile ogdi-3.1.5.orig/external/expat/makefile
+--- ogdi-3.1.5/external/expat/makefile	2001-08-27 14:11:10.000000000 +0000
++++ ogdi-3.1.5.orig/external/expat/makefile	2005-08-01 18:57:49.020052368 +0000
+@@ -36,7 +36,7 @@
+ # Compilation flags
+ #
+ INCLUDES = $(CURRENT_INCLUDE)
+-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) \
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC \
+ 	-DVERSION=\"expat_1.95.1\" -DPACKAGE="expat"
+ 
+ ifeq ($(BIG_ENDIAN),1)
+Only in ogdi-3.1.5.orig/external/zlib: OBJ.Linux
+diff -ur ogdi-3.1.5/external/zlib/makefile ogdi-3.1.5.orig/external/zlib/makefile
+--- ogdi-3.1.5/external/zlib/makefile	2001-04-19 05:26:46.000000000 +0000
++++ ogdi-3.1.5.orig/external/zlib/makefile	2005-08-01 18:58:47.984088472 +0000
+@@ -46,7 +46,7 @@
+ # Compilation flags
+ #
+ INCLUDES = $(CURRENT_INCLUDE)
+-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ #
+ # Primary target
+Only in ogdi-3.1.5.orig/lib: Linux
+Only in ogdi-3.1.5.orig/ogdi/c-api: OBJ.Linux
+diff -ur ogdi-3.1.5/ogdi/c-api/makefile ogdi-3.1.5.orig/ogdi/c-api/makefile
+--- ogdi-3.1.5/ogdi/c-api/makefile	2001-04-19 05:29:31.000000000 +0000
++++ ogdi-3.1.5.orig/ogdi/c-api/makefile	2005-08-01 18:53:51.936094608 +0000
+@@ -23,7 +23,7 @@
+ 		$(GRASS_INCLUDE) $(ZLIB_INCLUDE) $(PROJ_INCLUDE) \
+ 		$(EXPAT_INCLUDE)
+ 
+-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \
+ 		$(PROJ_STATICLIB) $(MATH_LINKLIB)
+Only in ogdi-3.1.5.orig/ogdi/datum_driver/canada: OBJ.Linux
+diff -ur ogdi-3.1.5/ogdi/datum_driver/canada/makefile ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile
+--- ogdi-3.1.5/ogdi/datum_driver/canada/makefile	2001-02-19 04:12:21.000000000 +0000
++++ ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile	2005-08-01 19:03:00.932634448 +0000
+@@ -17,7 +17,7 @@
+ SOURCES = nadconv.c dtcanada.c
+ 
+ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
+-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ LINK_LIBS= 
+ 
+Only in ogdi-3.1.5.orig/ogdi/datum_driver/usa: OBJ.Linux
+diff -ur ogdi-3.1.5/ogdi/datum_driver/usa/makefile ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile
+--- ogdi-3.1.5/ogdi/datum_driver/usa/makefile	2001-02-19 04:12:21.000000000 +0000
++++ ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile	2005-08-01 19:03:24.883993288 +0000
+@@ -17,7 +17,7 @@
+ SOURCES = dtusa.c
+ 
+ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
+-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ LINK_LIBS= $(PROJ_STATICLIB)
+ 
+Only in ogdi-3.1.5.orig/ogdi/driver/adrg: OBJ.Linux
+diff -ur ogdi-3.1.5/ogdi/driver/adrg/makefile ogdi-3.1.5.orig/ogdi/driver/adrg/makefile
+--- ogdi-3.1.5/ogdi/driver/adrg/makefile	2001-06-22 16:37:50.000000000 +0000
++++ ogdi-3.1.5.orig/ogdi/driver/adrg/makefile	2005-08-01 19:06:07.422283712 +0000
+@@ -18,7 +18,7 @@
+ 
+ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
+ 
+-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB) 
+ 
+Only in ogdi-3.1.5.orig/ogdi/driver/dted: OBJ.Linux
+diff -ur ogdi-3.1.5/ogdi/driver/dted/makefile ogdi-3.1.5.orig/ogdi/driver/dted/makefile
+--- ogdi-3.1.5/ogdi/driver/dted/makefile	2001-02-19 04:12:21.000000000 +0000
++++ ogdi-3.1.5.orig/ogdi/driver/dted/makefile	2005-08-01 19:06:31.460629328 +0000
+@@ -17,7 +17,7 @@
+ SOURCES = dted.c utils.c object.c
+ 
+ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
+-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ LINK_LIBS= $(OGDI_LINKLIB)  $(GLUTIL_STATICLIB) 
+ 
+Only in ogdi-3.1.5.orig/ogdi/driver/network: OBJ.Linux
+diff -ur ogdi-3.1.5/ogdi/driver/network/makefile ogdi-3.1.5.orig/ogdi/driver/network/makefile
+--- ogdi-3.1.5/ogdi/driver/network/makefile	2001-02-19 04:12:21.000000000 +0000
++++ ogdi-3.1.5.orig/ogdi/driver/network/makefile	2005-08-01 19:06:52.242470008 +0000
+@@ -17,7 +17,7 @@
+ SOURCES = remote.c ecs_clnt.c 
+ 
+ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GRASS_INCLUDE) $(PROJ_INCLUDE)
+-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ LINK_LIBS= $(OGDI_LINKLIB) $(RPC_LINKLIB) $(WIN_LINKLIB)  
+ 
+Only in ogdi-3.1.5.orig/ogdi/driver/rpf: OBJ.Linux
+diff -ur ogdi-3.1.5/ogdi/driver/rpf/makefile ogdi-3.1.5.orig/ogdi/driver/rpf/makefile
+--- ogdi-3.1.5/ogdi/driver/rpf/makefile	2001-02-19 04:12:21.000000000 +0000
++++ ogdi-3.1.5.orig/ogdi/driver/rpf/makefile	2005-08-01 19:07:39.956216416 +0000
+@@ -19,7 +19,7 @@
+ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) \
+ 	   $(GRASS_INCLUDE) $(PROJ_INCLUDE)
+ 
+-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ LINK_LIBS= $(OGDI_LINKLIB) $(VPF_STATICLIB) $(GLUTIL_STATICLIB) $(WIN_LINKLIB) $(MATH_LINKLIB)
+ 
+Only in ogdi-3.1.5.orig/ogdi/driver/skeleton: OBJ.Linux
+diff -ur ogdi-3.1.5/ogdi/driver/skeleton/makefile ogdi-3.1.5.orig/ogdi/driver/skeleton/makefile
+--- ogdi-3.1.5/ogdi/driver/skeleton/makefile	2001-02-19 04:12:21.000000000 +0000
++++ ogdi-3.1.5.orig/ogdi/driver/skeleton/makefile	2005-08-01 19:07:15.500934184 +0000
+@@ -18,7 +18,7 @@
+ 
+ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GLUTIL_INCLUDE) $(PROJ_INCLUDE)
+ 
+-CFLAGS 	= $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS)
++CFLAGS 	= $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)
+ 
+Only in ogdi-3.1.5.orig/ogdi/driver/vrf: OBJ.Linux
+diff -ur ogdi-3.1.5/ogdi/driver/vrf/makefile ogdi-3.1.5.orig/ogdi/driver/vrf/makefile
+--- ogdi-3.1.5/ogdi/driver/vrf/makefile	2001-06-20 21:49:31.000000000 +0000
++++ ogdi-3.1.5.orig/ogdi/driver/vrf/makefile	2005-08-01 19:08:03.541630888 +0000
+@@ -17,7 +17,7 @@
+ SOURCES = vrf.c utils.c feature.c object.c open.c swq.c vrfswq.c
+ 
+ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(VPF_INCLUDE) $(PROJ_INCLUDE) $(GLUTIL_INCLUDE)
+-CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS)
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ LINK_LIBS= $(OGDI_LINKLIB) $(WIN_LINKLIB) $(VPF_STATICLIB) $(MATH_LINKLIB)
+ 
+Only in ogdi-3.1.5.orig/ogdi/gltpd: OBJ.Linux
+Only in ogdi-3.1.5.orig/ogdi/glutil: OBJ.Linux
+Only in ogdi-3.1.5.orig/proj: OBJ.Linux
+diff -ur ogdi-3.1.5/proj/makefile ogdi-3.1.5.orig/proj/makefile
+--- ogdi-3.1.5/proj/makefile	2001-04-09 16:20:08.000000000 +0000
++++ ogdi-3.1.5.orig/proj/makefile	2005-08-01 19:01:03.573475752 +0000
+@@ -42,7 +42,7 @@
+ 
+ INCLUDES     	= $(CURRENT_INCLUDE)
+ 
+-CFLAGS 		= $(INCLUDES) $(COMMON_CFLAGS) 
++CFLAGS 		= $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
+ 
+ include $(TOPDIR)/config/common.mak
+ 
+Only in ogdi-3.1.5.orig/vpflib: OBJ.Linux
+diff -ur ogdi-3.1.5/vpflib/makefile ogdi-3.1.5.orig/vpflib/makefile
+--- ogdi-3.1.5/vpflib/makefile	2001-02-20 04:25:20.000000000 +0000
++++ ogdi-3.1.5.orig/vpflib/makefile	2005-08-01 19:09:48.072739744 +0000
+@@ -31,7 +31,7 @@
+ INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(VPF_INCLUDE)
+ 
+ CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) $(UNIX_DEFINE) \
+-	-DSYS_BIG_ENDIAN=$(BIG_ENDIAN)
++	-DSYS_BIG_ENDIAN=$(BIG_ENDIAN) -fPIC -DPIC
+ 
+ include $(TOPDIR)/config/common.mak
+ 
diff --git a/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild
deleted file mode 100644
index 901efc6752ac..000000000000
--- a/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild,v 1.5 2005/08/03 22:16:13 herbs Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="OGDI - Open Geographical Datastore Interface, a GIS support library"
-HOMEPAGE="http://ogdi.sourceforge.net"
-SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 sparc x86"
-IUSE=""
-
-DEPEND="sci-libs/proj
-	sys-libs/zlib
-	dev-libs/expat"
-
-src_compile() {
-	export TOPDIR="${S}"
-	export TARGET=`uname`
-	export CFG="release"
-	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
-
-	econf --with-projlib="-L/usr/$(get_libdir) -lproj" \
-	    --with-zlib --with-expat || die "econf failed"
-	make || die "make failed"
-}
-
-src_install() {
-	mv ${S}/bin/Linux/*.so ${S}/lib/Linux/. || die "lib move failed"
-	dobin ${S}/bin/Linux/*
-	insinto /usr/include
-	doins ogdi/include/ecs.h ogdi/include/ecs_util.h
-	dolib.so lib/Linux/*.so
-	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so || die "symlink failed"
-	dodoc ChangeLog LICENSE NEWS README VERSION
-}
diff --git a/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild
index 7f462db20cf0..6fd97ca32a35 100644
--- a/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild,v 1.5 2005/08/03 22:16:13 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild,v 1.6 2005/11/01 07:41:27 nerdboy Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="OGDI - Open Geographical Datastore Interface, a GIS support library"
 HOMEPAGE="http://ogdi.sourceforge.net"
@@ -17,6 +17,12 @@ DEPEND="sci-libs/proj
 	sys-libs/zlib
 	dev-libs/expat"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fpic.patch
+}
+
 src_compile() {
 	export TOPDIR="${S}"
 	export TARGET=`uname`
diff --git a/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
index 93482d270df9..d49262968aed 100644
--- a/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild,v 1.5 2005/08/03 22:16:13 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild,v 1.6 2005/11/01 07:41:27 nerdboy Exp $
 
 inherit toolchain-funcs eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="sci-libs/proj
diff --git a/sci-libs/ogdi/ogdi-3.1.5.ebuild b/sci-libs/ogdi/ogdi-3.1.5.ebuild
deleted file mode 100644
index 27a597391ae1..000000000000
--- a/sci-libs/ogdi/ogdi-3.1.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.5.ebuild,v 1.5 2005/08/03 22:16:13 herbs Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="OGDI - Open Geographical Datastore Interface, a GIS support library"
-HOMEPAGE="http://ogdi.sourceforge.net"
-SRC_URI="mirror://sourceforge/ogdi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="sci-libs/proj
-	sys-libs/zlib
-	dev-libs/expat"
-
-src_compile() {
-	export TOPDIR="${S}"
-	export TARGET=`uname`
-	export CFG="release"
-	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
-
-	econf --with-projlib="-L/usr/$(get_libdir) -lproj" \
-	    --with-zlib --with-expat || die "econf failed"
-	make || die "make failed"
-}
-
-src_install() {
-	mv ${S}/bin/Linux/*.so ${S}/lib/Linux/. || die "lib move failed"
-	dobin ${S}/bin/Linux/*
-	insinto /usr/include
-	doins ogdi/include/ecs.h ogdi/include/ecs_util.h
-	dolib.so lib/Linux/*.so
-	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so || die "symlink failed"
-	dodoc ChangeLog LICENSE NEWS README VERSION
-}