added get_libdir fix for bug #105782

(Portage version: 2.0.51.22-r2)

5 files changed, 27 insertions, 23 deletions

diff --git a/sci-libs/libgeotiff/ChangeLog b/sci-libs/libgeotiff/ChangeLog
index 9d979c8b309b..808cfa13d16f 100644
--- a/sci-libs/libgeotiff/ChangeLog
+++ b/sci-libs/libgeotiff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/libgeotiff
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/ChangeLog,v 1.8 2005/07/11 19:08:01 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/ChangeLog,v 1.9 2005/09/14 01:59:18 nerdboy Exp $
+
+  14 Sep 2005; Steve Arnold <nerdboy@gentoo.org> libgeotiff-1.2.0.ebuild,
+  libgeotiff-1.2.1.ebuild, libgeotiff-1.2.1-r1.ebuild:
+  added get_libdir fix for bug #105782
 
   11 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   libgeotiff-1.2.1-r1.ebuild:
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index f792fb2b3e7a..a72d392608ee 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,8 +1,8 @@
-MD5 4de8e65e65943545bd1ff2b55f7e6266 ChangeLog 1964
-MD5 8870660c58923543a02f66d365242be4 libgeotiff-1.2.0.ebuild 1210
-MD5 eda56284aea27adbb12635ba23006c4f libgeotiff-1.2.1-r1.ebuild 994
-MD5 39e0582148eeba42245a651b910f1d2c libgeotiff-1.2.1.ebuild 956
+MD5 bf5965e273770b20d60689c5f7b27e95 ChangeLog 2133
+MD5 361e4744c0b08be7bcc57c2283bf3286 libgeotiff-1.2.0.ebuild 1287
+MD5 eae12f2ede52edd2f51efc433b840b4b libgeotiff-1.2.1.ebuild 1033
 MD5 3cd06cd3d8efbe532cd128301ca23678 metadata.xml 219
+MD5 529356386aba96e4131b51dac71a315b libgeotiff-1.2.1-r1.ebuild 1071
 MD5 e77842442c89596a723f6ce5745cfd4d files/digest-libgeotiff-1.2.0 68
 MD5 0acd02f68bfcde1cc5f3f9db8992c99b files/digest-libgeotiff-1.2.1 68
 MD5 0acd02f68bfcde1cc5f3f9db8992c99b files/digest-libgeotiff-1.2.1-r1 68
diff --git a/sci-libs/libgeotiff/libgeotiff-1.2.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.2.0.ebuild
index 9da1704c905a..5728453ca37f 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.2.0.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.2.0.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/libgeotiff/libgeotiff-1.2.0.ebuild,v 1.4 2005/07/10 20:33:19 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.2.0.ebuild,v 1.5 2005/09/14 01:59:18 nerdboy Exp $
 
 inherit eutils
 
@@ -18,16 +18,16 @@ DEPEND="virtual/libc
 	sci-libs/proj"
 
 src_compile() {
-	econf || die
-	emake -j1 || die
+	econf || die "econf failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	dobin bin/{listgeo,geotifcp,makegeo} || die
-	insinto usr/include
+	dobin bin/{listgeo,geotifcp,makegeo} || die "dobin failed"
 	dolib.a libgeotiff.a
 	dolib.so libgeotiff.so.${PV}
-	dosym libgeotiff.so.${PV} usr/lib/libgeotiff.so
+	dosym libgeotiff.so.${PV} usr/$(get_libdir)/libgeotiff.so || die "dosym failed"
+	insinto usr/include
 	doins xtiffio.h xtiffiop.h geotiff.h geotiffio.h geovalues.h geonames.h geokeys.h geo_tiffp.h geo_config.h geo_keyp.h geo_normalize.h cpl_serv.h cpl_csv.h epsg_datum.inc epsg_gcs.inc epsg_pm.inc epsg_units.inc geo_ctrans.inc epsg_ellipse.inc epsg_pcs.inc epsg_proj.inc epsg_vertcs.inc geokeys.inc
 	insinto usr/share/epsg_csv
 	doins csv/*.csv
diff --git a/sci-libs/libgeotiff/libgeotiff-1.2.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.2.1-r1.ebuild
index db66b6107f22..e421fae97c57 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.2.1-r1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.2.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/libgeotiff/libgeotiff-1.2.1-r1.ebuild,v 1.3 2005/07/11 19:08:01 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.2.1-r1.ebuild,v 1.4 2005/09/14 01:59:18 nerdboy Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,16 +19,16 @@ DEPEND="virtual/libc
 
 src_compile() {
 	append-flags -fPIC
-	econf || die
-	emake -j1 || die
+	econf || die "econf failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	dobin bin/{listgeo,geotifcp,makegeo} || die
-	insinto usr/include
+	dobin bin/{listgeo,geotifcp,makegeo} || die "dobin failed"
 	dolib.a libgeotiff.a
 	dolib.so libgeotiff.so.${PV}
-	dosym libgeotiff.so.${PV} usr/lib/libgeotiff.so
+	dosym libgeotiff.so.${PV} usr/$(get_libdir)/libgeotiff.so || die "dosym failed"
+	insinto usr/include
 	doins libxtiff/*.h
 	doins *.h
 	doins *.inc
diff --git a/sci-libs/libgeotiff/libgeotiff-1.2.1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.2.1.ebuild
index c4380236f0ca..93eb9028167e 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.2.1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.2.1.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/libgeotiff/libgeotiff-1.2.1.ebuild,v 1.4 2005/07/10 20:33:19 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeotiff/libgeotiff-1.2.1.ebuild,v 1.5 2005/09/14 01:59:18 nerdboy Exp $
 
 inherit eutils
 
@@ -18,16 +18,16 @@ DEPEND="virtual/libc
 	sci-libs/proj"
 
 src_compile() {
-	econf || die
-	emake -j1 || die
+	econf || die "econf failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	dobin bin/{listgeo,geotifcp,makegeo} || die
-	insinto usr/include
+	dobin bin/{listgeo,geotifcp,makegeo} || die "dobin failed"
 	dolib.a libgeotiff.a
 	dolib.so libgeotiff.so.${PV}
-	dosym libgeotiff.so.${PV} usr/lib/libgeotiff.so
+	dosym libgeotiff.so.${PV} usr/$(get_libdir)/libgeotiff.so || die "dosym failed"
+	insinto usr/include
 	doins libxtiff/*.h
 	doins *.h
 	doins *.inc