Only cdparanoia executable is used. Convert the dependency to || () for libcdio-paranoia support.

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

3 files changed, 25 insertions, 20 deletions

diff --git a/media-sound/dir2ogg/ChangeLog b/media-sound/dir2ogg/ChangeLog
index c3c5cf558fb2..09845b147f4d 100644
--- a/media-sound/dir2ogg/ChangeLog
+++ b/media-sound/dir2ogg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/dir2ogg
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/ChangeLog,v 1.36 2010/10/10 06:04:30 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/ChangeLog,v 1.37 2013/01/23 11:51:13 ssuominen Exp $
+
+  23 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> dir2ogg-0.11.8-r1.ebuild:
+  Only cdparanoia executable is used. Convert the dependency to || () for
+  libcdio-paranoia support.
 
 *dir2ogg-0.11.8-r1 (10 Oct 2010)
 
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 24a5c80c0510..a9bea6801303 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST dir2ogg-0.11.6.tar.gz 19442 RMD160 2a68fff4fe9fb32d63ca508b3a2b4af8729a9d64 SHA1 cb5a70bcb045f331519981674031f489136c0e66 SHA256 cd3b6baa42a5ee0acde95f2ef41a2a56d9fd6be1c9877e8bba2bf15834f935dc
-DIST dir2ogg-0.11.8.tar.gz 21145 RMD160 08e5d6a0979ceb3ed59060820d29146ac03b899d SHA1 94ed623e0fc5dfbbf445ae7bc787114cc3af820c SHA256 0b6fd089fc1eb20cc92b7901c947ff6033ce04c897f9af9f962fa421a67ba7e0
-EBUILD dir2ogg-0.11.6.ebuild 980 RMD160 936b294e28478f52c99a7d838b922de9767d56c9 SHA1 086b7483e1196bb6f187c15dfa94a5e9a3f2c285 SHA256 3ce60c0f2e82446485816bc3a397a923c3d3af17e8efae49cbfa7a1278f1434e
-EBUILD dir2ogg-0.11.8-r1.ebuild 1285 RMD160 7ec77f602a0d6164c00df52b0757fc511a6ccf0b SHA1 f5e5b548d9efa8b9848b43a575a18efecc25a252 SHA256 c2935d97331684ffaf7b03e7cc49eff828a8cb874fe3db0ae808724a32d859db
-MISC ChangeLog 5137 RMD160 4069f4ba5d44f2a40dc6c6cffeecfb50c096944d SHA1 af0410dc00ceac8ea226fec91e884946dfa65dc9 SHA256 e2a6bc3ae3c348be15decc297bb352dce842cc90fece8ef380631181bd02a236
-MISC metadata.xml 321 RMD160 6536b7ffc97efd7b920457d7469ad22edaf462fb SHA1 7c53ddbf7819b11747eac00bec9c739d715b6452 SHA256 f6f86d28629827a35402a8f5c74bde97a53292706ed885864696a31337547892
+DIST dir2ogg-0.11.6.tar.gz 19442 SHA256 cd3b6baa42a5ee0acde95f2ef41a2a56d9fd6be1c9877e8bba2bf15834f935dc
+DIST dir2ogg-0.11.8.tar.gz 21145 SHA256 0b6fd089fc1eb20cc92b7901c947ff6033ce04c897f9af9f962fa421a67ba7e0 SHA512 44275ab5b1bda26e2148b24a1b9fc49ee09e6f2848c1e62d13da12369e28a1f787c695c1547b002f13e1733d14984bf3ca0c425d60ace8bda69f0de28af0ed8f WHIRLPOOL e1e5bcb116e706ce90a63f661f6a20234a7fc350207a021392e9983f343c439d5a0471ac42b0114f47a74e7e93d6f589126cf4789ee69d455e459936d65f7600
+EBUILD dir2ogg-0.11.6.ebuild 980 SHA256 3ce60c0f2e82446485816bc3a397a923c3d3af17e8efae49cbfa7a1278f1434e SHA512 e11bcd50bd24239758cf91026603475f66b5527d0093050bf2a449b6aabf55d16a7abb07065e4ce884d60e224cc2594ad72a4af75b9c808b2a48ebd28696556c WHIRLPOOL 4b81d0d4e3e3b8153bb9aeb7b240046c9d49650f1c6f1676d2064e5b25d5d7875cc3ab62f6e051ca1b2eaf81f147f7c17ca875792c034aad3cd7719ee0b81bf8
+EBUILD dir2ogg-0.11.8-r1.ebuild 1320 SHA256 b4f84d78940a50126d1c0824a8905940bbac8f7c2a927a8f3b0cb2e5df6eb976 SHA512 efbe1b436a8f0842ec96d126bba7992a3e4f02c59af8356a22c7739dbeb87106f8cc2e2f572b474f6604a524367ea4fe5c3c10a22571e26085b6053cc299fa6c WHIRLPOOL 666411b715e208cb0260ec546ab76ac4e77601b849e749550e6d3a18d98c83db7a5715f1652020babed5665cd7f8d7b603aac75fc016713d46d53c8f83b53063
+MISC ChangeLog 5320 SHA256 4fc90203b69f1b4a1f4ff9ad2998e2d830d07eb2c578328e1cac8ea118f58e07 SHA512 294f349be675eb78b2bfe2b069778fb1287b5b15ae09e84fb0499bbf7b83403bb24967b4fe0775262bb352b6d80359c6b995c9fbe141ce4efccf457b51db8e4c WHIRLPOOL 3b2b15e3326c709ea28aa533e0c183680931b41f894e9a52e299df3bf968da8d9407d6105df2d5c42fc0e0af2fdf4b4d305f9a980da8ddee7c372163568b47c3
+MISC metadata.xml 321 SHA256 f6f86d28629827a35402a8f5c74bde97a53292706ed885864696a31337547892 SHA512 ebee5b29afa5b2788922ab99edbb1516db40b5b3698276ca0f2bc50538c439aef95ba66f2e4a31aff29d1b07764fadf291aa6b48d92b038450eb8085d8f5787e WHIRLPOOL db62b18cd3181958e135f93aeaabc312230a9e2b1011ab15bd2cbf6de38c9498322b1848e1085e84b0185c04bb2f27190c638da9efa9d7a540307581e2078493
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMsVd7AAoJEEqz6FtPBkyjsvUIAKuaDvXz3IzuYjkToXfa8HKA
-JB03namLViY6UX+oqssU/qTDsO/3dLmsquxe137I8ua7fNj1ZVllotrgjrIxJRoR
-8UHZCpmx4VZplEdRSKVzFDCcmspfP5X054U/UauKHRN7nymdLUz45aTVTp2LPoDF
-JoWm+xhSX8iKvU9wB/8Apd/AXCR+DKLlfI30B2RzStiOg4yhUPedbzQsVRocEVmk
-VYI7RGVvNGtWvONGXzLih/xVh3n6I7RjA2lG02/cBhhiSwHyJMp/jBfdHAafReWV
-Bjw2LdeJBTr9qhXSq+xt8rAPxzDNSXEJmt1PSPboppgHmdxOMAQw3dboR3DetRU=
-=P7z7
+iQEcBAEBCAAGBQJQ/86pAAoJEEdUh39IaPFNEJQH/RLV3ZG04KFFWDsYAiSxAWcJ
++zEIqKlLB7AokUF4zsG2Kox3Vu7PyKIqOOODkrac60wPNaiZ92xJ6rEzSf2jYa3v
+70pxAPb1TuFRdCOWSXPqabn6AWNMcSEYUy2jRnJuKyjtSMXB8u330E9kyoXuEfYf
+0IRHeSlJsTE973NeSvYRdHyjSK+z4GWwNXptrz4hwjkcMPyl95xAh70O57y2qaAF
+MaRB0CAL/PrMFC4sUMP1Lrl1ex4zd8oAyrd9qOlSnC4+YhI88dZkr6YPvnl2CCl8
+hCQRDtDC6/aaMn+Tf+o0l/eEIEcd8JQUV1VxVDq4MEXu11niwpCsQDqgH8XqyEU=
+=wJTC
 -----END PGP SIGNATURE-----
diff --git a/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
index c56ebd74b4f6..8800be5fa301 100644
--- a/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild,v 1.1 2010/10/10 06:04:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild,v 1.2 2013/01/23 11:51:13 ssuominen Exp $
 
 EAPI=2
 inherit versionator
@@ -22,7 +22,8 @@ RDEPEND=">=dev-lang/python-2.5
 	>=media-libs/mutagen-1.11
 	aac? ( || ( media-libs/faad2
 		media-video/mplayer ) )
-	cdparanoia? ( media-sound/cdparanoia )
+	cdparanoia? ( || ( dev-libs/libcdio-paranoia
+		media-sound/cdparanoia ) )
 	flac? ( || ( media-libs/flac
 		media-video/mplayer ) )
 	mac? ( || ( media-sound/mac