Use || ( ) to allow installation of media-video/atomicparsley-wez instead of media-video/atomicparsley wrt #504232

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

8 files changed, 52 insertions, 30 deletions

diff --git a/media-sound/abcde/ChangeLog b/media-sound/abcde/ChangeLog
index 6a158b1c62d4..864dc13f4f8c 100644
--- a/media-sound/abcde/ChangeLog
+++ b/media-sound/abcde/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/abcde
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.69 2014/03/10 17:32:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.70 2014/03/11 19:11:24 ssuominen Exp $
+
+  11 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> abcde-2.5.2.ebuild,
+  abcde-2.5.4-r1.ebuild, abcde-2.5.4.ebuild:
+  Use || ( ) to allow installation of media-video/atomicparsley-wez instead of
+  media-video/atomicparsley wrt #504232
 
   10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> abcde-2.5.4.ebuild:
   Force exactly 0.6.18 (-r0, not -r1) of dev-python/eyeD3 for the old 0.6 series
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index ba9a5bee1671..b4e3b45fe625 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -5,19 +5,19 @@ AUX abcde-2.5.4-eyeD3-0.7-api.patch 622 SHA256 93a18f5587a851eeee4ff616b60095f52
 AUX m4a-tagging.patch 293 SHA256 7832fb5fc4e47c716fbdbf09fcc398a1bc72e3cafd2856835a579f165c43fc77 SHA512 b9fc2e4089446cafa2aa4d3d17ee909e2eab79bb8ac5d9a56dc5353a143ccc45df968640ab265a1cc857c43db5c17285af8959424defd2e93faf056df3559d07 WHIRLPOOL 1d2309da08639f6b0efa9818b20f2d9a93c543729edd271a3b9601b1d7d1258c5f2c9a03d702873da5f7fd123702d98e7212e7bdd5c45b700259fefe979eab8a
 DIST abcde-2.5.2.tar.gz 103419 SHA256 db267729f043848552c9f45973435c081cf07f5d93037eac008b52d7883fef72 SHA512 a04578e06844869342437199523f8c75307b4687190efa34220c8b009e24badbe836dc1378c33f7c1d4bb6e6e5ea2430b9c9203747ee852ff7d25d87ec5e2b81 WHIRLPOOL 51eb20b95241134274fe09003a603e43b574d5ec9d03374777bdee5c0595f9e189f3269f6e3c2effb3056d7fae6abe63392e908fb5358e92803a094e94141447
 DIST abcde-2.5.4.tar.gz 104229 SHA256 85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591 SHA512 be3c8f697873b65888a37ea6209e161a6fc7bbe26c6e139b211b1fbcb233d3e250b21f6fad2114962ca4dcce79240e2cec51f69ce47549c737071a6122694791 WHIRLPOOL ae5ea868c7d66f8bd367f0a9724546721524b84ae0478fb9bd2ae64b1c1b358a24bfd8d0303ce3012c2bcce40d3b97a1cbcedcb13f8d4dea2ae6cd988d6c0921
