New POSIX init script by Peter Alfredsen and Roy Marples (bug #194365)

Package-Manager: portage-2.1.3.9

7 files changed, 217 insertions, 14 deletions

diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog
index d5271b0f5390..7a06ae398663 100644
--- a/app-misc/g15daemon/ChangeLog
+++ b/app-misc/g15daemon/ChangeLog
@@ -1,6 +1,14 @@
 # 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.15 2007/05/01 10:31:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.16 2007/10/04 08:43:58 rbu Exp $
+
+*g15daemon-1.9.0-r1 (04 Oct 2007)
+*g15daemon-1.2.7-r1 (04 Oct 2007)
+
+  04 Oct 2007; Robert Buchholz <rbu@gentoo.org>
+  +files/g15daemon-1.2.7-r1.initd, +g15daemon-1.2.7-r1.ebuild,
+  -g15daemon-1.9.0.ebuild, +g15daemon-1.9.0-r1.ebuild:
+  New POSIX init script by Peter Alfredsen and Roy Marples (bug #194365).
 
   01 May 2007; Markus Rothe <corsair@gentoo.org> g15daemon-1.2.7.ebuild:
   Stable on ppc64; bug #175120
diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index c15de8c199c1..e1158a269de9 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX g15daemon-1.2.6a.confd 236 RMD160 8bd008853963292dcb63c3685ba39a8265fb8255 SHA1 3b315e7a12eb7375724f48f943862acc69963e57 SHA256 b5353ac723b8fc3184eaca3db84ced1904e89b43b448ee9713e2b1b9cffd7d01
 MD5 426cdcc0b01a44001170ffc920a6326c files/g15daemon-1.2.6a.confd 236
 RMD160 8bd008853963292dcb63c3685ba39a8265fb8255 files/g15daemon-1.2.6a.confd 236
@@ -6,6 +9,10 @@ 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
+AUX g15daemon-1.2.7-r1.initd 1159 RMD160 5116a84063c793310850cc62a6658bab0bc8cbf2 SHA1 37227d55924ce139c21aeb74139710562caef922 SHA256 17d6d4c3db13c45e9ee71cf8dda763acabe67fe3e02731c0aa33dbb48506b34a
+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.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
@@ -21,18 +28,22 @@ EBUILD g15daemon-1.2.6a-r1.ebuild 3504 RMD160 ce1d65c18c764cf7a195762d79a9bac1a7
 MD5 e150e0adfaf9e7243557e48bfda91b89 g15daemon-1.2.6a-r1.ebuild 3504
 RMD160 ce1d65c18c764cf7a195762d79a9bac1a788c14f g15daemon-1.2.6a-r1.ebuild 3504
 SHA256 559fbb561e519fb256b468406899a77ca978b4334d57cb935892055ac3d03b6a g15daemon-1.2.6a-r1.ebuild 3504
+EBUILD g15daemon-1.2.7-r1.ebuild 3424 RMD160 e16610105cc8dcf590ec266a963e680f3d4f8a33 SHA1 90df0420f6f437c741710e8a5fa3734615d2e99d SHA256 908484005803dad2f992f4719291530a787ba564ee603ed76d3565fcba965e7e
+MD5 e76aae4671a3d7a9046db12f55e96208 g15daemon-1.2.7-r1.ebuild 3424
+RMD160 e16610105cc8dcf590ec266a963e680f3d4f8a33 g15daemon-1.2.7-r1.ebuild 3424
+SHA256 908484005803dad2f992f4719291530a787ba564ee603ed76d3565fcba965e7e g15daemon-1.2.7-r1.ebuild 3424
 EBUILD g15daemon-1.2.7.ebuild 3421 RMD160 269d08b57541281744ba7ddde564727f9290e3a4 SHA1 9337b9d2a33ca8633f74fa98f3969cb553f580f5 SHA256 c7d6bb6e4b63ca68fe4f81322d3d8f0205268faa3d5e5e434ce1329c55d55231
 MD5 77fa67b970a3213fa9dd98ae01521988 g15daemon-1.2.7.ebuild 3421
 RMD160 269d08b57541281744ba7ddde564727f9290e3a4 g15daemon-1.2.7.ebuild 3421
 SHA256 c7d6bb6e4b63ca68fe4f81322d3d8f0205268faa3d5e5e434ce1329c55d55231 g15daemon-1.2.7.ebuild 3421
-EBUILD g15daemon-1.9.0.ebuild 3444 RMD160 7d1d27be0b6ff33f4e5d90bf62042d14fe97459c SHA1 850872fd66f0e78d6797a08ec855da76160c023d SHA256 d848a4c61e53b12d4db710e4968d53d5cf994b91c5f357fbe8feeb3d7bd7dedf
-MD5 bd5a8998fcc249cdd080bdd817d2d98c g15daemon-1.9.0.ebuild 3444
-RMD160 7d1d27be0b6ff33f4e5d90bf62042d14fe97459c g15daemon-1.9.0.ebuild 3444
-SHA256 d848a4c61e53b12d4db710e4968d53d5cf994b91c5f357fbe8feeb3d7bd7dedf g15daemon-1.9.0.ebuild 3444
-MISC ChangeLog 3060 RMD160 19f9317f6f3992fa9eddeacd9d2412fc73197840 SHA1 4d0d903141aef127d3626be983fec18d8fed21eb SHA256 bd8c4a3a75af2cc038dcbad66638b7e5dac99437e5dced1d39468e07e75a77d1
-MD5 847f10d5a8937fce49d17b08ee0860f0 ChangeLog 3060
-RMD160 19f9317f6f3992fa9eddeacd9d2412fc73197840 ChangeLog 3060
-SHA256 bd8c4a3a75af2cc038dcbad66638b7e5dac99437e5dced1d39468e07e75a77d1 ChangeLog 3060
+EBUILD g15daemon-1.9.0-r1.ebuild 3450 RMD160 cc132d245c8dff94d8b22092eba7f27f2242c0a7 SHA1 e4bf6957ded6dcea06ddceda205069bf3938ea0f SHA256 3d16cab69b24c7d7388dcb9a75c46d3ee3d24ee94ed679ad19410b0d7f7d3849
+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
@@ -43,6 +54,16 @@ SHA256 57cb072b57547b3c4ac8ee0a30a0126ebe172891c88eb9ce55db453a84319b57 files/di
 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
-MD5 f7a7897f552e4aac022d6e03764ba854 files/digest-g15daemon-1.9.0 250
-RMD160 07599fd676bb4dbd106d0f9fec6713edb9c01da4 files/digest-g15daemon-1.9.0 250
-SHA256 64fc705168e3caecd9207033bde17f6b44b242a1827dc1c32dbb7f0ee01c327f files/digest-g15daemon-1.9.0 250
+MD5 c8faae8f604dd526fef48e6b92899135 files/digest-g15daemon-1.2.7-r1 250
+RMD160 62a7b3c10fd7ebac6ac836540a2e7ad83d5cfa83 files/digest-g15daemon-1.2.7-r1 250
+SHA256 c49a95965963f4611f9325524ec1402bade524bb0fc917cbe23c53b8d6ac6d50 files/digest-g15daemon-1.2.7-r1 250
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHBKfUyZx3L/ph1soRAshDAJ9ff05P7xCs8vHxzNeSP7DRGIROnwCfciaV
+/VUO68CmeDpdD5LniGzqZjA=
+=mFky
+-----END PGP SIGNATURE-----
diff --git a/app-misc/g15daemon/files/digest-g15daemon-1.2.7-r1 b/app-misc/g15daemon/files/digest-g15daemon-1.2.7-r1
new file mode 100644
index 000000000000..f40663c0ddfd
--- /dev/null
+++ b/app-misc/g15daemon/files/digest-g15daemon-1.2.7-r1
@@ -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/digest-g15daemon-1.9.0 b/app-misc/g15daemon/files/digest-g15daemon-1.9.0-r1
index 0f5a8a3c5fe8..0f5a8a3c5fe8 100644
--- a/app-misc/g15daemon/files/digest-g15daemon-1.9.0
+++ b/app-misc/g15daemon/files/digest-g15daemon-1.9.0-r1
diff --git a/app-misc/g15daemon/files/g15daemon-1.2.7-r1.initd b/app-misc/g15daemon/files/g15daemon-1.2.7-r1.initd
new file mode 100644
index 000000000000..4ab66102e46b
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.2.7-r1.initd
@@ -0,0 +1,40 @@
+#!/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-r1.initd,v 1.1 2007/10/04 08:43:58 rbu 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 2> /dev/null&&wait `cat /var/run/g15daemon.pid`  \
+		|| start-stop-daemon --signal SIGKILL --stop --quiet --pidfile /var/run/g15daemon.pid
+	eend $?
+}
diff --git a/app-misc/g15daemon/g15daemon-1.2.7-r1.ebuild b/app-misc/g15daemon/g15daemon-1.2.7-r1.ebuild
new file mode 100644
index 000000000000..e07e1c93b5b6
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-1.2.7-r1.ebuild
@@ -0,0 +1,131 @@
+# 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.7-r1.ebuild,v 1.1 2007/10/04 08:43:58 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/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="perl python"
+
+DEPEND="dev-libs/libusb
+	dev-libs/libdaemon
+	>=dev-libs/libg15-1.2.0
+	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}/${P}.confd" ${PN}
+	newinitd "${FILESDIR}/${PF}.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/g15daemon-1.9.0.ebuild b/app-misc/g15daemon/g15daemon-1.9.0-r1.ebuild
index 9aaf33028b9f..3fef0817a7c4 100644
--- a/app-misc/g15daemon/g15daemon-1.9.0.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.0-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.9.0.ebuild,v 1.2 2007/03/12 22:14:57 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.0-r1.ebuild,v 1.1 2007/10/04 08:43:58 rbu Exp $
 
 inherit eutils linux-info perl-module python multilib
 
@@ -80,7 +80,7 @@ src_install() {
 	fi
 
 	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-1.2.7.initd" ${PN}
+	newinitd "${FILESDIR}/${PN}-1.2.7-r1.initd" ${PN}
 
 	if use perl; then
 		ebegin "Installing Perl Bindings (G15Daemon.pm)"