generalized lib install path and fixed ARCH typo

(Portage version: 2.0.51.22-r2)

6 files changed, 26 insertions, 31 deletions

diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog
index a3194b866f67..a81d9708d565 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.14 2005/08/02 23:35:36 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.15 2005/08/03 02:37:58 nerdboy Exp $
+
+  03 Aug 2005; Steve Arnold <nerdboy@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:
+  Generalized lib install path and fixed ARCH typo.  This one should
+  be good, in theory...
 
   02 Aug 2005; Herbie Hopkins <herbs@gentoo.org> ogdi-3.1.5-r1.ebuild:
   Multilib fixes.
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 6c2f142d4abc..5fa605b735fd 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0d74de2b09d5ac9b8e191aed674ef3d7 ogdi-3.1.5-r1.ebuild 1231
-MD5 e0eb462c28b33071556846a4ada0bfc6 ogdi-3.1.1-r1.ebuild 1126
-MD5 3aa9258a795cb85642ac16549c8114c4 ogdi-3.1.4-r1.ebuild 1127
-MD5 3b236fa4cf04d63b18afc74e5f076126 ChangeLog 2803
-MD5 ad2790850aada6ff3c9a07c463bf921f ogdi-3.1.5.ebuild 1125
+MD5 2245a4229416e427c61f7e0b0d76dc84 ChangeLog 3033
 MD5 3cd06cd3d8efbe532cd128301ca23678 metadata.xml 219
-MD5 74a3ce4489f2fb78319ceeb5689e459c files/digest-ogdi-3.1.5 62
-MD5 071752cb51961701a22258f05c390413 files/ogdi-3.1.5-fpic.patch 7619
+MD5 ae9df6370ad188cf6c269e9fc5e9f663 ogdi-3.1.5-r1.ebuild 1239
+MD5 db51b7d62bd6d02b734f6488fc6f71cb ogdi-3.1.4-r1.ebuild 1151
+MD5 44add50f9d40568590b639568cc4e613 ogdi-3.1.1-r1.ebuild 1151
+MD5 41f2b756cc0f781031f06e1c1b17845a ogdi-3.1.5.ebuild 1151
 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-r1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8ANX2G5bA0cA/ScRAsjkAKC6knJJgWKeMc8Tw2rkfkwOlPAFJQCgpCGZ
-eoNjS+TzaPT72VUhpocsDk8=
-=ROhl
------END PGP SIGNATURE-----
+MD5 071752cb51961701a22258f05c390413 files/ogdi-3.1.5-fpic.patch 7619
diff --git a/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild
index 6ab336e6f036..2508011a1ce9 100644
--- a/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.1-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.1-r1.ebuild,v 1.2 2005/07/30 22:11:12 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.1-r1.ebuild,v 1.3 2005/08/03 02:37:58 nerdboy Exp $
 
 inherit toolchain-funcs
 
@@ -34,6 +34,6 @@ src_install() {
 	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
+	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 0e831a6f7f1d..ae4f537456b3 100644
--- a/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.4-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.4-r1.ebuild,v 1.2 2005/07/30 22:11:12 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.4-r1.ebuild,v 1.3 2005/08/03 02:37:58 nerdboy Exp $
 
 inherit toolchain-funcs
 
@@ -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
@@ -34,6 +34,6 @@ src_install() {
 	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
+	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.5-r1.ebuild b/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
index e9cf2863a2f6..a5f649804500 100644
--- a/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.5-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.5-r1.ebuild,v 1.2 2005/08/02 23:35:36 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.5-r1.ebuild,v 1.3 2005/08/03 02:37:58 nerdboy Exp $
 
-inherit toolchain-funcs eutils multilib
+inherit toolchain-funcs eutils
 
 DESCRIPTION="OGDI - Open Geographical Datastore Interface, a GIS support library"
 HOMEPAGE="http://ogdi.sourceforge.net"
@@ -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
@@ -29,7 +29,7 @@ src_compile() {
 	export CFG="release"
 	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
 
-	econf --with-projlib="-L/usr/$(get_libdir) -lproj" \
+	econf --with-proj=/usr --with-projlib="-L/usr/lib -lproj" \
 	    --with-zlib --with-expat || die "econf failed"
 	make || die "make failed"
 }
@@ -40,6 +40,6 @@ src_install() {
 	insinto /usr/include
 	doins ogdi/include/ecs.h ogdi/include/ecs_util.h
 	dolib.so lib/Linux/*.so
-	dosym /usr/$(get_libdir)/libogdi31.so /usr/$(get_libdir)/libogdi.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.5.ebuild b/sci-libs/ogdi/ogdi-3.1.5.ebuild
index 4447c3d160db..5054ac459ac6 100644
--- a/sci-libs/ogdi/ogdi-3.1.5.ebuild
+++ b/sci-libs/ogdi/ogdi-3.1.5.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.ebuild,v 1.2 2005/07/30 22:11:12 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.1.5.ebuild,v 1.3 2005/08/03 02:37:58 nerdboy Exp $
 
 inherit toolchain-funcs
 
@@ -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
@@ -34,6 +34,6 @@ src_install() {
 	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
+	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so || die "symlink failed"
 	dodoc ChangeLog LICENSE NEWS README VERSION
 }