Version bump (also incorporating changeset from gnome-overlay)

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

4 files changed, 129 insertions, 10 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 5c5a7ebe56c0..b14ab3658d32 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.149 2011/10/14 19:27:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.150 2011/10/16 11:38:34 ssuominen Exp $
+
+*gvfs-1.10.0 (16 Oct 2011)
+
+  16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> +gvfs-1.10.0.ebuild:
+  Version bump (also incorporating changeset from gnome-overlay)
 
   14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.6.7-r1.ebuild:
   amd64 stable wrt #385699
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index a287f78fbc10..7796ef351f28 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -4,21 +4,23 @@ Hash: SHA1
 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.0.tar.xz 1291556 RMD160 cb039eb9bef2aa23fd901e56b41697069aee312c SHA1 0a55fe8f52ff3177e1217ba4e26a19366fd0d06d SHA256 50970f9f9052ecb6ab83860b366c718994bf618695010c11e1391ca886f71db8
 DIST gvfs-1.6.7.tar.bz2 1404372 RMD160 e833fdbc9dc503cdde8e0ab5a7a8fa5403ec1aa1 SHA1 285a810772dce8b37289cbe0aaab8354f2b6717a SHA256 fe5f6181eac14d5147794389bf57717226a15ddf8283631b434c2d9ec120d659
 DIST gvfs-1.8.2.tar.bz2 1413675 RMD160 3163a9fe5452904bdef804cfb0698c6deec86eea SHA1 4123bb4fd9d64f246adc8f3b6a00af12589cd37b SHA256 0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345
+EBUILD gvfs-1.10.0.ebuild 3053 RMD160 d3618485d57025842fda75b4b2d047f51d9982b3 SHA1 45a3c9cb91f7489a034a78420b70848d3af9c9aa SHA256 1155da038dfa12c39c1b0a18c7ff021354d73c7e921cc998c7f95fcc42b7e943
 EBUILD gvfs-1.6.7-r1.ebuild 3469 RMD160 4f33cb31c6feb40e2261cc76f04253314dd12511 SHA1 c41d093e93de8a5ea9eede7035444c43dfc08878 SHA256 e48aca72a60e4e46a4c9ed03133d961e9b47a135e637068a713861ddbe9e9c9e
 EBUILD gvfs-1.6.7.ebuild 3047 RMD160 3c3beebf0f2f45ed3d7cac469baaa2a0e7365fda SHA1 73f03e7ba9f396e3a5de559ef4086c2a610ca023 SHA256 401306541cf8173bc51e69096598af3d27fdabfff88d411e9b0009d4c6994d9d
 EBUILD gvfs-1.8.2-r1.ebuild 3374 RMD160 a6674be547f5bc850e2e3c886dce545f14fe1465 SHA1 19a44da4a75c9495c32983effe8a85097ab0e32b SHA256 51971c6c91296385609424351d04b24e71c4d55c9d6a792d54083bfbe66de906
