Ship libgcrypt.m4 to allow eautoreconf without libgcrypt installed (bug #399043, thanks to Christopher Head for reporting). Also, move gnome2_src_prepare after the eautoreconf.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 26 insertions, 12 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index b84094d612b1..b74a130d61b8 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.163 2012/01/14 17:04:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.164 2012/01/18 08:55:08 tetromino Exp $
+
+  18 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild:
+  Ship libgcrypt.m4 to allow eautoreconf without libgcrypt installed (bug
+  #399043, thanks to Christopher Head for reporting). Also, move
+  gnome2_src_prepare after the eautoreconf.
 
   14 Jan 2012; Markus Meier <maekke@gentoo.org> gvfs-1.10.1.ebuild:
   x86 stable, bug #393007
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 24f943b823ef..5d0324534067 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
 AUX gvfs-1.6.7-fix-renaming.patch 1484 RMD160 a35255f2e926ed44f41bf1ff14dbc1b50925113d SHA1 880f387bb127ae7c0346ee6114a7bd127e68c8ee SHA256 af564f4c555b1052fd88bf14798abd095920765f356549a40c56f6b791aaa5af
 DIST gvfs-1.10.1.tar.xz 1295236 RMD160 e50d96fc0b6aa9d2ab50a3cfc5c161be5d6e6e16 SHA1 d564d9934191342e6421cd038fc0674f8dd27eae SHA256 cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288
 DIST gvfs-1.6.7.tar.bz2 1404372 RMD160 e833fdbc9dc503cdde8e0ab5a7a8fa5403ec1aa1 SHA1 285a810772dce8b37289cbe0aaab8354f2b6717a SHA256 fe5f6181eac14d5147794389bf57717226a15ddf8283631b434c2d9ec120d659
-EBUILD gvfs-1.10.1.ebuild 3010 RMD160 d45b3a704d84347e31e214b00751166d3de09ed7 SHA1 9ea6f59e0220889286bfcdf93b44dbbc7ea4f18e SHA256 6950dfcb0d870257a6bcaed0bb9605938d48279617120d8084827cadf2d86f61
+DIST libgcrypt.m4.bz2 1526 RMD160 6149f51c00e1e21d85187136f7682e41271fed40 SHA1 1731ae882cdc7c53efeef2e23e0d2d9791c6d739 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128
+EBUILD gvfs-1.10.1.ebuild 3222 RMD160 7e69eb1bfd6faacfa26f29ee1be5f25a9bd14566 SHA1 71dab32e0dc201dffbb1cf13000f15fa8218a02b SHA256 4beb5cacf54270ea1a39a36b1207e105c451a078d3b28540aa502667e13161de
 EBUILD gvfs-1.6.7-r1.ebuild 3430 RMD160 d31f05df83ae8212767e5898bcaa87812bb871e0 SHA1 3e66a3ccc5d434e1e3d46522f14ca022486f875f SHA256 e0143c8ba2d0a580460561a05a7f230fe4de8374ed79d28a445b7fe83ba95444
-MISC ChangeLog 22467 RMD160 9d8d4cff5250f8eee5c1b5cbd5f01413e145a406 SHA1 29d90c75166a4d987581c1f1f7a21815b9ff0cbf SHA256 6980604ddc250c3f0e2a254af51878e20d99d0f1c6610ff29ba735adaac4ca78
+MISC ChangeLog 22733 RMD160 b9a58b63567de58b0d27d33f7af0cd2a8a34d551 SHA1 a7e88186538b9989362137d3360771d4095f30b6 SHA256 e3b44b10e8d638768014dda01f616d9e4ca76c198ea3497d7f9712704285c0ed
 MISC metadata.xml 1365 RMD160 91bbd0b4e8e676a0a8ac3302fbfaa83d0c905aa0 SHA1 13d13a60eabd3dde5139d7fa3cd0a3ae7a88a720 SHA256 8bdcd7b16c5ddff7b3f933412a06d4dd840e5ff33b00ee4283a7ec75d974f38f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8Rtg0ACgkQkKaRLQcq0GKW0ACghPFAJGasdTH+s0nXV/slfJw4
-KygAoJXr9SMo5Bl8bXXfmCQhq8II1+co
-=0mcM
+iF4EAREIAAYFAk8WiPEACgkQdjK8w9WeBnA7VgEAh8DDW2ZdcDSrsU/0LH7DjcR1
+U1jW6EtBOA0CqmMmSq4BALcTXN58+Nkj5oONqqbBoN+5kfc+hC/s5NbtbWvkuN81
+=38QE
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
index 1fe402cae4da..08d75c72dc9c 100644
--- a/gnome-base/gvfs/gvfs-1.10.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.6 2012/01/14 17:04:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.7 2012/01/18 08:55:08 tetromino Exp $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -24,6 +24,9 @@ else
 	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
 fi
 
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
+
 IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev"
 
 RDEPEND=">=dev-libs/glib-2.29.14
@@ -84,8 +87,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Conditional patching purely to avoid eautoreconf
 	use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch
 
@@ -101,7 +102,14 @@ src_prepare() {
 		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
 	fi
 
-	{ use gphoto2 || use archive || use prefix; } && eautoreconf
+	if use gphoto2 || use archive || use prefix; then
+		# libgcrypt.m4 needed for eautoreconf, bug #399043
+		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
+
+		AT_M4DIR=. eautoreconf
+	fi
+
+	gnome2_src_prepare
 }
 
 src_install() {