Version bump. Prevent "pid X is not a child of this shell" message by shutting down the daemon differently. Took maintainership.

Package-Manager: portage-2.1.4_rc10

6 files changed, 210 insertions, 15 deletions

diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog
index 7a06ae398663..9c89462e7506 100644
--- a/app-misc/g15daemon/ChangeLog
+++ b/app-misc/g15daemon/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2007/10/04 08:43:58 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.17 2007/12/19 17:38:29 chainsaw Exp $
+
+*g15daemon-1.9.1 (19 Dec 2007)
+
+  19 Dec 2007; Tony Vroon <chainsaw@gentoo.org>
+  +files/g15daemon-1.2.7-r2.initd, metadata.xml, +g15daemon-1.9.1.ebuild:
+  Version bump. Prevent "pid X is not a child of this shell" message by
+  shutting down the daemon differently. Took maintainership.
 
 *g15daemon-1.9.0-r1 (04 Oct 2007)
 *g15daemon-1.2.7-r1 (04 Oct 2007)
diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index e1158a269de9..cb80e46b6196 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -13,6 +13,10 @@ AUX g15daemon-1.2.7-r1.initd 1159 RMD160 5116a84063c793310850cc62a6658bab0bc8cbf
 MD5 3f812ec0c7c7f7469cfc9379135fcd24 files/g15daemon-1.2.7-r1.initd 1159
 RMD160 5116a84063c793310850cc62a6658bab0bc8cbf2 files/g15daemon-1.2.7-r1.initd 1159
 SHA256 17d6d4c3db13c45e9ee71cf8dda763acabe67fe3e02731c0aa33dbb48506b34a files/g15daemon-1.2.7-r1.initd 1159
+AUX g15daemon-1.2.7-r2.initd 1107 RMD160 33a13cbbdf3701b6e81fb39dfad5f6ee3318d1bc SHA1 7832d5da216f59b42423d2f9583eb2b3356ae237 SHA256 37d29b422cdc680bd066d8b0dca874781396aded214cf080014454421c9bb26d
+MD5 683bd4e5d08105c11c8d70328c8c10de files/g15daemon-1.2.7-r2.initd 1107
+RMD160 33a13cbbdf3701b6e81fb39dfad5f6ee3318d1bc files/g15daemon-1.2.7-r2.initd 1107
+SHA256 37d29b422cdc680bd066d8b0dca874781396aded214cf080014454421c9bb26d files/g15daemon-1.2.7-r2.initd 1107
 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
@@ -24,6 +28,7 @@ SHA256 bed4adb30913a12268769d5e6abfe2a2b6e1b583d45f252dbc6aa86492f3ba30 files/g1
 DIST g15daemon-1.2.6a.tar.bz2 273767 RMD160 947441a1c89d1f45f02094a59735f488a76ce285 SHA1 473f3e0aee0122597c1e91cf54b18d3d6e28e8e9 SHA256 583c4bece816b712959aba51f49d78bb587e215fbb6a322efe832477c74f2564
 DIST g15daemon-1.2.7.tar.bz2 275938 RMD160 e6490c9b3200c89cf88c574459eef7562a500161 SHA1 17ab942a389501c0b7b8a0ffdbf4397882d24daa SHA256 2f8cfa386c88e72dbb07c7112cbd943dbda4f56dd55d08a01c7bf9efd47d164f
 DIST g15daemon-1.9.0.tar.bz2 288639 RMD160 8695fadf63e84fb1e55067f32d2736f96665b6ab SHA1 1e74ea6f48732a4666ecb0e8da709da85971d65e SHA256 7a88bdb9464c6954a936efb8d1fc6bf2e7f90ce4e30ba2b982b7fdd1a9eb95e7
+DIST g15daemon-1.9.1.tar.bz2 301481 RMD160 2dab5ced813edb598b5b680f1fceee57164d7967 SHA1 21cdeed3542802fa87547e766c349e7c0cbc9c7b SHA256 a0928871e4f597278397e7f9a90247d4e4586870b58932b213fb1d1a30e0e7d3
 EBUILD g15daemon-1.2.6a-r1.ebuild 3504 RMD160 ce1d65c18c764cf7a195762d79a9bac1a788c14f SHA1 dd99d993dfbc9686ccf1e360af6ec1a6eea9af1f SHA256 559fbb561e519fb256b468406899a77ca978b4334d57cb935892055ac3d03b6a
 MD5 e150e0adfaf9e7243557e48bfda91b89 g15daemon-1.2.6a-r1.ebuild 3504
 RMD160 ce1d65c18c764cf7a195762d79a9bac1a788c14f g15daemon-1.2.6a-r1.ebuild 3504
@@ -40,14 +45,18 @@ EBUILD g15daemon-1.9.0-r1.ebuild 3450 RMD160 cc132d245c8dff94d8b22092eba7f27f224
 MD5 d33013a56b093569130a99d955ef6e25 g15daemon-1.9.0-r1.ebuild 3450
 RMD160 cc132d245c8dff94d8b22092eba7f27f2242c0a7 g15daemon-1.9.0-r1.ebuild 3450
 SHA256 3d16cab69b24c7d7388dcb9a75c46d3ee3d24ee94ed679ad19410b0d7f7d3849 g15daemon-1.9.0-r1.ebuild 3450
