Add patch to make gphoto2 tests more strict, fixes bug 264941

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 41 insertions, 8 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 5e99e3f0e757..2c1a29c78a53 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.65 2009/05/10 18:33:54 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.66 2009/05/14 10:43:52 nirbheek Exp $
+
+  14 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org> gvfs-1.2.2.ebuild,
+  +files/gvfs-1.2.2-gphoto2-stricter-checks.patch:
+  Add patch to make gphoto2 tests more strict, fixes bug 264941
 
   10 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org> -gvfs-0.2.5-r3.ebuild,
   -files/gvfs-0.2.5-bash-completion.patch,
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index fb84024b5c77..f7cbb48e6a19 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -5,10 +5,11 @@ AUX gvfs-1.0.3-http-leak.patch 1550 RMD160 7ba63537fec4368f317e94f9b4bb6d33aef08
 AUX gvfs-1.0.3-obexftp-icon.patch 1007 RMD160 354048e4b1a263e1cb3a9fa3b20cba006cc203dc SHA1 e0ba373437f2a6eb5739fc0410b459236804ca89 SHA256 97cf921786c0af4f57ec0cb31b3f5161843535a985bc3bb560198a44d9269ce3
 AUX gvfs-1.0.3-posixtest.patch 3368 RMD160 75f3d776550b49169066037a8f77489e9dff3389 SHA1 a95f01f041dc51fb3b73f6e920e29507ccfdbc79 SHA256 9f7aaf14305b88f11ebf223cf5212c7a9494c58277031a728dfd210ec7b98325
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
+AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
 DIST gvfs-1.0.3.tar.bz2 920742 RMD160 2d12e1f6690773e3aad5d59c826c509fa40a9443 SHA1 2beb736acc7b38e99c9fcb0585de6918fad5e7b7 SHA256 17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
 DIST gvfs-1.2.2.tar.bz2 1049206 RMD160 7822a4e94d6ae24b54075338480989e4606e7bb5 SHA1 812db328361b83c770f320ea32a9e5c0c6d5041e SHA256 ee301e9dbdfd4432313b6f5edafa42a8d3b28c60c3a705a18a5a6cef27c315ed
 EBUILD gvfs-1.0.3-r13.ebuild 2834 RMD160 68c40088637cfd7265b5f6b595e36727eb940784 SHA1 f6800a30eeafe35a17e144394bdca62931a1e867 SHA256 509faaea743316c87af8413a60a051730d1254af498882fd06642d04f416795d
 EBUILD gvfs-1.0.3-r2.ebuild 2549 RMD160 f2cdecd0ecef907b0ea6edf7541724c8cee41822 SHA1 40169e794fee6710a0900d297bb8125f92568ade SHA256 0d3d94d668fa3d9750fc486d017f08f89281906d9fa54bf0fba282dc1ae5fc4e
-EBUILD gvfs-1.2.2.ebuild 1886 RMD160 c2238cbc2ba8d1fcb43aac93f591ca9d90fbb94d SHA1 4167593768b6879f2fddb1eeffcb4babef8ecb4c SHA256 12988ef244f0919b20b126440fe48a08587a1587a3ff89f7869ebd2441c0d68e
-MISC ChangeLog 9543 RMD160 031470180b8c7a8ee69b88e0616005c25d9dc5c1 SHA1 caf16334cbdc571e14ade8d48d445c9bfa9275a1 SHA256 318d0fed5e3f0f87152552b43a505db29b605df0d5bc625ee95c43b88160a857
+EBUILD gvfs-1.2.2.ebuild 2027 RMD160 0574d0236421adf0df2753f7eafecf2553645975 SHA1 c0eb9928f8f89064925899104b0eaa14425c93a1 SHA256 26fc71740add10c8b572771ed5af4c32f1ad29511bcc8f5986e4578615412670
+MISC ChangeLog 9732 RMD160 2e5cedf7d4906ed8360517b748b09deb7be32e7b SHA1 49240a5c65b19b5cf8ca77425467d25d2cff4582 SHA256 eb5d841e234b0403e0809893b615d45a63adea1281b2550ae63718eb393bcaca
 MISC metadata.xml 864 RMD160 71f72e397643a884a5df4613040bd7a711ffc8f4 SHA1 2b83f7169d29d389e6aba00812b2dfb25d7f1a77 SHA256 7122d3aa2f01e10a870560059bf8b3a2bec93730d3451e73f9d7e145acce3783
diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch
new file mode 100644
index 000000000000..78fecb7cd618
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch
@@ -0,0 +1,28 @@
+Gentoo bug 264941
+Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=578027
+---
+diff -urNp gvfs-1.2.2/configure.ac gvfs-1.2.2-new/configure.ac
+--- gvfs-1.2.2/configure.ac	2009-04-03 13:00:54.000000000 +0530
++++ gvfs-1.2.2-new/configure.ac	2009-05-04 22:53:24.000000000 +0530
+@@ -307,12 +307,20 @@ if test "x$enable_gphoto2" != "xno" -a "
+       ;;
+   esac
+ 
++  if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then
++    AC_MSG_ERROR([gphoto2 support requested but not available])
++  fi
++
+   if test "x$msg_gphoto2" = "xyes"; then
+     if test "x$use_gphoto2" = "xyes"; then
+       PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
+       AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
+     else
+-      AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
++      if test "x$enable_gphoto2" = "xyes"; then
++        AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
++      else
++        AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
++      fi
+       msg_gphoto2=no
+     fi
+   fi
diff --git a/gnome-base/gvfs/gvfs-1.2.2.ebuild b/gnome-base/gvfs/gvfs-1.2.2.ebuild
index 2ff2c74be30e..b95325f4f96e 100644
--- a/gnome-base/gvfs/gvfs-1.2.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.2.2.ebuild,v 1.1 2009/05/10 18:18:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.2.2.ebuild,v 1.2 2009/05/14 10:43:52 nirbheek Exp $
 
 EAPI="2"
 
@@ -60,10 +60,10 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	if use archive; then
-		epatch "${FILESDIR}/${P}-expose-archive-backend.patch"
-		eautoreconf
-	fi
+	# Conditional patching purely to avoid eautoreconf
+	use gphoto2 && epatch "${FILESDIR}/${P}-gphoto2-stricter-checks.patch"
+	use archive && epatch "${FILESDIR}/${P}-expose-archive-backend.patch"
+	use gphoto2 || use archive && eautoreconf
 }
 
 src_install() {