Fix compability with dev-libs/libcdio-paranoia.

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

6 files changed, 42 insertions, 22 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index be78b47d441e..f33ff6a2f8b4 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.302 2013/01/14 04:22:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.303 2013/01/16 08:20:12 ssuominen Exp $
+
+  16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> mpd-0.17.3.ebuild:
+  Fix compability with dev-libs/libcdio-paranoia.
 
 *mpd-0.17.3 (14 Jan 2013)
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 1a65b9422c0e..dc30704a4eb6 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -10,17 +10,17 @@ DIST mpd-0.17.3.tar.bz2 548655 SHA256 37867e1859c51cce65ca793a641a61e975fbf3c564
 EBUILD mpd-0.16.8.ebuild 5527 SHA256 057bed13964b8cfddfb7ac8736fa97e9b823c9aa1e1d7cf5def5f94dfbb36f78 SHA512 f433c9bb10ca727693cf1ef55449d233352954704f3bc1f5d50db80bfee87e53eab522c340c64e33644b0aea680143f2a9fe22cd14410aacdad3e6d77b35f4fb WHIRLPOOL e9a4d264869a968693066115a2424b632644444d83c8444a605a8451369f882a06231c055f630dc2cf3c0ff1262d592405f7fc56b80b0ae6b69511413aacd455
 EBUILD mpd-0.17.1.ebuild 5898 SHA256 99b2eb683cd176f7cacd6fc8079d9ffe4272946a28dac4c839e46a90f621a059 SHA512 777778465aca403a5c1c52ce587434145dbe7b55cf01e974703eaecfbf7e9c6517a107838b9bedf493c58c45ea82161d5e67ecba1eff722c495d4ef5c1e9b9ee WHIRLPOOL b73373c6049ec609ce7d378121e20f83e67256d3ac67cd1bfe02d0be112ec0cd45e6b84b503e7aaa6a95ec19edb345764e190145733fbea197efda68c9fbb4af
 EBUILD mpd-0.17.2.ebuild 5898 SHA256 cba25fa07a647746a4374dadd1fadbad7d14c822e1b61199f8becd49cf3e3394 SHA512 eb6ef22bcfca9e9f5e054072fed893337b4993bab0df8bdd2818a221a5f36ab28801cc016feb2db8d4b6bb6caf8f96a116beb679ee4c9011e72db4f2f00687b2 WHIRLPOOL 24e4e45ebeaffea6a03d7dd4815b02ab5e83e9cc4e189de9a48a66a1e4d6a72a0e0ab364e508857a0b437f3fc1ff013fe74fba5389404c33e04e58e768bf9067
