gnome-base/gnome-vfs: Fix obsolete macros to work with automake-1.13, #466944

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 60 insertions, 22 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 4357d9f11346..c68d45c18906 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-vfs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.345 2012/05/15 23:41:59 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.346 2013/05/05 12:00:37 jlec Exp $
+
+  05 May 2013; Justin Lecher <jlec@gentoo.org> gnome-vfs-2.24.4-r1.ebuild,
+  +files/gnome-vfs-2.24.4-automake-1.13.patch:
+  Fix obsolete macros to work with automake-1.13, #466944
 
   15 May 2012; Alexis Ballier <aballier@gentoo.org> gnome-vfs-2.24.4-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 35a6349ce15c..293885f5255d 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX gnome-vfs-2.12.0-afs.patch 663 RMD160 a8ac6fbb9792b02090d3783ce10481bbc6b3b830 SHA1 fc7eb54b19a3bf43f1edc253c6517ea9bb60cb6c SHA256 a0bef85feae74a1ecc46f148a476d295e65c92b7a379546fb68186a7733e2e00
-AUX gnome-vfs-2.15.2-headers-define.patch 569 RMD160 5ff16b2fc13ef170a39dad9c300a8fb1581f8f93 SHA1 f448746dd581d8bee99377d860f3d4fb51659eb8 SHA256 ac0136ec0df6ba7efac5ac3403809383e7f681556f082537ee866d0398110918
-AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 RMD160 816b75d144fc264a34e45f0e2d17e37f528f1682 SHA1 a3011624f5078b468c0a67023109723f9455bd83 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345
-AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 RMD160 91c4b7b771548b6645a1bf1764cff9af7947da43 SHA1 da27fcb4652a8f3a9e042a916371bbf03f03ad71 SHA256 478f55fe5e38714a22854351d46a031cacf1c003855865a8bdd1c2f1ececb5c5
-AUX gnome-vfs-2.20.1-automagic-deps.patch 643 RMD160 0e984be0bf21114192174b87ed9cb9b91df38ff9 SHA1 75c330ed9dd352aae758c7691d766ba7df1a7885 SHA256 7d50fa5944125190ce0b0d47013bc4ff4fbfe2908520828dc9ced80d9b47ed02
-AUX gnome-vfs-2.24.0-uuid-mount.patch 2452 RMD160 3c7069f905861ddad103a0696cac41033905e231 SHA1 91a57c3e51da5e27f7a4382d559935c1370af3d1 SHA256 beb9aace30a3976fae53c1d6972e2dc1dbc1040de804197c01ecea296f3eda25
-AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 RMD160 8135b3d02f5b82bc297fe35617e077cfbee8feaf SHA1 71eff46e892e5b9da952054671f7c6eb2ce9a506 SHA256 aa87d5a019cb2ebfa3f66b64f7bebb19ed143a825d33e9d7370f89f9630b0214
-AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 RMD160 5289d40fdad2581985a6a97295df101904a8f0c4 SHA1 d24a56fd996e5cb315626e5d69dae820109f5f2d SHA256 77dcd6c2dd00d05b036efee3014334e4d96bcbd40de9d4632290df6125dbfbbe
-AUX gnome-vfs-2.24.4-gnutls27.patch 3235 RMD160 fde822d2b6552ef3ead45191a32af4f36c3a1d03 SHA1 811a82255b192ecf604ab9074866c71e1d7f297a SHA256 36ddcc5004189c3aea4edbd88fa3bbfe605737b21246110b144ffffcfc29c38c
-AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 RMD160 ee9a680747ed1060dd41bc64fd78d9791faa2fa8 SHA1 97b5a7ab01ba0976fac02accad7671ade5b8cbe0 SHA256 4d1841e7c296f7774aea01649d28549b5d04db486c5c7cd0b4c0e63ba04e4dc0
-DIST gnome-vfs-2.24.4.tar.bz2 1890370 RMD160 6a5952bea02dfc96782b6f1129fe765f5313a75b SHA1 0dc634e7dd979fd218f378902c0ca1af80738961 SHA256 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa
-EBUILD gnome-vfs-2.24.4-r1.ebuild 3630 RMD160 3cc70d51b3d3e991607ad334876364e2701d0292 SHA1 e64b3faba393a53cd19d64f04ed50637d0efdce6 SHA256 67107f7d07c56cf6706b942ad5e6b81e5e4c3fedfc400e087dcb3a029f341a1d
-MISC ChangeLog 46171 RMD160 282b51bfade3d9e2ad4311e2c0b3db9da6c224fa SHA1 616b26df9300698cad216cbd1459a1602aae7db6 SHA256 25277c7f20592730c68945b42dc55391b16786fb1ea815aaca478b094998e668
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+AUX gnome-vfs-2.12.0-afs.patch 663 SHA256 a0bef85feae74a1ecc46f148a476d295e65c92b7a379546fb68186a7733e2e00 SHA512 38b1268e774ba2e7726295ee019f939b9dfc5d1a67f8e45d9bc30a2ae20f647acd9570740ad06cb17d83d9299f863aa14dd77a2ca2f9f4910b9c328111ae5ca1 WHIRLPOOL 80b524e57e89c1c6872d0a31d92f7ed27f4cec3d4bf04dac15770faf8c600ce92cf6e91cfb1e023635ae085caf525f6233be27bf193feb2e93d61452aca042a5
+AUX gnome-vfs-2.15.2-headers-define.patch 569 SHA256 ac0136ec0df6ba7efac5ac3403809383e7f681556f082537ee866d0398110918 SHA512 fc4c512ffe74368e83026b24d32c2c77a41f0430d24e782586938dde6061cbc023adcbe2bc21a19d2b584b6c22078ae6d3df7c839576270055aa6832337df60a WHIRLPOOL e547fd177ae3b54e98042339eca7013049493d5513582394de6a20ca7397c50427bd0aa650e90e92d54da2c9226e19c0793942d36c7d47d0da6f2c4eae170f1d
+AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345 SHA512 527c24b8902c9a1049b08f6479d32674c8f382a9ae4d7c6f3de772c09347555fda680a3dbfe70fcc312db8aa939ccbc4a42d1a84fd6a9f4a51180943766f5261 WHIRLPOOL f7a60f04c5d86697c1e2f8e40251614bd7ad1a8ca9500d57d25a2570220804175b7d77eea1a51bb5d900aaa81c4f1f600a6530ffd7b45b378ce222846125fdb4
+AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 SHA256 478f55fe5e38714a22854351d46a031cacf1c003855865a8bdd1c2f1ececb5c5 SHA512 32cd2438a7b8d08a827ad8fc6118f67f14e4a67a176adfe3d6e5cc5a97934733c337d6bee41f06ab47920032fed0fd4cd5e761f9ad4ddc0617a2005f21bbf2ec WHIRLPOOL 7425385b4b5b15453fadaa48522da0adec2bb1ed63f7388a20430cd3f977cab21a6520474ccfe52fec2c0b8c1a4a44a91e83fddf274991577af545f5f8860512
+AUX gnome-vfs-2.20.1-automagic-deps.patch 643 SHA256 7d50fa5944125190ce0b0d47013bc4ff4fbfe2908520828dc9ced80d9b47ed02 SHA512 95ffa05d5212fd6156611e021a2dcd9ec940b6aa74c85d3c8a3ba01d840578af1f1af459ab724559b5a6331a757a74f1fa284455fce2c311c39e1855556bd745 WHIRLPOOL 5dfd0a11f1c566962d8efcefc97366d0039fad5319e8f578150edaafe53a740177a2c501a813287846f1ad3e95cec2acaa29c1d92710e5dd26e2faadf8e61a56
+AUX gnome-vfs-2.24.0-uuid-mount.patch 2452 SHA256 beb9aace30a3976fae53c1d6972e2dc1dbc1040de804197c01ecea296f3eda25 SHA512 f66dbba17937b2b1b00aed3804d0b927cd65a2f462853069e62d7973d3f3d88c2a0a2d153e1c95c27ecdf363ff0530f0e8d9849e7b168815ca3f1ad0baf98b96 WHIRLPOOL ba9c1a6310bb9d5366a1444393a7267916397c023115215d906e189d786a653e5b8719ffce15e50e7fcb4bb6baf7126bd8749f1f8e3255b4ec980715d1f790cc
+AUX gnome-vfs-2.24.4-automake-1.13.patch 840 SHA256 a6637462eb518f0b97ac964977b2f947384b0fdc8fd7f1e860d32a28dc1c6062 SHA512 88e9ef1ff7cb513d576fa8d6441ff10c5072f277aef65f107c4f742690db9a4ebee0c986c3773d2055538c771672de84c3d08435cb1f8329dae633db395ae639 WHIRLPOOL 435dfc1036f3c84f1144683ccc06fcba716b773063e5b1d08c29e3f7cdc3476e52fabe8f45fda827a4fb32cf847b70fb5b2b4d0991160f2192aaf2a7c1a440b2
+AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 SHA256 aa87d5a019cb2ebfa3f66b64f7bebb19ed143a825d33e9d7370f89f9630b0214 SHA512 e9afd45ccbe6552daedc20403a0ea892a3dbf039439acc1bcabbecdcac57e808828a83076a6a29492ac74fa81b3f47a02b9d9d2a2387e445b03c8bf4f96e3bab WHIRLPOOL e0ab0bbd937be3b5ca3926f3175c27a6d50e9b5fd6fc1c1f4e395cfaccfbbeee573d4d6740708755d7a042bb54ad36e7229b9dd13498bc27b89202ad4d3557a4
+AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 SHA256 77dcd6c2dd00d05b036efee3014334e4d96bcbd40de9d4632290df6125dbfbbe SHA512 434a3491b55cfdd581bf3f542d464844941af72daa6933d957a85120d17ee72fff59e9d98e303bd17a3fd9f1694506186a52309d2ec3077680f7d45759e4ae77 WHIRLPOOL cf13feb6ef7d3178a5a4895a622702855cf4464fc92b8bbfeacef8650af8fda47ed3616a91f49cdd17398882d80416c957ab568b6a7e3dcdbd050e764184b177
+AUX gnome-vfs-2.24.4-gnutls27.patch 3235 SHA256 36ddcc5004189c3aea4edbd88fa3bbfe605737b21246110b144ffffcfc29c38c SHA512 a17ea282f22e22c2390c3a53efab2c99a3fbb2ee370c0c1a19a477ff76bdeae483bf1886f09680681b824254c14a8a411470c95319c4f3d5a7775f4369935b25 WHIRLPOOL 4c8a3e8f2202c31ebca9df4281f8212d65ab7ca04466034fbedb25c999644c55464950b3253c436fe0f5c65f3476894205d16178875834885d44a96f6ccde9b0
+AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 SHA256 4d1841e7c296f7774aea01649d28549b5d04db486c5c7cd0b4c0e63ba04e4dc0 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f WHIRLPOOL 253cf6b04c06bc03cd97ea10b7d6a5d82500b6c54aa835502e7ba6517abec5782e84997a34a2397b863ba2a37af07b697cb452c3486fd0d98a7cd67cd5fc7cfe
+DIST gnome-vfs-2.24.4.tar.bz2 1890370 SHA256 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581 WHIRLPOOL 53376928ae04cc1d693e57afe18f2b91431b8c8d678cf58eedd057eb23e9f34010294faf83e3085126adf310da5a135076cf085f63f1db0d3a1add21cc0641a9
+EBUILD gnome-vfs-2.24.4-r1.ebuild 3722 SHA256 00d78a672a014a08a6d31f6b343b5fea890abee6712654f90d60df749dcf2eff SHA512 8c2f93707af0e1ae44a8d98828b9d09c82c6bae4e91ab5343e250bb3407e6981035bd9d958803454d0bd32c79b24840ecbeee3236eb839f57d91026cac1db1ba WHIRLPOOL 1f21312ff95c1636eafbafbe14ba91f1c7b5d505f098924bf745aa6b3f26a157fe8e3470b3b924ba43087cd6acdae54ae5dd989deb134c282149a0e4b41623e3
+MISC ChangeLog 46348 SHA256 e8845e134873ed06dfd62c01b7d7705069303e89c4ef4bc72ecd9029039b88c4 SHA512 a65048ec7f401b96ae27109af7b336aecf437909109a2970deebb5b0f6b0d878b911d1a6e850c6ec4d2e7c67be19f72ea0b4afb4c17adc34c39c21a9f7891cc8 WHIRLPOOL 7bfe815bc267777081545e637b582d778a980999fb16fe57a830a2efb998ced3f9d04720252be22503fa20c4ae5a562639ed24fe6fa8bb8ee8aa2559f7122158
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEUEARECAAYFAk+y6c0ACgkQvFcC4BYPU0ryXwCgw75Y4fGiD2+tuUyAiQf3mYZ0
-wZcAmIO2Nrq3pfXbAA2V6ca09gViJo4=
-=4p3h
+iEYEAREKAAYFAlGGSeYACgkQgAnW8HDreRaPvQCgnfazHJHm6Mr+Ey03KxjlUXaV
+dd8AniB4ux5PI9HlJM+67kA7zF+7TXj0
+=PJnT
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch
new file mode 100644
index 000000000000..69f470a396a9
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch
@@ -0,0 +1,30 @@
+ configure.in     | 2 +-
+ test/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 7335451..7817998 100644
+--- a/configure.in
++++ b/configure.in
+@@ -33,7 +33,7 @@ AC_SUBST(LIBGNOMEVFS_REVISION)
+ AC_SUBST(LIBGNOMEVFS_AGE)
+ AC_SUBST(LIBGNOMEVFS_VERSION)
+ 	
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE(gnome-vfs, $LIBGNOMEVFS_VERSION)
+ 
+ dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 5b0992e..626bdec 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -65,7 +65,7 @@ TESTS = test-acl	  \
+ 	test-async-cancel \
+ 	test-escape       \
+ 	test-uri       	  \
+-	$(srcdir)/auto-test	
++	auto-test
+ 
+ libraries =						\
+ 	$(top_builddir)/libgnomevfs/libgnomevfs-2.la	\
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
index 86290e720832..beaa00b87261 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-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/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild,v 1.6 2012/05/15 23:41:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild,v 1.7 2013/05/05 12:00:37 jlec Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -101,6 +101,9 @@ src_prepare() {
 	# Disable broken test, bug #285706
 	epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
 
+	# Fix for automake-1.13 compatibility, #466944
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+
 	# Fix deprecated API disabling in used libraries - this is not future-proof, bug 212163
 	# upstream bug #519632
 	sed -i -e '/DISABLE_DEPRECATED/d' \