Version bump, drop old and fix of bug #167240

Package-Manager: portage-2.1.2-r9

8 files changed, 62 insertions, 49 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/Manifest b/app-misc/g15daemon/Manifest
index 2e810c74201a..a634a694cebe 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -1,14 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX g15daemon-1.2.5.confd 257 RMD160 ef5d168bcd9b71f11e6fb918347b53f1de7c4f32 SHA1 738b73ab8612f31567f09c2612720f9eff7c95bb SHA256 0afbc2d645cd8f099ab52bda080ba49364fd25b49e3c09db9fd827268eee9fad
-MD5 271c771250e1d0e374b305d6d406f4fc files/g15daemon-1.2.5.confd 257
-RMD160 ef5d168bcd9b71f11e6fb918347b53f1de7c4f32 files/g15daemon-1.2.5.confd 257
-SHA256 0afbc2d645cd8f099ab52bda080ba49364fd25b49e3c09db9fd827268eee9fad files/g15daemon-1.2.5.confd 257
-AUX g15daemon-1.2.5.initd 958 RMD160 133757a1c21a3481a2de8bc37326f5ef64cc45f1 SHA1 a13630bb032406d150b25971b2f055cb6c518b58 SHA256 0a0f0e3f5ec00264c7a6e18d46518cfd5cf7144ff710ee1eeeffe2bcfe11233c
-MD5 98b815a6259def2d10362b8ba57efa34 files/g15daemon-1.2.5.initd 958
-RMD160 133757a1c21a3481a2de8bc37326f5ef64cc45f1 files/g15daemon-1.2.5.initd 958
-SHA256 0a0f0e3f5ec00264c7a6e18d46518cfd5cf7144ff710ee1eeeffe2bcfe11233c files/g15daemon-1.2.5.initd 958
 AUX g15daemon-1.2.6a.confd 235 RMD160 74fafd433d56abbff7b12290803338ce1d1eb10b SHA1 7f61663aa17cd964b7268b45d7feed532a716ff2 SHA256 bf37d4ee5a80589909f1831ad6d7393c6b25818b61e65814ee074880245aa2cc
 MD5 f733a28491f028a8747be6da883c4818 files/g15daemon-1.2.6a.confd 235
 RMD160 74fafd433d56abbff7b12290803338ce1d1eb10b files/g15daemon-1.2.6a.confd 235
@@ -17,34 +9,42 @@ AUX g15daemon-1.2.6a.initd 1002 RMD160 5b30c2a2976fb42ae2d7b57caa89f86dbf52ca3f
 MD5 dd4224fb4be08287b1f977c89dbdfdf2 files/g15daemon-1.2.6a.initd 1002
 RMD160 5b30c2a2976fb42ae2d7b57caa89f86dbf52ca3f files/g15daemon-1.2.6a.initd 1002
 SHA256 99270b912a1c0de2e707cd304216bf0388b2d7a8f3838a38e5491c9919883380 files/g15daemon-1.2.6a.initd 1002
