Fix compability with libcdio-paranoia.

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

3 files changed, 25 insertions, 18 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index 4b47cd59a0fd..0f32ad3a399d 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/qmmp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.102 2013/01/14 21:39:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.103 2013/01/16 08:29:30 ssuominen Exp $
+
+  16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> qmmp-0.6.6.ebuild:
+  Fix compability with libcdio-paranoia.
 
 *qmmp-0.6.6 (14 Jan 2013)
 
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index a8f9cf2236e1..97476785439f 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -6,24 +6,18 @@ DIST qmmp-0.6.5.tar.bz2 797215 SHA256 7a53af8228e0062eda5df5d34c00221587a1a3764e
 DIST qmmp-0.6.6.tar.bz2 798388 SHA256 dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99 SHA512 c87e4288ec5ef7f0ada07bbe3fd051e592cd1a7ca12f64821a17fa3fdefa42fa658f335d1e3cb25174bdcadb959361dc33ccdd34bf1b6b624201f563ca076d1e WHIRLPOOL ec90318ed771a5162d0a957734515eadb8de464cccb9a2face27b1f0472aad3b5885d77d64256f2b49779567acc33f419c0a6cae373749084c7a7904892198d1
 EBUILD qmmp-0.6.0.ebuild 3208 SHA256 fb51bc3d66446db598c4b341937b24cef56702c5a0f66766e2970efd4495e520 SHA512 166df11703aad4406156bdab75641f34374e8d3ebbf4ebd5b84659ce229f3a0eab4a5cfcd3ccfb19f3c1af9100cae6114a6087ce59a15caeb60ba28daea89fa6 WHIRLPOOL 7d4e64f08524390bae85318df458a3101435503d5ab64f9d5860fab1025bd4d4cd51c105acca9023c19bfc4a2c2ad37e95fd60d200697e75295767e5c2f5863d
 EBUILD qmmp-0.6.5.ebuild 3210 SHA256 9961a13e50a4b213ce5eb52b9c8e6cc04b137910fc0d41973e830f30c5f8c1e6 SHA512 c7244860cb7e9e16b0718548ded7ea6ad5157d0e75a46969d94fcafb02fc76037d177d89bf71230ec0ebfa5a1efb7c0c9acf4dedd721aa91289759044e5874e5 WHIRLPOOL 56b2b50fc911a1356696ceea9791e09b12dccb1d14fd2d5f6f7117907f2a048bb83305e65d5c1002a5e6d2e056886da15b8980ff9dea82dde014808d7a4336ab
-EBUILD qmmp-0.6.6.ebuild 3210 SHA256 244da67a4c722496c846da9f36386465b4ed8716a00f9e1f4dd51fdf33bddee0 SHA512 03e2bc93a8937aaba72e6fd0814273e181238f21264c3c7676b2d015cb9380a2c50e22daec4a1b7c6e185dcdb9fcc680ae8e652ef601a26c87c0f9857d096362 WHIRLPOOL c58d142f7666336eef16f88e53bd8a499998242dced4481651374388c7059bc9850a0abf2f1bbd2f34c2a9dfa82206ab5fdb4e9d93c4ba92081b7874f96b23eb
+EBUILD qmmp-0.6.6.ebuild 3463 SHA256 cc530220a77f7b7fe06d0c72c86e69008f39321547b9eec2f64f952da7a466bd SHA512 aefe4f6c15124caeab68fe71c20f3aeb76a367145a05448f136c43ac26bcb60827c265074f5a7b5c35f610a27397d7197a283e4e72fa604703ac3a66ba19a65c WHIRLPOOL 1c55264525de87bb73043af333c7136e1bb051f99d23258ba97cc05f6bf43930b786ea2dd2f1e4a94ab7d326b91c3d368c30b31a974b6b641527f904e90f4ea1
 EBUILD qmmp-9999.ebuild 3040 SHA256 3270cba6102e7d45c5cc29e3e698856062053cf24f116540dc94122631dea732 SHA512 88e0bb48f63570d511de4d503ca3d12c32837449962727a1a7d58c0a9ab7371dcb3a9cd70254fb633c350c1bd21eb885722498792827af35b38dfb123f7766ca WHIRLPOOL 7a859f8931af64cdfce0b1fc07b39aa88144e04374883335a0303dcf82685c97654779a49b9ef636c9651984b5febea63b70126b49df2e64512440622c8addc4
