Fix the multilib dependencies.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

diff --git a/media-libs/glpng/ChangeLog b/media-libs/glpng/ChangeLog
index 22184f9c6c13a5eb0c97e635f627a1c7666003ef..ab7cfdd35beb534b3ff66747c13ca67217a01005 100644 (file)
--- a/media-libs/glpng/ChangeLog
+++ b/media-libs/glpng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/glpng
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/ChangeLog,v 1.13 2015/03/25 00:08:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/ChangeLog,v 1.14 2015/05/02 16:12:49 chewi Exp $
+
+*glpng-1.46-r1 (02 May 2015)
+
+  02 May 2015; James Le Cuirot <chewi@gentoo.org> +glpng-1.46-r1.ebuild,
+  -glpng-1.46.ebuild:
+  Fix the multilib dependencies.
 
   25 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> glpng-1.46.ebuild:
   tidy

diff --git a/media-libs/glpng/Manifest b/media-libs/glpng/Manifest
index c4e6a1b4c8cdf0d7b3299213cf8f1af197f9d6c3..1346442cbea859b7b1d4296647533ee8488e4579 100644 (file)
--- a/media-libs/glpng/Manifest
+++ b/media-libs/glpng/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX glpng-1.45-libpng15.patch 1239 SHA256 50e837797c57864a9069299e95550478f592dc791e5493ca58f9d9a04f05d5ac SHA512 928111878fc2e486cf67f60a08c451f1a0fdbaade7a0561bb9894612ed974ff67a859e93916462f93bb76b7894f6d426c42cd159d6515e11458a08168a9f7c5f WHIRLPOOL abd57b6454e69118c769bd50d60dd8b328a2bb78f81ebbdc1a22b74b4e55f0ac061ca78ea15319aa10d59f5003810fde261db7fe8a8490b8bd0caf0315715d5f
 DIST glpng-1.45.tar.bz2 64426 SHA256 a002aa60f460b0f363267d10c79c730b9dba4c834d0ee43eac15460c2e05f2e8 SHA512 002d6ca05c603d2728454c4daafddca3be23afabd17181d69d7993734306e71c65cf4562e6598ca09b5a50e0c94ecbb0e3b1622788d50af53f54abfae5904747 WHIRLPOOL 643c3dc658068c397fdfe4002a7e0f098c79dbd74189926b4fbbcad70302fe666cec170169562bf776c022894c5910685c247474d8fa37196eef887ccc020892
 DIST glpng-1.46.tar.gz 41024 SHA256 4a3e489deca733524780470c4fb89806e354515b541efb58d44f2e11936dc39e SHA512 82fbd6154a0ca16102b4c31f7fbd907cf8c18b20c1693c60f8dcdd1fe42ebe579f98da2b36c00fc080b2880c720e8099dac0d460a8de1b2bf1145abbf05a20ae WHIRLPOOL 1bad8a51377fed856cfba3309ae7c4069517d31d372b297f3f8d60616e561d3cc042751ff50bb11aaac73d27198b47c4d428139ce4f27d5f38dd4d7a80678b78
 EBUILD glpng-1.45-r1.ebuild 780 SHA256 161f95126487dce01b574d8f2e3110ec8bcf041348659ecef8a7bd7fbb7a9042 SHA512 884447b7e8ad7441061983d86d8e778ca87931786ba0e2c456541621c139e731533e4865a5eeca301535141fbf3ce5143a6d1f6965cf10e50ca35832d751e32d WHIRLPOOL 8faec1fe691d6ce810b179756e9bb2c5bd741e304a93b60f1f566cc5f58531f1c1059ef473831f67bce158c4926c04fc4f2b16230532add949d3a09bc00249be