-EBUILD mpd-0.17.3.ebuild 5900 SHA256 4a8aa940ac924129cb381aa892d4d16b98711ac66342188a093ebafafdd394f0 SHA512 587df8028722f4309edc2a02f9dff32bd719dec4d9159a60bbcf3afa9c65b03ebd5186e69fe2f3bdaaf225f2b96bea2a929f97cff1413231c761d51791d46bc9 WHIRLPOOL 8c4ad634de2f9c00d76692be499624a9cb8c7a3644cb673d4faedd911b6729e5f3230b56257fac827dc1e71850763dfa72ee77d11d17695fd5db2520522c7079
-MISC ChangeLog 43559 SHA256 8c61958b2d0eeb14a06e9771f8492dcb71c29fd580d1cfdeb55791b0ad1449dc SHA512 7892d6fdc4663558dc593c20e8e6987cfe65ab6c998bae3433ee515a6805f1e6bae4c865a7f134b71228478c4b9e0cc45ede99e0f328f6f4898b76dc3dad85af WHIRLPOOL bb411474228dc4293748ce3b5f13a87fb8e41a8537712cc2f79c294a15ac2e305879d3ac9394311c28016cf6bdef8320c955f842c68f256e32d250cb9860d6c0
+EBUILD mpd-0.17.3.ebuild 6106 SHA256 c5a0b0082bb0488f23ef94a5afe5695466844a5383ea9884a4b5ca20af4504ad SHA512 d8bd3193664967ae83678bdfb79a6d295c0382f1160736adc7995adfd9884cd7a0bd7732856bfcaaf5643e66d795277623c1dbfb2b583fb1e61af04c9401377e WHIRLPOOL 400edd9b34989592f8c428717bb131976d669b9772b04c15716bfa0f214ef3f26c0106680d5f1154be070dc636702c40ce6a33696ebd83b5f4e74d3d93f7255e
+MISC ChangeLog 43683 SHA256 41cf4a5fe6ca3503e9c3bb4c1a1b2ecba1908beaead8537072f24730d5774496 SHA512 6940a84aeb6f453020efb8448cf656ae8956b1eab3021c227c56becb1672c17edb90b5b355ecc4a409c4d552ed1696e3e1e78da10ce4d3fa383971a46c23507d WHIRLPOOL 3505b8205aa6e6449ad077320df688956d6208a88a49371d4afa043c3c7c452f67da7b3dfd529b217f55c965e06f846092a0b658050a64263ca0321edffa37b1
 MISC metadata.xml 1859 SHA256 ac0f784f218125bb433527a9646a10e2b54064707b81caaeac7bea9e17904bc3 SHA512 f69d851132ac7db4459b216b6dc7eee4e498833f9902e0995159a1253c2ef00159bb7d1bdd55bc4c18a0383887ecedbe3e0684d7d4a5a673bed927f58ba27c14 WHIRLPOOL 54ab0532189033132bd7d50ab77acd9be0b2fb731502dcb46130f90573d6466dff534dba48bb385cef1a8459006da59a8fdbb25c16a5be54014c06721bd55a0f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ84gJAAoJEEqz6FtPBkyjLosH/Aw6EHSRYe6akqFr7cL0ghA8
-F2LdMmNALpg+5lBzeP1uMroTeivjaCgUFIUGzEyQ5lemWKwQDLkLUC+OUfWRuaa6
-eQ5/H02OO3Nq7uF3kjlfq8CcKc8zpxtiy7PVQXv8CE7Ii2H29aMzW07kSd04/v/i
-jEV9w/Lc8HLbSuox7xH9A+LKsSFQO0GLEBAR3BMHm27EahDJvPgloZHTNLwEH431
-cfLvb+RKRVW5pRCDIBsDeWmjJJeEIwOquOO3A7UZSDT+Qm5xrR/fQZXyzzC1/qKH
-d58EJ3R30fFrTmaXNvjfyi6xlCl9wg/RdEpQTBsyjMp8YeexiTJ4zBF0CpSW8yc=
-=KksL
+iQEcBAEBCAAGBQJQ9mJ0AAoJEEdUh39IaPFNOe4H/1hLDpkhaXQtXy5KQdKLWFVg
+h07PLcoPIYpFUUQrea/l33Ismg+lA5zg1pGLmDdU66q3ANiY+0vQfDVtHNozI1D7
+vo2BIq820U9y+mp0L30M+UKv9+iek6G7v4y4wnB9MyZACXbUHT3EwRpsPhFtYZ05
+c/6lWudYNdyHiKdRuoG3Swqd43cDCSxrFTXHLw7nY4LoFRVnUCaXUS8AkxijW90R
+vhkQ+6jc0iJSgQ+7IsMx0fMtJPJSi1ITpMT1DtyTN+6/k/uINxPCVwkbkCJAf815
+Tbpebjy6EdGlqXiZayp6WwknHiTTu8yBGi3B8xXcJMIdVhJeMU5CTSRp40mlsqw=
+=8xKs
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.17.3.ebuild b/media-sound/mpd/mpd-0.17.3.ebuild
index 8f76c3967cc8..1c4f16c4799c 100644
--- a/media-sound/mpd/mpd-0.17.3.ebuild
+++ b/media-sound/mpd/mpd-0.17.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.3.ebuild,v 1.1 2013/01/14 04:22:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.3.ebuild,v 1.2 2013/01/16 08:20:12 ssuominen Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib systemd user
@@ -37,7 +37,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	ao? ( media-libs/libao[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile )
 	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio[-minimal] )
