Update to EAPI5; drop old.

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

4 files changed, 19 insertions, 146 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 4a768ec92f01..e8f00adb22d3 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.194 2012/12/03 10:02:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.195 2012/12/10 11:26:30 tetromino Exp $
+
+  10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -gvfs-1.14.1.ebuild,
+  gvfs-1.14.2.ebuild:
+  Update to EAPI5; drop old.
 
   03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.12.3.ebuild,
   gvfs-1.12.3-r1.ebuild, gvfs-1.14.1.ebuild, gvfs-1.14.2.ebuild:
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 7eb626f61adf..224df401baea 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -7,23 +7,21 @@ AUX gvfs-1.12.3-gphoto2-stricter-checks.patch 1719 SHA256 ba50fa4e9e468e62eccad1
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519 SHA512 2f1c8fb6d3fe1171991b2d56fceb7f36ed52e17b29b003eaee09a7550981466de4c7da1b85b16ff71cc710fa0bf90dddd25d0cb91ffc095e67764e75fe09b347 WHIRLPOOL 8b44d6106752108b8db2c548508ead6c951a2baba2725c513e66d95bf2f34a257ee1a9764726575fc50e0f24e536548d5425b93559546261edf9ef0d359e75ec
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062 SHA512 e3dbcfc257a5ce2ecebc2011317717d853f8069fbdca1c4bb81e90c79acbe3661f64c68321a1d209fdb3584e09efaf3c655d10b8a586f4a9be3d51d62ada9662 WHIRLPOOL 6c417af80339cee72de22c6ddf055057eefabc059c944a848283566ec20ef4785025b72d79537002254bd4a4675d68d892f7aea435b992245d5b22db689ebb97
 DIST gvfs-1.12.3.tar.xz 1361968 SHA256 38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2 SHA512 1b2a2947447fa0917c64a69e02c84a1f870e88fb12c65169a86fd54165e5d4df671e324653ce1d1f123e03187f284e645ef6d4311000b9e88ac2aec055d48a58 WHIRLPOOL 07b21d6ddbb2388944e88af5057d5c027ea9cc4848e6901d74f428498cc4e87db4b80846ca2914802777c32b536bb220a7a8a3c0eae3a8e1f9373a032cd4511f
-DIST gvfs-1.14.1.tar.xz 1465416 SHA256 0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a SHA512 cffe1c3316f60e1d09ddc6481567a316de07f8eebe7ae604f365b7dcca9818ecd59c7c92fd49ba34d64fbd0075c189c89cf830343d0a935f9a245940818fa4e6 WHIRLPOOL fafa2dee3e553b74cb703c76ce5619f5dd2d388dc74aade025edb6e00e5edc35ee7c400b3c7eee9458c2c86e72e7ec6a92b0df4122d1533a99de27514dd1792c
 DIST gvfs-1.14.2.tar.xz 1466384 SHA256 c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc SHA512 f7f4fa2b69d51f087d0f5094c4a170363cad2cd86c6de94241bb4fd9adfcde48ee34c21f5e3e761ff13ba39d842f886dbabba5cecb466dcbae9a40c9b7976a58 WHIRLPOOL dff3f4fc334cb5f3ccd82260fd0feb7c57da8d588e5e9fd5ec5c8563dc52922fe58ff6ac3de85af94d7c7ff6d32acc85edb9def6db90130ef75681566222cde4
 DIST libgcrypt.m4.bz2 1526 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128 SHA512 fe7916d01efb1d14c4d84ed37f3b53b04d3b005cb04b603bded8d24e147fe69a4c0823164483dba3bc95cf540eaf93a0c0ad59f29f8e1edbae9566a81be5900d WHIRLPOOL 6baa8ed005a691fb1f31ac420d801d20a1611519a38749718dcf3956557f40a058c24b988d20534a62084fadd4141c44893cfa751ebf8011cf55d83c759868dd
 EBUILD gvfs-1.12.3-r1.ebuild 3466 SHA256 49936d3d86dcf4ddc80a478a9db0e5586e72c73d04361b44a30fa5ec9e8362b9 SHA512 f11196389d7d79ec881662053bd1cade54107e70f88dd4e885d080ecf5f45766788e1611b8ee92099a843ff1d5ddabf480fbd72942b545f424beb8fa20ad7ac5 WHIRLPOOL 1bc644a38084723dec529e6cbedbc780be6ee094a68dc980891bb38deffab1cc9bf3268ff77569841dba45acd73ab1a81cae6cecf79a8057ef633bcc561b909b
 EBUILD gvfs-1.12.3.ebuild 3455 SHA256 f0c746e083ab2373ca139d60a5fe7b1c967ca1cfff20713e060a2a04f1e53230 SHA512 ef301479f451caa8bde73348e08c1bf8b754c9cc2305e91aa15dbf38da493d9e914ab977a78e37c296937433a26743f7a9226292d1bd31b51ca4b49685d04631 WHIRLPOOL b8c5178dc0a513c4eb662fb33170bdc75766920ccd9628ed7bb9b93f18d46fa2554730d42d8d5dbc04d104873e9f47f5f8c7740fcead298fffebd87f3f5aea85
