Fixed build on PIC-dependent arches. Bumped to 3.1.5-r1.

(Portage version: 2.0.51.22-r2)

5 files changed, 237 insertions, 4 deletions

diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog
index 0af8ae0d99a6..ef39ed804406 100644
--- a/sci-libs/ogdi/ChangeLog
+++ b/sci-libs/ogdi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2005/07/30 22:11:12 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.13 2005/08/02 02:31:59 kugelfang Exp $
+
+*ogdi-3.1.5-r1 (02 Aug 2005)
+
+  02 Aug 2005; Danny van Dyk <kugelfang@gentoo.org>
+  +files/ogdi-3.1.5-fpic.patch, +ogdi-3.1.5-r1.ebuild:
+  Bumped to 3.1.5-r1 to fix build on PIC-dependent arches and affected shared
+  libraryies on all other arches.
 
   30 Jul 2005; Steve Arnold <nerdboy@gentoo.org> ogdi-3.1.1-r1.ebuild,
   ogdi-3.1.4-r1.ebuild, ogdi-3.1.5.ebuild:
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index da84c5e61112..afa7118239e9 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,8 +1,11 @@
-MD5 0e8383be9cf5bdba1db59f615d5bf092 ChangeLog 2465
+MD5 17f5500c22926b80f47af34406588f33 ChangeLog 2715
 MD5 3cd06cd3d8efbe532cd128301ca23678 metadata.xml 219
-MD5 3aa9258a795cb85642ac16549c8114c4 ogdi-3.1.4-r1.ebuild 1127
+MD5 72aa1e49c299270b7635748f8360c2a9 ogdi-3.1.5-r1.ebuild 1208
 MD5 e0eb462c28b33071556846a4ada0bfc6 ogdi-3.1.1-r1.ebuild 1126
+MD5 3aa9258a795cb85642ac16549c8114c4 ogdi-3.1.4-r1.ebuild 1127
 MD5 ad2790850aada6ff3c9a07c463bf921f ogdi-3.1.5.ebuild 1125
 MD5 59e695f13d9d346bdd13a22bde58a3a6 files/digest-ogdi-3.1.1-r1 62
-MD5 74a3ce4489f2fb78319ceeb5689e459c files/digest-ogdi-3.1.5 62
 MD5 e328cdec7e54dc60be77116181727d5a files/digest-ogdi-3.1.4-r1 62
+MD5 74a3ce4489f2fb78319ceeb5689e459c files/digest-ogdi-3.1.5 62
+MD5 071752cb51961701a22258f05c390413 files/ogdi-3.1.5-fpic.patch 7619
+MD5 74a3ce4489f2fb78319ceeb5689e459c files/digest-ogdi-3.1.5-r1 62
diff --git a/sci-libs/ogdi/files/digest-ogdi-3.1.5-r1 b/sci-libs/ogdi/files/digest-ogdi-3.1.5-r1
new file mode 100644
index 000000000000..b2bb76f1964a
--- /dev/null
+++ b/sci-libs/ogdi/files/digest-ogdi-3.1.5-r1
@@ -0,0 +1 @@
+MD5 9ccf8202b63875a68ded23588bd49544 ogdi-3.1.5.tar.gz 913902
diff --git a/sci-libs/ogdi/files/ogdi-3.1.5-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.5-fpic.patch
new file mode 100644
index 000000000000..33fb56103193
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.1.5-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.5-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..f567c2c4123f
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
@@ -0,0 +1,45 @@
+# 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.1 2005/08/02 02:31:59 kugelfang Exp $
+
+inherit toolchain-funcs eutils
+
+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_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fpic.patch
+}
+
+src_compile() {
+	export TOPDIR="${S}"
+	export TARGET=`uname`
+	export CFG="release"
+	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
+
+	econf --with-proj=/usr --with-projlib="-L/usr/lib -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 /usr/lib/libogdi31.so /usr/lib/libogdi.so
+	dodoc ChangeLog LICENSE NEWS README VERSION
+}