Apply paranoia.h hack from 1.14.2 ebuild to fix build against libcdio-paranoia, since libcdio-0.8x is now completely from the tree. Thanks to desultory for noticing.

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

3 files changed, 18 insertions, 19 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 8687f9321ccd..fb576dae1ac2 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.237 2014/03/29 22:32:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.238 2014/04/05 08:55:42 tetromino Exp $
+
+  05 Apr 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gvfs-1.12.3-r1.ebuild:
+  Apply paranoia.h hack from 1.14.2 ebuild to fix build against
+  libcdio-paranoia, since libcdio-0.8x is now completely gone from the tree.
+  Thanks to desultory for noticing.
 
   29 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.14.2.ebuild,
   gvfs-1.16.4.ebuild, gvfs-1.18.3.ebuild:
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index c2980c37a596..d3daafedc041 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gvfs-1.12.3-gphoto2-2.5-1.patch 2925 SHA256 fb55f86c2602947b88b53c3ebc8c4c2f1b15e3eefa69dc8a1936f91c3e737020 SHA512 2acc9179ba8f0cbfbe4e96b2535458a38753319fe14c32bb69574254be79a32db8223e0003c67c520d613d78f1c681441798d4e52b1ad2671571c358f655d32a WHIRLPOOL 98e9d0a201a09bdeba79e0c9698d8aab5097a23c7d9100a7dec1feeed643895ce74ec4ac1e6215d34f151a4d0be36c06d3497fe1fe234323bf94372105f51fe3
 AUX gvfs-1.12.3-gphoto2-2.5-2.patch 1251 SHA256 9ac03fb241f16a095812e6cd4440ecca5d20819874c9ed285af353e2bdeca733 SHA512 d41b0848bf4f5d09e5e0479d4722da1c52d6af0e65f9f62631f1dfce2f2fdea7569a2e95057bedf2c1180d4c0c14accb330c15f444d20fcf8346b61b3356d10a WHIRLPOOL 04c91a5f31ba1bcf21c22ca98ce505ebf28344b815bafa8338167f723b7d9b779b979e2f183976b7da570a15bb2dd7ab1f3b66bc7def373ab7759f1e98187987
 AUX gvfs-1.12.3-gphoto2-stricter-checks.patch 1719 SHA256 ba50fa4e9e468e62eccad1ebfc91f6c794f2b0f95da23a463ede260f4c9ca248 SHA512 71275ea9f3ba56577f0890ae087e8ab6704840a9f228bbfba8adbb31f81e101e9e9c0d78daf0ccb788e3e8aa0ebaa1b583f70ad5394858cac4e221ea2ceddcb5 WHIRLPOOL eb8952c3fba5ca5330a99ff7c5ad6789cf14532ce7166d86dfd8cd9b1cfe8599d51316c6daefa6d57d62659b55de4cb8a2a043a464a97bc1faabba39c0de29d6
@@ -12,20 +9,9 @@ DIST gvfs-1.14.2.tar.xz 1466384 SHA256 c3bbdac4bc89de82a2ba373799da80d24fb6a038a
 DIST gvfs-1.16.4.tar.xz 1497840 SHA256 903c6373955522c35acf07c610990812ed13e68ca514a42396cd2dba28b7580e SHA512 78662aa074f5d9c5e1f543d83adf06647507c1c4f04cdf3e8447ef9952055a0e5b11181cc1ce507b0f455fd70d24fd75acc7454dd60fd0c42242c6a3e37f0b06 WHIRLPOOL ec50f99e12915506403ef05dbf4851c539a3d6c4fa5087f215fc4ec96910e6fd35ae4ea9695fdc4cbd9ada7c959edc08aaaa3940f93fd98fa802e18951e2e1be
 DIST gvfs-1.18.3.tar.xz 1537320 SHA256 1d829716dcf1c5c016ee0c8aaff4cfd4fc4c719a4125f5c4f206f26c5bdc472c SHA512 1589c327de12c5186f1bc5ff48d9404062e2fcdbba266be44b4a71a52341cbd7de51aeecd41540d7ed73c2a21d789ce0d7ba83afa64a42b39753a66a3f81f911 WHIRLPOOL 7d35913ab3fea9dc1341b5e2f9dab3ed33f768e9f24e6ce78fbdad10ddafaae99531257941b445fd1540efb96f47cebd613a00baff18b5baa01509eaab3c5fa9
 DIST libgcrypt.m4.bz2 1526 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128 SHA512 fe7916d01efb1d14c4d84ed37f3b53b04d3b005cb04b603bded8d24e147fe69a4c0823164483dba3bc95cf540eaf93a0c0ad59f29f8e1edbae9566a81be5900d WHIRLPOOL 6baa8ed005a691fb1f31ac420d801d20a1611519a38749718dcf3956557f40a058c24b988d20534a62084fadd4141c44893cfa751ebf8011cf55d83c759868dd