-EBUILD abcde-2.5.2.ebuild 1494 SHA256 66a0a5baa51f9f0599c70a9853259ec8582da17edfd0d78552398bef59124939 SHA512 b43f079afd4883f1060528abf8415ada81a6ac5e67cc75dc08920dfaa41521af6d2f09147a5c8e812b88f219901ceb631cc7c9886bc94bd5ea78e1c9612ea70e WHIRLPOOL 8e709fd87117f94fec06dabf97b117225e51557cca85e3cab60ca6db33aba4bdd6f50f58dbf1a335230f4859da9ac3b4a555e440bdde8f301cb1a0a6eb0f9a15
-EBUILD abcde-2.5.4-r1.ebuild 1622 SHA256 9d91d4bcda67678ed2d13900e8fa0d80d25d9ff697a59072d72b9582d14cb5bd SHA512 d8ff232a1b7c603db6951c1c932e3ea8c3abf7e420fd7922451b48934aa71f093f2b6d5752d7397538a6a7c78c227cf001975c1a1136e736b1426d238f49f988 WHIRLPOOL 6ef9fbba88d8a93e6f4d8be2eb49a22e4d6a5941d9cd40525ad56f9cba3b6a8b3744c9d8ef6f345545655c83919314cff99c03e72b0d1b37728b57b66cf0a092
-EBUILD abcde-2.5.4.ebuild 1573 SHA256 743472c3341370de0331b402291809b87da094e6dc8fe051ab7a640cb8972656 SHA512 6800c9461287cca9fda7d317064312c9a6b9872f3985fe889899431e4bcc39ecfe476e6002beb8dd29a59d36a085791561eb04f5d22fac69ff23bf49040d231d WHIRLPOOL 3827862c2178f38918f3d5af493c2b398b23f2c4841885068bd8b75131fedaf4c970d2afe8c71ebccc985d3295d90ae2ab0272e5439f394b846a4c7aae03e0dc
-MISC ChangeLog 10045 SHA256 546c2b16d2ad5f65f57c445d59611e64b7758b52fb2d5d3711db96a4500f9762 SHA512 e352234ae6f8b6cf34ff964f47e99a864165489435d7232f52eddf7d00656093784b08e48e5b2195fca77f5e2f1eb41d69b93f3a9dcad653550c08bd44b83438 WHIRLPOOL a6fc6303300bcaf9dd2f3032a982614928e178969231dec93d3e01421821b29846dd0e2ae1243c4738f94c729cdf004ec2db8ac830463bdb525aa7f26b316bec
+EBUILD abcde-2.5.2.ebuild 1531 SHA256 f94fa2f57e695bd195964491506e067f3e5b796ac1138e618655e7b9fdc196b1 SHA512 cd3bcc66e1c7582df85a265c67e389b1a167dc834a1f2fe49652fa2c10e45e2c0291a4744eb823e911f146fda2759c23a9339efa8e78fcaa4cb3d5a3d95f9137 WHIRLPOOL 75fdbfcbb25862351fbbc833bc7d5f2443a1a98934d000527626c089f17d67cca38e6b2f00841b89d6bbc5db730dfcf42004ecca6342cd29908b794784647754
+EBUILD abcde-2.5.4-r1.ebuild 1665 SHA256 055d270e0a555947668a59830c05e74edddb41bad2c39120836f4df259159c67 SHA512 2755ef5124f15274b1db5d39401496275c259d13237f0e1cf609892a62d6de22b4c4f31b6eee89560f7e1387018d1438f3132e4bb1501959f557e659f113d4d3 WHIRLPOOL d7c2cef4bff0afc98030637af73cb58e82e6f1d442a27b2c1dd870f3d7048a522ad50606b87cf41a69ac0cdf7021108190007551dbb35207ab6580761b84f69d
+EBUILD abcde-2.5.4.ebuild 1610 SHA256 49229c3e4b3ec00393be7ad50d5031857288ab0ff5e25640a46e332309f7a946 SHA512 1c17a40251e4355286813445ef658068ec701d02610a229897667f5ff58f4de9cd0ef4168d2882859243ee6b576e3f4fbceafe13c7f2b54e1a4919a3c936cf2e WHIRLPOOL 35ba17449bba78ccf5f08180cf96540474e7164934b9d525a7b1a6cf6697d2cb1e5d8be997801fd24b56afdde8b45b3ae66fca9d87b7e9b3a032cfc91b676c79
+MISC ChangeLog 10284 SHA256 547937744cd04c7e6ab7526ff83445e63fdacfd62a47afd6926acae1565265f5 SHA512 e14b25b843df5854ded1b947040412024d1e44eca096dc504be2976d2372dd3fd7e085e887cbb7619951a02d4ce3da45c1aa8894a627814e25a02d73573f7b74 WHIRLPOOL 3dafb3ebe0249d09e7adba30e98c76e8304a283630643d07bc6c3c2998876267d860b888f5c4e62e7e35cf17acb9a372d1ce5aa0b35dfe6d1ac81f923bcd64a7
 MISC metadata.xml 503 SHA256 93ed304877b7336e5feccea3e2ef9479170b9b4a90f135bcf2bdc8bca34f083a SHA512 a55c181d39fb341086c0b6d56d7070104a026227bec84a90b7552b77559112749387f32369656d805a6b2bc19c06ee1c7abfb0649f8372b8834e095cefa473a2 WHIRLPOOL 3d5970ec2b7a630bd9afcd181b75e1a37b19a8f27dc8daa8e2f9ceb3a2d0c3f894e846797b38a1bc81c8ea976292642ab54e1d4ebfab01c30ac9b9d5b8b2fdb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTHfZaAAoJEEdUh39IaPFNVZ0H/2AQ3wat+G8+YLu69HgUZDtN
