Simplify libcdio dependency string.

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

3 files changed, 18 insertions, 11 deletions

diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index aabf5efca1ff..ef53915594fa 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/cmus
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.67 2013/10/07 21:01:38 fauli Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.68 2014/07/14 15:19:40 ssuominen Exp $
+
+  14 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> cmus-2.5.0-r1.ebuild:
+  Simplify libcdio dependency string.
 
   07 Oct 2013; Christian Faulhammer <fauli@gentoo.org> cmus-2.5.0-r1.ebuild:
   make USE=mad enabled by default for people outside of desktop profiles,
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 35ccfc4f9bb3..c108777f95fb 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -3,13 +3,17 @@ Hash: SHA256
 
 AUX cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch 3080 SHA256 5c28f763c34609a52a613c6c264a301c4cc21cb620d4cd0074786e27dca194c8 SHA512 8670c44c20819c724d1a14b8cc598b7987b5b220e93a5b799dd5355da0fd431e42ea6de450489a7c7e3ca3da5404679c0a491ced993e22fa73e1b3eb604fd8e6 WHIRLPOOL c2e8c89fde7be1839af9a335879f5959b812c93a3a1fe2023fbace221f846b87595f2b5fd6e57716aeb1dcfed1f781ab15fa58850cca79d038443095a34c4210
 DIST cmus-v2.5.0.tar.bz2 224675 SHA256 2021fab64088898d62d1439525ec345e219f58d91a9e933dc85e84eda21c8ddf SHA512 a43e976dd7ca39d576ae51b0f66f9bc4fa21f30626cb814fa237389c9bbc1c0b5a3a28b1d3d0d86527c3a3ffb771cc68d29d5ca8b88f0390bda7926e668504e4 WHIRLPOOL 44baaf57e0e572736f7d2ed2fa1f16c6712831c1e10de5ef26a142f7b366547fa39212e5f947fbba6401212c9ffd41f208f4cbc457d9d9ac9f08282fbedbeb3c
-EBUILD cmus-2.5.0-r1.ebuild 2806 SHA256 3a3cb4fa99329b45091971142d9c0a9529a837b74bc8f698a433ebf2e55ed67d SHA512 1f3018169698ca9cdb22906410582f1eb04e4fa1d39dbd33d71ec90fd77370b84b1f529c0a16ed301a6e38618e215cda0cdb8c9de874470b2b81d07d3b4c10f5 WHIRLPOOL 3e42b3722e9ccfe3b21dbf8d7ee546ab24dd9ad344fa6936114ba85da3b64bbbbc07a6d5cbee8413ccc7fd93890518d78d3c664f4263a39d51a6b80c56c08eda
-MISC ChangeLog 9990 SHA256 2c1e69195774f290bc3213dc784535caf340c8f2db7ae0837979f8ac0956f343 SHA512 0f036e21c1ca8a544ba011a529a40f97920157cafae08b3a8a2334e1286a943aae3ed264a3bf84b4d7969ea5658f1c8b212148d7725b8b41232d096e645bb2f9 WHIRLPOOL 6990fad6d3c02ae0eda5ae21350af7c4c08d815fd396671d0aed8f44387d729db448eff5858f0f6a66e59c9959392ddf7d440325b4fa6de1fc5768f710ac6527
+EBUILD cmus-2.5.0-r1.ebuild 2770 SHA256 8901a1dd629c0827cc517ee245852a6367bfef6404bdf3729f29df06c1d49bcb SHA512 848ebf52427659264414686a371834434bf22c210dfe18ea4879aeff1ae0a4b79cf1fa03ff0172c4002c5b42b7d221d2a02b1f5107cadc68d800c7b90ddcb157 WHIRLPOOL f8f9454835a1bc83b06bc31ce9a40b82ca85d470d9a881a96715be91bdd1228b671032f57f00bdd3302ccc8fdf72d00a9c601374536b440fe74049782a3dcea5
+MISC ChangeLog 10109 SHA256 17a6ababd47cd114693e4984d40b022326018d98146e4b803daea094c59f6f8f SHA512 25ff620ea7f10c682e9c7feca23edc32f160e433e6d8d370a563a9c85a02352719e138d36da2ac39256644dc51b57e3dc3c7cff115ea4b90465b9c4a13b9b9e9 WHIRLPOOL b517a4e31803827a392bcb8684d60a1f979228640ea4aa7050d8fde705316da0d08393c2239c128c7122931ee9eb698cc5859c824d67766fdbfaa74c5f130754
 MISC metadata.xml 611 SHA256 d97e31156c3093352fd75327f7ebff1f97e6babf6b9f372277ab16c03811125f SHA512 5cda481701d4f94f8a09c06f7d0a7f583115d6e555bb33840384e6c0da9644218614cdbca0d6575641c341b2143d6cd852907ab2169b66d7d967f8f9d1eb29d9 WHIRLPOOL e3c34ac2fab6d1dabc290ee352f2e01532721d74295fc0ab012ef192e88fa9113eea601f863af429b25177ee153dd338443cdf6ce3e669fdfbeb3b1964df7fd6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJTIc8ACgkQNQqtfCuFneMvQQCgn4BcpEZ32hgOq3pr6tx2S+hi
-01MAn0y+QDDpUXx0Z0DdLbYLc/2kIqVo
-=HqfK
+iQEcBAEBCAAGBQJTw/PRAAoJEEdUh39IaPFN+TUH/A8d4mtGdlWYa2L8Yyqoxg89
+S+f3a1GPP9Ic9UbE/6jU0ngVcnSbIzvLWAUGHSR+nAV6p82heNyyrjxGsA87YdL/
+7digsiEinm9v2+7eQYsv6oizZeWRYoRvL6FTOq7Mf/1SdxcKcdaXbDfTwZ0yrQ1l
+ZJPqFZfSg0ENtgw3rub0AUHQ6WrqZqI3tXIfSV2gsIqfwhMps8dO4vDpehvE+3Pk
+utF8YANY/SlwrkT/ryLeEGYj8+K30I1PeOjXIbMNYXgRB2UQd+RiQkeSVfnnBjX7
+GnGZdFoqOaKxZ+ojbKaRMO21Zowzbdt8oNUMho1vFJyH2giNJuPYx0gLOp5uRNk=
+=ALu8
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cmus/cmus-2.5.0-r1.ebuild b/media-sound/cmus/cmus-2.5.0-r1.ebuild
index 9ccbc7a54b38..95a94d9fc40c 100644
--- a/media-sound/cmus/cmus-2.5.0-r1.ebuild
+++ b/media-sound/cmus/cmus-2.5.0-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/cmus/cmus-2.5.0-r1.ebuild,v 1.5 2013/10/07 20:56:51 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.5.0-r1.ebuild,v 1.6 2014/07/14 15:19:40 ssuominen Exp $
 
 EAPI=5
 inherit eutils multilib
@@ -21,7 +21,7 @@ CDEPEND="sys-libs/ncurses[unicode?]
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
 	ao? ( media-libs/libao )
 	cue? ( media-libs/libcue )
-	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+	cdio? ( dev-libs/libcdio-paranoia )
 	cddb? ( media-libs/libcddb )
 	discid? ( media-libs/libdiscid )
 	flac? ( media-libs/flac )