Fixes by tove from bug #170417 and version bump

(Portage version: 2.1.2-r9)

6 files changed, 171 insertions, 21 deletions

diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog
index 50a05399afef..300803f0c561 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.10 2007/02/18 19:38:16 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.11 2007/03/12 22:11:25 rbu Exp $
+
+*g15daemon-1.9.0 (12 Mar 2007)
+
+  12 Mar 2007; Robert Buchholz <rbu@gentoo.org>
+  files/g15daemon-1.2.6a.confd, g15daemon-1.2.6a-r1.ebuild,
+  g15daemon-1.2.7.ebuild, +g15daemon-1.9.0.ebuild:
+  Fixes by tove from bug #170417 and version bump
 
 *g15daemon-1.2.7 (18 Feb 2007)
 
diff --git a/app-misc/g15daemon/files/digest-g15daemon-1.9.0 b/app-misc/g15daemon/files/digest-g15daemon-1.9.0
new file mode 100644
index 000000000000..0f5a8a3c5fe8
--- /dev/null
+++ b/app-misc/g15daemon/files/digest-g15daemon-1.9.0
@@ -0,0 +1,3 @@
+MD5 3212e3e7f5b3f10a38d2cf3366206591 g15daemon-1.9.0.tar.bz2 288639
+RMD160 8695fadf63e84fb1e55067f32d2736f96665b6ab g15daemon-1.9.0.tar.bz2 288639
+SHA256 7a88bdb9464c6954a936efb8d1fc6bf2e7f90ce4e30ba2b982b7fdd1a9eb95e7 g15daemon-1.9.0.tar.bz2 288639
diff --git a/app-misc/g15daemon/files/g15daemon-1.2.6a.confd b/app-misc/g15daemon/files/g15daemon-1.2.6a.confd
index c190c17f2b63..2d7cd51ce83b 100644
--- a/app-misc/g15daemon/files/g15daemon-1.2.6a.confd
+++ b/app-misc/g15daemon/files/g15daemon-1.2.6a.confd
@@ -2,4 +2,4 @@
 
 # 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, above the multimedia keys).
-CLIENT_SWITCH_L1="no"
\ No newline at end of file
+CLIENT_SWITCH_L1="no"
diff --git a/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild b/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild
index ee5a79932365..c71012685559 100644
--- a/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.2.6a-r1.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.6a-r1.ebuild,v 1.3 2007/02/18 19:38:16 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild,v 1.4 2007/03/12 22:11:25 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"
@@ -66,25 +66,26 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} install || die "make install failed"
 
 	# remove odd docs installed my make
-	rm "${D}/usr/share/doc/${P}/"{LICENSE,README.usage}
-	gzip "${D}/usr/share/doc/${P}/"*
+	rm "${D}/usr/share/doc/${PF}/"{LICENSE,README.usage}
 
-	insinto /usr/share/g15daemon/contrib
+	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" g15daemon
-	newinitd "${FILESDIR}/${P}.initd" g15daemon
+	newconfd "${FILESDIR}/${P}.confd" ${PN}
+	newinitd "${FILESDIR}/${P}.initd" ${PN}
 
 	if use perl; then
 		ebegin "Installing Perl Bindings (G15Daemon.pm)"
 		cd "${WORKDIR}/G15Daemon-0.2"
+		docinto perl
 		perl-module_src_install
 	fi
 
@@ -95,13 +96,16 @@ src_install() {
 
 		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/g15daemon
 		doins g15daemon.py
-		newdoc AUTHORS pyg15daemon_AUTHORS
+		docinto python
+		dodoc AUTHORS
 	fi
+
+	prepalldocs
 }
 
 pkg_postinst() {
 	if use python; then
-		python_mod_optimize "/usr/lib/python*/site-packages/g15daemon"
+		python_mod_optimize "${ROOT}/usr/$(get_libdir)/python*/site-packages/g15daemon"
 		echo ""
 	fi
 
@@ -124,6 +128,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if use python; then
-		python_mod_cleanup "/usr/lib/python*/site-packages/g15daemon"
+		python_mod_cleanup "/usr/$(get_libdir)/python*/site-packages/g15daemon"
 	fi
 }
diff --git a/app-misc/g15daemon/g15daemon-1.2.7.ebuild b/app-misc/g15daemon/g15daemon-1.2.7.ebuild
index a36aaf877c32..db9700089f26 100644
--- a/app-misc/g15daemon/g15daemon-1.2.7.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.2.7.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.7.ebuild,v 1.1 2007/02/18 19:38:16 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.7.ebuild,v 1.2 2007/03/12 22:11:25 rbu Exp $
 
 inherit eutils linux-info perl-module python multilib
 
@@ -66,13 +66,13 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} install || die "make install failed"
 
 	# remove odd docs installed my make
-	rm "${D}/usr/share/doc/${P}/"{LICENSE,README.usage}
-	gzip "${D}/usr/share/doc/${P}/"*
+	rm "${D}/usr/share/doc/${PF}/"{LICENSE,README.usage}
 
-	insinto /usr/share/g15daemon/contrib
+	insinto /usr/share/${PN}/contrib
 	doins contrib/xmodmaprc
 	doins contrib/xmodmap.sh
 	if use perl; then
@@ -85,6 +85,7 @@ src_install() {
 	if use perl; then
 		ebegin "Installing Perl Bindings (G15Daemon.pm)"
 		cd "${WORKDIR}/G15Daemon-0.2"
+		docinto perl
 		perl-module_src_install
 	fi
 
@@ -95,13 +96,16 @@ src_install() {
 
 		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/g15daemon
 		doins g15daemon.py
-		newdoc AUTHORS pyg15daemon_AUTHORS
+		docinto python
+		dodoc AUTHORS
 	fi
+
+	prepalldocs
 }
 
 pkg_postinst() {
 	if use python; then
-		python_mod_optimize "/usr/lib/python*/site-packages/g15daemon"
+		python_mod_optimize "${ROOT}/usr/$(get_libdir)/python*/site-packages/g15daemon"
 		echo ""
 	fi
 
@@ -122,6 +126,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if use python; then
-		python_mod_cleanup "/usr/lib/python*/site-packages/g15daemon"
+		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.ebuild
new file mode 100644
index 000000000000..8b34290730e1
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-1.9.0.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.0.ebuild,v 1.1 2007/03/12 22:11:25 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/libg15-1.2.0
+	>=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}/${P}.confd" ${PN}
+	newinitd "${FILESDIR}/${P}.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
+}