Version bump, minor fixes

svn path=/trunk/; revision=77

7 files changed, 197 insertions, 10 deletions

diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index 7a80aba..7af3557 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -6,16 +6,29 @@ AUX g15daemon-1.2.3.initd 859 RMD160 9b1f9b499b31f67897f24036bc8b4ac9c32663ff SH
 MD5 71f591ed8e9092dec6be49dbf4646bba files/g15daemon-1.2.3.initd 859
 RMD160 9b1f9b499b31f67897f24036bc8b4ac9c32663ff files/g15daemon-1.2.3.initd 859
 SHA256 ed883bcb8ac714686f5fcf8596e251ac95a23f8c1684ae0cb66efc8cdf95dd0a files/g15daemon-1.2.3.initd 859
+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 6eec4764db45455bd5f778805f69d79e4efeadce SHA1 d05132312e5ed33a3c9a4aeeb36db6d8efd7827f SHA256 7dc54046cc737a9cf93b0358370b3783afe5f9da70d398dc4195ffb6aeb76c99
+MD5 3f3dade89e15658e8a17c8720568d58e files/g15daemon-1.2.5.initd 958
+RMD160 6eec4764db45455bd5f778805f69d79e4efeadce files/g15daemon-1.2.5.initd 958
+SHA256 7dc54046cc737a9cf93b0358370b3783afe5f9da70d398dc4195ffb6aeb76c99 files/g15daemon-1.2.5.initd 958
 DIST g15daemon-1.2.1.tar.bz2 267042 RMD160 0b94f4541603448efbf6b4bdbb1bcadc254a614e SHA1 ba03cd08601b965f5afd84353dcd8eafefa2afe5 SHA256 207efaa4180e3ab6069213f042e149650cd9af54e4976fc0d36b48f6192fa8e9
 DIST g15daemon-1.2.3.tar.bz2 304548 RMD160 897d80b4cea3aa98163b168638992f4daea4ccdd SHA1 d36043bf84062c62306952b86f595438b026301c SHA256 9bc3cecf17277825b8084d08e1ed6550c6e4a338cfee3604262908afac45bc9e
-EBUILD g15daemon-1.2.1-r2.ebuild 3215 RMD160 4d699a73e6525dbf4705ded2d5fc603504fc23ce SHA1 f86dcf3aeeb32f749454480bb7f739397c9cca5d SHA256 675309837d707fc66212d5850c46fb20882229956a08088764cfe1c2bd7e588d
-MD5 686ee0fcf526dd4213db2cacfdb501b1 g15daemon-1.2.1-r2.ebuild 3215
-RMD160 4d699a73e6525dbf4705ded2d5fc603504fc23ce g15daemon-1.2.1-r2.ebuild 3215
-SHA256 675309837d707fc66212d5850c46fb20882229956a08088764cfe1c2bd7e588d g15daemon-1.2.1-r2.ebuild 3215
-EBUILD g15daemon-1.2.3.ebuild 3401 RMD160 8594de1fc275bf4f7d31419f730d253029620397 SHA1 942649423a2672e0b0061e785cf1b12c0a62c6ce SHA256 9629e65e60dc2c368f1f8d6cd13e3b92a628d77ca9ed43060ff43e5266d51785
-MD5 eadd656825aa9b3434114097b5406c42 g15daemon-1.2.3.ebuild 3401
-RMD160 8594de1fc275bf4f7d31419f730d253029620397 g15daemon-1.2.3.ebuild 3401
-SHA256 9629e65e60dc2c368f1f8d6cd13e3b92a628d77ca9ed43060ff43e5266d51785 g15daemon-1.2.3.ebuild 3401
+DIST g15daemon-1.2.5.tar.bz2 281845 RMD160 fefe5c802469e67553e483626b28369a525fdd05 SHA1 4c28fca380f9ce43b1d7f6e867e1e89fd0a9d7da SHA256 64b5046566d6116847826ecef6adcf9a87e279ea68bf1270d0ff314a3489b4e9
+EBUILD g15daemon-1.2.1-r2.ebuild 3224 RMD160 a42e79705e4e4a2ceef7f5b93b0da16c3dc3b43e SHA1 7735af96b3d726c1ce6627846f9f44a885ee0c74 SHA256 9b84defa63c6a255f9e8d067cfb87c1432082b8269e08b2ddbf55e900a7a4dbd
+MD5 c2bfface27cc65b2f00178d2adb00633 g15daemon-1.2.1-r2.ebuild 3224
+RMD160 a42e79705e4e4a2ceef7f5b93b0da16c3dc3b43e g15daemon-1.2.1-r2.ebuild 3224
+SHA256 9b84defa63c6a255f9e8d067cfb87c1432082b8269e08b2ddbf55e900a7a4dbd g15daemon-1.2.1-r2.ebuild 3224
+EBUILD g15daemon-1.2.3.ebuild 3410 RMD160 79a08a43618b1f7a1cbcf0a2144511dc9cd2a3e6 SHA1 9a93a86c1ee387113a069b54f1dc17103ae7c5d6 SHA256 503fd8f64dddd8afded335bdebd98e7b92262898f7f8285270df4d9abb078bee
+MD5 c3bc82e395bbe3de4c32c9b197462a41 g15daemon-1.2.3.ebuild 3410
+RMD160 79a08a43618b1f7a1cbcf0a2144511dc9cd2a3e6 g15daemon-1.2.3.ebuild 3410
+SHA256 503fd8f64dddd8afded335bdebd98e7b92262898f7f8285270df4d9abb078bee g15daemon-1.2.3.ebuild 3410
+EBUILD g15daemon-1.2.5.ebuild 3337 RMD160 ae2b33db9a70b9087b76c5aab40f14e42fd7c290 SHA1 83a68bed66a76459943682344e2b32cb38ad031f SHA256 5067957fdf552295f104938262b8462744db898a0fbd5a0584ea119cdcdcf761
+MD5 ea197d268990c7f1a90da00bdb11ede3 g15daemon-1.2.5.ebuild 3337
+RMD160 ae2b33db9a70b9087b76c5aab40f14e42fd7c290 g15daemon-1.2.5.ebuild 3337
+SHA256 5067957fdf552295f104938262b8462744db898a0fbd5a0584ea119cdcdcf761 g15daemon-1.2.5.ebuild 3337
 MISC ChangeLog 1218 RMD160 caf633180d76e3934c198a867d3019661d71a9db SHA1 ae02a73d3d62d308861ac1e9eb5e455082a2c0d2 SHA256 4e5ad89b1154a6c614ec505b3070d60fbd1a1af69c5cf657c7dfb63903158f9e
 MD5 54b0fc69073f1269d77aa66e1d5d1153 ChangeLog 1218
 RMD160 caf633180d76e3934c198a867d3019661d71a9db ChangeLog 1218
