gnome-base/gvfs: fix location of bash-completion script

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 146 insertions, 2 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index f84e664029fd..2a2cd0be48b8 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.20 2008/08/12 13:34:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.21 2008/08/20 13:03:40 remi Exp $
+
+*gvfs-0.2.5-r2 (20 Aug 2008)
+
+  20 Aug 2008; Rémi Cardona <remi@gentoo.org>
+  +files/gvfs-0.2.5-bash-completion.patch, +gvfs-0.2.5-r2.ebuild:
+  fix location of bash-completion script
 
   12 Aug 2008; Raúl Porcel <armin76@gentoo.org> gvfs-0.2.5.ebuild:
   alpha/ia64/sparc stable wrt #229709
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index be0cfad64387..5801bb8fb2cd 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,7 +1,9 @@
+AUX gvfs-0.2.5-bash-completion.patch 2002 RMD160 4be918587bf2e5ed0a05c8aaaca86e38fcc63cd6 SHA1 620b3e22d6b2e0558f632cc1962d95695458ff1a SHA256 04b247915f396734b29398a611d078a972b33a085c53766a56d0053797961fc4
 DIST gvfs-0.2.3.tar.bz2 830289 RMD160 41c35159d5b72ae38ee47922ffe8b7f90d153c2b SHA1 9b2a73b4d0edf77a623eeda001f634f11d8ea74b SHA256 27d73ba99f71d01d306887a19535a3384e9e374db5231f8f7eb2918f8eb0f877
 DIST gvfs-0.2.5.tar.bz2 826404 RMD160 f1b403c859ce91a5620ca16067d225f8a733857f SHA1 b92b27792fe711319f9f0bba678dc9c074cb5b97 SHA256 f8bb3d32b1fe797190b9d8f2a6b0cdf91e897326a26cf8d9583e41f0d3aae86b
 EBUILD gvfs-0.2.3.ebuild 1724 RMD160 ee5861b66bb2ae9d3a20a376fe0f9e295806402f SHA1 0d93196f98903d4fbeb11f80f0cc5430fdafc2fc SHA256 f5779d15a79f8d4265d0c3de39d0f86d7b83f28ef54ebeed831efa1f8ec8a0e2
 EBUILD gvfs-0.2.5-r1.ebuild 1729 RMD160 653a5360074c564ca0ed2cbc9832ad45bb4bdb86 SHA1 25cbfe5bb40a464fd10b0b6de42c91411d540677 SHA256 27dcf4f6555eeeb77da30b74a8a73e415624b6c337f9f4eba68ea716e4a805e8
+EBUILD gvfs-0.2.5-r2.ebuild 2126 RMD160 32d74e3b014563ef46ac4960a14522b9c20ddfe4 SHA1 b62d79728206f5596178f11ef424b6e9893cb15e SHA256 f5a2e54476b264df368fba9f6402d962e7f21bf08a4c778ae3beed48a09e2352
 EBUILD gvfs-0.2.5.ebuild 1599 RMD160 92770ad97a4435d47d00947041efff816f7a10b4 SHA1 62a8bf725dfabefb7fd04547a7157deeffbea8e5 SHA256 65bd059a5fa92297735f61edf740f090997f4314cb59174c6ad380796d3d93f4
-MISC ChangeLog 2979 RMD160 3e26a8118a68be1c4d5a60ab58da562af6a2f2e5 SHA1 ce81ac0330ece4f3416cf1a54736e2309b2047e3 SHA256 9f4b106a0a73e05055e648ea24b2e07e3cf42fa90f04e2b61ac780f416bcfeda
+MISC ChangeLog 3161 RMD160 50e0710b5329019112dea66a2805950f2813ae57 SHA1 c4efc539c98a19ddf759b6ad030526ada3ef9dd2 SHA256 4e76e5e31493684ba37da55f3e07e59a1f6b4f59c8c1a88cf54b0d6055d1966c
 MISC metadata.xml 736 RMD160 b47be7b5fc5ed00a4e1682f0cdf025eb6af277b3 SHA1 4b9e5e748d8dcc21f950ce8f76bce7d529129c96 SHA256 1079af8695ba6f4e7b8216f76ae1d01c209f7484798530639beea1cc216d34ef
