Version bump. Change default key actions, bug #157559.

(Portage version: 2.1.3.6)

6 files changed, 104 insertions, 2 deletions

diff --git a/x11-misc/hotkeys/ChangeLog b/x11-misc/hotkeys/ChangeLog
index d87c8b13697d..55512bf4d199 100644
--- a/x11-misc/hotkeys/ChangeLog
+++ b/x11-misc/hotkeys/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/hotkeys
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/hotkeys/ChangeLog,v 1.30 2007/08/20 13:40:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/hotkeys/ChangeLog,v 1.31 2007/08/21 14:01:53 ulm Exp $
+
+*hotkeys-0.5.7.4.0.1 (21 Aug 2007)
+
+  21 Aug 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/hotkeys-0.5.7.4.0.1-audacious.patch,
+  +files/hotkeys-0.5.7.4.0.1-gcc4.patch, metadata.xml,
+  +hotkeys-0.5.7.4.0.1.ebuild:
+  Adding falco and myself as maintainers. Version bump. Change default key
+  actions to audtool, bug #157559.
 
   03 Jun 2007; Samuli Suominen <drac@gentoo.org> metadata.xml,
   hotkeys-0.5.7.1-r1.ebuild:
diff --git a/x11-misc/hotkeys/files/digest-hotkeys-0.5.7.4.0.1 b/x11-misc/hotkeys/files/digest-hotkeys-0.5.7.4.0.1
new file mode 100644
index 000000000000..17b5bbfbc36d
--- /dev/null
+++ b/x11-misc/hotkeys/files/digest-hotkeys-0.5.7.4.0.1
@@ -0,0 +1,3 @@
+MD5 b25291c9863f7c6a0dd032936e181160 hotkeys_0.5.7.4-0.1.tar.gz 245307
+RMD160 5ee69a101c96a8d163c33147b8c1426bad4b2023 hotkeys_0.5.7.4-0.1.tar.gz 245307
+SHA256 8dcae0979be02f2f181937ac0bbea5b16990be384392a65c920d7b9dea43fba5 hotkeys_0.5.7.4-0.1.tar.gz 245307
diff --git a/x11-misc/hotkeys/files/hotkeys-0.5.7.4.0.1-audacious.patch b/x11-misc/hotkeys/files/hotkeys-0.5.7.4.0.1-audacious.patch
new file mode 100644
index 000000000000..d768e0200434
--- /dev/null
+++ b/x11-misc/hotkeys/files/hotkeys-0.5.7.4.0.1-audacious.patch
@@ -0,0 +1,19 @@
+--- hotkeys-0.5.7.4.orig/src/conf.c	2007-07-20 15:53:06.000000000 +0200
++++ hotkeys-0.5.7.4/src/conf.c	2007-08-21 10:24:47.000000000 +0200
+@@ -42,11 +42,11 @@
+     "CDROM",           "/dev/cdrom",
+ 
+     /* general actions */
+-    "PrevTrack",       "xmms --rew",
+-    "Play",            "xmms --play-pause",
+-    "Stop",            "xmms --stop",
+-    "Pause",           "xmms --pause",
+-    "NextTrack",       "xmms --fwd",
++    "PrevTrack",       "audtool --playlist-reverse",
++    "Play",            "audtool --playback-playpause",
++    "Stop",            "audtool --playback-stop",
++    "Pause",           "audtool --playback-pause",
++    "NextTrack",       "audtool --playlist-advance",
+ /*    "Rewind",          "\0",
+  */
+ 
diff --git a/x11-misc/hotkeys/files/hotkeys-0.5.7.4.0.1-gcc4.patch b/x11-misc/hotkeys/files/hotkeys-0.5.7.4.0.1-gcc4.patch
new file mode 100644
index 000000000000..a0bcf85af132
--- /dev/null
+++ b/x11-misc/hotkeys/files/hotkeys-0.5.7.4.0.1-gcc4.patch
@@ -0,0 +1,21 @@
+--- src/fixVMware.c~	2004-12-24 16:03:55.000000000 +0100
++++ src/fixVMware.c	2007-08-20 16:37:34.000000000 +0200
+@@ -19,6 +19,8 @@
+     $Id: hotkeys-0.5.7.4.0.1-gcc4.patch,v 1.1 2007/08/21 14:01:54 ulm Exp $
+ */
+ 
++#include <stdlib.h>
++#include <strings.h>
+ #include <signal.h>
+ #include <unistd.h>
+ #include <pthread.h>
+--- src/splash.c~	2002-12-03 19:13:14.000000000 +0100
++++ src/splash.c	2007-08-20 16:38:19.000000000 +0200
+@@ -27,6 +27,7 @@
+ 
+ #if HAVE_GTK
+ 
++#include <stdlib.h>
+ #include <gtk/gtk.h>
+ #include <X11/X.h>
+ #include <X11/Xatom.h>
diff --git a/x11-misc/hotkeys/hotkeys-0.5.7.4.0.1.ebuild b/x11-misc/hotkeys/hotkeys-0.5.7.4.0.1.ebuild
new file mode 100644
index 000000000000..6f868be0fde9
--- /dev/null
+++ b/x11-misc/hotkeys/hotkeys-0.5.7.4.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/hotkeys/hotkeys-0.5.7.4.0.1.ebuild,v 1.1 2007/08/21 14:01:53 ulm Exp $
+
+inherit eutils versionator
+
+MY_PV=$(get_version_component_range 1-4)
+MY_DIST_PV=$(replace_version_separator 4 '-')
+DESCRIPTION="A hotkeys daemon for your Internet/multimedia keyboard in X"
+HOMEPAGE="http://packages.debian.org/unstable/x11/hotkeys"
+SRC_URI="mirror://debian/pool/main/h/${PN}/${PN}_${MY_DIST_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+IUSE="gtk xosd"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libxkbfile
+	>=dev-libs/libxml2-2.2.8
+	>=sys-libs/db-4.3.29-r2
+	xosd? ( >=x11-libs/xosd-1 )
+	gtk? ( >=x11-libs/gtk+-2 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-audacious.patch"
+}
+
+src_compile() {
+	# use_with gtk doesn't work for USE=-gtk
+	econf \
+		$(useq gtk && echo "--with-gtk") \
+		$(use_with xosd) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS BUGS ChangeLog README TODO || die "dodoc failed"
+}
diff --git a/x11-misc/hotkeys/metadata.xml b/x11-misc/hotkeys/metadata.xml
index 73420b6cf0f0..6add070e5a89 100644
--- a/x11-misc/hotkeys/metadata.xml
+++ b/x11-misc/hotkeys/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>maintainer-needed@gentoo.org</email>
+  <email>falco@gentoo.org</email>
+</maintainer>
+<maintainer>
+  <email>ulm@gentoo.org</email>
 </maintainer>
 </pkgmetadata>