-MISC ChangeLog 3366 RMD160 b3ea5168b0f0b2b40de4d7432b503825a8d3f4c9 SHA1 6faef17498d9726b03c271e29a1e8eaf1d8f28a4 SHA256 26134678eeccfe75769868e9a49f41d7c4987d4cc13c4868768b97233986c466
-MD5 74d92f62292f05edb45e847e6467e64a ChangeLog 3366
-RMD160 b3ea5168b0f0b2b40de4d7432b503825a8d3f4c9 ChangeLog 3366
-SHA256 26134678eeccfe75769868e9a49f41d7c4987d4cc13c4868768b97233986c466 ChangeLog 3366
-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
+EBUILD g15daemon-1.9.1.ebuild 3452 RMD160 63e7bf78d4db9f9f54dc48e017c9141ca43a3be5 SHA1 1c3069a6c54650c75d9c268832f06f4059911940 SHA256 d3109b1b41f3eb22ca09b4db7087db76f9720771c2977df9c1ddf7af14725734
+MD5 93e941ce1466439591dbc870bb377685 g15daemon-1.9.1.ebuild 3452
+RMD160 63e7bf78d4db9f9f54dc48e017c9141ca43a3be5 g15daemon-1.9.1.ebuild 3452
+SHA256 d3109b1b41f3eb22ca09b4db7087db76f9720771c2977df9c1ddf7af14725734 g15daemon-1.9.1.ebuild 3452
+MISC ChangeLog 3659 RMD160 be11d9df9380df4fe70f44a956bfe77181f87a44 SHA1 2e96fb73658d7aea37754d90b50124d85780693d SHA256 0911d66f5396a8c55954d529e0d46ddc20769c42c4fd84f261d12d82b937d10a
+MD5 10134ed7dee02d97991d35bbe91849aa ChangeLog 3659
+RMD160 be11d9df9380df4fe70f44a956bfe77181f87a44 ChangeLog 3659
+SHA256 0911d66f5396a8c55954d529e0d46ddc20769c42c4fd84f261d12d82b937d10a ChangeLog 3659
+MISC metadata.xml 249 RMD160 3a959d6b2d70ee342ccdf4abcaa3107d6f2897ed SHA1 942405176c914e1682a8a0daa6c5b9d7b6a2a94d SHA256 5a7fbdf3050c5c4c8f1dc154e8c715162b71ef329ec3e59facb4965dea2c9a81
+MD5 fc0bf8dce7a722646dc586f3eee8b6c6 metadata.xml 249
+RMD160 3a959d6b2d70ee342ccdf4abcaa3107d6f2897ed metadata.xml 249
+SHA256 5a7fbdf3050c5c4c8f1dc154e8c715162b71ef329ec3e59facb4965dea2c9a81 metadata.xml 249
 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
@@ -60,10 +69,13 @@ SHA256 c49a95965963f4611f9325524ec1402bade524bb0fc917cbe23c53b8d6ac6d50 files/di
 MD5 f7a7897f552e4aac022d6e03764ba854 files/digest-g15daemon-1.9.0-r1 250
 RMD160 07599fd676bb4dbd106d0f9fec6713edb9c01da4 files/digest-g15daemon-1.9.0-r1 250
 SHA256 64fc705168e3caecd9207033bde17f6b44b242a1827dc1c32dbb7f0ee01c327f files/digest-g15daemon-1.9.0-r1 250
+MD5 ef7837d731477412b08c38d93b16e10e files/digest-g15daemon-1.9.1 250
+RMD160 aa8680e096ab888b9e5dff4bf4c6750fc9e7e2b8 files/digest-g15daemon-1.9.1 250
+SHA256 9008fa21239fde6e292e618ea1f9a33fb563821444f7c3bf847966a76cacec50 files/digest-g15daemon-1.9.1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHBKfUyZx3L/ph1soRAshDAJ9ff05P7xCs8vHxzNeSP7DRGIROnwCfciaV
-/VUO68CmeDpdD5LniGzqZjA=
-=mFky
+iD8DBQFHaVayp5vW4rUFj5oRArgsAJ0Wwhb/VKBzqhNYQxLMzrmE/NXcugCfd2Tn
+tPVVgfF6lpvVAH3vQ1+Bvsc=
+=Btj2
 -----END PGP SIGNATURE-----
