Added bash completion and an autostart .desktop file from upstream's bzr repo

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 93 insertions, 10 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index c6d4d611197d..30dcdba637b8 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.103 2009/05/18 21:57:15 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.104 2009/06/01 12:03:14 nixphoeni Exp $
+
+*gdesklets-core-0.36.1-r2 (01 Jun 2009)
+
+  01 Jun 2009; Joe Sapp <nixphoeni@gentoo.org>
+  -gdesklets-core-0.36.1-r1.ebuild, +gdesklets-core-0.36.1-r2.ebuild,
+  +files/gdesklets-core-0.36.1-bash-completion, +files/gdesklets.desktop:
+  Added bash completion and an autostart .desktop file to be included in the
+  next release
 
 *gdesklets-core-0.36.1-r1 (15 May 2009)
 
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index 56c84ea0a6fc..af89412e189b 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -1,10 +1,12 @@
 AUX gdesklets-control-getid 1146 RMD160 e2a770486e996067c1484f24d73692ce4c34582b SHA1 59ee72ae2eab9f91d2e53bcf6d2113b148844b8f SHA256 a3d793c625b5205fd07fdc61d665a6720a2714b403139f5de6cd18fee1c20899
 AUX gdesklets-core-0.36-python-2.6-fix.patch 531 RMD160 81940f4dfc1f8b21470eee369f0fdfe5187a7c9f SHA1 e1c801522b9039e9c57a09c824662093fa9cb776 SHA256 1281220ff4f599c1c0b513c4ef0d89670b0af04331cefed0d895b3dbd5a737a0
+AUX gdesklets-core-0.36.1-bash-completion 1429 RMD160 58005a49b24dc5daf60c93fee0148f1aa995daef SHA1 5fc1bf3c3ffed1d04ca5302047082d03c2221b40 SHA256 12475cc4137b31098cb05ceafb3852d497e311a138b4171795568d88d012abf4
 AUX gdesklets-core-0.36.1-test-control.py-install-fix.patch 483 RMD160 a3a0b625c92738bb99d19f1332ded97fe717d387 SHA1 b088909f190a39479515b9501918fb7e31a03903 SHA256 2d3ef43385c3e2eb506a714ece81768abe6500f58392514a4b1e327bf098625d
 AUX gdesklets-core-0.36_beta-linguas.patch 1208 RMD160 5b691f445e73316232e394b8dca91601ac57d706 SHA1 d9fe4ed5775921c772b00399f3479afbb4a184d9 SHA256 760a79c3df6c6680ea6b76d787f666a603c919f7fac6b22869a4cb6ab7023b4b
 AUX gdesklets-migration-tool 7343 RMD160 d8d3f992e8786534a184de00bbcd5d1eebf93d4e SHA1 f0e0bd96663a35e1f98b2ec3b377a2b4246cbd33 SHA256 6dd834d92f1a70280e8b3d7b7a005564e0daa5e2769758f47e151044d62cfa48
+AUX gdesklets.desktop 265 RMD160 a6a84a28abf1120cc8df2e52505c119cdb82cca7 SHA1 a8a544d457cf613f939c45e29681bab307b0fa36 SHA256 8b38972217e4a923fb988b7982eb1e6655f1f885686a4b9585810999588c11ee
 DIST gdesklets-0.36.1.tar.gz 3537820 RMD160 ff658aa32ee562ed0563f01e6c5c7267c0e1fa7c SHA1 a865fd5cd65f4e217fb2c16982961b7b1f6d54cc SHA256 5e0cfd4cd99437aba24dfca33a72b2b6aef33b4c1128064ce82a368280bc6d61
-EBUILD gdesklets-core-0.36.1-r1.ebuild 3398 RMD160 ec071b580ba9432314c15c0c28511da81c3ad482 SHA1 38753338c04cd60698417bf0fb1c8addca633cd3 SHA256 a472d25bc2ca37437e456e314dd77dd472bcba860cfc8e88f37772056fd9e260
+EBUILD gdesklets-core-0.36.1-r2.ebuild 3781 RMD160 027a03954735bca3ff6dc2c6c1ae48485f434563 SHA1 94caa37d7985435311de8430eb4ac86b2126d597 SHA256 336b3f931fda1849e243d8f87793add8e3ff327d85daff032e4bf13888135441
 EBUILD gdesklets-core-0.36.1.ebuild 3295 RMD160 e3c4d556bd7c436a7a7b88da3717e5bb09c78e8c SHA1 5e9a1949ad3930ad0c31cfdadcb303aaa0e2d9b0 SHA256 52743f43b259e81b7200db532d284251d006f00bde0574cd14bb26315873edac
