Fix autotools eclass usage, bug 160431. Remove a redundant version

(Portage version: 2.1.2_rc4-r6)
 (Signed Manifest commit)

3 files changed, 22 insertions, 114 deletions

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 7c2f0b0c2f24..5fb12b406310 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-vfs-2-CAN-2005-0706.patch 490 RMD160 b0609022ed5ce0b782342ab7f1771ded69b44fbf SHA1 02c00c90e00aaa2d6cc0dbcb095a9f343e6fc3a8 SHA256 aa360ff6aff9ad766b97f96659f3440a7c5fddad80166170b7cf2e43f3bf0964
 MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
 RMD160 b0609022ed5ce0b782342ab7f1771ded69b44fbf files/gnome-vfs-2-CAN-2005-0706.patch 490
@@ -19,24 +22,19 @@ MD5 83ce05e705bb1615ecc14c41d848ab96 files/gnome-vfs-2.16.0-no-dbus-crash.patch
 RMD160 816b75d144fc264a34e45f0e2d17e37f528f1682 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710
 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710
 DIST gnome-vfs-2.14.2.tar.bz2 1816194 RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 SHA1 ffd2e5f229495f55587d8499e5f2b8b8a76e5448 SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7
-DIST gnome-vfs-2.16.2.tar.bz2 1852172 RMD160 805a009c439e3b416e99b0d543f1364db7c03c42 SHA1 6aaf7223ab95874d5171346ffa497ae262fd4653 SHA256 5ba60ec5172368674bcb1993995c498925e3cd9a409d07d0aaf9623def55a947
 DIST gnome-vfs-2.16.3.tar.bz2 1900424 RMD160 9600bb4f4630d48600c1469fa5077d8e969a10cc SHA1 a4c97179e2c4abf8cfcf236e56f7d328feaef89b SHA256 657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777
-EBUILD gnome-vfs-2.14.2-r1.ebuild 1999 RMD160 f34199f452b2c04ff28f7b8450efc83b12a30163 SHA1 3af9d2023675b79e012e684a9e06b4afb9890635 SHA256 873e5ca38af3dfd7795c1599ad5f064c3ce4bb04f5ca3f6387d62621815222a0
-MD5 16e63b60b39516a2dc44751d3e59ba8a gnome-vfs-2.14.2-r1.ebuild 1999
-RMD160 f34199f452b2c04ff28f7b8450efc83b12a30163 gnome-vfs-2.14.2-r1.ebuild 1999
-SHA256 873e5ca38af3dfd7795c1599ad5f064c3ce4bb04f5ca3f6387d62621815222a0 gnome-vfs-2.14.2-r1.ebuild 1999
-EBUILD gnome-vfs-2.16.2.ebuild 2450 RMD160 ec1c2017add4cca7d0d92b864b382125f6878e8f SHA1 4589485a90614b10aef2b49c73b4fdf1e33a4f6f SHA256 b791a07669cecb8b693d52f2c40a6c340d89fd1f2112e5fcfc7a497f7c5513f9
-MD5 f07dc836d9845fe3da907aa22cf6aa80 gnome-vfs-2.16.2.ebuild 2450
-RMD160 ec1c2017add4cca7d0d92b864b382125f6878e8f gnome-vfs-2.16.2.ebuild 2450
-SHA256 b791a07669cecb8b693d52f2c40a6c340d89fd1f2112e5fcfc7a497f7c5513f9 gnome-vfs-2.16.2.ebuild 2450
-EBUILD gnome-vfs-2.16.3.ebuild 2448 RMD160 806be63e96d4ad9397329308c8f2984e1044955b SHA1 7d990a7128ad3209aaa5270a724220fd0a386f4b SHA256 b37a1dfc6ae6c0dd84fc829515b791d644dbefd9118ed0ef81ef2826d64859f4
-MD5 67377a29a919cf155236686f5b044220 gnome-vfs-2.16.3.ebuild 2448
-RMD160 806be63e96d4ad9397329308c8f2984e1044955b gnome-vfs-2.16.3.ebuild 2448
-SHA256 b37a1dfc6ae6c0dd84fc829515b791d644dbefd9118ed0ef81ef2826d64859f4 gnome-vfs-2.16.3.ebuild 2448
-MISC ChangeLog 30624 RMD160 44625aa0051015e6360e35cde5ab56cf58f5292e SHA1 08858bbb4f304b0babee3deaa0bcef2acc357f25 SHA256 93e78ddc35cf5fb7ad532edd39b9542b4a1d900ef9215c661ab9ae7fe6eb7f9a
-MD5 dcac7bafbe807042380dfdad0586df72 ChangeLog 30624
-RMD160 44625aa0051015e6360e35cde5ab56cf58f5292e ChangeLog 30624
-SHA256 93e78ddc35cf5fb7ad532edd39b9542b4a1d900ef9215c661ab9ae7fe6eb7f9a ChangeLog 30624
+EBUILD gnome-vfs-2.14.2-r1.ebuild 2036 RMD160 83e8bf96ef2869a3f021ab103a9db77bfe77698c SHA1 30bfc0d8dfb9174c778dbb93a976de99d723d38f SHA256 42e72d37519652fc3e189bc2f514bec7ee432966859ba8498e2652b92a0b6db7
+MD5 345a311458b2341f2c59cb7cb7c6ed01 gnome-vfs-2.14.2-r1.ebuild 2036
+RMD160 83e8bf96ef2869a3f021ab103a9db77bfe77698c gnome-vfs-2.14.2-r1.ebuild 2036
+SHA256 42e72d37519652fc3e189bc2f514bec7ee432966859ba8498e2652b92a0b6db7 gnome-vfs-2.14.2-r1.ebuild 2036
+EBUILD gnome-vfs-2.16.3.ebuild 2466 RMD160 68516b27e7a623db2a1bfdf1eb1e7f03009d2748 SHA1 55411e6db44b618081317a7cf09ccc1bb597694c SHA256 cd6ce85f87b92746b6f187c7d03c7aa0cc297554192ac39f699b536dc666bd98
+MD5 75b4f7dd24721c081b66e33358f5a785 gnome-vfs-2.16.3.ebuild 2466
+RMD160 68516b27e7a623db2a1bfdf1eb1e7f03009d2748 gnome-vfs-2.16.3.ebuild 2466
+SHA256 cd6ce85f87b92746b6f187c7d03c7aa0cc297554192ac39f699b536dc666bd98 gnome-vfs-2.16.3.ebuild 2466
+MISC ChangeLog 30819 RMD160 c520b03b1eecfb07ea5c5c9e1e69a3606c1c9fe9 SHA1 e762a4a820abefda8970ce1d049b52d41543c4e0 SHA256 61ef58f2840f2d60502e2fa6893778254c792bca52af4f68f9e41115ddb641f7
+MD5 e34a615bd9a1b7d6231412b26a2a4112 ChangeLog 30819
+RMD160 c520b03b1eecfb07ea5c5c9e1e69a3606c1c9fe9 ChangeLog 30819
+SHA256 61ef58f2840f2d60502e2fa6893778254c792bca52af4f68f9e41115ddb641f7 ChangeLog 30819
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -44,9 +42,13 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 524f567956bcd255067b935908595f46 files/digest-gnome-vfs-2.14.2-r1 256
 RMD160 94eb0c6421e6f2d056120e84e6a1bc9ae1e2cf10 files/digest-gnome-vfs-2.14.2-r1 256
 SHA256 bb570a6e1ed458d3e0173c04dcdddf3bd535f6a5cbda70592e5c472edbc9aa8a files/digest-gnome-vfs-2.14.2-r1 256