diff --git a/app-misc/g15daemon/files/digest-g15daemon-1.9.1 b/app-misc/g15daemon/files/digest-g15daemon-1.9.1
new file mode 100644
index 000000000000..89a7be3af481
--- /dev/null
+++ b/app-misc/g15daemon/files/digest-g15daemon-1.9.1
@@ -0,0 +1,3 @@
+MD5 e1f86ed0ebcaba3584187f33a36a634f g15daemon-1.9.1.tar.bz2 301481
+RMD160 2dab5ced813edb598b5b680f1fceee57164d7967 g15daemon-1.9.1.tar.bz2 301481
+SHA256 a0928871e4f597278397e7f9a90247d4e4586870b58932b213fb1d1a30e0e7d3 g15daemon-1.9.1.tar.bz2 301481
diff --git a/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd b/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd
new file mode 100644
index 000000000000..b8e8cd6a5714
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# 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.7-r2.initd,v 1.1 2007/12/19 17:38:30 chainsaw Exp $
+
+# Init script for g15daemon
+
+depend() {
+	after hotplug
+	after usb
+	after modules
+}
+
+start() {
+	ebegin "Starting g15daemon"
+
+	# Does the input device already exist?
+	if [ -e /proc/modules -a ! -e /dev/input/uinput ]; then
+		# We can load modules, but uinput device does not exist
+		einfo "Loading uinput module"
+		/sbin/modprobe uinput > /dev/null 2> /dev/null
+	fi
+
+	local SWITCHKEY=""
+	[ "${CLIENT_SWITCH_L1}" = "yes" ] && SWITCHKEY="--switch"
+	start-stop-daemon --start --background --pidfile /var/run/g15daemon.pid \
+		--exec /usr/sbin/g15daemon -- ${SWITCHKEY}
+	eend $? "Failed to start g15daemon."
+}
+
+stop() {
+	ebegin "Stopping g15daemon"
+	local KILLOPT="-k"
+	if [ $BACKLIGHT_OFF = "yes" ]; then
+		KILLOPT="-K"
+	fi
+	/usr/sbin/g15daemon ${KILLOPT} &>/dev/null
+	sleep 1
+	start-stop-daemon -R 5 --stop --quiet --pidfile /var/run/g15daemon.pid
+	eend $?
+}
diff --git a/app-misc/g15daemon/g15daemon-1.9.1.ebuild b/app-misc/g15daemon/g15daemon-1.9.1.ebuild
new file mode 100644
index 000000000000..267d2de0ca05
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-1.9.1.ebuild
@@ -0,0 +1,132 @@
+# 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.9.1.ebuild,v 1.1 2007/12/19 17:38:29 chainsaw 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/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="perl python"
+
+DEPEND="dev-libs/libusb
+	>=dev-libs/libg15-1.2.4
+	>=dev-libs/libg15render-1.2
+	perl? ( >=dev-perl/Inline-0.4 )
+	python? ( dev-lang/python )"
+
+RDEPEND="${DEPEND}
+	perl? ( dev-perl/GDGraph )"
+
+uinput_check() {
+	ebegin "Checking for uinput support"
+	linux_chkconfig_present INPUT_UINPUT
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		eerror "To use g15daemon, you need to compile your kernel with uinput support."
+		eerror "Please enable uinput support in your kernel config, found at:"
+		eerror
+		eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
+		eerror
+		eerror "Once enabled, you should have the /dev/input/uinput device."
+		eerror "g15daemon will not work without the uinput device."
+		die "INPUT_UINPUT support not detected!"
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	uinput_check
+}
+
+src_unpack() {
+	unpack ${A}
+	if use perl; then
+		unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
+	fi
+	if use python; then
+		unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
+	fi
+}
+
+src_compile() {
+	econf || die "configure failed"
+
+	emake || die "make failed"
+
+	if use perl; then
+		cd "${WORKDIR}/G15Daemon-0.2"
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} install || die "make install failed"
+
+	# remove odd docs installed my make
+	rm "${D}/usr/share/doc/${PF}/"{LICENSE,README.usage}
+
+	insinto /usr/share/${PN}/contrib
+	doins contrib/xmodmaprc
+	doins contrib/xmodmap.sh
+	if use perl; then
+		doins contrib/testbindings.pl
+	fi
+
+	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-1.2.7-r2.initd" ${PN}
+
+	if use perl; then
+		ebegin "Installing Perl Bindings (G15Daemon.pm)"
+		cd "${WORKDIR}/G15Daemon-0.2"
+		docinto perl
+		perl-module_src_install
+	fi
+
+	if use python; then
+		ebegin "Installing Python Bindings (g15daemon.py)"
+		cd "${WORKDIR}/pyg15daemon"
+		python_version
+
+		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/g15daemon
+		doins g15daemon.py
+
+		docinto python
+		dodoc AUTHORS
+	fi
+
+	prepalldocs
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize "${ROOT}/usr/$(get_libdir)/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."
+	elog ""
+	elog "Create the xmodmap:"
+	elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
+	elog ""
+	elog "Adding keycodes to an existing xmodmap:"
+	elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup "/usr/$(get_libdir)/python*/site-packages/g15daemon"
+	fi
+}
diff --git a/app-misc/g15daemon/metadata.xml b/app-misc/g15daemon/metadata.xml
index dce4644a99be..3ae74f316232 100644
--- a/app-misc/g15daemon/metadata.xml
+++ b/app-misc/g15daemon/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>lcd</herd>
 	<maintainer>
-		<email>rob@thetruth.de</email>
-		<name>Robert Buchholz</name>
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
 	</maintainer>
 </pkgmetadata>