-MISC ChangeLog 20702 RMD160 d7912ca018245434fc0e908c4b164efd6c72bd77 SHA1 72651930ca6468e96f4ecdfaded8b232b9a7935f SHA256 79fa035ca90bc613ec3d1e7cf80429dd0fd2f57449fa7c2332bedb8a8d94cc13
-MISC metadata.xml 1026 RMD160 9f60ad05b950ee45d8500c8640f26021f397ab5f SHA1 dd73b18963c0beb12f4ea099833c1376952f0c3b SHA256 b5aa8baad5d63d30113e894a8630e80fb5350dbd91903949e336bd604925fd38
+MISC ChangeLog 20871 RMD160 2b89d42a8fb99a62d490a245a874237d2ae566d6 SHA1 db595ed09bfe1f1d14f04d9e0c0fbdb6b4d6340e SHA256 2f1a7a9ce047786d84cf2520224619886784df8c2c1c4ba10c5199bc2c03b4eb
+MISC metadata.xml 1131 RMD160 24282f039aef6b75732c9c1ea12c7af80edd09de SHA1 840f736a4471f737fd38ca419308aefc9861d0c5 SHA256 2ecc04873e7b003b649771120252276c8641f14a0c193d082a1bf66c983d60d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOmI0pAAoJEEdUh39IaPFNWYkIAIJBX4XtBHVFfYFraf3Lb4mS
-AhK4j8fMRiNyQFzjeF4QKMAf/5scV+MzCUZpzWrR8yQJrZeRG05EMvGz+/IQ95SJ
-zaB1BdNAd2iOK9i6F64/yb7OMVco6HlkssvUXLgyAQym6JpnOB60ze8d+zlRxzLi
-hYpN9QgQnThNNNEgsfVJW5uzzbEMxWk5LsCgmGgJwzcJ4WUZAX40pPX1n5iN79jP
-0oCr92D0phVCdPd+kKsvh+UaW5fiGIfEYg9JkO5q6QdrxyOJeO7RRB6tRCmXcU7/
-j+4cAT9xklRiWqGcEZxBDl4/7M7jZV+dH66wE66i8xBiIfMjdT7srK0FgV5eUoI=
-=GMdJ
+iQEcBAEBAgAGBQJOmsIwAAoJEEdUh39IaPFN8G0IAJsPjF0Q97pAJ1pRtiKogJwM
+Nae9u7t7bvFZdY31Km/zeebje+V8AqVuRrMHsj4lgnpkpggaXS6aT079eTyX1CO9
+05O9YXi9MQszPZqBxJt8aGDcZ4p1sttAzOjmAJeIPtQlGZ+/M61k2U7a+WhtfT7x
+Upf52Fr/AFuucJFAYvgz33spBDSNRR7QZc2vgx7iS3zMehndCXhlblYflg0GBh46
+hgDbPxoyz7YlLhdahWytvYlZh1Q3sM+LAUi0XHnZkShVpSSaQhzChY0NurKO55fu
+9itMvuS5bE7rZujK8pE0/RdADosjbrCRMpncjFxDfJMVx1IxH2kE7tc0gRMiCVg=
+=rxiW
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.10.0.ebuild b/gnome-base/gvfs/gvfs-1.10.0.ebuild
new file mode 100644
index 000000000000..7dc6216735c8
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.10.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.0.ebuild,v 1.1 2011/10/16 11:38:34 ssuominen 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
+
+IUSE="archive avahi bluetooth bluray cdda crypt doc fuse gdu gnome-keyring gphoto2 +http ios prefix samba +udev"
+
+RDEPEND=">=dev-libs/glib-2.29.14
+	sys-apps/dbus
+	dev-libs/libxml2
+	net-misc/openssh
+	!prefix? ( >=sys-fs/udev-164-r2 )
+	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 )
+	crypt? ( dev-libs/libgcrypt )
+	fuse? ( >=sys-fs/fuse-2.8.0 )
+	gdu? ( >=sys-apps/gnome-disk-utility-3.0.2 )
+	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] ) )
+	http? ( >=net-libs/libsoup-gnome-2.26.0 )
+	samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
+			<=net-fs/samba-3.3 ) )"
+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 archive)
+		$(use_enable avahi)
+		$(use_enable bluetooth obexftp)
+		$(use_enable bluray)
+		$(use_enable cdda)
+		$(use_enable crypt afp)
+		$(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 !prefix udev)"
+}
+
+src_prepare() {
+	gnome2_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
+
+	{ use gphoto2 || use archive || use prefix; } && eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	newbashcomp programs/gvfs-bash-completion.sh ${PN}
+}
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index f71befad44bd..c98b827d8e44 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -12,6 +12,7 @@ applications not using gio to access the gvfs filesystems.
 <use>
 	<flag name='archive'>Enables support for accessing files in archives
 		transparently via <pkg>app-arch/libarchive</pkg></flag>
+	<flag name='bluray'>Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
 	<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy
 		application access</flag>
 	<flag name="gdu">Enable <pkg>sys-apps/gnome-disk-utility</pkg> integration</flag>