-EBUILD gvfs-1.12.3-r1.ebuild 3365 SHA256 97a73a791dfd2ed20978eb7524859bf7030cbb86d7763eb4282a38a7249e3a87 SHA512 02b143e979283ebbec12f9a074ef4b372a14a71703b1842c644775ec77cf58eb5b24b8ecbad38132e8d61bceaf0ce2a419c03729f71117c2604dca35b925a704 WHIRLPOOL 53197212018a56f9f2da26be2fce30257c27b5369331d293f385cf9a880c6ac7334d11bffad81400ad185789cf4073d1046073019650369518b6d6d07fbf1b97
+EBUILD gvfs-1.12.3-r1.ebuild 3602 SHA256 54f9f048fd945ab3f1ea0cc5657dab2a4d0ef9ec923c61b25360783ddadc876b SHA512 7fff8ddf914893536b966c460cc0f40f7c1ed891324846f7b3e9b721f5afd5cd8e355d84bd4d28cd9bbcaa0a0c0ededd3aeeaca13e1e0ea6d0509a60fc214856 WHIRLPOOL 4331fba21a4a3c7239a5fbae4139f379646f88f321280e886d8882b4e29e74bd1e25b3def9f3caca3fc12d8ae09bfc9a6d2cf957cb59075fc67a6749d890f5ee
 EBUILD gvfs-1.14.2.ebuild 3933 SHA256 8ec05fc80ae5bb79e14c57b1357f18933194f56f22cf742cb4f5304b7a513b8b SHA512 0334aeff3a68e534bd18d086f115dd801f941a0897c043da208b2b171302e218b8532e89dde34c5880e23d4f41cf9ed0ef3c7eef7ea206fe295e1979796791f4 WHIRLPOOL 7a46b0a4d12b6692d257903722032de6d64906e24b8e3312dde10d5fa8b7b53ee37a5c5068dc31a7813142b03a5ea990317f33786103d820e21cdb3bdeb57dbb
 EBUILD gvfs-1.16.4.ebuild 3695 SHA256 8f5b34eb38ab5bf6b42ae08457662350e3ef80917ab45b2ac29db03ecb381eda SHA512 9db8f45365476749eb9e3b4778f921a5213af1b533dc7a597d5298332eee890a518cbc651bf30cfacc0115cfaf74f78c5e191fd1c6de6a685f69b8d7d207de1a WHIRLPOOL 0d84695a680cd472f8d38647535759afb7576285475e865f41a74fbb24148fa097ff7355ba5db3b65dcbd7405a57b2895e5b66af9a1dd553af61f0e856b32848
 EBUILD gvfs-1.18.3.ebuild 3709 SHA256 15c9bfe0e03c433867551b7c6c2a2c6d95fba277ec97cdf0c88d0557c79895d1 SHA512 75a1760f3564453ab9ea9bd053f210574a5cb237e715b5116f615cd2645024d5742229aa2ecb5c4c877e24928f3301c93603f2363da17d4129520f3230d504eb WHIRLPOOL bc91362c41c25990e62a35840d5961149bcc7923b6bf3f02ae9d760ae0ffb14783a82c5019d63a921e65e26ea5787da50876d8c5fc9306c7cc4d9348cfbdb84d
