Version bump, drop old and fix of bug #167240

(Portage version: 2.1.2-r9)

7 files changed, 34 insertions, 21 deletions

diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog
index 208a4b900563..50a05399afef 100644
--- a/app-misc/g15daemon/ChangeLog
+++ b/app-misc/g15daemon/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/g15daemon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.9 2007/01/27 19:00:04 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.10 2007/02/18 19:38:16 rbu Exp $
+
+*g15daemon-1.2.7 (18 Feb 2007)
+
+  18 Feb 2007; Robert Buchholz <rbu@gentoo.org>
+  -files/g15daemon-1.2.5.confd, -files/g15daemon-1.2.5.initd,
+  +files/g15daemon-1.2.7.confd, +files/g15daemon-1.2.7.initd,
+  -g15daemon-1.2.5.ebuild, g15daemon-1.2.6a-r1.ebuild,
+  +g15daemon-1.2.7.ebuild:
+  Version bump, drop old and fix of bug #167240
 
   27 Jan 2007; Joseph Jezak <josejx@gentoo.org> g15daemon-1.2.5.ebuild,
   g15daemon-1.2.6a-r1.ebuild:
diff --git a/app-misc/g15daemon/files/digest-g15daemon-1.2.5 b/app-misc/g15daemon/files/digest-g15daemon-1.2.5
deleted file mode 100644
index 19a3a4733133..000000000000
--- a/app-misc/g15daemon/files/digest-g15daemon-1.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 59753037fc0e93b83ae67f8c38db4b82 g15daemon-1.2.5.tar.bz2 281845
-RMD160 fefe5c802469e67553e483626b28369a525fdd05 g15daemon-1.2.5.tar.bz2 281845
-SHA256 64b5046566d6116847826ecef6adcf9a87e279ea68bf1270d0ff314a3489b4e9 g15daemon-1.2.5.tar.bz2 281845
diff --git a/app-misc/g15daemon/files/digest-g15daemon-1.2.7 b/app-misc/g15daemon/files/digest-g15daemon-1.2.7
new file mode 100644
index 000000000000..f40663c0ddfd
--- /dev/null
+++ b/app-misc/g15daemon/files/digest-g15daemon-1.2.7
@@ -0,0 +1,3 @@
+MD5 ab84b85dfd6e0819f7a5ed85eb8e2673 g15daemon-1.2.7.tar.bz2 275938
+RMD160 e6490c9b3200c89cf88c574459eef7562a500161 g15daemon-1.2.7.tar.bz2 275938
+SHA256 2f8cfa386c88e72dbb07c7112cbd943dbda4f56dd55d08a01c7bf9efd47d164f g15daemon-1.2.7.tar.bz2 275938
diff --git a/app-misc/g15daemon/files/g15daemon-1.2.5.confd b/app-misc/g15daemon/files/g15daemon-1.2.7.confd
index e2b959ebebe1..08ea97f49763 100644
--- a/app-misc/g15daemon/files/g15daemon-1.2.5.confd
+++ b/app-misc/g15daemon/files/g15daemon-1.2.7.confd
@@ -1,6 +1,9 @@
 # /etc/conf.d/g15daemon: Configuration for the g15daemon
 
-# The L1 key is a , above the multimedia keys.  
 # Key to switch the client-screens. Default is the MR key,
-# Set to "yes" to use L1 key instead (black round key below the LCD).
-CLIENT_SWITCH_L1="no"
\ No newline at end of file
+# Set to "yes" to use L1 key instead (black round key below the LCD, above the multimedia keys).
+CLIENT_SWITCH_L1="no"
+
+# Set to "yes" to switch off the lcd backlight when stopping g15daemon.
+BACKLIGHT_OFF="no"
+
diff --git a/app-misc/g15daemon/files/g15daemon-1.2.5.initd b/app-misc/g15daemon/files/g15daemon-1.2.7.initd
index b31ccb9d7fc8..13996c8fcf1f 100644
--- a/app-misc/g15daemon/files/g15daemon-1.2.5.initd
+++ b/app-misc/g15daemon/files/g15daemon-1.2.7.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.2.5.initd,v 1.1 2006/11/13 23:18:01 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.2.7.initd,v 1.1 2007/02/18 19:38:16 rbu Exp $
 
 # Init script for g15daemon
 
