Version bump and added ka0ttic's bash completion code... closes bugs #69814 and #70058.

9 files changed, 73 insertions, 49 deletions

diff --git a/media-sound/xmmsctrl/ChangeLog b/media-sound/xmmsctrl/ChangeLog
index 38abb812afce..c8c8557f9775 100644
--- a/media-sound/xmmsctrl/ChangeLog
+++ b/media-sound/xmmsctrl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/xmmsctrl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/ChangeLog,v 1.15 2004/09/15 19:42:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/ChangeLog,v 1.16 2004/11/04 23:22:33 eradicator Exp $
+
+*xmmsctrl-1.8 (04 Nov 2004)
+
+  04 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/xmmsctrl-1.8-jump.patch, +files/xmmsctrl.bash-completion,
+  -xmmsctrl-1.6-r1.ebuild, -xmmsctrl-1.6.ebuild, +xmmsctrl-1.8.ebuild:
+  Version bump and added ka0ttic's bash completion code... closes bugs #69814
+  and #70058.
 
   15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> xmmsctrl-1.7.ebuild:
   Stable sparc.
diff --git a/media-sound/xmmsctrl/Manifest b/media-sound/xmmsctrl/Manifest
index 1c9d0e18639d..f47d0ead499e 100644
--- a/media-sound/xmmsctrl/Manifest
+++ b/media-sound/xmmsctrl/Manifest
@@ -1,9 +1,8 @@
 MD5 312b20a4b863739d6117271a9c17efbd ChangeLog 1958
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 b1698e868830a7dc88a88045036eddf9 xmmsctrl-1.6-r1.ebuild 788
-MD5 272d38f5a69313086e623e2b42931825 xmmsctrl-1.6.ebuild 753
 MD5 0993fde26d7701ec1043d6478bffa33b xmmsctrl-1.7.ebuild 792
-MD5 8a895c8a1f15679dd525bd79ce8516f0 files/digest-xmmsctrl-1.6 62
-MD5 8a895c8a1f15679dd525bd79ce8516f0 files/digest-xmmsctrl-1.6-r1 62
+MD5 7981e4c552532c0de704a0405f06794b xmmsctrl-1.8.ebuild 821
+MD5 820f89eab5c374f7690d5e6ad325876e files/digest-xmmsctrl-1.8 63
 MD5 c7c656137800fdd34067cd2e40c9775e files/digest-xmmsctrl-1.7 62
 MD5 81df994f3cc643315bc3ce5f0b83e848 files/xmmsctrl-jump.patch 374
