Fix multilib support (bug #524396). Remove old.

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

5 files changed, 32 insertions, 64 deletions

diff --git a/media-libs/libbdplus/ChangeLog b/media-libs/libbdplus/ChangeLog
index fe5e5069f6ab..4ac1a9412cbe 100644
--- a/media-libs/libbdplus/ChangeLog
+++ b/media-libs/libbdplus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libbdplus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbdplus/ChangeLog,v 1.2 2015/01/29 01:23:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbdplus/ChangeLog,v 1.3 2015/03/13 15:20:12 yngwin Exp $
+
+  13 Mar 2015; Ben de Groot <yngwin@gentoo.org> -libbdplus-0.1.1.ebuild,
+  libbdplus-0.1.2.ebuild, libbdplus-9999.ebuild:
+  Fix multilib support (bug #524396). Remove old.
 
 *libbdplus-0.1.2 (29 Jan 2015)
 
@@ -14,4 +18,3 @@
   22 Sep 2014; Steve Dibb <beandog@gentoo.org> +libbdplus-0.1.1.ebuild,
   +libbdplus-9999.ebuild, +metadata.xml:
   Initial commit, bug 496812
-
diff --git a/media-libs/libbdplus/Manifest b/media-libs/libbdplus/Manifest
index 50631f1260f7..16a2532ba006 100644
--- a/media-libs/libbdplus/Manifest
+++ b/media-libs/libbdplus/Manifest
@@ -1,21 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libbdplus-0.1.1.tar.bz2 323508 SHA256 deb5e64984e625e40e1e0e1b6b1f9c041e7c77101b4b39df0d76ab8a4ec426cf SHA512 00ae3c94791471c8544973983f10fa0ab7b89282d940c966099de55eeda57034b64bda4d84326c1618e284c6138658571e2258108857a80f573b86dc72bc74fc WHIRLPOOL 44da568a96d3f7f614add2c7fef86c79e48defed6318ccbb26ed9b197bbfc7b5340cada6ea17772a55fa49d2340d5ff2615d78587cfc984329d62d84fbb3b82e
 DIST libbdplus-0.1.2.tar.bz2 319828 SHA256 a631cae3cd34bf054db040b64edbfc8430936e762eb433b1789358ac3d3dc80a SHA512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b WHIRLPOOL 56ab27f0aaeaacc2cc0338091cea810da6126fd09da201084dcdf5f69e4d2b483c31a0e59004c101a900a43b7581fed03b4f1686c20531f1241f7f92291b3e55
-EBUILD libbdplus-0.1.1.ebuild 936 SHA256 a728bda126b114591e8400bae73df974bbe598162a0eb3fa4c7769af35e57d4a SHA512 25118c1c655fe14c06d17fd39b144384e9290a56ab02269591d6ab8cc65dfb3ce63e5fb5e556ea08170027de99d54a28615bf4cc94a4388431b0845a6393df0d WHIRLPOOL 5601f64d5b7dd1af4a3a94a3398105bc54652c770bc77dbc3850cee8fcc268af79bc4c3fb696503408d8106946abfcae3974364e900187d7def843bbfde2c7fe
-EBUILD libbdplus-0.1.2.ebuild 905 SHA256 bcc24045ee8699e1f5c659a928acfe73d71ad82ce7a4239e059249c9f23fe4b6 SHA512 9bf1e800bd37e17d9f718adddc17c3396a3d7d1b5303787c84350876c513dda367a61f223610052ff163d76977929a95ee742a7540be9a555184bf5b90801de5 WHIRLPOOL efdca8928190b9674aa264b91541707c7d3a0c0b1f96addf9c13a435cc1d786b3ba6e22ec55e9b1333a0e5f5b6f50004c450c27341b0e448b72b32a8842ead80
-EBUILD libbdplus-9999.ebuild 904 SHA256 ac2460855b14c36e9163adf69402f4b80017e91acb1686d03a62ccb0af6477ec SHA512 5860cba58289c629592d6acc8e6cb8963b816a753454ee0cfa62f98cd27372e516ae8b98044eb3a35f7f594b1a9a8020580cc7d8fccaf7bd745afadaae79adb4 WHIRLPOOL bf628c7a7a6caecfe91687cff306c2482dfcb0d355e07ec228a0f4013b546148990f2a1e199f9154d7e60f0f29cb906022436f8e11510bbc473ec0338bf61dbc
-MISC ChangeLog 615 SHA256 26c59507dc60b11f65f70016144fbe9a247747450bf91fa74cd58d2699824fdc SHA512 27508c6b5b6cce2305d61a1f4a8155ec88f6dde164d1ab1ceafbcdb9e0ac2e2a755f63052f82557ec85da9896d74d9b792685353c7ece14d15301caa13b67ab4 WHIRLPOOL 973bbc338e8622c6cc94b76ed5d7b4c28ac0f5c495e84b74c14b91bb8479ebb6ccb632d1ccac301590da5b0e7092924400c26dd7cf179f18d6e9218945c04201
+EBUILD libbdplus-0.1.2.ebuild 961 SHA256 a1f287010533c030234239cbdd8601478c6847afb32fbfa94da27009f0b050db SHA512 003239dcd5a69e2db60d023b308229382e7c25c0a819b6722824d3ffbd2cc57b03c78e702f37844b2182e05b83090812eb55524855f37b03f8e5fe7166323707 WHIRLPOOL 7563f51b12e0f1d64dd27707c905ac9479b55c73c7a879b93319dd3ae82d01fa2d4ccdf8b400b416e1c3dd9f7f8dedb0da2e0a0d07699e91334d806b9d258242
+EBUILD libbdplus-9999.ebuild 960 SHA256 fedfff12fd29b0f839c232b8ba10f44f9735f2ac24b57f443d9c9bc158b8fa2b SHA512 1aee27f86e4701b93860773f7889b0d7d6ade6e74a5e61dbfecd0495455e403d4b252144c141c0822b8f5ced96730b3c057cd1ace568a8bc56d4f5d1b9435aa9 WHIRLPOOL eae0008044c538119c273c51cb01808979c2d0e55e933021d436d97d2cdf226c3f49137508b6f7fa99cc474cf980a87d00d2b17c5505ad14341affe0397b37d8
+MISC ChangeLog 784 SHA256 02d173ba6e55c5ad118ea6c113e396d9320f3b9a14089b5f2d8e74e483fa3c39 SHA512 bca38829a5facff3bafd3c56c01010fb4d8f62dd0be359950ebd719abae8972c7e21998820f6e43c2a4d166de171f02899cdd4adbcb554a4279effa18e0da854 WHIRLPOOL 19ad3f0bb4915f774d0326ac62d164367af10d62a4c095cc6e39b36300f380dc40b6230d00f48b9f01577363ecdae69c081c535e2100abde3a5df366386a0513
 MISC metadata.xml 241 SHA256 8c9a4f7182d1986591fdec7093ae9ed0a2d84e8ac8a7b74353e4be7caf408f9a SHA512 852fc3332ae99b1ae22237889aa112756c6fa63e7a17456f1f7fbc09a7cd334c7f5ad1751e4007dec6e4398db6a892d5c2d51e3196029ee7789d270c3676a0e5 WHIRLPOOL 658a1e24c48edc1829efbec75eb8240e07cb2dc4526aeb12b94fb76e5e42a0276e22dd31e86ceaca087cb9a1524e7686861a7e91ee1b28d43562dce755856df2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUyYufAAoJEEqz6FtPBkyjkp0H/jXnPrRP8bjGbnIImQTj/a9A
-Sw8HBwSPajdv9mgTThV67E6o+frR/jg8o1BJg4cML8BPqnOw6j5WZKQ2xjka12fv
-5T/mdyP+uBBi8CTfys/tCKXz4NuFGDY+Ca/NNZcGwhYVvL9AC73nvGAvLEAts58Z
-6o9g1lZx23vlASH/Pjei206hRVwJBziw22xK60t/YDKgSQ/Yj0ZHypi5xlyZvfPB
-A2ZZmukWEYw85OfZwSyEH2l7m+a/fDp0PSjLknKzJ0OJkmOHYQLY1mTAQbNDUJM7
-1aCvQfGAtt4pKgcsKdqOnovLy2TkxfgOmkUqfQp7wTdmv4N2Rwu6fk405YXPASI=
-=HcCN
+iQJ8BAEBCABmBQJVAwAuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOB8UQALAOrg8FWLs2sPQeFomGCJEh
+wg8RxBX86ITyBsfcdxK3+HguL8frcyePgS5gPZ1wnjwXQjcIWs9N+JRcPGKGUb5M
+He9/tY23Y2xUJt1tj8JpWAvKtC2xwf8DRNBT8WUYSEru/wNpUnYVOVMaODJ1lMQT
+6TrE8EIdVdYVIRJEekYMkBJ77rBe2IS4NIVORHRrpwst83i4TjZBXIfLqX4IS0jx
+R1myxoERHmhlsRt4vobgEqNp4/R4p5XlWhOYExGweFsL8ER8fyWpPozkdAIa3sSa
+CXm3rdoxCXhD41mt2hLgJ+jGFs9VxlvUw8Y9YEZ7gCsPEwh5FgpaY/S+IOzA0SPY
+7XYOIMeCJhHtmIV4CvpbuBZJE+RKXOjmRBIpqYAeQqnKhSzbJXD1eQaVV5IvAims
+TuQGq+YOVlOFENyzk4E5uyluxfJtzLQELQqE4LuMoYDjsQoe72Arz8iBmyvODbO4
+uPGD3BSIXGqt5zw0nIDPMTRFnzRLarlHLqse2jUOpnAtWly1uoCPoJ5LKJ9+grw/
+EpK7+WUudVKH6KzEGosuZkKU98B+o8WgEHW+8mThejd+36NMR5zssMeMaTXR9mhX
+AQsxtP0uM9ZDXXRAG2HEsLrs9bKrXtLOxGdmUpx/iiMGEaXv/sHmx2bgz2uFb2bt
+dA86bir/TZGElDDZuppk
+=bHo2
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libbdplus/libbdplus-0.1.1.ebuild b/media-libs/libbdplus/libbdplus-0.1.1.ebuild
deleted file mode 100644
index 61a911b9a4c7..000000000000
--- a/media-libs/libbdplus/libbdplus-0.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbdplus/libbdplus-0.1.1.ebuild,v 1.1 2014/09/22 21:35:45 beandog Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://git.videolan.org/${PN}.git"
-	SRC_URI=""
-else
-	SRC_URI="http://ftp.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Blu-ray library for BD+ decryption"
-HOMEPAGE="http://www.videolan.org/developers/libbdplus.html"
-IUSE="aacs"
-
-inherit autotools-multilib ${SCM}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/libgcrypt
-	aacs? ( >=media-libs/libaacs-0.7.0 )"
-DEPEND="${RDEPEND}"
-
-DOCS="ChangeLog README.txt"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-optimizations \
-		$(use_with aacs libaacs)
-}
diff --git a/media-libs/libbdplus/libbdplus-0.1.2.ebuild b/media-libs/libbdplus/libbdplus-0.1.2.ebuild
index 4c58113993f1..7569c752c156 100644
--- a/media-libs/libbdplus/libbdplus-0.1.2.ebuild
+++ b/media-libs/libbdplus/libbdplus-0.1.2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbdplus/libbdplus-0.1.2.ebuild,v 1.1 2015/01/29 01:23:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbdplus/libbdplus-0.1.2.ebuild,v 1.2 2015/03/13 15:20:12 yngwin Exp $
 
 EAPI=5
-
 inherit autotools-multilib
 
 if [[ ${PV} == 9999 ]] ; then
@@ -21,9 +20,9 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="aacs static-libs"
 
-RDEPEND="dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	aacs? ( >=media-libs/libaacs-0.7.0 )"
+RDEPEND="dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+	dev-libs/libgpg-error[${MULTILIB_USEDEP}]
+	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 DOCS="ChangeLog README.txt"
diff --git a/media-libs/libbdplus/libbdplus-9999.ebuild b/media-libs/libbdplus/libbdplus-9999.ebuild
index 9fb9b11e155e..8bb521962fda 100644
--- a/media-libs/libbdplus/libbdplus-9999.ebuild
+++ b/media-libs/libbdplus/libbdplus-9999.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbdplus/libbdplus-9999.ebuild,v 1.2 2015/01/29 01:23:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbdplus/libbdplus-9999.ebuild,v 1.3 2015/03/13 15:20:12 yngwin Exp $
 
 EAPI=5
-
 inherit autotools-multilib
 
 if [[ ${PV} == 9999 ]] ; then
@@ -21,9 +20,9 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="aacs static-libs"
 
-RDEPEND="dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	aacs? ( >=media-libs/libaacs-0.7.0 )"
+RDEPEND="dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+	dev-libs/libgpg-error[${MULTILIB_USEDEP}]
+	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 DOCS="ChangeLog README.txt"