@@ -30,6 +30,9 @@ start() {
 
 stop() {
 	ebegin "Stopping g15daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/g15daemon.pid
+	local KILLOPT="-k"
+	[[ ${BACKLIGHT_OFF} = "yes" ]] && KILLOPT="-K"
+	/usr/sbin/g15daemon ${KILLOPT} 2&> /dev/null  \
+		|| start-stop-daemon --stop --quiet --pidfile /var/run/g15daemon.pid
 	eend $?
 }
diff --git a/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild b/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild
index e2f1200c272d..ee5a79932365 100644
--- a/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild,v 1.2 2007/01/27 19:00:04 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild,v 1.3 2007/02/18 19:38:16 rbu Exp $
 
 inherit eutils linux-info perl-module python multilib
 
@@ -101,7 +101,7 @@ src_install() {
 
 pkg_postinst() {
 	if use python; then
-		python_mod_optimize "${ROOT}/usr/lib/python*/site-packages/g15daemon"
+		python_mod_optimize "/usr/lib/python*/site-packages/g15daemon"
 		echo ""
 	fi
 
@@ -124,6 +124,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if use python; then
-		python_mod_cleanup "${ROOT}/usr/lib/python*/site-packages/g15daemon"
+		python_mod_cleanup "/usr/lib/python*/site-packages/g15daemon"
 	fi
 }
diff --git a/app-misc/g15daemon/g15daemon-1.2.5.ebuild b/app-misc/g15daemon/g15daemon-1.2.7.ebuild
index f2451c5cabaa..a36aaf877c32 100644
--- a/app-misc/g15daemon/g15daemon-1.2.5.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.2.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.5.ebuild,v 1.3 2007/01/27 19:00:04 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.7.ebuild,v 1.1 2007/02/18 19:38:16 rbu Exp $
 
 inherit eutils linux-info perl-module python multilib
 
 DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
 HOMEPAGE="http://g15daemon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,7 +15,7 @@ IUSE="perl python"
 
 DEPEND="dev-libs/libusb
 	dev-libs/libdaemon
-	>=dev-libs/libg15-1.1.0
+	>=dev-libs/libg15-1.2.0
 	perl? ( >=dev-perl/Inline-0.4 )
 	python? ( dev-lang/python )"
 
@@ -101,13 +101,14 @@ src_install() {
 
 pkg_postinst() {
 	if use python; then
-		python_mod_optimize "${ROOT}/usr/lib/python*/site-packages/g15daemon"
+		python_mod_optimize "/usr/lib/python*/site-packages/g15daemon"
 		echo ""
 	fi
 
 	elog "To use g15daemon, you need to add g15daemon to the default runlevel."
 	elog "This can be done with:"
 	elog "# /sbin/rc-update add g15daemon default"
+	elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
 	elog ""
 	elog "To have all new keys working in X11, you'll need create a "
 	elog "specific xmodmap in your home directory or edit the existent one."
@@ -117,13 +118,10 @@ pkg_postinst() {
 	elog ""
 	elog "Adding keycodes to an existing xmodmap:"
 	elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
-	elog ""
-	elog "Note: the daemon now supports to use the small round key"
-	elog "instead of MR for switching LCD clients. see /etc/conf.d/g15daemon"
 }
 
 pkg_postrm() {
 	if use python; then
-		python_mod_cleanup "${ROOT}/usr/lib/python*/site-packages/g15daemon"
+		python_mod_cleanup "/usr/lib/python*/site-packages/g15daemon"
 	fi
 }