@@ -30,3 +43,6 @@ SHA256 243c86e7442d399f7ab45e8ac7bcbea8e3896097442a147890314a59b528deaa files/di
 MD5 e1401f5b094e36d56d3a4377891aa2f3 files/digest-g15daemon-1.2.3 250
 RMD160 2f63298f6dba165c16100e4a15780201a0f6e84f files/digest-g15daemon-1.2.3 250
 SHA256 988167ef01938019a1c995632c4a640ec76ea7cff3eff6f678303a5e9ec1d450 files/digest-g15daemon-1.2.3 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
diff --git a/app-misc/g15daemon/files/digest-g15daemon-1.2.5 b/app-misc/g15daemon/files/digest-g15daemon-1.2.5
new file mode 100644
index 0000000..19a3a47
--- /dev/null
+++ b/app-misc/g15daemon/files/digest-g15daemon-1.2.5
@@ -0,0 +1,3 @@
+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/g15daemon-1.2.5.confd b/app-misc/g15daemon/files/g15daemon-1.2.5.confd
new file mode 100644
index 0000000..e2b959e
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.2.5.confd
@@ -0,0 +1,6 @@
+# /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
diff --git a/app-misc/g15daemon/files/g15daemon-1.2.5.initd b/app-misc/g15daemon/files/g15daemon-1.2.5.initd
new file mode 100644
index 0000000..80138e5
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.2.5.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2006 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.3.initd,v 1.1 2006/10/31 22:29:10 jokey 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 && ! -e /dev/input/uinput ]] ; then
+		# We can load modules, but uinput device does not exist
+		einfo "Loading uinput module"
+		/sbin/modprobe uinput &> /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"
+	start-stop-daemon --stop --quiet --pidfile /var/run/g15daemon.pid
+	eend $?
+}
diff --git a/app-misc/g15daemon/g15daemon-1.2.1-r2.ebuild b/app-misc/g15daemon/g15daemon-1.2.1-r2.ebuild
index 8203969..23a2022 100644
--- a/app-misc/g15daemon/g15daemon-1.2.1-r2.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.2.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.1-r2.ebuild,v 1.1 2006/10/24 07:57:04 jokey Exp $
 
-inherit eutils linux-info perl-module python
+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/"
diff --git a/app-misc/g15daemon/g15daemon-1.2.3.ebuild b/app-misc/g15daemon/g15daemon-1.2.3.ebuild
index 037be57..0f622a3 100644
--- a/app-misc/g15daemon/g15daemon-1.2.3.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.2.3.ebuild
@@ -4,7 +4,7 @@
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
-inherit eutils linux-info perl-module python autotools
+inherit eutils linux-info perl-module python autotools multilib
 
 DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
 HOMEPAGE="http://g15daemon.sourceforge.net/"
diff --git a/app-misc/g15daemon/g15daemon-1.2.5.ebuild b/app-misc/g15daemon/g15daemon-1.2.5.ebuild
new file mode 100644
index 0000000..60839e8
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-1.2.5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.3.ebuild,v 1.1 2006/10/31 22:29:10 jokey 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="perl python"
+
+DEPEND="dev-libs/libusb
+	dev-libs/libdaemon
+	>=dev-libs/libg15-1.1.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}" 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}/"*
+
+	insinto /usr/share/g15daemon/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
+		einfo "Installing Perl Bindings (G15Daemon.pm)"
+		cd "${WORKDIR}/G15Daemon-0.2"
+		perl-module_src_install
+	fi
+
+	if use python; then
+		einfo "Installing Python Bindings (g15daemon.py)"
+		cd "${WORKDIR}/pyg15daemon"
+		python_version
+
+		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/g15daemon
+		doins g15daemon.py
+		newdoc AUTHORS pyg15daemon_AUTHORS
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize "${ROOT}/usr/lib/python*/site-packages/g15daemon"
+		einfo ""
+	fi
+
+	einfo "To use g15daemon, you need to add g15daemon to the default runlevel."
+	einfo "This can be done with:"
+	einfo "# /sbin/rc-update add g15daemon default"
+	einfo ""
+	einfo "To have all new keys working in X11,"
+	einfo "you'll need create a specific xmodmap in your home directory"
+	einfo "or edit the existant one."
+	einfo ""
+	einfo "create the xmodmap:"
+	einfo "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
+	einfo ""
+	einfo "adding keycodes to an existing xmodmap:"
+	einfo "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup "${ROOT}/usr/lib/python*/site-packages/g15daemon"
+	fi
+}
\ No newline at end of file