-MISC ChangeLog 33847 SHA256 adebf590b910f2f178197cf3a8b14e906cf2811b8781191581e809a0d4b3461d SHA512 faf040e81a081e4ab8b8e9d267ac4fff02bc6c3cd3067f2c33ab542a8caa98adf3ba5e0adb607454fd7f055d35bd9f9010d9e1a50f6dab73746b20f4eac48ee2 WHIRLPOOL 422eb698d7ef9b67630702585e61cee006c03ae89f4dc7821fa017454f3acd2c27e4ed8712e7b738df5a601b21ece10d90bddae580adec3fd5d5a232af0dc1a3
+MISC ChangeLog 34109 SHA256 205a60196bacdf9350fee9de282a34e9b75e0abb0dd84123fcfbf350a0f324e7 SHA512 606357df4875e8bf0fc6b4ae5c5bbd1c1ea7ee737e202a7cc6207043a4c7dd5a96f0cbc714deb169683adc2e5ded0303f4824d7946c2eed5554075c14105071c WHIRLPOOL 9993df53aa07cd3f8f508826694eda69affce87d468012ffe17c09d3ab4aa824e4de906ec208eb7fe051d94ebd853ec7cd82a3d5b6b066f4b555986012e8da8e
 MISC metadata.xml 1547 SHA256 5f05c22a706de39194219216cb6bbfe608656517126829067ebc3ff37fb2b4e5 SHA512 6e880b69df0c6a245645bcf00ba56d635a40deaecbe510c074982e976c942285e32abe334675333f375020eae8cc82134a72c7ba93afc8e03117c4975478def3 WHIRLPOOL 70c0ac42a95015c9d69fe39655a0110a7f396c3d407f867ab41bc0eb3520f5b906683b9cfb0e0ddb978dda7a330ba20c2ded504700aeb98b04511cd7a4622cee
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJTN0nXAAoJEJ0WA1zPCt1hT5kIAJmFGcC9sX6w56Wk5mKExipU
-7SMlJ3rdm+w+eKt/0LyUrdlkc1CDElB93tSvZdIXtHrllnOyog1+ZsSDTciCvm4r
-QA/2m4Gxu3AxVYIfO8K67qnxcHDsJDdVg7DoHRZ+YhTTQwQ7y3NTFiT4MON4UFVk
-YZZKqFIVhIHFZCV/vHSVHpV5JXklhXmYfhNp4GutA76T2LB27Yd3PmQ1C8nJMxfj
-8yXSH0xcZQ7LpgNs/kIwk/hMO5Ow91AeTLK4SXzH1Iff87b0RHq6Bfjx8I0SS3kC
-73FpOhyPNV9inrA58QpMTN0uk9KFGkHHQNbdkDI7xnZoSSTXgFcqLSYALzAQ+2w=
-=Gxme
------END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild b/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild
index 2d17e0ce4844..7e0de135fcc5 100644
--- a/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.12.3-r1.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/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild,v 1.14 2014/03/01 22:33:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild,v 1.15 2014/04/05 08:55:42 tetromino Exp $
 
 EAPI=5
 GCONF_DEBUG=no
@@ -46,7 +46,7 @@ RDEPEND=">=dev-libs/glib-2.31.0:2
 		>=app-pda/libimobiledevice-1.1.0:=
 		>=app-pda/libplist-1:= )
 	udev? (
-		cdda? ( >=dev-libs/libcdio-0.78.2:=[-minimal] )
+		cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
 		virtual/udev:=[gudev] )
 	udisks? ( >=sys-fs/udisks-1.90:2 )
 	http? ( >=net-libs/libsoup-gnome-2.26.0:= )
@@ -82,6 +82,13 @@ src_prepare() {
 		$(use_enable samba)
 		$(use_enable udisks udisks2)"
 
+	# Replace me with correct patch, see #452400
+	if has_version dev-libs/libcdio-paranoia; then
+	sed -i \
+		-e '/#include/s:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+		daemon/gvfsbackendcdda.c || die
+	fi
+
 	# Conditional patching purely to avoid eautoreconf
 	if use gphoto2; then
 		epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-stricter-checks.patch