-IZ5REoxZFArbHjZU/QUtYjRqGjHEmG/nHvgVKjT9NdICxiv/JTi5+KQLt3+lVxcK
-H7i/M36AnJRzeW2lRtBvVHetQ97SceZieTxZviAwHBo9HYYafqeMNSZy30dkdJeI
-lxpF/ZRUs/Ovy95bjFrlmmTfhSc2uqbTXIH/y1vEusXsm9NPilVnMGccgIsKbK+j
-pzwy6/fi0/ifYXEMRKC30FvSbQP788iTbZgpzMmbIv0JFUISMMcVxfTC4jESRFAz
-InN6jUF7ivXRFkufz/+atAlXIPmq4fTs1o8i6c4/bTDkS4jeNZ5IZn0mskZngG4=
-=jIBW
+iQEcBAEBCAAGBQJTH18CAAoJEEdUh39IaPFNbFQH/3i8KbWASo8SMRiQP3clT9rq
+OCTZHAjx3vf+bL8+qNauFYDc+7lvXsi0EQf/dbunWYuwxbs7f4TKZU2C+tFQTTqs
+YJFvIv3HRkSI6m8zhY4dF+WxRJt5Pb/cncX4gOSLO2Rlby8GNFoSNYB6XzlXEHEs
+bK8XUdN8f/r8g5IzCE1XgrNgv+JgJRdG9O03LHjzG5eK8c4BIncqMnHwzrF05eST
+x5ie/jLB9VVK5Hr4HkjqS0fmnF3FPa8A3y8smWhnpSiqctU4kObsIDV4PT9Nix7p
+0QfleyEXl4PdbxwaWAHRAGgRZcq+N7sm3jyGT7f1bu+831/KhbYyGWrmUHYBSz8=
+=WbCt
 -----END PGP SIGNATURE-----
diff --git a/media-sound/abcde/abcde-2.5.2.ebuild b/media-sound/abcde/abcde-2.5.2.ebuild
index 8330a70312a4..c2d7c5ad4450 100644
--- a/media-sound/abcde/abcde-2.5.2.ebuild
+++ b/media-sound/abcde/abcde-2.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.2.ebuild,v 1.7 2012/11/25 09:32:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.2.ebuild,v 1.8 2014/03/11 19:11:24 ssuominen Exp $
 
 EAPI=4
 inherit eutils
@@ -20,7 +20,7 @@ RDEPEND="media-sound/cd-discid
 	virtual/eject
 	aac? (
 		media-libs/faac
-		media-video/atomicparsley
+		|| ( media-video/atomicparsley media-video/atomicparsley-wez )
 		)
 	cdparanoia? ( media-sound/cdparanoia )
 	flac? ( media-libs/flac )
diff --git a/media-sound/abcde/abcde-2.5.4-r1.ebuild b/media-sound/abcde/abcde-2.5.4-r1.ebuild
index cd0ac1167e2c..a36f160c5aaf 100644
--- a/media-sound/abcde/abcde-2.5.4-r1.ebuild
+++ b/media-sound/abcde/abcde-2.5.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4-r1.ebuild,v 1.2 2013/02/03 19:33:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4-r1.ebuild,v 1.3 2014/03/11 19:11:24 ssuominen Exp $
 
 EAPI=5
 inherit eutils