-MISC ChangeLog 13508 SHA256 a6b8635ce77000d7a26e895122d9aa85db8d04dadbdc8a2a183773769fe298b9 SHA512 8c3c3e9c107b49c3da66cdb3f5ba9db41d46c59f92606ae2b0f71a181544bd8bb83aed7c9bbf231396ec88088f7266c03a204ef88b5ae7ac99de0a8eed444a32 WHIRLPOOL 394bb4e5d09db807393aa3944c7f226e5317fc395380b10d981ab59e766ca7be86e844663bad027f51ce33252aa9b1d8dff7e540c2ab28daf3ec5a1ca0ac5395
+MISC ChangeLog 13624 SHA256 e9f012717e870e4fe784d000581b68fe641d6d764bf9161e6cd58766a69b802b SHA512 94f4c1b44683664981c13c9ed8ae15347def005f1932b0de738d4bf03ef3455302acc1b350cc88d64ad78d6032c4845396d2b147dbe9e0b9423546333b5df06f WHIRLPOOL 7ea3ecb56bd16a60f460e398b9fcb9f8c872d1398962182abb9faf49eea180c06f06feda839f69d2355981c680c122ba3876f3e2264633e4469699e6922e506f
 MISC metadata.xml 1136 SHA256 a377a91d1fc8233722ca0a95c3c81abd711e356c270cb8737829f2cc7021b575 SHA512 c6b6f654f143e797e6ade945b253f8e37ec9fda8adc482a23a152d1ccdb2afaadd3797a09db606dfa8b4375e9dfd6dd012156dc1d0f29be3b209e0fc99c13103 WHIRLPOOL 7742391dc0241c4ec33bc92d5732af4ac7e465c06bb7ee0dde0212fc56481d5b2690f54dcf95c86f21ade97f94c5ae409541253ffa8cb9b7a155b821e5bbb32c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ9HsYAAoJEPqDWhW0r/LCflEP+gPgsMqpB9M+bpRq30DT/EWo
-cRcZdzkbP6lxiOrd3SH+rXN2ts1ZwOyxB7NgwGQHUE/uaBQMryO/J4CNItVYQeU4
-LUMb8TgJZrSE9ni8zkU8adY40y5i+w19gugBDZVJh6sDhnXqkvg+UHRgQl7c4Upn
-/1A6XTANtkzzo3M5CTnt2qMSkV3oZI/UjQOrAdd+k3CRC+QLzR3KlvHVBszIr3+r
-qMJi2YmoGsEES3THiLpR10oLkudRCyEH3EYJcGdMDu29d9f7rXdrc+BnYr8TqIz9
-Gp3rfS9MJdc/ba2UNg2qWm6v2wM9o9t2ov8+Hpdt07U6am34qSnYM3flAotmFVlr
-6JG+MARv4KC9UNL+VffL5TS+yhXlLskKZ5cHM9JMjlJp0veLpJmoADm6AMFJMeo5
-976GWM4XW/WVM7hU8Y8Pgvpk1Te731nTjNqBlJQJPjiduSLlhadM22O81Nn3QC8g
-75xSw/v/jsiixBeC3vPCE8mTQ9AVWDk4fzeDW2M18DIZ8Qf+jt21eKWrx3UM0wFX
-J296oFCtdwGIAuL53lqJhlwhkFL8PU8uHF9EJzuwqV5TASH9h4wWhu5DLCcL4jHO
-ApNBg0lygZdcOXUveDLE3c2yieh6EdOHr83nGhlOcBEGweZQb47TuGCtSST5w25r
-yfwnMzTszEh46MJtVX6s
-=ZtPU
+iQEcBAEBCAAGBQJQ9mShAAoJEEdUh39IaPFNd/4H/1Owr2bFD0GPXZgjV+Gm0mm+
+yghMIed/AQ5m9SS7psO4BLeBB/AuWgN7x9RASgnJVFcr6oGp0ObJrNDGe1AmRnTs
+lfu0vH/thVGGdvceFEfCsApxmnSUD00zRxXAq/kDB1MXhnvvAAQESIqswrRgoiW1
+9EApRYL6rjsBqJw90rOEcOgkSIwmmBclAy4qEm8XCbPD3VYoTuSRT9Abwfms2fGd
+1ztVuN+uGd7LbDSPl7AgyDscj0fYI+g9SgNYJthv4lgV4rI/SiwZg7D/Se+C7xR8
+x7IAKsN/GBR11BjpwX28WaCwLpPgbAK6D0ICJf7dT8zZvktq51SVQsmmA4aqzxo=
+=qszA
 -----END PGP SIGNATURE-----
diff --git a/media-sound/qmmp/qmmp-0.6.6.ebuild b/media-sound/qmmp/qmmp-0.6.6.ebuild
index 0fae6965ec15..b46dbc731269 100644
--- a/media-sound/qmmp/qmmp-0.6.6.ebuild
+++ b/media-sound/qmmp/qmmp-0.6.6.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/qmmp/qmmp-0.6.6.ebuild,v 1.1 2013/01/14 21:39:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.6.6.ebuild,v 1.2 2013/01/16 08:29:30 ssuominen Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ RDEPEND="x11-libs/qt-qt3support:4
 	media-libs/taglib
 	alsa? ( media-libs/alsa-lib )
 	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio )
+	cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 	dbus? ( sys-apps/dbus )
 	aac? ( media-libs/faad2 )
 	enca? ( app-i18n/enca )
@@ -63,6 +63,16 @@ DOCS="AUTHORS ChangeLog README"
 
 CMAKE_IN_SOURCE_BUILD="1"
 
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	base_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_use alsa)