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

Package-Manager: portage-2.1.3.6

7 files changed, 131 insertions, 13 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/Manifest b/x11-misc/hotkeys/Manifest
index c9ffdab4a14a..de09d7c20b91 100644
--- a/x11-misc/hotkeys/Manifest
+++ b/x11-misc/hotkeys/Manifest
@@ -5,26 +5,42 @@ AUX hotkeys-0.5.7.1-r1-gentoo.diff 1379 RMD160 28035b3b08b440948666f7c6857f0b347
 MD5 2b1987adcf943427133e4f897782604c files/hotkeys-0.5.7.1-r1-gentoo.diff 1379
 RMD160 28035b3b08b440948666f7c6857f0b34759a341a files/hotkeys-0.5.7.1-r1-gentoo.diff 1379
 SHA256 283c0af43294d456530fe5d653709dbddf6743c25fc4e69c26073bbe3c92fc91 files/hotkeys-0.5.7.1-r1-gentoo.diff 1379
+AUX hotkeys-0.5.7.4.0.1-audacious.patch 732 RMD160 dc921697f47c122f2fe1d001f6f0fd07e61df3b3 SHA1 553c13b0da30093450cdc03a437af280d9c00da7 SHA256 86c1b14a03a990f17aa15c84e335be5ad7a74f50ce8554fd2d55e47534480eec
+MD5 22e056d898c76299795119efab798d76 files/hotkeys-0.5.7.4.0.1-audacious.patch 732
+RMD160 dc921697f47c122f2fe1d001f6f0fd07e61df3b3 files/hotkeys-0.5.7.4.0.1-audacious.patch 732
+SHA256 86c1b14a03a990f17aa15c84e335be5ad7a74f50ce8554fd2d55e47534480eec files/hotkeys-0.5.7.4.0.1-audacious.patch 732
+AUX hotkeys-0.5.7.4.0.1-gcc4.patch 551 RMD160 4f54707eaa5155992df8e79f8707cd73027cad3c SHA1 49a02037f6b625d95793641ab5f1f0daadb8c2ff SHA256 c2b3bd2cb8cc6f54db4d48c1b9a7f330b1a21c0abf4d98fd599be0168e955479
+MD5 c59bc4578098b21e86491e5809fbdfcd files/hotkeys-0.5.7.4.0.1-gcc4.patch 551
+RMD160 4f54707eaa5155992df8e79f8707cd73027cad3c files/hotkeys-0.5.7.4.0.1-gcc4.patch 551
+SHA256 c2b3bd2cb8cc6f54db4d48c1b9a7f330b1a21c0abf4d98fd599be0168e955479 files/hotkeys-0.5.7.4.0.1-gcc4.patch 551
 DIST hotkeys_0.5.7.1.tar.gz 234289 RMD160 d28b22f2fbfbf71defb80da28c8ac44112615465 SHA1 994efbc8008efc1d5f27d7143cceeb118aac0f51 SHA256 6901bcdb81ca2b6a4ed095b227a2bbca1833fc18d8ed189b7fc803369f1a6faa
+DIST hotkeys_0.5.7.4-0.1.tar.gz 245307 RMD160 5ee69a101c96a8d163c33147b8c1426bad4b2023 SHA1 ac4f6bd7bf743273e2f42a73ac11cb7696da044a SHA256 8dcae0979be02f2f181937ac0bbea5b16990be384392a65c920d7b9dea43fba5
 EBUILD hotkeys-0.5.7.1-r1.ebuild 1007 RMD160 fdcef95d9f926a7e0d84c06dd8d974bda471bad4 SHA1 96275ac2dbbfc4a8db1bfa56691ecd5aeba99b26 SHA256 2557db313b61d798cc4fbfa0e9e12187c3810f0109205d7fd1802ba6fbe7f633
 MD5 2f843cb6d46738a11edfdaf91eae9b6d hotkeys-0.5.7.1-r1.ebuild 1007
 RMD160 fdcef95d9f926a7e0d84c06dd8d974bda471bad4 hotkeys-0.5.7.1-r1.ebuild 1007
 SHA256 2557db313b61d798cc4fbfa0e9e12187c3810f0109205d7fd1802ba6fbe7f633 hotkeys-0.5.7.1-r1.ebuild 1007
