Add multilib fix, mark ~amd64 wrt bug 112778

Package-Manager: portage-2.0.53_rc7

diff --git a/media-libs/loadpng/ChangeLog b/media-libs/loadpng/ChangeLog
index b7eee59d4fd5f6c17dd67da63add7e3f1cd092e4..742d08403898ced98bf4c98fe676df39d7be9a54 100644 (file)
--- a/media-libs/loadpng/ChangeLog
+++ b/media-libs/loadpng/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/loadpng
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/loadpng/ChangeLog,v 1.4 2005/11/25 18:24:23 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/loadpng/ChangeLog,v 1.5 2005/11/28 15:28:39 herbs Exp $
+
+  28 Nov 2005; Herbie Hopkins <herbs@gentoo.org> loadpng-1.4.ebuild:
+  Add multilib fix, mark ~amd64 wrt bug 112778
 
 *loadpng-1.4 (25 Nov 2005)
 

diff --git a/media-libs/loadpng/Manifest b/media-libs/loadpng/Manifest
index d735b4d480dacfa890d66b35edae6bb03adbc02b..f183ce6d4afdca0b19cf65b45d3ecf7da0b558ca 100644 (file)
--- a/media-libs/loadpng/Manifest
+++ b/media-libs/loadpng/Manifest
@@ -1,6 +1,16 @@
-MD5 53d80273a1560135ed1774c601beab3b ChangeLog 626
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 740b024344d850d49bac42d04999e6ac ChangeLog 738
 MD5 554c88d7f5e0707f80d8e1e510a2bec9 files/digest-loadpng-0.11 63
 MD5 c5f90f48f9460b9b77f5e597ea546e47 files/digest-loadpng-1.4 62
 MD5 f6d536c02a947597d906d3419adfc2b8 loadpng-0.11.ebuild 664
-MD5 01051044075fad539b03836148d675cc loadpng-1.4.ebuild 813
+MD5 21b90ff1bab5f87743ab924ed4e97ea8 loadpng-1.4.ebuild 878
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDiyI32G5bA0cA/ScRAqakAKC8TYKkKjX2O6Il7PVPCDgaaFQy6QCgnH5V
+u/7N4AjWQj29FsTK4I+TiOY=
+=QHYS
+-----END PGP SIGNATURE-----

diff --git a/media-libs/loadpng/loadpng-1.4.ebuild b/media-libs/loadpng/loadpng-1.4.ebuild
index 83fb6ec7a60145be7dba0df425a83b6c673892dd..1a5d88cf62a8a69a1336b0378d8a9aa4b23ef7d7 100644 (file)
--- a/media-libs/loadpng/loadpng-1.4.ebuild
+++ b/media-libs/loadpng/loadpng-1.4.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/media-libs/loadpng/loadpng-1.4.ebuild,v 1.1 2005/11/25 18:24:23 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/loadpng/loadpng-1.4.ebuild,v 1.2 2005/11/28 15:28:39 herbs Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs multilib
 
 DESCRIPTION="load and save PNG files in Allegro programs"
 HOMEPAGE="http://tjaden.strangesoft.net/loadpng/"
@@ -10,7 +10,7 @@ SRC_URI="http://tjaden.strangesoft.net/loadpng/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/allegro-4.0.0
@@ -25,7 +25,10 @@ src_unpack() {
 }
 
 src_install() {
-       dodir /usr/lib
+       dodir /usr/$(get_libdir)
        dodir /usr/include
-       make prefix="${D}"/usr install || die
+       make \
+               prefix="${D}"/usr \
+               libdir="${D}"/usr/$(get_libdir) \
+               install || die
 }