-DIST g15daemon-1.2.5.tar.bz2 281845 RMD160 fefe5c802469e67553e483626b28369a525fdd05 SHA1 4c28fca380f9ce43b1d7f6e867e1e89fd0a9d7da SHA256 64b5046566d6116847826ecef6adcf9a87e279ea68bf1270d0ff314a3489b4e9
+AUX g15daemon-1.2.7.confd 329 RMD160 962088db694d25a6935de80299a45d94787ed251 SHA1 f452f915e6f903e4cdbbfc3db3e2e57ef702425f SHA256 a7977e03f0faaed85f659b077fddc3a589c2e2d4386df1e9afc89133c25bc613
+MD5 cea470427f7640c6e9d9df7ddef26270 files/g15daemon-1.2.7.confd 329
+RMD160 962088db694d25a6935de80299a45d94787ed251 files/g15daemon-1.2.7.confd 329
+SHA256 a7977e03f0faaed85f659b077fddc3a589c2e2d4386df1e9afc89133c25bc613 files/g15daemon-1.2.7.confd 329
+AUX g15daemon-1.2.7.initd 1077 RMD160 33d59ace2b40f969962a47872a4b506bddca0795 SHA1 f339c92e50d69f888ee42f6acc86cfec39f4e49d SHA256 bed4adb30913a12268769d5e6abfe2a2b6e1b583d45f252dbc6aa86492f3ba30
+MD5 0c8b541989f292c9233898efd790cf84 files/g15daemon-1.2.7.initd 1077
+RMD160 33d59ace2b40f969962a47872a4b506bddca0795 files/g15daemon-1.2.7.initd 1077
+SHA256 bed4adb30913a12268769d5e6abfe2a2b6e1b583d45f252dbc6aa86492f3ba30 files/g15daemon-1.2.7.initd 1077
 DIST g15daemon-1.2.6a.tar.bz2 273767 RMD160 947441a1c89d1f45f02094a59735f488a76ce285 SHA1 473f3e0aee0122597c1e91cf54b18d3d6e28e8e9 SHA256 583c4bece816b712959aba51f49d78bb587e215fbb6a322efe832477c74f2564
-EBUILD g15daemon-1.2.5.ebuild 3474 RMD160 19bb8cca8492d3df281c5b8a71d120af51a7fb12 SHA1 fa2279a88d3cff6fc03b3bfecb80bbc5e6a28ca5 SHA256 a788f490359c23565d99af229eb18fc307763800a67ce3ad665316633cadd5da
-MD5 e8f40a6a9f311f311df190044beb6e8e g15daemon-1.2.5.ebuild 3474
-RMD160 19bb8cca8492d3df281c5b8a71d120af51a7fb12 g15daemon-1.2.5.ebuild 3474
-SHA256 a788f490359c23565d99af229eb18fc307763800a67ce3ad665316633cadd5da g15daemon-1.2.5.ebuild 3474
-EBUILD g15daemon-1.2.6a-r1.ebuild 3486 RMD160 3a07a629bdb5c7c760ba9ce19b9f84d3d3b7ce74 SHA1 9af42603dd67c2cf4894fc89db84085961f96dba SHA256 756db148f906e095d8c100907d83f86f2c0c6d2046fd4385a2190b2a3daad49e
-MD5 f17c0710aa7f2435da5fb744be9db281 g15daemon-1.2.6a-r1.ebuild 3486
-RMD160 3a07a629bdb5c7c760ba9ce19b9f84d3d3b7ce74 g15daemon-1.2.6a-r1.ebuild 3486
-SHA256 756db148f906e095d8c100907d83f86f2c0c6d2046fd4385a2190b2a3daad49e g15daemon-1.2.6a-r1.ebuild 3486
-MISC ChangeLog 2062 RMD160 feb7125c18d6e58c72fb9354e2245fe9c0dec7a9 SHA1 0e9b4af8db72569711e5f80919ac5e4192a9835c SHA256 ab364ab3cd58fca4e3015e6acc3f15f03fc31cf311f47e79e691bccfa21d3921
-MD5 4972cbda12c0762afee43ee7d13fdd2b ChangeLog 2062
-RMD160 feb7125c18d6e58c72fb9354e2245fe9c0dec7a9 ChangeLog 2062
-SHA256 ab364ab3cd58fca4e3015e6acc3f15f03fc31cf311f47e79e691bccfa21d3921 ChangeLog 2062
+DIST g15daemon-1.2.7.tar.bz2 275938 RMD160 e6490c9b3200c89cf88c574459eef7562a500161 SHA1 17ab942a389501c0b7b8a0ffdbf4397882d24daa SHA256 2f8cfa386c88e72dbb07c7112cbd943dbda4f56dd55d08a01c7bf9efd47d164f
+EBUILD g15daemon-1.2.6a-r1.ebuild 3469 RMD160 1d3dc372c1fded7b7a02f3c6543e2d21e82636f8 SHA1 394a47dd7eb762925fc83223802c774cc695bf9f SHA256 81af5ab0a2b3c43c3de3aa241c8e9dbead7ba39f4f19c24e5e2265385b5495cf
+MD5 2d2c178a959e4bcdd218c88943a8e26a g15daemon-1.2.6a-r1.ebuild 3469
+RMD160 1d3dc372c1fded7b7a02f3c6543e2d21e82636f8 g15daemon-1.2.6a-r1.ebuild 3469
+SHA256 81af5ab0a2b3c43c3de3aa241c8e9dbead7ba39f4f19c24e5e2265385b5495cf g15daemon-1.2.6a-r1.ebuild 3469
+EBUILD g15daemon-1.2.7.ebuild 3373 RMD160 20d20cb95028dcd566266ec1468d0d476020a110 SHA1 608f0c3499f3c45066646614a31e6aa99aa1ac95 SHA256 6dbba9ff2886fb13b4ce49d67ea90e06bc14eb9c4424ac4b2c02df6726837b3d
+MD5 a57863625deecc754fb4bdec27ff4c3f g15daemon-1.2.7.ebuild 3373
+RMD160 20d20cb95028dcd566266ec1468d0d476020a110 g15daemon-1.2.7.ebuild 3373
+SHA256 6dbba9ff2886fb13b4ce49d67ea90e06bc14eb9c4424ac4b2c02df6726837b3d g15daemon-1.2.7.ebuild 3373
+MISC ChangeLog 2395 RMD160 c64e0819a0cf0f3e1303bdb8a7fe3d6e90bb73a6 SHA1 dfd3721071323584ae5df1711ecf9e5903840fc3 SHA256 75507e39163a81d146c2097c43a6a77802e0125ad0afa1c7a9a33b70006a8194
+MD5 79beae8c4606d5faa70bab4ace03d27b ChangeLog 2395
+RMD160 c64e0819a0cf0f3e1303bdb8a7fe3d6e90bb73a6 ChangeLog 2395
+SHA256 75507e39163a81d146c2097c43a6a77802e0125ad0afa1c7a9a33b70006a8194 ChangeLog 2395
 MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a
 MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250
 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250
 SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a metadata.xml 250
