Version bump

(Portage version: 2.1.2.2)

5 files changed, 55 insertions, 20 deletions

diff --git a/x11-misc/keytouch/ChangeLog b/x11-misc/keytouch/ChangeLog
index bbad146d3f79..c04c7404a4d2 100644
--- a/x11-misc/keytouch/ChangeLog
+++ b/x11-misc/keytouch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/keytouch
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v 1.4 2007/01/30 19:52:53 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v 1.5 2007/03/21 00:07:50 nyhm Exp $
+
+*keytouch-2.3.0 (21 Mar 2007)
+
+  21 Mar 2007; Tristan Heaven <nyhm@gentoo.org> +files/keytouch-acpid,
+  +keytouch-2.3.0.ebuild:
+  Version bump
 
 *keytouch-2.2.4 (30 Jan 2007)
 
diff --git a/x11-misc/keytouch/files/digest-keytouch-2.2.3 b/x11-misc/keytouch/files/digest-keytouch-2.2.3
deleted file mode 100644
index 0a8c98e3682a..000000000000
--- a/x11-misc/keytouch/files/digest-keytouch-2.2.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a927d5c84a71f02e2b0b0eb1edfdbee6 keytouch-2.2-user_manual.pdf 301051
-RMD160 1a1b228012956be00727c6a11062976d79cac45d keytouch-2.2-user_manual.pdf 301051
-SHA256 d8913c84437bac66adb0464e673bf06ab390042f75603ddf99167758577ed60c keytouch-2.2-user_manual.pdf 301051
-MD5 043b47542608cd7c7be1bbbea82dcad7 keytouch-2.2.3.tar.gz 791226
-RMD160 53539ba421901b19abda14cda8850ccd04a9427a keytouch-2.2.3.tar.gz 791226
-SHA256 e3674cc57c574b2faae014ef630ca69dc042a404ead5cac8edc578fabfeffa5b keytouch-2.2.3.tar.gz 791226
-MD5 366337c740a458ecb323f454bd56307d keytouch-2.2_tech_manual.pdf 244176
-RMD160 d35f36e83c4cf24c0cee3510d639f55a83580766 keytouch-2.2_tech_manual.pdf 244176
-SHA256 921df5388c7aee8dcc9233784a81885fd77f948791f38cd3900a5875df6d3a6f keytouch-2.2_tech_manual.pdf 244176
diff --git a/x11-misc/keytouch/files/digest-keytouch-2.3.0 b/x11-misc/keytouch/files/digest-keytouch-2.3.0
new file mode 100644
index 000000000000..557130994502
--- /dev/null
+++ b/x11-misc/keytouch/files/digest-keytouch-2.3.0
@@ -0,0 +1,3 @@
+MD5 dbd503d952168aeb0c4637359cfe5d21 keytouch-2.3.0.tar.gz 801674
+RMD160 66f5b8eb4e73ddad5534f0525785243e75b8b2d9 keytouch-2.3.0.tar.gz 801674
+SHA256 c88d0c6f5469104b005e79192c410a2295512e9debe8bbd9464fc7539c91fdf8 keytouch-2.3.0.tar.gz 801674
diff --git a/x11-misc/keytouch/files/keytouch-acpid b/x11-misc/keytouch/files/keytouch-acpid
new file mode 100644
index 000000000000..ea212a4c9f37
--- /dev/null
+++ b/x11-misc/keytouch/files/keytouch-acpid
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/files/keytouch-acpid,v 1.1 2007/03/21 00:07:50 nyhm Exp $
+
+depend() {
+	need acpid
+}
+
+start() {
+	ebegin "Running keytouch-init"
+	/usr/bin/keytouch-init
+	eend $?
+
+	ebegin "Starting keytouch-acpid"
+	start-stop-daemon --start --background --exec /usr/bin/keytouch-acpid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping keytouch-acpid"
+	start-stop-daemon --stop --exec /usr/bin/keytouch-acpid
+	eend $?
+}
diff --git a/x11-misc/keytouch/keytouch-2.2.3.ebuild b/x11-misc/keytouch/keytouch-2.3.0.ebuild
index 3ece1e71dfad..f1b27d1340b3 100644
--- a/x11-misc/keytouch/keytouch-2.2.3.ebuild
+++ b/x11-misc/keytouch/keytouch-2.3.0.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.2.3.ebuild,v 1.3 2007/01/30 19:52:53 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.3.0.ebuild,v 1.1 2007/03/21 00:07:50 nyhm Exp $
 
-inherit eutils versionator
+inherit eutils versionator linux-info
 
-DOC_V=$(get_version_component_range -2)
 DESCRIPTION="Easily configure extra keyboard function keys"
 HOMEPAGE="http://keytouch.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PN}-${DOC_V}_tech_manual.pdf
-		mirror://sourceforge/${PN}/${PN}-${DOC_V}-user_manual.pdf )"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc kde"
+IUSE="acpi kde"
 
 RDEPEND=">=x11-libs/gtk+-2
 	gnome-base/gnome-menus
 	x11-misc/xbindkeys
+	media-libs/alsa-lib
+	acpi? ( sys-power/acpid )
 	kde? ( || (
 		kde-base/kdesu
 		kde-base/kdebase ) )
@@ -48,13 +47,16 @@ src_compile() {
 }
 
 src_install() {
-	doinitd "${FILESDIR}"/${PN} || die "doinitd failed"
+	if use acpi ; then
+		newinitd "${FILESDIR}"/${PN}-acpid ${PN} || die "newinitd failed"
+	else
+		doinitd "${FILESDIR}"/${PN} || die "doinitd failed"
+	fi
 
 	newicon keytouch-keyboard/pixmaps/icon.png ${PN}.png
 	make_desktop_entry ${PN} keyTouch ${PN}.png System
 
 	dodoc AUTHORS ChangeLog
-	use doc && dodoc "${DISTDIR}"/*.pdf
 
 	local d
 	for d in . keytouch-config keytouch-keyboard ; do
@@ -71,9 +73,18 @@ pkg_postinst() {
 	elog
 	elog "If support for your keyboard is not included in"
 	elog "this release, check for new keyboard files at"
-	elog "http://keytouch.sourceforge.net/dl-keyboards.html"
+	elog "${HOMEPAGE}dl-keyboards.html"
 	elog
 	elog "x11-misc/keytouch-editor can be used to create"
 	elog "your own keyboard files"
 	echo
+	if use acpi && ! linux_chkconfig_present INPUT_EVDEV ; then
+		ewarn "To add support for ACPI hotkeys, CONFIG_INPUT_EVDEV"
+		ewarn "must be enabled in your kernel config."
+		ewarn
+		ewarn "  Device Drivers"
+		ewarn "    Input device support"
+		ewarn "      <*>/<M> Event interface"
+		echo
+	fi
 }