Simplify libcdio dependency string.

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

7 files changed, 31 insertions, 35 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index 264a7994c34c..ad4584cc77ae 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/qmmp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.129 2014/07/12 08:51:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.130 2014/07/14 15:24:20 ssuominen Exp $
+
+  14 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> qmmp-0.6.8.ebuild,
+  qmmp-0.7.3.ebuild, qmmp-0.7.6.ebuild, qmmp-0.7.7.ebuild, qmmp-9999.ebuild:
+  Simplify libcdio dependency string.
 
 *qmmp-0.8.0 (12 Jul 2014)
 
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 7362d6b5fa3f..3a96038af0f7 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -6,30 +6,22 @@ DIST qmmp-0.7.3.tar.bz2 848638 SHA256 57e4e1a00450a5a094b290df5410f8ab5a80da364a
 DIST qmmp-0.7.6.tar.bz2 863433 SHA256 e9964936822e44ac4cca9ab64ddf7e091429996b7d67694279ce5303624400c3 SHA512 ab9a0d337b786c0ad6302f704e542e60c419d567eee371e46f6cbe9054199ff012831d6f0503ee84d501ad5a875671e14cfd909d9aaee8057a9bcc77a1b411eb WHIRLPOOL 8156e72e4599c6b53f73be59c95d9258a670da1e33dd9bf6a274a784f8ded5c015ee2eaa5b41d6defc0f6a0ec2cc227d91a9ccd7a8955180a52faf17e649ba77
 DIST qmmp-0.7.7.tar.bz2 859947 SHA256 dda66bf60121a8a2cb7175b16b3b948099f8c119ee9a11c671555e8c38caa387 SHA512 d640ecd4683bdad3ebbfb5529c983a7647fb6dbd7262061012fc1b5fdfaed7042435764ae0eef62fe67b7fdf7c3a3f6ea47e57ed7d8414546f727669b2d36005 WHIRLPOOL f8b91f1a5bbed02804a2b53151e0a654a5838f626409e8580831401f211b80a2c50c8949127ff89e36e5aaaa0cbf7c3bcb6f3104b407fd04853b64e105dfbdce
 DIST qmmp-0.8.0.tar.bz2 977600 SHA256 61f44646ffd3f1d90b93607076a405160be5d9736e91c9739c80070bc5357439 SHA512 7103143ab8cc4cfd3f454dc3832caff2b73d9abc5362714b4084c9ebd6b58d8dc8eb04080ac9dfccd4f0d65c6e9bb85297ca2ca591c7f358115021ceede7dc35 WHIRLPOOL 9f29cb56ea27b67006a351c5169f028b9521d84c81b3babc130758689493c1faa0ce9f9c21c11909c7f7257e6ddde3133a8ee0c9a36c88153bc19180345051e7