-MISC ChangeLog 20004 RMD160 8c4c3cb642eb3ae4ae78a2b789aa4039198e2acc SHA1 1e78ac23e74e8a6dea88ea2365337c6672d92e1a SHA256 0bfbd94ec12632c407a3d44933a11de474f7a2ab0b6ceb0fe9e3cbb5f14cfe76
+MISC ChangeLog 20329 RMD160 ccb9800c4d2d0e17f68e63021ab9d2c9a423254a SHA1 77bcb8e2dc65a4fe0ad54954e06c703d0e58d82e SHA256 8aba150bc214d1b064eca08e74afa570c367e162356ec684a76656d9787e88bd
 MISC metadata.xml 225 RMD160 84ee2a2d6e82c97c9059ca7cfc17f222f18e4431 SHA1 54492f0c3ac21555e1a60882fa7b92103fc3d2c8 SHA256 49feb5b4f0a008e92acb1626adf763199e38ad92f465e41943a89941213ffeef
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.1-bash-completion b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.1-bash-completion
new file mode 100644
index 000000000000..8f6e1a1b0bd7
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.1-bash-completion
@@ -0,0 +1,50 @@
+# $Id: gdesklets-core-0.36.1-bash-completion,v 1.1 2009/06/01 12:03:14 nixphoeni Exp $
+# See http://devmanual.gentoo.org/tasks-reference/completion/index.html
+# Author: Joe Sapp
+
+_gdesklets() 
+{
+	local cur prev opts
+
+	COMPREPLY=()
+
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+	opts="open start stop list restart profile shell status about
+		version configure help check"
+	running_opts="slay"
+	not_running_opts=""
+
+	# Do these take an additional paramater?
+	case "${prev}" in
+	open)
+		# First, look for .display files in the current directory
+		COMPREPLY=$(compgen -f -o filenames -X '!*.display' ${cur})
+		
+		# If no filename completions are found, try for directory
+		# completions
+		# This, with the '-o filenames' argument on the 'complete'
+		# line below allows entering a directory name with the intent
+		# of finishing with a .display file
+		COMPREPLY=( ${COMPREPLY:-$(compgen -d ${cur})} )
+		return 0
+		;;
+	profile)
+		local prof_output=$(gdesklets profile | grep "Available" | sed -e 's/.*: //' -e 's/,//')
+		COMPREPLY=( $(compgen -W "${prof_output}" -- ${cur}) )
+		return 0
+		;;
+	esac
+
+	if [[ ${COMP_CWORD} -eq 1 ]] ; then
+		local status="$(gdesklets status)"
+		if [[ "${status}" == *not* ]] ; then
+			opts="${opts} ${not_running_opts}"
+		else
+			opts="${opts} ${running_opts}"
+		fi
+		COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+		return 0
+	fi
+}
+complete -F _gdesklets -o filenames gdesklets
diff --git a/gnome-extra/gdesklets-core/files/gdesklets.desktop b/gnome-extra/gdesklets-core/files/gdesklets.desktop
new file mode 100644
index 000000000000..58458661c18e
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=gDesklets
+Type=Application
+Encoding=UTF-8
+Version=1.0
+Categories=Utility;
+X-GNOME-Autostart-enabled=true
+Exec=gdesklets start
+Icon=gdesklets
+GenericName=Desktop Widgets
+Comment=Eye candy for your desktop
+GenericName[es]=Widgets para Escritorio
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r2.ebuild
index 990c9a6e2762..244341166b56 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r1.ebuild,v 1.1 2009/05/18 21:57:15 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r2.ebuild,v 1.1 2009/06/01 12:03:14 nixphoeni Exp $
 
 # desklets don't run with USE=debug
 GCONF_DEBUG="no"
 
 # We want the latest autoconf and automake (the default)
-inherit gnome2 python eutils autotools multilib
+inherit gnome2 python eutils autotools multilib bash-completion
 
 MY_PN="gDesklets"
 MY_P="${PN/-core/}-${PV/_/}"
@@ -69,8 +69,16 @@ src_install() {
 
 	gnome2_src_install
 
+	# Install bash completion script
+	BASH_COMPLETION_NAME="gDesklets"
+	dobashcompletion "${FILESDIR}/${PN}-${PV}-bash-completion"
+
+	# Install autostart script
+	insinto "/etc/xdg/autostart"
+	doins "${FILESDIR}/gdesklets.desktop"
+
 	# Install the gdesklets-control-getid script
-	insinto /usr/$(get_libdir)/gdesklets
+	insinto "/usr/$(get_libdir)/gdesklets"
 	insopts -m0555
 	doins "${FILESDIR}/gdesklets-control-getid"
 
@@ -85,7 +93,7 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 
 	# Compile pyc files on target system
-	python_mod_optimize "${ROOT}"/usr/$(get_libdir)/gdesklets
+	python_mod_optimize "${ROOT}/usr/$(get_libdir)/gdesklets"
 
 	echo
 	elog "gDesklets Displays are required before the library"
@@ -99,14 +107,17 @@ pkg_postinst() {
 	elog "Next you'll need to start gDesklets using"
 	elog "           ${ROOT}usr/bin/gdesklets start"
 	elog "If you're using GNOME this can be done conveniently through"
-	elog "Applications->Accessories->gDesklets"
+	elog "Applications->Accessories->gDesklets or automatically each login"
+	elog "under System->Preferences->Sessions"
 	elog
 	elog "If you're updating from a version less than 0.35_rc1,"
 	elog "you can migrate your desklet configurations by"
 	elog "running"
 	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/gdesklets-migration-tool"
 	elog "after the first time you run gDesklets"
-	echo
+	elog
+	BASH_COMPLETION_NAME="gDesklets"
+	bash-completion_pkg_postinst
 
 }
 
@@ -115,6 +126,6 @@ pkg_postrm() {
 	gnome2_pkg_postrm
 	# Cleanup after our cavalier python compilation
 	# The function takes care of ${ROOT} for us
-	python_mod_cleanup /usr/$(get_libdir)/gdesklets
+	python_mod_cleanup "/usr/$(get_libdir)/gdesklets"
 
 }