-MD5 a65d716449ee7b08744319167e0acfb5 files/digest-g15daemon-1.2.5 250
-RMD160 2f6511909661793a57a3e61126d85735c8061b90 files/digest-g15daemon-1.2.5 250
-SHA256 3d7355675ab2d75b223e7b3950393d44494f9f42fe6871d5903f74aae04661af files/digest-g15daemon-1.2.5 250
 MD5 a66a56850306aca8b19eb71548a7b330 files/digest-g15daemon-1.2.6a-r1 253
 RMD160 c1d37efd5d8effd1340c2535196ddeda64db4547 files/digest-g15daemon-1.2.6a-r1 253
 SHA256 57cb072b57547b3c4ac8ee0a30a0126ebe172891c88eb9ce55db453a84319b57 files/digest-g15daemon-1.2.6a-r1 253
+MD5 c8faae8f604dd526fef48e6b92899135 files/digest-g15daemon-1.2.7 250
+RMD160 62a7b3c10fd7ebac6ac836540a2e7ad83d5cfa83 files/digest-g15daemon-1.2.7 250
+SHA256 c49a95965963f4611f9325524ec1402bade524bb0fc917cbe23c53b8d6ac6d50 files/digest-g15daemon-1.2.7 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFu6CfcsIHjyDViGQRAgEnAKCR0rgoZ3K4ErGGZw0EqhcUmsyAZwCfe25j
-QjKf95NvkKeafkZQw5dLUUc=
-=H3SO
+iD8DBQFF2KsvyZx3L/ph1soRApkjAKDSHwHmaxlqNic+jntGUXT9+iZewQCg1n7J
+jbkb+ms/DH5PuoaMETol6Rs=
+=gL7W
 -----END PGP SIGNATURE-----
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
 }