-EBUILD qmmp-0.6.8.ebuild 3490 SHA256 109a12e0476ea594b47698e5d6675654d6c63f1dd674ee3308407c99a2087cda SHA512 ce06f496a0ee529802229add3547fa787db0ad627f04399f7cba7030728846ebb30c6ce7030f62f3cf3337029ee5b81c6f5947d4b39ade7b5fd11e6dc632efc6 WHIRLPOOL 5642c3dd5e1fe3c1d8dad166462d6218841f777461456fbe733ed8da7032040814d876d43bc2a6550b94acb35d220b1a8de2980834de45758508d3af64e2b436
-EBUILD qmmp-0.7.3.ebuild 3600 SHA256 c1b6d2cbe733a9d4b5564ac6424415e8659271e7ee76494cb322c0204b903326 SHA512 3f7d7185da174d6d55124b29fe20b072ca14e1f04c88ee2457602347ea00cb9e29980e0ca2eee5d3b3015be00189c6508f8f58a9355ab0ce72b50f04673bb797 WHIRLPOOL 6ab577a36f83e0cee36d2f2a780667eeb19075b51650d7843d4c6f2e7cd9c78777d2fdc2bd84a2b70deebbea8671a262f0853583b98433ac70810871bbbbe907
-EBUILD qmmp-0.7.6.ebuild 3604 SHA256 5a85bf817cc7f979b78f8f4d63c90b5b607e822ccfc7d8f84a237c1621f71d79 SHA512 6aaf81b17f0f3479bddff40e533c64c448fda6513ed4e869ae11fd19463fcb99ac68d90cae972e0495cd3f8b654baea1bb176d12f0971b392a3bc35de7b392a5 WHIRLPOOL ee46e508a4fb30ae8568bcfb8bed7aceca540f64a2de2a03bc702f53dc617e4e455809b35825e99a6970f14748037f8f78b19a71f080c1576e74ec50db287740
-EBUILD qmmp-0.7.7.ebuild 3600 SHA256 eeb41361063a40e50c84fc106ec40f996198903f7fd15f022b0b61189c68ebf9 SHA512 36deaec03534b7b6842d96a259754408328cbed4327fcb8ba27b8fe808aa2d36eafbf11372dd6b8a5a669096509e7e20e144e8b65d62b88a2341794865a4558c WHIRLPOOL 915cc69846508edac451d7a5c39aa66550805f52967988d5ce653f82efc039aae5ff50adbeae28b1301a93c995b2c91e1a3b2cbdea7aa4b0e2a2af9020841d70
+EBUILD qmmp-0.6.8.ebuild 3451 SHA256 de5192d679472468bc44051600aa5a9f38769dcca7e262cb931f51e60768d5f3 SHA512 1868f1991f900985e01715c044106c41c9a1014fdbf4eb462f013247b118d7ade00c2088b4dc0acf5e6e6e94694ad0c32100a1109f299e9f7062ab8dc7b1ebca WHIRLPOOL 16396775aa0380452bca282d5af54e1fa2b306c23f2a3e3889d211926b184c2011c96559c33879e69e6a3c73d4327c352778671f19a425fbe86b2f81ebde1149
+EBUILD qmmp-0.7.3.ebuild 3559 SHA256 5af0334c0c2d58965c65cac9f3ba2134236b74e11b5d371e3ccc5404a95c4f0c SHA512 89277b454fc71602cffcde9e2bb17f3e27e0f10c66726b1b7dfb7baa3069de746bb1ab6692cdee55f890236f51d866f21f9cb60c5d827a2c887b456f1ffa0cbc WHIRLPOOL 669312117dbf08ecb626ad2673f359ae0fcb337ed0c1d5d4789b2153942ba96fc84417c84af976cdff59485e8d790dd45e7861d7f8c5bf96e09cbf137a696c40
+EBUILD qmmp-0.7.6.ebuild 3561 SHA256 7fa9c9ca070f00936d62679741f3bf32db30709e3bab93ecb1b287fbe58dabb0 SHA512 57de9d014f543220d9fbe9125d4df0aec1ab20786a9a25739da3f3dad9b3fb897f5c5753ad2d64c570a47fff996e7f12b008bcbe622f20d75c0001097bfe7ce5 WHIRLPOOL 4bf1b455fb96538fbbfc5b2b7155cd3cd3ecb51b3932e8a9059286a6ea68ff3ac532d1aea36524d1d81e205ba2d0d89d754d72f51fc2ad428d6aa2816ffb56db
+EBUILD qmmp-0.7.7.ebuild 3561 SHA256 510fe0c3e1e3ff6e5f550fa937a0245aadb8b032a795afb4b2d38894d22cb44b SHA512 481172c669d84035002b5335b699d6ae1e8cf45f9dff7cd15a8fc34239d217c2e519bfb9df65f6b8abc6a8cf87ceaaa184fc1b08cc12b1abb88e51a17afdf707 WHIRLPOOL f181be7ed9ea6e87a985cb053e17370bbe5eeed22945e3e301b0f87e412110064ea429e8888538b4c5b02d9d99a673927745d50256792fdc379e3fed793f55fc
 EBUILD qmmp-0.8.0.ebuild 3600 SHA256 5110f1e008b91363c39933804c4e161b06b6a6c7c090d07a2c772068830efa04 SHA512 43ec8f0c6eb9ca4981b97790e5e208ace04df64920e7dc414dcc143559e0bb44941da34e8943f9c7321ebcd0d331f270f8fcde12b356e90efe9120d21f5324ae WHIRLPOOL 9921cee579f6797cb582aea62d38fc0488f70c7532f20ac284f71a96f115bf3e7b306c3227e9ac464e9195282a68d9e6ad6e209b0ccb60f17e9ace391930056d
