get_libdir fixes. Atable on amd64.

3 files changed, 21 insertions, 25 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index b031bdfad33f..9b9e08ec263c 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libpng
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.52 2004/09/22 14:55:08 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.53 2004/09/23 07:48:21 eradicator Exp $
+
+  23 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> libpng-1.2.7.ebuild:
+  get_libdir fixes.  Atable on amd64.
 
   22 Sep 2004; Heinrich Wendel <lanius@gentoo.org> libpng-1.2.7.ebuild:
   stable on x86, fixes some nasty rendering bugs in khtml
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index a0319d653a86..fc58ebc2ce0a 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 348b9b8fa4ed900902335f093c00f9fc ChangeLog 9171
+MD5 5d027b5bf1017876c805ae2b9cd77169 libpng-1.2.7.ebuild 1846
+MD5 55be302ed12a97ee2d73718de404fc8e libpng-1.2.5-r7.ebuild 1858
+MD5 27c760768a4fc92ab321749bfc3451f9 ChangeLog 9292
 MD5 9d081a89def4ae88e4a8a679fe90101f libpng-1.2.5-r8.ebuild 1898
-MD5 8b7b5799cf7df46c1844b92f113ad232 libpng-1.2.7.ebuild 1745
+MD5 3338fff0166374e14ae138e6a1f4cd21 files/1.2.7-gentoo.diff 464
+MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r7 65
+MD5 cf98652d430c500b40470ffbcc2636e1 files/digest-libpng-1.2.7 65
+MD5 b664d38f024a7b21f299727e4aa76d2e files/libpng-1.2.5-gentoo.diff 3470
 MD5 7443cfcd027ad293e56ec7bed76ee21c files/macos.patch 589
 MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r8 65
 MD5 d1cb64b64c0652863c89a3eb1f7c5f66 files/libpng-1.2.5-security.diff 10114
-MD5 b664d38f024a7b21f299727e4aa76d2e files/libpng-1.2.5-gentoo.diff 3470
-MD5 3338fff0166374e14ae138e6a1f4cd21 files/1.2.7-gentoo.diff 464
-MD5 cf98652d430c500b40470ffbcc2636e1 files/digest-libpng-1.2.7 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBUkgKHTu7gpaalycRAjT9AKDOt6nzTEkQwildhEAnMjiNponvtwCgteWy
-VIcBrWXwaRhwHW5koeDbvgw=
-=vjHo
------END PGP SIGNATURE-----
diff --git a/media-libs/libpng/libpng-1.2.7.ebuild b/media-libs/libpng/libpng-1.2.7.ebuild
index 2fc4bdd765d2..2c51a466bc82 100644
--- a/media-libs/libpng/libpng-1.2.7.ebuild
+++ b/media-libs/libpng/libpng-1.2.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.7.ebuild,v 1.3 2004/09/22 14:55:08 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.7.ebuild,v 1.4 2004/09/23 07:48:21 eradicator Exp $
+
+IUSE=""
 
 inherit flag-o-matic eutils gcc
 
@@ -10,8 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="1.2"
-KEYWORDS="x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~alpha ~mips ~macos ~ppc-macos"
-IUSE=""
+KEYWORDS="x86 ~ppc ~sparc ~arm ~hppa amd64 ~alpha ~mips ~macos ~ppc-macos"
 
 DEPEND="sys-libs/zlib"
 
@@ -28,14 +29,14 @@ src_unpack() {
 	if use macos || use ppc-macos ; then
 		epatch "${FILESDIR}/macos.patch" # implements strnlen
 		sed \
-			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
+			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/$(get_libdir):" \
 			-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
 			-e "s:-O3:${CFLAGS}:" \
 			-e "s:prefix=/usr/local:prefix=/usr:" \
 			scripts/makefile.darwin > Makefile
 	else
 		sed \
-			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
+			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/$(get_libdir):" \
 			-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
 			-e "s:-O3:${CFLAGS}:" \
 			-e "s:prefix=/usr/local:prefix=/usr:" \
@@ -52,15 +53,15 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{include,lib} /usr/share/man
-	einstall MANPATH="${D}/usr/share/man" || die
+	dodir /usr/include /usr/$(get_libdir) /usr/share/man
+	make DESTDIR="${D}" MANPATH="/usr/share/man" LIBPATH="/usr/$(get_libdir)" install || die
 	doman libpng.3 libpngpf.3 png.5
 	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
 }
 
 pkg_postinst() {
 	# the libpng authors really screwed around between 1.2.1 and 1.2.3
-	if [ -f "${ROOT}/usr/lib/libpng.so.3.1.2.1" ] ; then
-		rm "${ROOT}/usr/lib/libpng.so.3.1.2.1"
+	if [ -f "${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1" ] ; then
+		rm "${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1"
 	fi
 }