Multilib fixes.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 25 insertions, 11 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 139475b795d4..34ac28f8e2fb 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.7 2005/07/30 23:46:05 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.8 2005/08/02 23:51:30 herbs Exp $
+
+  02 Aug 2005; Herbie Hopkins <herbs@gentoo.org> gdal-1.2.5-r1.ebuild,
+  gdal-1.2.6-r2.ebuild:
+  Multilib fixes.
 
 *gdal-1.2.6-r2 (30 Jul 2005)
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e2639aae7860..581b9e069272 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dbde47da00f85ec5ab00fe894a9bbb8b gdal-1.2.5-r1.ebuild 3244
+MD5 2a16cc058bfd73f8177582258fcc12cb gdal-1.2.6-r2.ebuild 3999
+MD5 b537ffc8f13e570567ab66e11f7f71a9 ChangeLog 1577
 MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481
-MD5 bbe6a805177b966d3eb162e597a10e19 gdal-1.2.6-r2.ebuild 3951
-MD5 cc6ff270240fa78b5b23ee508dccf150 ChangeLog 1465
-MD5 cffffd06d2205813df3407b5a2fdc341 gdal-1.2.5-r1.ebuild 3209
 MD5 82ada11f44c42ddedbfa5426ad7991d2 files/digest-gdal-1.2.5-r1 63
 MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6-r2 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC8AcP2G5bA0cA/ScRAmViAKDaob6znMXi5JRz3gPR4+vvsPf5vgCg59Ud
+49ksoi8lkM6JP2/h7fH73ZI=
+=+Q2D
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.2.5-r1.ebuild b/sci-libs/gdal/gdal-1.2.5-r1.ebuild
index bd86b04f6301..283662d00b25 100644
--- a/sci-libs/gdal/gdal-1.2.5-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.2.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/gdal/gdal-1.2.5-r1.ebuild,v 1.3 2005/07/11 19:12:15 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.5-r1.ebuild,v 1.4 2005/08/02 23:51:30 herbs Exp $
 
-inherit eutils libtool gnuconfig distutils
+inherit eutils libtool gnuconfig distutils multilib
 
 # libgrass support is coming soon...
 #	grass? ( >=sci-geosciences/grass-5.0 )
@@ -46,7 +46,7 @@ src_compile() {
 	distutils_python_version
 	# This package uses old borked automake/autoconf and libtool, so
 	# it doesn't work without ${D} (or with econf and einstall).
-	pkg_conf="--datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal --enable-shared --with-gnu-ld --with-pic"
+	pkg_conf="--datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal --libdir=${D}usr/$(get_libdir) --enable-shared --with-gnu-ld --with-pic"
 	[ "${ARCH}" = "x86" ] && pkg_conf="${pkg_conf} --without-libtool"
 	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) $(use_with postgres pg) $(use_with fits cfitsio) $(use_with ogdi)"
 
diff --git a/sci-libs/gdal/gdal-1.2.6-r2.ebuild b/sci-libs/gdal/gdal-1.2.6-r2.ebuild
index f6f6c4d98aff..f0d5eeb45e30 100644
--- a/sci-libs/gdal/gdal-1.2.6-r2.ebuild
+++ b/sci-libs/gdal/gdal-1.2.6-r2.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/gdal/gdal-1.2.6-r2.ebuild,v 1.1 2005/07/30 23:46:05 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r2.ebuild,v 1.2 2005/08/02 23:51:30 herbs Exp $
 
-inherit eutils libtool gnuconfig distutils
+inherit eutils libtool gnuconfig distutils multilib
 
 IUSE="jpeg png geos gif grass jasper netcdf hdf python postgres mysql odbc sqlite ogdi fits debug"
 
@@ -61,7 +61,7 @@ src_compile() {
 	# This package uses old borked automake/autoconf and libtool, so
 	# it doesn't work without ${D} (or with econf and einstall).
 	pkg_conf="--datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal \
-		--enable-shared --with-gnu-ld --with-pic"
+		--libdir=${D}usr/$(get_libdir) --enable-shared --with-gnu-ld --with-pic"
 
 	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
 		$(use_with postgres pg) $(use_with fits cfitsio) \
@@ -70,7 +70,7 @@ src_compile() {
 
 	# It can't find this
 	if useq ogdi ; then
-		use_conf="--with-ogdi=/usr/lib ${use_conf}"
+		use_conf="--with-ogdi=/usr/$(get_libdir) ${use_conf}"
 	fi
 
 	if useq gif ; then