Version bump, fixes bugs in udisks and gphoto2 backends.

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

3 files changed, 140 insertions, 6 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index c893f0496b76..7721ca911814 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.173 2012/04/13 04:08:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.174 2012/04/21 08:20:34 tetromino Exp $
+
+*gvfs-1.12.1 (21 Apr 2012)
+
+  21 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +gvfs-1.12.1.ebuild:
+  Version bump, fixes bugs in udisks and gphoto2 backends.
 
   13 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.12.0.ebuild,
   +files/gvfs-1.12.0-afp-gcc-4.5.patch:
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index b7db9a2f00af..ad2298971c36 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gvfs-1.10.1-libimobiledevice-1.1.2.patch 2813 RMD160 84bdfa6b681cb7eb57a0220caecf35491a2cbe42 SHA1 0e9090a65236fa0e49a7927c1839e3bacdc5d646 SHA256 db8bc868fb74f470b4a91ee4eed6e4f327a64b5a666a37c915ef504ace1258e8
 AUX gvfs-1.10.1-unneeded-include.patch 706 RMD160 e6e911fb43aa24201422f3ced7d03d753ce7bc99 SHA1 b180b53b35b8191c0a75795ab40ffec32d4c78ec SHA256 7271536185ad468c39474b8eea387af7038a974c60964b5d8d4f6bac0cc96969
@@ -8,15 +8,21 @@ AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35de
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
 DIST gvfs-1.10.1.tar.xz 1295236 RMD160 e50d96fc0b6aa9d2ab50a3cfc5c161be5d6e6e16 SHA1 d564d9934191342e6421cd038fc0674f8dd27eae SHA256 cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288
 DIST gvfs-1.12.0.tar.xz 1342208 RMD160 8a423a8b9eb988946802502299b0194e3a17a52e SHA1 372f5ca24ff419e5d278ba47165f0be760d32e33 SHA256 87ffb27fd884be65570d64530c3121f9e49848070b62a26e39cd363f6a6bd555
+DIST gvfs-1.12.1.tar.xz 1359064 RMD160 8147ba0e5f9de1ceab6404c204dd03a094545e4d SHA1 371dc60749ff4330f30bcbddacc1ef08c00d4da8 SHA256 d75dbb0cee87ca93f393c96da56affa51609114814b87771cfc9871c09b5355e
 DIST libgcrypt.m4.bz2 1526 RMD160 6149f51c00e1e21d85187136f7682e41271fed40 SHA1 1731ae882cdc7c53efeef2e23e0d2d9791c6d739 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128
 EBUILD gvfs-1.10.1.ebuild 3566 RMD160 21420049d234d9571f5092b346e4228c55eb3694 SHA1 ab30d749fe2077c2b8e9e3d3afc3e951930246b2 SHA256 9d6ea30adfda4c53c0c36e2e20b4bd3b141b39bf80674b2134132d41debe576c
 EBUILD gvfs-1.12.0.ebuild 3667 RMD160 c1916b945bc6ed002afd984fb4567e83cc629268 SHA1 5700129fc4d2fee17ea52c12e86373b660425c98 SHA256 f08f7e30d540ebddf4bddb715c2dcaaad800bc6b02bf6cad6a091e2d14142015
-MISC ChangeLog 24333 RMD160 e4d56041ec9fd9b1f2c04178618c9d192bdce07f SHA1 4ba4e690a2bdec474b35d3b1154158510232990f SHA256 8b43f7964ff348d4608d5daa7f27b7034cd2c9096973b15d9cee2d197b6f36a5
+EBUILD gvfs-1.12.1.ebuild 3382 RMD160 33e5190e3a3b5a039c974c058be509a0d37d770b SHA1 aaa82466a9027f43285d1ad11bfc1367ef8c6691 SHA256 a499c1af2747925204eb2898e94db0fe642b206badc3b08ce1f71652924863d6
+MISC ChangeLog 24501 RMD160 3700634a6b5c1cb4c0d56a4386d30fe503f6cde5 SHA1 cf8a3d84a39590dc84fe48f22e819217b4e0f605 SHA256 1ab00210b0b0b00a95b2a4a1e20c171ed883a6141b4b72d67a0911f0c707959b
 MISC metadata.xml 1315 RMD160 58c1f8a1d25d892346632ae34a9a3b58288cd029 SHA1 2dd23a67b1cfdffcf1729bf2963893d743859e8c SHA256 79981750cbbf2fd42c086917b23562c668ea309acd311ae4c613b9ff29f7d65a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+HptkACgkQdjK8w9WeBnCnnQD/ZNEGQfcPnwEHvFlQnGzCB/nc
-zlNQvaVrWr39LH7TjAoA/A8/Ydo9WlX12FNL2uyv1QqsUn7cRTKjyDoTjXe0R+u4
-=QSdT
+iQEcBAEBAgAGBQJPkm3XAAoJEJ0WA1zPCt1hiF4H/jKix52dK3tJ2EpBh5nXCQCE
+Qe7JAzWMGGO0g5nntm1vHjssyp/+fHpoIzQc0AXN2oI5inxalxOEed+ZrCbTsNiG
+hMkiwmksL1zYiVF5biogpjSYzevu7bKzVTyGeMNVj5IwB10EToCTCSefIsfG2wt/
+hX1e3FVzcBhfDg310IipIaWiXfTo3p3+cJ8RK0jfYCg5w+7zZ/bZdkPZ7J2fWi2q
+OHwB6DoyHuWWO1pCML1x0hBWeObMAJvziCFkM1rMJDKe4C9rymwdU0aFqH4S3XPp
+GW5zAnGfhPZABbWPh7ZJWUGsZY4/3p7MUt8Z9xhpifwZmIF1zhH+g5qI2HNOX+M=
+=J4cy
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.12.1.ebuild b/gnome-base/gvfs/gvfs-1.12.1.ebuild
new file mode 100644
index 000000000000..31b7c11e2109
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.12.1.ebuild
@@ -0,0 +1,123 @@
+# 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.12.1.ebuild,v 1.1 2012/04/21 08:20:34 tetromino Exp $
+
+EAPI=4
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+[[ ${PV} = 9999 ]] && inherit gnome2-live
+
+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 ~x86-fbsd"
+	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 udisks"
+
+RDEPEND=">=dev-libs/glib-2.31.0:2
+	sys-apps/dbus
+	dev-libs/libxml2
+	net-misc/openssh
+	!prefix? ( >=sys-fs/udev-164-r2 )
+	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? ( >=gnome-base/gnome-keyring-1.0 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+	ios? (
+		>=app-pda/libimobiledevice-1.1.0
+		>=app-pda/libplist-1 )
+	udev? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
+	udisks? ( >=sys-fs/udisks-1.90:2 )
+	http? ( >=net-libs/libsoup-gnome-2.26.0 )
+	samba? ( >=net-fs/samba-3.4.6[smbclient] )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+REQUIRED_USE="cdda? ( udev )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-bash-completion
+		--disable-hal
+		--disable-schemas-compile
+		--with-dbus-service-dir=/usr/share/dbus-1/services
+		$(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 ios afc)
+		$(use_enable udev gudev)
+		$(use_enable http)
+		$(use_enable gnome-keyring keyring)
+		$(use_enable samba)
+		$(use_enable udisks udisks2)
+		$(use_enable !prefix udev)"
+}
+
+src_prepare() {
+	# Conditional patching purely to avoid eautoreconf
+	use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch
+
+	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 prefix; 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 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() {
+	gnome2_src_install
+	newbashcomp programs/gvfs-bash-completion.sh ${PN}
+}