Enable hal support only if udev support is disabled.

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

3 files changed, 121 insertions, 3 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index be46c46e4913..8fde96bd71da 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gvfs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.125 2010/12/27 21:13:44 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.126 2011/01/04 09:22:11 ssuominen Exp $
+
+*gvfs-1.6.6-r1 (04 Jan 2011)
+
+  04 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> +gvfs-1.6.6-r1.ebuild:
+  Enable hal support only if udev support is disabled.
 
   27 Dec 2010; Brent Baude <ranger@gentoo.org> gvfs-1.6.4-r2.ebuild:
   Marking gvfs-1.6.4-r2 ppc64 for bug 346687
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 9da9582bcb30..6717fb8bbe15 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -8,6 +8,7 @@ DIST gvfs-1.6.6.tar.bz2 1387796 RMD160 705934a0a3f520a41237374abeb0182d01398903
 EBUILD gvfs-1.6.3.ebuild 3022 RMD160 cbdd2873068f2f5b344fcea577b2638b3bce1018 SHA1 8aec1dfe99b9c55c6dcfce312eac5b88a05ba0cc SHA256 3aec682a24b2b76d9cbcca5900fbd9a4c2ffa0be806e9695d074f55367d5579a
 EBUILD gvfs-1.6.4-r1.ebuild 3120 RMD160 d4b070221217a085a8eb635747b901c72e360b51 SHA1 487e8412d56ae3d6e8d163814e337b3e2b2f280f SHA256 5609e452fe6fb3322b6a156f932b803cb05ffa94e233407b8c6b7d686dba39f5
 EBUILD gvfs-1.6.4-r2.ebuild 3203 RMD160 0e455fb84df7f725c7389456abc9ecb2bcd46ceb SHA1 257fb4a41bb5fd03c03b6f2eaf5a97d0fad8fdc4 SHA256 73e1c7edc14d1077bcac1621dc87d2eaaf9cf2965016c6818269eb74ce95931c
+EBUILD gvfs-1.6.6-r1.ebuild 3192 RMD160 e95524f9cb44659471ee3f1e33a09c0734c7daa4 SHA1 87e6cc56c6e145198782a7abcaa8f722ba743887 SHA256 3512d5b2e2f56ec7ec46e7dee7db3c2a81959451d728f6fd50248650aa7d8cfd
 EBUILD gvfs-1.6.6.ebuild 3030 RMD160 697fca45281319e862571a23d8eb657ea49f48ce SHA1 919a00714429bd122938d2f22145526d97290350 SHA256 a70ababfe936d21c59ba4517053281090c6098e05ec157b23bfda136514dcdf1
-MISC ChangeLog 17653 RMD160 af1571d49f27be8bdf88d3a52711ef82fb639893 SHA1 addbff0d1618dcb0fa6b1a83d16c888c057ba0b9 SHA256 7f171d3f453fdcd0e5695de03b62fbd44cc463ee209d510afe6b43e86e9848ec
+MISC ChangeLog 17819 RMD160 716f47e19b1b7e04cc25d07c5faebb5f60c7cc0b SHA1 bd52c9913f5ceaa21bef6b17abcfe7876b007dc2 SHA256 8ecddca12c30d5d5767cc07afc4cb9f61b3a77b6e5e1d1d1bd7950ca28fc325d
 MISC metadata.xml 1100 RMD160 2d3714eb866d2d48d35e2b69fd5f2228b414793c SHA1 79ac2d6f91caecd4be3202ebb71489d7ff7dee98 SHA256 9b2f7554d979873b4a6900725cba341517bab4980cb63625704cbd62e8bbbb37
diff --git a/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild b/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild
new file mode 100644
index 000000000000..76788eae650b
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild
@@ -0,0 +1,112 @@
+# 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.6.6-r1.ebuild,v 1.1 2011/01/04 09:22:11 ssuominen Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools bash-completion gnome2 eutils
+
+DESCRIPTION="GNOME Virtual Filesystem Layer"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal
++http iphone samba +udev"
+
+RDEPEND=">=dev-libs/glib-2.23.4
+	>=sys-apps/dbus-1.0
+	dev-libs/libxml2
+	net-misc/openssh
+	>=sys-fs/udev-138
+	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 )
+	fuse? ( sys-fs/fuse )
+	gdu? ( >=sys-apps/gnome-disk-utility-2.29 )
+	gnome? ( >=gnome-base/gconf-2.0 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+	iphone? ( app-pda/libimobiledevice )
+	udev? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		>=sys-fs/udev-145[extras] )
+	hal? ( !udev? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		>=sys-apps/hal-0.5.10 ) )
+	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-0.19
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+pkg_setup() {
+	if use cdda && ! use hal && ! use udev; then
+		ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\""
+		ewarn "cdda support will NOT be built unless you enable EITHER hal OR udev"
+	fi
+
+	G2CONF="${G2CONF}
+		--disable-hal
+		--enable-udev
+		--disable-bash-completion
+		--with-dbus-service-dir=/usr/share/dbus-1/services
+		$(use_enable archive)
+		$(use_enable avahi)
+		$(use_enable bluetooth obexftp)
+		$(use_enable cdda)
+		$(use_enable fuse)
+		$(use_enable gdu)
+		$(use_enable gnome gconf)
+		$(use_enable gphoto2)
+		$(use_enable iphone afc)
+		$(use_enable udev gudev)
+		$(use_enable http)
+		$(use_enable gnome-keyring keyring)
+		$(use_enable samba)"
+	
+	if use hal && ! use udev; then
+		G2CONF="${G2CONF} --enable-hal"
+		ewarn "Enabling deprecated hal support. This will override udev support."
+	fi
+
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+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
+
+	use gphoto2 || use archive && eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	use bash-completion && \
+		dobashcompletion programs/gvfs-bash-completion.sh ${PN}
+}
+
+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"
+	ewarn "You may need to log out and log back in for some changes to take effect"
+}