diff --git a/gnome-base/gvfs/files/gvfs-0.2.5-bash-completion.patch b/gnome-base/gvfs/files/gvfs-0.2.5-bash-completion.patch
new file mode 100644
index 000000000000..b16d3a63afe6
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-0.2.5-bash-completion.patch
@@ -0,0 +1,58 @@
+Index: trunk/programs/Makefile.am
+===================================================================
+--- trunk/programs/Makefile.am	(revision 1769)
++++ trunk/programs/Makefile.am	(revision 1770)
+@@ -32,8 +32,10 @@
+ 	gvfs-less				\
+ 	$(NULL)
+ 
+-profiledir = $(sysconfdir)/profile.d
++if ENABLE_BASHCOMP
++profiledir = $(BASHCOMP_DIR)
+ profile_SCRIPTS = gvfs-bash-completion.sh
++endif
+ 
+ gvfs_cat_SOURCES = gvfs-cat.c
+ gvfs_cat_LDADD = $(libraries)
+@@ -80,4 +82,4 @@
+ gvfs_mkdir_SOURCES = gvfs-mkdir.c
+ gvfs_mkdir_LDADD = $(libraries)
+ 
+-EXTRA_DIST=gvfs-less gvfs-bash-completion.sh
++EXTRA_DIST = gvfs-less gvfs-bash-completion.sh
+Index: trunk/configure.ac
+===================================================================
+--- trunk/configure.ac	(revision 1769)
++++ trunk/configure.ac	(revision 1770)
+@@ -472,6 +472,25 @@
+ AC_SUBST(ARCHIVE_CFLAGS)
+ AC_SUBST(ARCHIVE_LIBS)
+ 
++dnl Install bash-completion file?
++AC_ARG_ENABLE([bash-completion],
++	      AC_HELP_STRING([--disable-bash-completion],
++			     [build without bash-completion support]),
++	      msg_bash_completion=$enableval,
++	      msg_bash_completion=yes)
++if test "x$enable_bash_completion" != "xno"; then
++  msg_bash_completion=yes
++fi
++AM_CONDITIONAL(ENABLE_BASHCOMP, test "$msg_bash_completion" = "yes")
++
++AC_ARG_WITH([bash-completion-dir],
++	    AC_HELP_STRING([--with-bash-completion-dir=PATH],
++	    		   [choose directory for bash-completion file (default=SYSCONFDIR/profile.d)]),
++	    with_bashcomp_dir=$withval,
++	    with_bashcomp_dir=$sysconfdir/profile.d)
++BASHCOMP_DIR=$with_bashcomp_dir
++AC_SUBST(BASHCOMP_DIR)
++
+ dnl ==========================================================================
+ 	
+ dnl Globally define_GNU_SOURCE and therefore enable the GNU extensions
+@@ -555,4 +574,5 @@
+         DNS-SD support:               $msg_avahi
+ 	Use HAL for volume monitor:   $msg_hal (with fast init path: $have_hal_fast_init)
+ 	GNOME Keyring support:        $msg_keyring
++	Bash-completion support:      $msg_bash_completion
+ "
diff --git a/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild b/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild
new file mode 100644
index 000000000000..d28d5abe291f
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild,v 1.1 2008/08/20 13:03:40 remi Exp $
+
+inherit bash-completion gnome2 eutils autotools
+
+DESCRIPTION="GNOME Virtual Filesystem Layer"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avahi bluetooth cdda doc fuse gnome gphoto2 hal gnome-keyring samba"
+
+RDEPEND=">=dev-libs/glib-2.16
+		 >=sys-apps/dbus-1.0
+		 >=net-libs/libsoup-2.4
+		 dev-libs/libxml2
+		 net-misc/openssh
+		 avahi? ( >=net-dns/avahi-0.6 )
+		 cdda?  (
+					>=sys-apps/hal-0.5.10
+					>=dev-libs/libcdio-0.78.2
+				)
+		 fuse? ( sys-fs/fuse )
+		 gnome? ( >=gnome-base/gconf-2.0 )
+		 hal? ( >=sys-apps/hal-0.5.10 )
+		 bluetooth? (
+			dev-libs/dbus-glib
+			>=net-wireless/bluez-libs-3.12
+			dev-libs/expat
+			)
+		 gphoto2? ( >=media-libs/libgphoto2-2.4 )
+		 gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
+		 samba? ( >=net-fs/samba-3 )"
+DEPEND="${RDEPEND}
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.19
+		doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+			--enable-http
+			--with-bash-completion-dir=${ROOT}usr/share/bash-completion
+			$(use_enable bash-completion)
+			$(use_enable avahi)
+			$(use_enable bluetooth obexftp)
+			$(use_enable cdda)
+			$(use_enable fuse)
+			$(use_enable gnome gconf)
+			$(use_enable gphoto2)
+			$(use_enable hal)
+			$(use_enable gnome-keyring keyring)
+			$(use_enable samba)"
+
+	if use cdda && built_with_use dev-libs/libcdio minimal; then
+		ewarn
+		ewarn "CDDA support in gvfs requires dev-libs/libcdio to be built"
+		ewarn "without the minimal USE flag."
+		die "Please re-emerge dev-libs/libcdio without the minimal USE flag"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}/${PN}-0.2.5-bash-completion.patch"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	use bash-completion && \
+		mv "${D}/usr/share/bash-completion/gvfs-bash-completion.sh" \
+		"${D}/usr/share/bash-completion/gvfs"
+}