+MD5 05f6185db85e7f3988a289cfdaace9c6 files/xmmsctrl.bash-completion 938
diff --git a/media-sound/xmmsctrl/files/digest-xmmsctrl-1.6 b/media-sound/xmmsctrl/files/digest-xmmsctrl-1.6
deleted file mode 100644
index 08cc0659180e..000000000000
--- a/media-sound/xmmsctrl/files/digest-xmmsctrl-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 71fd55fbd9d8f7a05adb24897e8ef643 xmmsctrl-1.6.tar.gz 7843
diff --git a/media-sound/xmmsctrl/files/digest-xmmsctrl-1.6-r1 b/media-sound/xmmsctrl/files/digest-xmmsctrl-1.6-r1
deleted file mode 100644
index 08cc0659180e..000000000000
--- a/media-sound/xmmsctrl/files/digest-xmmsctrl-1.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 71fd55fbd9d8f7a05adb24897e8ef643 xmmsctrl-1.6.tar.gz 7843
diff --git a/media-sound/xmmsctrl/files/digest-xmmsctrl-1.8 b/media-sound/xmmsctrl/files/digest-xmmsctrl-1.8
new file mode 100644
index 000000000000..4944e8765d6b
--- /dev/null
+++ b/media-sound/xmmsctrl/files/digest-xmmsctrl-1.8
@@ -0,0 +1 @@
+MD5 0774f3e61cfc89c1fd3f0526c48b35db xmmsctrl-1.8.tar.gz 14043
diff --git a/media-sound/xmmsctrl/files/xmmsctrl-1.8-jump.patch b/media-sound/xmmsctrl/files/xmmsctrl-1.8-jump.patch
new file mode 100644
index 000000000000..0dc0db22fc4e
--- /dev/null
+++ b/media-sound/xmmsctrl/files/xmmsctrl-1.8-jump.patch
@@ -0,0 +1,15 @@
+diff -Naur xmmsctrl-1.8.orig/xmmsctrl.c xmmsctrl-1.8/xmmsctrl.c
+--- xmmsctrl-1.8.orig/xmmsctrl.c	2004-04-02 04:55:06.000000000 -0800
++++ xmmsctrl-1.8/xmmsctrl.c	2004-11-04 15:18:37.487096112 -0800
+@@ -135,6 +135,11 @@
+     "print this help message."
+   },
+   {
++    "jump" ,
++    xmms_remote_show_jump_box ,
++    "open the xmms jump to file box"
++  },
++  {
+     "next" , 
+     xmms_remote_playlist_next ,
+     "xmms next song command, go to the next song."
diff --git a/media-sound/xmmsctrl/files/xmmsctrl.bash-completion b/media-sound/xmmsctrl/files/xmmsctrl.bash-completion
new file mode 100644
index 000000000000..1568d3ca5e1f
--- /dev/null
+++ b/media-sound/xmmsctrl/files/xmmsctrl.bash-completion
@@ -0,0 +1,38 @@
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/files/xmmsctrl.bash-completion,v 1.1 2004/11/04 23:22:33 eradicator Exp $
+# xmmsctrl completion
+
+_xmmsctrl()
+{
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    opts="launch not cur eject getlength getpos gettime getvol help jump \
+    next pause play playlist playfiles pref prev previous remove repeat \
+    shuffle stop title quit --help equalizer main play_list paused playing \
+    is_equalizer is_main is_play_list is_stream running session dir time \
+    track vol"
+
+    if [ ${COMP_CWORD} -eq 1 ] ; then
+	COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
+	return 0
+    fi
+
+    case "${prev}" in
+	equalizer|main|play_list)
+	    COMPREPLY=($(compgen -W "0 1" -- "${cur}"))
+	    ;;
+	dir)
+	    COMPREPLY=($(compgen -A directory -- "${cur}"))
+	    ;;
+	not)
+	    COMPREPLY=($(compgen -W "${opts/not}" -- "${cur}"))
+	    ;;
+	*)
+	    COMPREPLY=()
+	    ;;
+    esac
+}
+complete -F _xmmsctrl xmmsctrl
+
+# vim: set ft=sh tw=80 sw=4 et :
diff --git a/media-sound/xmmsctrl/xmmsctrl-1.6.ebuild b/media-sound/xmmsctrl/xmmsctrl-1.6.ebuild
deleted file mode 100644
index 3a34d2e92afe..000000000000
--- a/media-sound/xmmsctrl/xmmsctrl-1.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/xmmsctrl-1.6.ebuild,v 1.10 2004/09/02 18:18:28 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="A small program to control xmms from a shell script."
-SRC_URI="http://www.docs.uu.se/~adavid/utils/${P}.tar.gz"
-HOMEPAGE="http://user.it.uu.se/~adavid/utils/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc ~alpha ~hppa"
-
-IUSE=""
-
-DEPEND=">=media-sound/xmms-1.2.7-r16"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-	epatch ${FILESDIR}/xmmsctrl-jump.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	dobin xmmsctrl
-	dodoc README HELP
-	mv samples ${D}/usr/share/doc/${PF}/
-	prepalldocs
-}
diff --git a/media-sound/xmmsctrl/xmmsctrl-1.6-r1.ebuild b/media-sound/xmmsctrl/xmmsctrl-1.8.ebuild
index 77409bb1d98d..9cbd9545202c 100644
--- a/media-sound/xmmsctrl/xmmsctrl-1.6-r1.ebuild
+++ b/media-sound/xmmsctrl/xmmsctrl-1.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/xmmsctrl-1.6-r1.ebuild,v 1.8 2004/09/02 18:18:28 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmmsctrl/xmmsctrl-1.8.ebuild,v 1.1 2004/11/04 23:22:33 eradicator Exp $
 
 IUSE=""
 
-inherit eutils
+inherit eutils bash-completion
 
 DESCRIPTION="A small program to control xmms from a shell script."
 SRC_URI="http://www.docs.uu.se/~adavid/utils/${P}.tar.gz"
@@ -12,17 +12,14 @@ HOMEPAGE="http://user.it.uu.se/~adavid/utils/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc ~alpha ~hppa"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 
-RDEPEND=">=media-sound/xmms-1.2.7-r16"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/portage-2.0.48"
+DEPEND="media-sound/xmms"
 
 src_unpack() {
 	unpack ${A} || die
 	cd ${S}
-	epatch ${FILESDIR}/xmmsctrl-jump.patch
+	epatch ${FILESDIR}/${P}-jump.patch
 }
 
 src_compile() {
@@ -35,4 +32,6 @@ src_install () {
 
 	docinto samples
 	dodoc samples/*
+
+	dobashcompletion ${FILESDIR}/${PN}.bash-completion ${PN}
 }