-EBUILD glpng-1.46.ebuild 723 SHA256 5ac9002fbf4b0b4eb2ea599937392e2526f3a31ef1f23b8f295cbbeae27c263a SHA512 271cabc1a1de47b8c4bdc6c815f7a59472078ca09233e7dadc44938edad08707e7a9216f21ad7374ad6d4f71c5c406c62f52dba719cdff2e6edbd3f002ca44d1 WHIRLPOOL f8f571cb7342e92d88185797b2506cda780e2cca0ed8a24d7d544454120eb1ebb40d9b80d74ae101f1c8cd07cac8c406f00b9e4197f1a03b036a71c540c5a744
-MISC ChangeLog 2212 SHA256 bba430fb6fad3950c546633a94fe703e9a05e534d133637df169c0b3404440d3 SHA512 b2b3ca2dfeb1ffee6a04c73ed55448cddfb5bacc8975e86b6b35a8bdd6f869d6b61bb4ef2ad3adefb39891351d05d0a225052e3c377c86032de16f5b7546e9c7 WHIRLPOOL c81002f6838134684763fe3219489e0299e14459a60d8e8bcaef21f16a1e8ec011b6947d247d4b80a0a6a70aeb316dc892a39c4ba01179348e0bc98ea5c2278e
+EBUILD glpng-1.46-r1.ebuild 804 SHA256 b9a30058b89b82b6fafd8b01866bbb54bad24f7e8abc1203d1df755c2ec478a7 SHA512 4e98b59b007c26d3f1b09c61eed629f6e2e41c54a9277b22b353b82838ea086a3005df199e9ad0400be6caffd87bbeb5e6d28b96a36fbd626d0b9ca29f87de7a WHIRLPOOL 2c8b32ded37a6bb81fb69932b69fea5c0ce2350de74deaf12d39a2d2f0ae7a89f705a252eb68259b1bb6c7cc2297f04554dcbe31a1125aae61a7c814057fedee
+MISC ChangeLog 2367 SHA256 f8af609505cfd286bda2ad6081b7d67a8e363c874563f8bb9e146f7689a77d7e SHA512 69080c389e25dda65d67c59eb828ec6531120c36afd65320452ae423c27ab78f12cc4a15093ed7dd0dd27bfce886929c1ce05719f8ffe0d106f98f4cbcc90658 WHIRLPOOL 07bbb746bba200ff67ef25efdc679ab98871e336e695d364153ee723eb2cb60e54bf4db8ac851d9d825c8e40c91dddd1c6e7a1614b5b5e2369f2ead5d36af14d
 MISC metadata.xml 447 SHA256 51787cdd2468e86fb0a1b49727aa4a344c9f7036a45978b34486d70b0520a287 SHA512 925f440118ffd0d251d7693c71a74bff73554e8123fb30e65d5edcae1afa91a1d35d1c07ff359449fb32af78674aa11fa0ebdc444a9744f29c6fec11c543d7ee WHIRLPOOL 71f5d3350217a996a14d058265b0424817a1b350418ac692b3c72de5cd28c578c6ba06895b5b0a3c356e7d5f668a737a908588f5e71cf446468d1f5e264af35c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVRPeIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3ksWUP/ina8O2LiQms8/HrxfhTkALe
+28oqa6aMmpJ1pstHt+67bLO4zJ70QstHfRN2W8cx85tEliwVeo25pwMMp/xUVM/i
+P3PA6MmE+6i2G4sRw1lN/452ECYijS+qLSgLP5sLy0mHz1E7bDho0QCQnGnlvYCq
+kBD2T2TRg9eFI/gvLHNUvYVknjXnFaiUFqlUnKP5MebRFi7JO1kLTRBIJ7GienV3
+uAD6KDYHWTEj2/pQ+30IKFzwPFCFcHwbVOWrzo8jHIEoqE+wyoXBvgIeVG5W819R
+M/G9LTAv6Q8Gk8ksb9znoizyECilmPaa478yRNPxwtnVu+W6uStuIT9llIADq+u9
+ZRToDMnvc48ySqdSZLyH4/etECQ+mIzLaAmJ2p4SzS9P0O+XSZBXo2s2LNRXgF/X
+jbxk3Vos0Hk88IhX80VqL2Pq4RTf3gi1zoDQm9k14Jf+hSV45Wf4o7pTpKCFZCgc
+GwmfXJ7C0QcX9qhMkcdhNEMUds8OcONTn2vzQySUWrXS6gd9Iv2H5YKjjxoqF+it
+obg3G8AQF78Pv67/SLr0N8o2e1sTUE64sKdDQXJl8P4ewcfCePpfVEvjGSB4WTpl
+GjD9yOr2f1nLrzLFOo3nbK7MKO/Z60bcmtX08cpPkad+en4xjTq8UCv9ZrEiLIFx
+ropSqToQ10UkYM67B5kO
+=jAo0
+-----END PGP SIGNATURE-----

diff --git a/media-libs/glpng/glpng-1.46.ebuild b/media-libs/glpng/glpng-1.46-r1.ebuild
similarity index 66%
rename from media-libs/glpng/glpng-1.46.ebuild
rename to media-libs/glpng/glpng-1.46-r1.ebuild
index 03049fd73c94aeb59d1558fdcaf7e64bebe7a5c5..fd316a2aacd656bb0704e9949cf66edb600ced06 100644 (file)
--- a/media-libs/glpng/glpng-1.46.ebuild
+++ b/media-libs/glpng/glpng-1.46-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/glpng-1.46.ebuild,v 1.2 2015/03/25 00:08:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/glpng-1.46-r1.ebuild,v 1.1 2015/05/02 16:12:49 chewi Exp $
 
 EAPI=5
 inherit cmake-multilib
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="static-libs"
 
-RDEPEND="virtual/opengl
-       virtual/glu
-       media-libs/libpng:0=
-       sys-libs/zlib"
+RDEPEND="virtual/opengl[${MULTILIB_USEDEP}]
+       virtual/glu[${MULTILIB_USEDEP}]
+       media-libs/libpng:0=[${MULTILIB_USEDEP}]
+       sys-libs/zlib:=[${MULTILIB_USEDEP}]"
 DEPEND=${RDEPEND}
 
 S=${WORKDIR}/${PN}