New version for GNOME 2.28. Clean up old revision.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 56 insertions, 16 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 0359c7d2dd3f..c525f151374f 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.81 2009/10/24 16:49:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.82 2009/10/29 21:56:04 eva Exp $
+
+*gvfs-1.4.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-1.2.2.ebuild,
+  +gvfs-1.4.1.ebuild, metadata.xml:
+  New version for GNOME 2.28. Clean up old revision.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> gvfs-1.2.3.ebuild:
   ppc stable #281427
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 1459065bebe1..953a6151ff3e 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gvfs-1.0.3-bluez4-debug.patch 813 RMD160 17173a9a2a1dff295b7ab97ce9eb3910eebd781d SHA1 71790ed4385978188baa78fdb9b496de3ab64057 SHA256 0aec6ed9395f3ebf598613ddc80fab86ff14db1a8f2256fc1355ea864ac4943b
 AUX gvfs-1.0.3-bluez4.patch 15992 RMD160 ce019597f52e3f58bea23e098ffab70ac1f1ed83 SHA1 3734c27032184c956013c46b3915e05d84dd5009 SHA256 e9eb881f06b1b404e0c362c6e66975cdef2e5956b103720364a8fd6db7c9a4ce
 AUX gvfs-1.0.3-gmountspec-SIGSEGV.patch 467 RMD160 17131acfdbe080d283cf4290b338554192c71ea1 SHA1 f4e898d755463f55280ae712935bafb19891c30f SHA256 c93f11cc77de7e8b5e40c61cd7e2edaad7adb30c816087d67370ce49f518be10
@@ -7,11 +10,18 @@ AUX gvfs-1.0.3-posixtest.patch 3368 RMD160 75f3d776550b49169066037a8f77489e9dff3
 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
 DIST gvfs-1.0.3.tar.bz2 920742 RMD160 2d12e1f6690773e3aad5d59c826c509fa40a9443 SHA1 2beb736acc7b38e99c9fcb0585de6918fad5e7b7 SHA256 17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
-DIST gvfs-1.2.2.tar.bz2 1049206 RMD160 7822a4e94d6ae24b54075338480989e4606e7bb5 SHA1 812db328361b83c770f320ea32a9e5c0c6d5041e SHA256 ee301e9dbdfd4432313b6f5edafa42a8d3b28c60c3a705a18a5a6cef27c315ed
 DIST gvfs-1.2.3.tar.bz2 1041079 RMD160 ea8469449073b9a0e50fde4301fa5bc4ff5bbe56 SHA1 c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4 SHA256 395d480c1b64504ba75a8deb70ef6790f2ff07538fca73ef1d26a996223e5879
+DIST gvfs-1.4.1.tar.bz2 1249982 RMD160 7ebc21bd89c7f4c6045fc57db18df2a5949d4153 SHA1 f2c125719d6e5a635bdbb86834c12ef0d586db5a SHA256 e281b1d173cecd53948317b73b458b3cffcf0cdaa7ee1568aa71db30c4e31ea5
 EBUILD gvfs-1.0.3-r13.ebuild 2828 RMD160 29f6a5ca7311f4eccf1aefaa1635fddc2b9c8fc0 SHA1 9ff03f436eee307987ddd7186f54778a319821ea SHA256 94a3c28f8ee70dd4d37c75dd37b202729435aeca8b6c7f2aa8000ca155c3c9ef
 EBUILD gvfs-1.0.3-r2.ebuild 2549 RMD160 f2cdecd0ecef907b0ea6edf7541724c8cee41822 SHA1 40169e794fee6710a0900d297bb8125f92568ade SHA256 0d3d94d668fa3d9750fc486d017f08f89281906d9fa54bf0fba282dc1ae5fc4e
-EBUILD gvfs-1.2.2.ebuild 2069 RMD160 34f9e625b8235fa0a4a4f0c88352717f1e22ddbd SHA1 8d0b120169b2994b02bf95716414a63fbbc559c3 SHA256 34a95e31f473b7d7ac015c04e960cdac0dc55b379393e9ff8dca078d7651fe63
 EBUILD gvfs-1.2.3.ebuild 2201 RMD160 dc5c9b426164d18205279edc89af62b4b236982d SHA1 73e0f5719c440669243893b55549501792a15008 SHA256 249b0bcdc2d5d553eb488d869d9ae8000f1f8a337db20608c6d0987a38ea79b5