-MD5 7448055a5029914820b4ed492031b304 files/digest-gnome-vfs-2.16.2 256
-RMD160 cbca2e6b91b5f8a901b0d85b80d0815bd680b6c6 files/digest-gnome-vfs-2.16.2 256
-SHA256 27f00d441abd897dca4bf9e1affba99edfb41769043b3ce0a5538930f61bd453 files/digest-gnome-vfs-2.16.2 256
 MD5 28792f7ed0fdae28e12fe6241aab69f2 files/digest-gnome-vfs-2.16.3 256
 RMD160 103fa1e26870938e412081a05cfb05ff0c5a0746 files/digest-gnome-vfs-2.16.3 256
 SHA256 835094a7022fd132b2fe440cf39b51e57961a11c434bd44fc6e9fda283d99e9a files/digest-gnome-vfs-2.16.3 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFoY5wkeYb6olFHJcRAh0/AJ9jexXMlS3/BBoRgFZJeB/l9jeJ4wCglLw2
+2e2EyctJk3I4+ZcwhP7nb2A=
+=eNUT
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.2
deleted file mode 100644
index 9b5b4d0b3b04..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1ad3988f374012f233973188ce518ae8 gnome-vfs-2.16.2.tar.bz2 1852172
-RMD160 805a009c439e3b416e99b0d543f1364db7c03c42 gnome-vfs-2.16.2.tar.bz2 1852172
-SHA256 5ba60ec5172368674bcb1993995c498925e3cd9a409d07d0aaf9623def55a947 gnome-vfs-2.16.2.tar.bz2 1852172
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.16.2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.16.2.ebuild
deleted file mode 100644
index ea935ac1ea2e..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.16.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2006 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.16.2.ebuild,v 1.4 2006/11/20 01:58:17 leio Exp $
-
-WANT_AUTOMAKE=1.9
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="avahi doc gnutls hal ipv6 samba ssl"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.9.3
-	>=gnome-base/orbit-2.12.4
-	>=dev-libs/libxml2-2.6
-	>=net-misc/neon-0.25.3
-	app-arch/bzip2
-	virtual/fam
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	|| ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 )
-	samba? ( >=net-fs/samba-3 )
-	gnutls?	(
-				net-libs/gnutls
-				!gnome-extra/gnome-vfs-sftp
-			)
-	ssl?	(
-		!gnutls?	(
-				>=dev-libs/openssl-0.9.5
-				!gnome-extra/gnome-vfs-sftp
-				)
-		)
-	hal?	(
-				>=sys-apps/hal-0.5.7
-			)
-	avahi? ( >=net-dns/avahi-0.6 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-PDEPEND="hal? ( >=gnome-base/gnome-mount-0.4 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	if use hal ; then
-		G2CONF="--with-hal-mount=/usr/bin/gnome-mount \
-				--with-hal-umount=/usr/bin/gnome-umount \
-				--with-hal-eject=/usr/bin/gnome-eject"
-	fi
-
-	G2CONF="${G2CONF}                 \
-		--disable-schemas-install     \
-		--disable-cdda                \
-		--disable-howl                \
-		--enable-http-neon            \
-		$(use_enable ssl openssl)     \
-		$(use_enable gnutls)          \
-		$(use_enable samba)           \
-		$(use_enable ipv6)            \
-		$(use_enable hal)             \
-		$(use_enable avahi)"
-
-	# this works because of the order of conifgure parsing
-	# so should always be behind the use_enable options
-	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Allow the Trash on afs filesystems (#106118)
-	epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
-
-	# Fix compiling with headers missing
-	epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
-
-	# Fix for crashes running programs via sudo
-	epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
-
-	# For gtk-doc macro failure when it's not installed
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-}