Fixed logic errors in init script. Removed old. Committed -r9 straight to stable

(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC)

6 files changed, 30 insertions, 231 deletions

diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog
index 429d6b6d7ed2..4070b42b7761 100644
--- a/app-misc/g15daemon/ChangeLog
+++ b/app-misc/g15daemon/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-misc/g15daemon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.51 2013/11/03 12:07:21 polynomial-c Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.52 2014/08/03 11:23:31 polynomial-c Exp $
+
+*g15daemon-1.9.5.3-r10 (03 Aug 2014)
+*g15daemon-1.9.5.3-r9 (03 Aug 2014)
+
+  03 Aug 2014; Lars Wendler <polynomial-c@gentoo.org>
+  -g15daemon-1.9.5.3-r5.ebuild, -g15daemon-1.9.5.3-r7.ebuild,
+  -g15daemon-1.9.5.3-r8.ebuild, +g15daemon-1.9.5.3-r9.ebuild,
+  +g15daemon-1.9.5.3-r10.ebuild, -files/g15daemon-1.2.7-r2.initd,
+  files/g15daemon-1.9.5.3.initd:
+  Fixed logic error in init script so that CLIENT_SWITCH_L1=no doesn't prevent
+  the deamon from starting. Added a better way to handle restart situations.
+  Removed old. Moved -r8 ebuild to -r10. Committed -r9 straight to stable.
 
   03 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> metadata.xml:
   Added myself as maintainer.
diff --git a/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd b/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd
deleted file mode 100644
index b8e8cd6a5714..000000000000
--- a/app-misc/g15daemon/files/g15daemon-1.2.7-r2.initd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/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/files/g15daemon-1.9.5.3.initd b/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd
index 7976cff0144f..4ea22a0c7985 100644
--- a/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd
@@ -1,14 +1,14 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd,v 1.2 2013/03/18 17:49:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd,v 1.3 2014/08/03 11:23:31 polynomial-c Exp $
 
 # Init script for g15daemon
 
 pidfile="/var/run/g15daemon.pid"
 command="/usr/sbin/g15daemon"
+start_stop_daemon_args="--wait 30"
 command_args=""
-start_stop_daemon_args="--background --pidfile ${pidfile}"
 
 depend() {
 	after hotplug
@@ -22,12 +22,14 @@ start_pre() {
 		if [ ! -e "/dev/input/uinput" ] && [ ! -e "/dev/uinput" ] ; then
 			# We can load modules, but uinput device does not exist
 			einfo "Loading uinput module"
-			/sbin/modprobe uinput > /dev/null 2> /dev/null
+			/sbin/modprobe uinput > /dev/null 2> /dev/null \
+				|| return 1
 		fi
 	fi
 
-	local SWITCHKEY=""
-	[ "${CLIENT_SWITCH_L1}" = "yes" ] && command_args="--switch"
+	if [ "${CLIENT_SWITCH_L1}" = "yes" ] ; then
+		command_args="--switch"
+	fi
 }
 
 stop() {
@@ -36,6 +38,9 @@ stop() {
 	if [ $BACKLIGHT_OFF = "yes" ]; then
 		KILLOPT="-K"
 	fi
-	start-stop-daemon -R 5 --exec ${command} -- ${KILLOPT}
+	while [ -f "${pidfile}" ] && kill -0 $(cat ${pidfile}) ; do
+		${command} ${KILLOPT}
+		sleep 1
+	done
 	eend $?
 }
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r8.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r10.ebuild
index dbf1343ff0f4..eb65618341c1 100644
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r8.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r8.ebuild,v 1.1 2013/03/18 17:49:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r10.ebuild,v 1.1 2014/08/03 11:23:31 polynomial-c Exp $
 
 EAPI=4
 GENTOO_DEPEND_ON_PERL="no"
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild
deleted file mode 100644
index 8180eda7b7bd..000000000000
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild,v 1.4 2012/03/08 15:17:35 ranger Exp $
-
-EAPI=4
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils linux-info perl-module python base
-
-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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="perl python static-libs"
-
-DEPEND="virtual/libusb:0
-	>=dev-libs/libg15-1.2.4
-	>=dev-libs/libg15render-1.2
-	perl? (
-		dev-lang/perl
-		dev-perl/GDGraph
-		>=dev-perl/Inline-0.4
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-forgotten-open-mode.patch"
-	"${FILESDIR}/${P}-overflow-fix.patch"
-)
-uinput_check() {
-	ebegin "Checking for uinput support"
-	local rc=1
-	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
-	rc=$?
-
-	if [[ $rc -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."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	uinput_check
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-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_prepare() {
-	if use perl; then
-		perl-module_src_prepare
-		sed -i \
-			-e '1i#!/usr/bin/perl' \
-			"${S}"/contrib/testbindings.pl
-	else
-		# perl-module_src_prepare always calls base_src_prepare
-		base_src_prepare
-	fi
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static)
-
-	if use perl; then
-		cd "${WORKDIR}/G15Daemon-0.2"
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		cd "${WORKDIR}/G15Daemon-0.2"
-		perl-module_src_compile
-	fi
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	# remove odd docs installed my make
-	rm "${ED}/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}
-	dobin "${FILESDIR}/g15daemon-hotplug"
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}/99-g15daemon.rules"
-
-	insinto /etc
-	doins "${FILESDIR}"/g15daemon.conf
-
-	# Gentoo bug #301340, debian bug #611649
-	exeinto /usr/lib/pm-utils/sleep.d
-	doexe "${FILESDIR}"/20g15daemon
-
-	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"
-
-		installation() {
-			insinto $(python_get_sitedir)
-			doins g15daemon.py
-		}
-		python_execute_function installation
-
-		docinto python
-		dodoc AUTHORS
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize g15daemon.py
-		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 g15daemon.py
-	fi
-}
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r9.ebuild
index 860bbb53ea80..0d129dd5ba0f 100644
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild,v 1.6 2013/08/07 13:27:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r9.ebuild,v 1.1 2014/08/03 11:23:31 polynomial-c Exp $
 
 EAPI=4
 GENTOO_DEPEND_ON_PERL="no"