-EBUILD qmmp-9999.ebuild 3600 SHA256 0621d74df95b394ec7ff3eede62ee038bbbca022cf508fe03ad0143be8aebd11 SHA512 91c394109341e30c674a766070dca4ecbfcec43caf82a9f234e72e4ae6a91c8436ca7913f38a745e9dff2b86ef72b3c288fdd5e89e03034907805453e8b366ce WHIRLPOOL 993cbc9a40765bdf459940b0419c39c06d06414010c3b3b2c2e4464069075a4574d99defdc5101febb0f3e3d95098a23f52b7fbec1ddc87d500cfa17a6954836
-MISC ChangeLog 16915 SHA256 7b730b04be80a00d13223d52c7d4201fc679640442fa9e7cec6a4b99b25bcd94 SHA512 3592a82f75d6909a6d4d5db948c66cb6a471dd060402733f88dff468008fd197cd629579f094b9200b7b95187af25296acbad5d10aa76303385d43e298d11c30 WHIRLPOOL 9d8fb3eb82ce21c812bd002044ca0483060262aa623eb263c36fb058623a9cdb573de6a4ce54e8efd3b51f40d1ab5e7334cd75ef23849a4c4c70792307a9f69b
+EBUILD qmmp-9999.ebuild 3561 SHA256 83021b746ca7c89420fdfea5ed7b1e6ef3b8e1a6450d2b0840fd82be1fbcfec9 SHA512 d98fd4055d6955e53af9b915796c518d97775b6076d39eb2f078a2b617c8e8e1acd6a839536b2ae212180dc06c474b520dc5e0fe16a0b607309ee4c1defc1028 WHIRLPOOL 0026bf90194553bab01c11e4e6e726c45c57f2f813530ce8ae5e983a0e21480a35373059164d873ac97c64607585819b3aead202d66b0974ccc9cc69b1fb1fbb
+MISC ChangeLog 17105 SHA256 08fa63cec802db3a428e2ee7de689b019ed6f2a117fd9cc59e16e9b534df3b51 SHA512 4b0a3f8c9a40dae7b144e69f61d188316d8e080281d8487d790885c4ad9ef568c615848fadf553424dd4a22de1088cb4e59a98a0a607307103878b3e3810587b WHIRLPOOL 8b8319460c83d7bedeaec9728f3b706ef96d6fddc6cc8b194f78112836846a82d3feb4bd8a4b97f11c0c815b4bdcaffbc49e15f7b18b6595a9784ed2cf93f355
 MISC metadata.xml 1185 SHA256 99c9ffd5cfd8994acbc1dc053c93d38ba135ee297fcdf2103cefd7d9d93b4265 SHA512 52224723076435dfdebad954a655b45f0be50bd52515c4c6fb1c9a91c4e3449886630e7c3f1c72a42695cb4bdb08c8633064289f0c267c7edc6374e3b8663be6 WHIRLPOOL 5289438eba45d6538ff9ec0fc8fe0c796ae243e96395b96dd545a842417e5777c4b3eeffb5f70ff8dfee1eab19f7b060fada3793ac085bcba4d0fe67d94be2ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTwPcsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88KXIQAMi1cknh9iXyofQPlgaBCPEl
-fQd26fU2z2UJ2sfS72kmM0/oBRy2Gp5OL/Vc0QSgiyKkl1hy3uYipmQ0LAHH1Dbw
-LoQr3uMcpL/sIWELEHQ50tgoTWn0QaWs282i2ALadXKFZ9HT8I7X659na554V49h
-Vv2qnZO6HV6tl3DhGTnHmtv4rxpLQ/9rlKVe5vbfaeNt2YSeYtjLdJdEFC1SLM4M
-kOS8tYhuZZXakXPfurpCPXPNZjvlE0r7lz8al82/2ZeicRBz8UFT1M4Tuk4KZHl+
-Ttn19HBAcFOmc9MX2+Zaz0IoPFW7Ds3gkh2nF/s831GEMwjJoU+5NiztFGkIBhyo
-y9gPExzABY4gp3YeH5s27TXFgymbAsxQyqqZw/Kcm/xPLpGDqadAUTTe1lUlPuhV
-TaScEuRes1SZ/HiWXwTSaYTZmIr8PNRSxVEw5h5AekVa5gXGELwEV+0iWPMVxVDG
-UruNkvuZ2UvCrAKz2P+ieeZZieH8tUVN+vGZhHqdiUtIRCd9YWUwR5E46O44oVOe
-ixazAi1DxJvGryXkYtJftrodv2IzbinGZE1csrdN+b/ZHNdknnFwoaO4HZKkMZqq
-9HbyXC1NvZgUeewaA+t5cNG/ox2dkb2oiIqeQ0lpZPAYaJsT8FUWgAK7Mup5ScJe
-b6+sJoPKpEvvx+5hGK3I
-=abKd
+iQEcBAEBCAAGBQJTw/TpAAoJEEdUh39IaPFNoYUH/RsXsW0hWK+vax2p9qZlANOi
+aZPtFGX00VG9Wzw5YEZyufe9SjA4KnNKIrFjI+4or0ujdYd1GwivYZkfygTka7Qj
+SIAkkpVbhRIbd75aCD+ruj7VvZS2szhnWeS+34DgCwPMV/YTxKH/Y9fAtNd6eVQN
+9+YBR2pTbyR6IaujCxTQ5bkFKW5Xt9WaKkonFbYIQA5lJ8GziAmaTdZOx5wx89j6
+6LLkF8H67ajOKRacJzsicQZQMeq86aBl1sFOkZce6HQ4RN7rbBcIssXLtTlqLe9l
+XSng3XW5FAlK5GLHZUfyl17ojMC+ABEtoOo/cOdxH2taxQ4kw6/mVlucqLhj7oE=
+=s4EE
 -----END PGP SIGNATURE-----