-EBUILD gvfs-1.14.1.ebuild 3582 SHA256 4c28204467f3c334ef69625789283a4f9383b99577e644a62b90c14ebdb8b04c SHA512 26b8cbdc59222a3c070fce7a1f96c4253a8037b9e7a22b9f694215b17c036e8d13bfeec5ee613a58572b6ae3d1991fdfd5dda79a4ea2ed8009e6778b15b99ee8 WHIRLPOOL d65b290dfb8481fdb3417a36ae539255df603410491b8788c1ecb8f749a12d1c38e082734194b96dcb5063c848ec9baa891cb627503166168e1077c4008fe830
-EBUILD gvfs-1.14.2.ebuild 3525 SHA256 632431192c3843c01dc2f41e4857fd27292740e48ecd6a7ab77872a253249f09 SHA512 a084430c62d5f62b2d47d145c65a9134418c3e173f011a54173819fbfb0427d2dd6a81bf1a538d82db6b6b76715c065e2451e05d5f93a0ba47df38eae7e87da7 WHIRLPOOL 103e699434969c0e84be2b09f4543ac312cb036726f80906d0bc530e19b5c031fe98122e7b730afb5ed7db5908f8a64c79fa555501094853d12a2913b7d9742e
-MISC ChangeLog 27989 SHA256 92c2a6107e23af427d5e00c62afc9c825a5d26c02a59c7a4f68e667a3c839778 SHA512 08449dfdf7556ddf7d46084ca26dcbd822709bffb5eb56d175e8e176a761c98c2b59e02fa9ac741bacef304ec90812b7f2b01542a4be1c9c1974195424448ff4 WHIRLPOOL 370fb0d963f4e14e7218e0f09b9ea91bbe34c1810788c5fb859d847de5f0aeead3332b7ade0317c0c099b136f216ec8c26c5c06233c201a9c583a6f887a276c2
+EBUILD gvfs-1.14.2.ebuild 3531 SHA256 5d0220007413ec62a1e8aa9af52d8b9c8288c7415d22a2705245be4031a81439 SHA512 d6ec3f4edd7c2d81cea274a0efff353a671cf5cf5b3843bed1bb6f252bc8f312460a8f248d67033830821cca36aee3e1c3d8b1d8d4ee7435f4d789a767a30a3c WHIRLPOOL bda3236e4837b521875f93a71295daf0fc2098a719004f00a952b48ef8d905510db885a8ccf2f1edaf63472a8c9b375df190c1cc409529e79af0dc83b6025b8f
+MISC ChangeLog 28121 SHA256 e649cf7c3b89ead2c7a32d51c470290a1841ff0cceb822a181843409eb7ddc31 SHA512 e185f82636ac20b1ae0dc5617401b7fe18cc9f8a95693ac02fdcd5110a93858d464746da9bd8c67327ea9e29afc9849867dd1d64455bf527bf84b2286421e00a WHIRLPOOL 6be4bffcd9e81efdcbbb164339f4477cccc919291fd3012e286e44ce12bbdc711ebc6d4f1856a147af5fe9abca0233fdacd3cface75f6816ab929491decbb034
 MISC metadata.xml 1436 SHA256 8abc5f14d4c38e07815876aba0a376bd4c73e308477dd0cb584ec2e0fd3a58f1 SHA512 5c8481499c086482c54d5ccd18ad31f60941298e6329b32a88e909d571df46cadb80ee6c6d890a83b68288806901504287793f68c47970122092a17b8aa59a3b WHIRLPOOL 52c575106ca10f2e10406d669fc7802af23ff6dd055e03751cc9a33ced386291cf6d1865c968536cf50da9e3ccbf9511d6a7fda82ba2ef5888a7d06e0a086096
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQvHiuAAoJEEdUh39IaPFNEfkH/2GpfC0iLzNFavp+dOJEVCVH
-/sUy8J/8gxYg1BQQkSGHNqZ1vx3Zvoq617Vw10ImVWumXHHFqEyaQQHj+Pa5drUo
-yLbfdB4kCGShSrQF4AB3oQJXI03lFC8FWlU9IGrw4hxRStHG1tLwPNU7QruaY3sd
-JKz23vyyP7ZYytC0/Ssybl6mNAqjEUQEunZyGalv070hhZ7trVVcAjtOxlQBCJsW
-aHPUx/13ouQrpZbBAj8J1W7unS4rVcSqs7AnDbd+74Flc3ftdMA0rgmq14KIF4jm
-P41Ms84aje+9ts5wT6HJ2rJSejJoW7vTBC8E0yM20fdWccOFcQOyi+8r8GoE5t0=
-=yIev
+iQEcBAEBCAAGBQJQxcbnAAoJEJ0WA1zPCt1hqCQH/iVa3oBpZD2VLa9wpEnKTB3c
+gMkrVcR1sTCMIUd+PC0rxH9rBx7c4kbvjfKPmaVH3pk1mhgQIUoChutb4YORWxbC
+hmt7yfGqX5NcjVPhMMSxyODHgreBfXuL7jwUmGYg36tgQvQm9q3NIob/ctIRES6t
+GrFscZ0qEP7Ycvxaa7FOyV73Pd2KM8irvocgJ1g8pLJQw+yM763Pj/F4O0eAd0uL
+IbyEtmOhopnc11siTTMXnjk1C86ROi+XLhffSgauCtuIG+tuwPRrJSjGQ/9UgLm8
+S/3HlsCvwPx6aVbD5O8HAI5F4uc8ZD5cDzTmShD33ogzA2E9hL/vrVzgeX1D7f0=
+=DJZb
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.14.1.ebuild b/gnome-base/gvfs/gvfs-1.14.1.ebuild
deleted file mode 100644
index 121b22956ef2..000000000000
--- a/gnome-base/gvfs/gvfs-1.14.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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.14.1.ebuild,v 1.2 2012/12/03 10:02:21 ssuominen Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	DOCS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-	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 gtk +http ios samba systemd +udev udisks"
-REQUIRED_USE="systemd? ( udisks )"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND=">=dev-libs/glib-2.33.12:2
-	sys-apps/dbus
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2 )
-	archive? ( app-arch/libarchive )
-	avahi? ( >=net-dns/avahi-0.6 )
-	bluetooth? (
-		>=app-mobilephone/obex-data-server-0.4.5
-		dev-libs/dbus-glib
-		net-wireless/bluez
-		dev-libs/expat )
-	bluray? ( media-libs/libbluray )
-	fuse? ( >=sys-fs/fuse-2.8.0 )
-	gdu? ( || (
-		>=gnome-base/libgdu-3.0.2
-		=sys-apps/gnome-disk-utility-3.0.2-r300
-		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-gnome-2.26.0 )
-	ios? (
-		>=app-pda/libimobiledevice-1.1.0
-		>=app-pda/libplist-1 )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
-	systemd? ( sys-apps/systemd )
-	udev? (
-		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
-		virtual/udev[gudev] )
-	udisks? ( >=sys-fs/udisks-1.97:2[systemd?] )"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-REQUIRED_USE="cdda? ( udev )"
-
-pkg_setup() {
-	# --enable-documentation installs man pages
-	G2CONF="${G2CONF}
-		--disable-bash-completion
-		--disable-hal
-		--disable-schemas-compile
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
-		--enable-documentation
-		$(use_enable afp)
-		$(use_enable archive)
-		$(use_enable avahi)
-		$(use_enable bluetooth obexftp)
-		$(use_enable bluray)
-		$(use_enable cdda)
-		$(use_enable fuse)
-		$(use_enable gdu)
-		$(use_enable gphoto2)
-		$(use_enable gtk)
-		$(use_enable ios afc)
-		$(use_enable udev)
-		$(use_enable udev gudev)
-		$(use_enable http)
-		$(use_enable gnome-keyring keyring)
-		$(use_enable samba)
-		$(use_enable systemd libsystemd-login)
-		$(use_enable udisks udisks2)"
-}
-
-src_prepare() {
-	if use archive; then
-		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
-		echo mount-archive.desktop.in >> po/POTFILES.in
-		echo mount-archive.desktop.in.in >> po/POTFILES.in
-	fi
-
-	if ! use udev; then
-		sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
-		sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
-		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
-	fi
-
-	if use archive || ! use udev; then
-		# libgcrypt.m4 needed for eautoreconf, bug #399043
-		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
-
-		[[ ${PV} = 9999 ]] || AT_M4DIR=. eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	dobashcomp programs/completion/gvfs
-}
diff --git a/gnome-base/gvfs/gvfs-1.14.2.ebuild b/gnome-base/gvfs/gvfs-1.14.2.ebuild
index d62a0db596a7..c3e3398ec0c4 100644
--- a/gnome-base/gvfs/gvfs-1.14.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.14.2.ebuild
@@ -1,8 +1,8 @@
 # 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.14.2.ebuild,v 1.2 2012/12/03 10:02:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.14.2.ebuild,v 1.3 2012/12/10 11:26:30 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -36,8 +36,8 @@ RDEPEND=">=dev-libs/glib-2.33.12:2
 	sys-apps/dbus
 	dev-libs/libxml2:2
 	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2 )
-	archive? ( app-arch/libarchive )
+	afp? ( >=dev-libs/libgcrypt-1.2.2:= )
+	archive? ( app-arch/libarchive:= )
 	avahi? ( >=net-dns/avahi-0.6 )
 	bluetooth? (
 		>=app-mobilephone/obex-data-server-0.4.5
@@ -51,7 +51,7 @@ RDEPEND=">=dev-libs/glib-2.33.12:2
 		=sys-apps/gnome-disk-utility-3.0.2-r300
 		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
 	gnome-keyring? ( app-crypt/libsecret )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
 	gtk? ( >=x11-libs/gtk+-3.0:3 )
 	http? ( >=net-libs/libsoup-gnome-2.26.0 )
 	ios? (