@@ -21,7 +21,7 @@ RDEPEND="media-sound/cd-discid
 	virtual/eject
 	aac? (
 		media-libs/faac
-		media-video/atomicparsley
+		|| ( media-video/atomicparsley media-video/atomicparsley-wez )
 		)
 	cdparanoia? (
 		|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
diff --git a/media-sound/abcde/abcde-2.5.4.ebuild b/media-sound/abcde/abcde-2.5.4.ebuild
index 55da03edd7ca..7a5f3c5757de 100644
--- a/media-sound/abcde/abcde-2.5.4.ebuild
+++ b/media-sound/abcde/abcde-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4.ebuild,v 1.4 2014/03/10 17:32:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4.ebuild,v 1.5 2014/03/11 19:11:24 ssuominen Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ RDEPEND="media-sound/cd-discid
 	virtual/eject
 	aac? (
 		media-libs/faac
-		media-video/atomicparsley
+		|| ( media-video/atomicparsley media-video/atomicparsley-wez )
 		)
 	cdparanoia? (
 		|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
diff --git a/media-sound/audiotag/ChangeLog b/media-sound/audiotag/ChangeLog
index 628bd06f70f7..d1b6b45dddc0 100644
--- a/media-sound/audiotag/ChangeLog
+++ b/media-sound/audiotag/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/audiotag
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/ChangeLog,v 1.28 2011/01/06 16:44:51 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/ChangeLog,v 1.29 2014/03/11 19:10:07 ssuominen Exp $
+
+  11 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> audiotag-0.19.ebuild:
+  Use || ( ) to allow installation of media-video/atomicparsley-wez instead of
+  media-video/atomicparsley wrt #504232
 
   06 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> audiotag-0.19.ebuild:
   ppc64 stable wrt #346113
@@ -111,4 +115,3 @@
   07 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> :
   New ebuild thanks submitted by Ryan McGuigan <ryan@cardweb.com>. Closes bug
   #45884.
-
diff --git a/media-sound/audiotag/Manifest b/media-sound/audiotag/Manifest
index 46e56674a190..843c906e956a 100644
--- a/media-sound/audiotag/Manifest
+++ b/media-sound/audiotag/Manifest
@@ -1,4 +1,18 @@
-DIST audiotag-0.19.tar.bz2 15016 RMD160 f4db43af490fc379c6062e44c63fac6edcc11dbf SHA1 1ee8e443f5a52a5dad2b062974b9b47b4768ec7f SHA256 7b6a2de751058a95755f0842b83f2b1d8b94e5cd7634cbe71d67257208bf4646
-EBUILD audiotag-0.19.ebuild 732 RMD160 22f9cba93e8c28e7404d9d4cea386c771b0fdffa SHA1 a163ba8af90772cd60448c665a737752495d0108 SHA256 130ea1b2fb664adcd4e898d41e74ca9466e46e91ba95d4c4f782e1933cdb5906
-MISC ChangeLog 3651 RMD160 e3f3bc8f9d0aafff14e0e1ad1e899dd858f23893 SHA1 df37b327c5bb786e880122020caa4cf8e63fa00e SHA256 0af960a3b71908d91227b22fcb99076f6b56226594dcfd22705fa68043a23bac
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST audiotag-0.19.tar.bz2 15016 SHA256 7b6a2de751058a95755f0842b83f2b1d8b94e5cd7634cbe71d67257208bf4646
+EBUILD audiotag-0.19.ebuild 769 SHA256 14c0ef84f94282692ae395eb44bdf0b1165ee8f3e0316923157e589a2cde6b30 SHA512 5c58bf9cf53b3a740d57a498ff58d559f28e521a606506d8fd529fe60acddef712ee63b3eac488680e2ce531310010ad781fe84924a550e820e070501893100a WHIRLPOOL c4b49e939c3549bc2ea78be600e916d0824a6119269672e004bc3a06f2769bb5aa5e27c48f1effceff365a4e41321116f034a6030e0393b0dbe422d8f0e6fda0
+MISC ChangeLog 3846 SHA256 229ca490dd1ca26e02b40b879822d686317c1d200194e3c43e02fd4b58470e13 SHA512 32b123738c10b865bda257924ad71b2d1e274861d65d33c7a500b0fdf6cae6c2a6526bf6ad689d3b9feb611ca7b1f67ee379867afa86c8e8aae447c22c2ea0ff WHIRLPOOL e1bf89275537954b4f296cfc3cb8226f46f2a0c2a2aaac33e3b57d6ff5a39b0b688344c0622706f18fb388e15d8cc6c04919b53a37b4e160f0b89f8d9a71e6f4
+MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTH161AAoJEEdUh39IaPFN4KYH/2ibSAq4b4ULOQcAGb8FiVLK
+KC1yOzpVD6iAqbQki3EHgssVovKZhVojLFzEf/BUmM7okwXBbbqMXPnAZw77r2i6
+2e1cDXM7zkwAAZQ5aVleBRYWCHxH1mpm9qDz7ZuiV8xATmdzlPf7fSlEI22ra/me
+Re9ugtD7aoea7+YY3MsaJIoJJd79WWI+4rv5EdGdUan0v1KDBZ/TaqeDRkJE3hyK
+2i3SEB7f3H1rmN6bEWI5+LcNTx5stspBjwtgQA+pf0nkfbBzjcmA2ZncNrpOcckd
+Qqz/0CXPS54c2p/iM3z//oSqveFIGgQdTh8+CFCTOdRBjW2DY4bAbgKwDqqdcn0=
+=5yp3
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audiotag/audiotag-0.19.ebuild b/media-sound/audiotag/audiotag-0.19.ebuild
index 91f42ba08fa3..5770b5d44387 100644
--- a/media-sound/audiotag/audiotag-0.19.ebuild
+++ b/media-sound/audiotag/audiotag-0.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/audiotag-0.19.ebuild,v 1.4 2011/01/06 16:44:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audiotag/audiotag-0.19.ebuild,v 1.5 2014/03/11 19:10:07 ssuominen Exp $
 
 DESCRIPTION="A command-line tool for mass tagging/renaming of audio files."
 HOMEPAGE="http://github.com/Daenyth/audiotag"
@@ -15,7 +15,7 @@ RDEPEND="dev-lang/perl
 	flac? ( media-libs/flac )
 	vorbis? ( media-sound/vorbis-tools )
 	mp3? ( media-libs/id3lib )
-	aac? ( media-video/atomicparsley )"
+	aac? ( || ( media-video/atomicparsley media-video/atomicparsley-wez ) )"
 DEPEND=""
 
 src_install() {