diff --git a/media-sound/qmmp/qmmp-0.6.8.ebuild b/media-sound/qmmp/qmmp-0.6.8.ebuild
index 8e3107ff144a..82218fb85ef5 100644
--- a/media-sound/qmmp/qmmp-0.6.8.ebuild
+++ b/media-sound/qmmp/qmmp-0.6.8.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/qmmp/qmmp-0.6.8.ebuild,v 1.4 2013/07/18 21:11:20 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.6.8.ebuild,v 1.5 2014/07/14 15:24:20 ssuominen Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ RDEPEND="dev-qt/qt3support:4
 	media-libs/taglib
 	alsa? ( media-libs/alsa-lib )
 	bs2b? ( media-libs/libbs2b )
-	cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+	cdda? ( dev-libs/libcdio-paranoia )
 	dbus? ( sys-apps/dbus )
 	aac? ( media-libs/faad2 )
 	enca? ( app-i18n/enca )
diff --git a/media-sound/qmmp/qmmp-0.7.3.ebuild b/media-sound/qmmp/qmmp-0.7.3.ebuild
index 4c56fc4e474f..a81979564f6c 100644
--- a/media-sound/qmmp/qmmp-0.7.3.ebuild
+++ b/media-sound/qmmp/qmmp-0.7.3.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/qmmp/qmmp-0.7.3.ebuild,v 1.4 2014/02/24 01:59:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.7.3.ebuild,v 1.5 2014/07/14 15:24:20 ssuominen Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ RDEPEND="dev-qt/qt3support:4
 	media-libs/taglib
 	alsa? ( media-libs/alsa-lib )
 	bs2b? ( media-libs/libbs2b )
-	cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+	cdda? ( dev-libs/libcdio-paranoia )
 	dbus? ( sys-apps/dbus )
 	aac? ( media-libs/faad2 )
 	enca? ( app-i18n/enca )
diff --git a/media-sound/qmmp/qmmp-0.7.6.ebuild b/media-sound/qmmp/qmmp-0.7.6.ebuild
index ae27984f3c44..b7c6368676b3 100644
--- a/media-sound/qmmp/qmmp-0.7.6.ebuild
+++ b/media-sound/qmmp/qmmp-0.7.6.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/qmmp/qmmp-0.7.6.ebuild,v 1.1 2014/04/18 13:33:06 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.7.6.ebuild,v 1.2 2014/07/14 15:24:20 ssuominen Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ RDEPEND="dev-qt/qt3support:4
 	media-libs/taglib
 	alsa? ( media-libs/alsa-lib )
 	bs2b? ( media-libs/libbs2b )
-	cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+	cdda? ( dev-libs/libcdio-paranoia )
 	dbus? ( sys-apps/dbus )
 	aac? ( media-libs/faad2 )
 	enca? ( app-i18n/enca )
diff --git a/media-sound/qmmp/qmmp-0.7.7.ebuild b/media-sound/qmmp/qmmp-0.7.7.ebuild
index ac936b29e55e..fcc887e3e94a 100644
--- a/media-sound/qmmp/qmmp-0.7.7.ebuild
+++ b/media-sound/qmmp/qmmp-0.7.7.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/qmmp/qmmp-0.7.7.ebuild,v 1.1 2014/05/28 17:49:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.7.7.ebuild,v 1.2 2014/07/14 15:24:20 ssuominen Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ RDEPEND="dev-qt/qt3support:4
 	media-libs/taglib
 	alsa? ( media-libs/alsa-lib )
 	bs2b? ( media-libs/libbs2b )
-	cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+	cdda? ( dev-libs/libcdio-paranoia )
 	dbus? ( sys-apps/dbus )
 	aac? ( media-libs/faad2 )
 	enca? ( app-i18n/enca )
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 169943b0ee67..b9d5d0765001 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.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/qmmp/qmmp-9999.ebuild,v 1.27 2013/10/14 19:10:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-9999.ebuild,v 1.28 2014/07/14 15:24:20 ssuominen Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ RDEPEND="dev-qt/qt3support:4
 	media-libs/taglib
 	alsa? ( media-libs/alsa-lib )
 	bs2b? ( media-libs/libbs2b )
-	cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+	cdda? ( dev-libs/libcdio-paranoia )
 	dbus? ( sys-apps/dbus )
 	aac? ( media-libs/faad2 )
 	enca? ( app-i18n/enca )