-MISC ChangeLog 3377 RMD160 d5914acfe87bc415d8c01536842da651bdff1309 SHA1 cdcc372e877652fc95b5182e2f56266cb279c69e SHA256 70c3488a9d689c255e56c1122b1156d9aaac20fb99d4cb84e621c392812b4a13
-MD5 e86fbfd809fef27a82ad796561022ffe ChangeLog 3377
-RMD160 d5914acfe87bc415d8c01536842da651bdff1309 ChangeLog 3377
-SHA256 70c3488a9d689c255e56c1122b1156d9aaac20fb99d4cb84e621c392812b4a13 ChangeLog 3377
-MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
-MD5 4eda2fda81ea6a89d8f1f4a2dcd12a85 metadata.xml 233
-RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 metadata.xml 233
-SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b metadata.xml 233
+EBUILD hotkeys-0.5.7.4.0.1.ebuild 1275 RMD160 9ec22c7289e95ce10c5e5c67be6152b8cf5ae07e SHA1 428e8a8630d7ace6d4307503d07ea30b10b7d9f2 SHA256 cd6a7612088e286bac847f56f2c3134b4c720af71d2f4fa985c1295d6361dc85
+MD5 63c2b7ac74bc7bacf94cd4ec6e8a75ca hotkeys-0.5.7.4.0.1.ebuild 1275
+RMD160 9ec22c7289e95ce10c5e5c67be6152b8cf5ae07e hotkeys-0.5.7.4.0.1.ebuild 1275
+SHA256 cd6a7612088e286bac847f56f2c3134b4c720af71d2f4fa985c1295d6361dc85 hotkeys-0.5.7.4.0.1.ebuild 1275
+MISC ChangeLog 3703 RMD160 5517688a72da30e5e31bc46e7b572bd5a0cc053c SHA1 558c96bd3901a37373b3ae952eec893007d160f0 SHA256 d7cea0b7baa958b779ab891635d427075a4af0ddac5b416fbca1fc362eaff17a
+MD5 80fdfea24418100ff811ec0ae7fb5af2 ChangeLog 3703
+RMD160 5517688a72da30e5e31bc46e7b572bd5a0cc053c ChangeLog 3703
+SHA256 d7cea0b7baa958b779ab891635d427075a4af0ddac5b416fbca1fc362eaff17a ChangeLog 3703
+MISC metadata.xml 280 RMD160 f268bd475a3bc7c1dd9cbbb2d2b5064dfd8c9854 SHA1 316dfd95a6615e74306eb5d833f0f706eab959f5 SHA256 05274975de0b6f2dab13c27588365325e7cebe103141913826cb2abcde82f2d9
+MD5 65eb418e8d484adeb1d8afe0ce4da908 metadata.xml 280
+RMD160 f268bd475a3bc7c1dd9cbbb2d2b5064dfd8c9854 metadata.xml 280
+SHA256 05274975de0b6f2dab13c27588365325e7cebe103141913826cb2abcde82f2d9 metadata.xml 280
 MD5 d1bd1eea7cffd8018b6b104563f4ce0e files/digest-hotkeys-0.5.7.1-r1 247
 RMD160 1e3640692ddafc3bb9407ea50773b435fb2e9b2e files/digest-hotkeys-0.5.7.1-r1 247
 SHA256 e08b64a1425d20b0390d001cfbf922f228cad2c034e897955d23e90a5c536c82 files/digest-hotkeys-0.5.7.1-r1 247
+MD5 a3d2bd5a7d1dc63fbf70b279ec9f5650 files/digest-hotkeys-0.5.7.4.0.1 259
+RMD160 ff329069b11f49a4c7f3d65aacb80714b0db9e33 files/digest-hotkeys-0.5.7.4.0.1 259
+SHA256 36b91db9fbb106630547ae193e008ca98dae075a1c6bcc05d7e366493b1561e5 files/digest-hotkeys-0.5.7.4.0.1 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGyZndOeoy/oIi7uwRAqyVAJ9/lQ1TsEOF18CkX3lu91T1W/4R9gCgkGLP
-3i08k+JQoLKuYDb6NAv1uZo=
-=qGFs
+iD8DBQFGyvBaOeoy/oIi7uwRAqaRAJsGcYL7sIUrv8txgbv8pGlKvhvkMwCg28oh
+Bp1Mi7u3M2kONE50OPLcj+c=
+=Ech6
 -----END PGP SIGNATURE-----
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>