-MISC ChangeLog 11347 RMD160 5139c7ea4a8bb029686faa43cc1478aef11b2900 SHA1 e66d9b2449ccde3188648da580643c2386fbba77 SHA256 20f7b00114a982a9b49a9167071031fbd698d76f82a1af673ff074c9c759ea7b
-MISC metadata.xml 772 RMD160 35cb85a16ab578a4daae8ff01d827bd910d45534 SHA1 294f2a15b4885b4156ad1e8992dea48d7ed667a9 SHA256 eef880e838c21b18343f2a94aa14eb21d7da15e320e1998ced2916784d6dff1e
+EBUILD gvfs-1.4.1.ebuild 2666 RMD160 84580ac5ed3840d15c1c5c7cc206263d471f1c09 SHA1 96af1d7ddff6556555015cf82c1d50aa96114084 SHA256 7b101a0731a0b00616d5fdf71b6fac2347317a09dad2e2fd6389379f20cceebf
+MISC ChangeLog 11535 RMD160 bcf646f06ee96004a7bcd1200f695ec9136b007a SHA1 a018eba5518a3005296a107587c29cf9b01ae093 SHA256 53c3ee9535ca9d6c173c1dcbeefa265bfafb2ad8fc77fc4733f0d22d32c52dec
+MISC metadata.xml 932 RMD160 0a9dfc77656b6f035d833003d00a34fc7bc51213 SHA1 4a200aa26ceba493d6eb59feb269668619c092a5 SHA256 196c4a5412f54bfb81959c1fb1a12c3a7dbcb020045c9f11ecad473026a2b32e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrqD3oACgkQ1fmVwcYIWAbBiACeIpHiiwSTXj20CzBW/Yd5O3j3
+Em0AoJ3g3oUe82UTRWjfLwpRxTax+RFb
+=Ub8a
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.2.2.ebuild b/gnome-base/gvfs/gvfs-1.4.1.ebuild
index a9afdaa279cf..39258e4e29f0 100644
--- a/gnome-base/gvfs/gvfs-1.2.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.4.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.2.2.ebuild,v 1.6 2009/05/30 14:04:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.4.1.ebuild,v 1.1 2009/10/29 21:56:04 eva Exp $
 
 EAPI="2"
+GCONF_DEBUG="no"
 
 inherit autotools bash-completion gnome2 eutils
 
@@ -11,38 +12,49 @@ HOMEPAGE="http://www.gnome.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="archive avahi bluetooth cdda doc fuse gnome gnome-keyring gphoto2 hal samba"
+KEYWORDS="~amd64 ~x86"
+IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal samba +udev"
 
-RDEPEND=">=dev-libs/glib-2.19
+RDEPEND=">=dev-libs/glib-2.21.2
 	>=sys-apps/dbus-1.0
 	>=net-libs/libsoup-2.25.1[gnome]
 	dev-libs/libxml2
 	net-misc/openssh
+	>=sys-fs/udev-138
 	archive? ( app-arch/libarchive )
 	avahi? ( >=net-dns/avahi-0.6 )
 	bluetooth? (
 		dev-libs/dbus-glib
 		net-wireless/bluez
 		dev-libs/expat )
-	cdda?  (
-		>=sys-apps/hal-0.5.10
-		>=dev-libs/libcdio-0.78.2[-minimal] )
 	fuse? ( sys-fs/fuse )
+	gdu? ( >=sys-apps/gnome-disk-utility-2.28 )
 	gnome? ( >=gnome-base/gconf-2.0 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4 )
-	hal? ( >=sys-apps/hal-0.5.10 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+	udev? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		>=sys-fs/udev-145[extras] )
+	hal? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		>=sys-apps/hal-0.5.10 )
 	samba? ( >=net-fs/samba-3 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.19
+	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 pkg_setup() {
+	if use cdda && ! use hal && ! use gudev; then
+		ewarn "You have \"+cdda\", but you have \"-hal\" and \"-gudev\""
+		ewarn "cdda support will NOT be built unless you enable EITHER hal OR gudev"
+	fi
+
 	G2CONF="${G2CONF}
+		--enable-udev
 		--enable-http
 		--disable-bash-completion
 		$(use_enable archive)
@@ -50,8 +62,10 @@ pkg_setup() {
 		$(use_enable bluetooth obexftp)
 		$(use_enable cdda)
 		$(use_enable fuse)
+		$(use_enable gdu)
 		$(use_enable gnome gconf)
 		$(use_enable gphoto2)
+		$(use_enable udev gudev)
 		$(use_enable hal)
 		$(use_enable gnome-keyring keyring)
 		$(use_enable samba)"
@@ -61,8 +75,14 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Conditional patching purely to avoid eautoreconf
-	use gphoto2 && epatch "${FILESDIR}/${P}-gphoto2-stricter-checks.patch"
-	use archive && epatch "${FILESDIR}/${P}-expose-archive-backend.patch"
+	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
+
 	use gphoto2 || use archive && eautoreconf
 }
 
@@ -75,4 +95,6 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	use bash-completion && bash-completion_pkg_postinst
+
+	ewarn "In order to use the new gvfs services, please reload dbus configuration"
 }
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 376b05f0a343..45b3bd485569 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -14,6 +14,8 @@ applications not using gio to access the gvfs filesystems.
 		transparently via <pkg>app-arch/libarchive</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>
+	<flag name="udev">Enable udev base replacement code for cdda feature</flag>
 </use>
 </pkgmetadata>