+	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 	curl? ( net-misc/curl )
 	ffmpeg? ( virtual/ffmpeg )
 	flac? ( media-libs/flac[ogg?] )
@@ -90,6 +90,12 @@ pkg_setup() {
 src_prepare() {
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
 	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+			src/input/cdio_paranoia_input_plugin.c || die
+	fi
 }
 
 src_configure() {
diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index de828b49e587..58d37fb94c0e 100644
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/xmms2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.30 2012/11/16 09:30:51 slyfox Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.31 2013/01/16 08:15:40 ssuominen Exp $
+
+  16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> xmms2-0.8-r1.ebuild:
+  Fix compability with dev-libs/libcdio-paranoia.
 
   16 Nov 2012; Sergei Trofimovich <slyfox@gentoo.org> xmms2-0.7-r2.ebuild,
   xmms2-0.7-r3.ebuild, xmms2-0.8-r1.ebuild:
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 2d848a0b2d06..b8323571605e 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -9,13 +9,17 @@ DIST xmms2-0.7DrNo.tar.bz2 1519973 SHA256 59c58d9380e6b002920a8dc75f0fd4629ab175
 DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8 WHIRLPOOL 741dd85b8c065eea799675588a8d4c389c47fa3dcf129a9fd799bb5da0ffcb1eeffa45cfaca40af7c505908818b5e7960c1a54e947f53358edeb43841f2eaa5c
 EBUILD xmms2-0.7-r2.ebuild 6239 SHA256 d5c60070e23e70ef42bcff960304a3c99e7f911de2c98c9936a89b84974babcb SHA512 35cdfc50f79cc6c0d27912aeec3f81fa08c5a64b85918024da9ed40ac320d50576ee27c7968a2e725595995f9ad7175f701a2a58f15628dd9b3d0306694b53de WHIRLPOOL 0a651b9933c874673df635e5f9f70c49c027ee6efe5d5aab9c7930ee34e83c06d82941eea78634cd3729b7ef6995be089a825958aba65b9effe8003808de1277
 EBUILD xmms2-0.7-r3.ebuild 6475 SHA256 dfc21331365b7a6047f189eea1ca17b3212c9d8f079b0c3b6beab2b1b44526f5 SHA512 e80749311fb6a25adf8acdeeff5c4f4742c608d177a490191da33ec7669a4c78f07d735af1f9af5567ef699dea94781a60c4dc31878a4ae9f5a5dce5f0c55e1c WHIRLPOOL 61928d8dc09d520905da68bd6756d598240430cd96c0cc88d6db17e7e0fac3947ebb1f37dbed3ef4561f235e68c0276eaa6f059dfa9599b493b8bbfe6294db3b
-EBUILD xmms2-0.8-r1.ebuild 6716 SHA256 8580fdcef2ec36cd11cbffb29916a47bd7d5bf72788336421a8d991a2ac6cd49 SHA512 cbe491e5a6fb7f04ea9145f89b087ca351cb44bf788fa697a1852d613af4a95bee0357fd38a912a466c3ce1ba77dcbfe16f687a05546169281318564020de24f WHIRLPOOL 94483683858638ccf6c9a6003d6699a7ad95642036d10c76ae7e2c9833cea99cb7b646c938f9873a4d9ee7824cbb458148186e88b247f99aa5f98bb8835302bb
-MISC ChangeLog 5290 SHA256 9dca9f9733e973022ba3b622531a789b24cf44b4fbb811b80c0fb2cae35242e5 SHA512 807e6745e597e746ffda7443fcdb287a6d640bebc8017ccb3094f3262c1d319d397007f729dcc3c614450fc28e0d517995772241e0251e52de5a809117b02c74 WHIRLPOOL 7ef1faf5a5ec648eac3d154e03fe1a39c265a9a9f0ec3d285f04b1b058e12b33e70e4e7b32ea5a1e78f3d7b15a48161f25ed6bcb3c7a33002424d84993a722d4
+EBUILD xmms2-0.8-r1.ebuild 6902 SHA256 9956e669bba69e69ba9731aafe39b27ec654598301a910203eb4db11647be96a SHA512 d7dc05c993750579850f361ba13ac7a256fac9496d2019d9c3e2b610d85597eda39f96c3a36859ef75b899e4d90c2c44e497beaf29a9dfef5b7f4d2ef8b1796f WHIRLPOOL c43581b98c0e4fe3c1f08eeb7f86f9cb7b53edea032343598138dfd5c8804ed42d7dacba5700aa360d821e8939f8f93317d1760d08674c50d7735f8c54eeb4bd
+MISC ChangeLog 5419 SHA256 3afb3cfa78353a414d8337935bc47713821c4eed11f636bb1f744532d7ec7ff3 SHA512 48a07c8fc7ade1f9358eab7e9c89fceac84dc21c199a2e2a7ac06819f6484c841d45b35fb1fd5b492d7286f82e6af356db24b3de6d60046fdebbb7e90003a28d WHIRLPOOL e1ecc7bcc66811067926e17915f4d3bba4f708e79e921dd045ed4b39e73b20f594c5cb4aef2b01e2f4799a017a2e61ba06fe083aaaaa09270ca248beeceb82f1
 MISC metadata.xml 2435 SHA256 f7fb6c7694bf849149c7f3f3f2aec711543d994f782b95dd75ca1759bcc1e22a SHA512 a10a9821af91f0935adb73a0c7c315178c92f8821aede4d0da3a5ea1348280d02006027c32298fcdaefbe2e888c3416881fdd65800e12e340caf73d2ae0326f4 WHIRLPOOL 1e128aaf2c232dc22ed7b02777840f2a480039dfae65e36e586ae42785295639d4ee6798061c13bf2ce085b318ae8a84327f49dd560414a248ff2993a3736fe5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCmB9EACgkQcaHudmEf86qXigCeKNTbFcPOiCyVtthIy/OFYaQG
-ZHAAoIRdFytuKy44wt5iuyyGJvwp2pxb
-=rym4
+iQEcBAEBCAAGBQJQ9mFkAAoJEEdUh39IaPFN65IH/3va5zMIaJ/qd3rfuqOEto2t
+/CdrwAFnhJGPCfWphtvQ30IDlP9cAVYhxTVKzX9yBSf+AgFKSglzbZG1RNklOdVE
+P5cURQFS+/mqDYFUeRPBNLBaUf9O3/swPEqki5zV5/yzqYJ0qkIJGoQcVL021shE
+lATEsoDd6r0/lF1Kh5wDfjlMlV6nf9MC5eszmPywZzkx243jq8JglMieUJQggeVq
+Sje5NiV3AIF5/JlxM9yM48MbWUaHDY2PSq4qMhevlXIP1F0G2A4Otzrjw8+qP40M
+0mNbYROxCcjapQpgmn6Afj4W1rkU4zQsQxImO4NqBbUFROcPIi2u+17VV7AhBvs=
+=TPRF
 -----END PGP SIGNATURE-----
diff --git a/media-sound/xmms2/xmms2-0.8-r1.ebuild b/media-sound/xmms2/xmms2-0.8-r1.ebuild
index 397eb0006d98..4de33daeac89 100644
--- a/media-sound/xmms2/xmms2-0.8-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 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/xmms2/xmms2-0.8-r1.ebuild,v 1.10 2012/11/16 09:30:51 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.11 2013/01/16 08:15:40 ssuominen Exp $
 
 EAPI=3
 
@@ -29,7 +29,7 @@ RDEPEND="server? (
 		alsa? ( media-libs/alsa-lib )
 		ao? ( media-libs/libao )
 		avahi? ( net-dns/avahi[mdnsresponder-compat] )
-		cdda? ( dev-libs/libcdio
+		cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal]	)
 			>=media-libs/libdiscid-0.1.1
 			>=media-sound/cdparanoia-3.9.8 )
 		curl? ( >=net-misc/curl-7.15.1 )
@@ -107,6 +107,10 @@ src_prepare() {
 	cd .waf* || die
 	epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch
 	cd "${S}"
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die
+	fi
 }
 
 src_configure() {