Add a missing open() permission and install default configuration file

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

10 files changed, 67 insertions, 696 deletions

diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog
index 9d00a2266acc..54bd25f04990 100644
--- a/app-misc/g15daemon/ChangeLog
+++ b/app-misc/g15daemon/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/g15daemon
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.22 2008/09/08 11:44:02 chainsaw Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.23 2009/02/01 16:18:40 jokey Exp $
+
+*g15daemon-1.9.5.3-r2 (01 Feb 2009)
+
+  01 Feb 2009; <jokey@gentoo.org> +files/g15daemon.conf,
+  +files/g15daemon-1.9.5.3-forgotten-open-mode.patch,
+  -g15daemon-1.2.6a-r1.ebuild, -g15daemon-1.9.0-r1.ebuild,
+  -g15daemon-1.9.1.ebuild, -g15daemon-1.9.2.ebuild, -g15daemon-1.9.3.ebuild,
+  -g15daemon-1.9.5.3.ebuild, +g15daemon-1.9.5.3-r2.ebuild:
+  Add a missing open() permission and install default configuration file
 
 *g15daemon-1.9.5.3-r1 (08 Sep 2008)
 
diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index 1ca582b66c3c..91c33736c88d 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 99-g15daemon.rules 90 RMD160 35df4086850c7170227e472cc82d7db0d0e2d23b SHA1 fff177b525ba9e7882cc01ae61091c483a3863c1 SHA256 dab916b3cb839bb55f4b6f599f83de2c4dbdd87005394f737dc59ab4df7d4e84
 AUX g15daemon-1.2.6a.confd 236 RMD160 8bd008853963292dcb63c3685ba39a8265fb8255 SHA1 3b315e7a12eb7375724f48f943862acc69963e57 SHA256 b5353ac723b8fc3184eaca3db84ced1904e89b43b448ee9713e2b1b9cffd7d01
 AUX g15daemon-1.2.6a.initd 1002 RMD160 5b30c2a2976fb42ae2d7b57caa89f86dbf52ca3f SHA1 1796fc22d68cd9c99a4ca9c4623403dc33e8762e SHA256 99270b912a1c0de2e707cd304216bf0388b2d7a8f3838a38e5491c9919883380
@@ -8,29 +5,14 @@ AUX g15daemon-1.2.7-r1.initd 1159 RMD160 5116a84063c793310850cc62a6658bab0bc8cbf
 AUX g15daemon-1.2.7-r2.initd 1107 RMD160 33a13cbbdf3701b6e81fb39dfad5f6ee3318d1bc SHA1 7832d5da216f59b42423d2f9583eb2b3356ae237 SHA256 37d29b422cdc680bd066d8b0dca874781396aded214cf080014454421c9bb26d
 AUX g15daemon-1.2.7.confd 329 RMD160 962088db694d25a6935de80299a45d94787ed251 SHA1 f452f915e6f903e4cdbbfc3db3e2e57ef702425f SHA256 a7977e03f0faaed85f659b077fddc3a589c2e2d4386df1e9afc89133c25bc613
 AUX g15daemon-1.2.7.initd 1077 RMD160 33d59ace2b40f969962a47872a4b506bddca0795 SHA1 f339c92e50d69f888ee42f6acc86cfec39f4e49d SHA256 bed4adb30913a12268769d5e6abfe2a2b6e1b583d45f252dbc6aa86492f3ba30
+AUX g15daemon-1.9.5.3-forgotten-open-mode.patch 639 RMD160 04b8ae6d53ccb99a9bba32d0ae93b58d6859c71e SHA1 81c9d08dec32d87bb26836668a6984e0182e24ce SHA256 0d97a53d63052d2da325b39b6186330432fbf1a16be3e09eef4f250410f79e38
 AUX g15daemon-hotplug 187 RMD160 df076cb3c47e976085e362fa1b6c7b1429857684 SHA1 61a1ddf817746e46e48c77186f145c59b5e3256f SHA256 694fcaa68b7de070a257c72b3d9b0736377bbf3102d41c9aadcb9b27d0efcdad
-DIST g15daemon-1.2.6a.tar.bz2 273767 RMD160 947441a1c89d1f45f02094a59735f488a76ce285 SHA1 473f3e0aee0122597c1e91cf54b18d3d6e28e8e9 SHA256 583c4bece816b712959aba51f49d78bb587e215fbb6a322efe832477c74f2564
+AUX g15daemon.conf 516 RMD160 50e8da6e93ae52960519c00d0f76ca6ba636f33a SHA1 db3b0b119c1f77dc91a7a9222c45ed3bd65f73df SHA256 94a79cea3ac0fa566cd6515e32eec22bb6a26e353c83608767dc65d1a2404037
 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
-DIST g15daemon-1.9.2.tar.gz 399349 RMD160 2be18efbcfefac09de33387f1736ab3000e0511c SHA1 8e402491da5ecc3b3945cef55fee0594317b5e91 SHA256 c400a4a7fbe4cc5a4dd7adc29c60ca1e52c3649af382f0f32239f2320a0ff603
-DIST g15daemon-1.9.3.tar.gz 399817 RMD160 7c60cbafa5b33008b5d13ca9d171b2a5dafb8980 SHA1 e9b6bdd4602474f6c97437ff48c2d20c7ed93343 SHA256 d7828a80acde9cb4b5187f39d66a033cbe8147a4b34e574b0e0ba4961fe695a9
 DIST g15daemon-1.9.5.3.tar.gz 414603 RMD160 937362cd75d578e1b992868aeacefa928390ab4d SHA1 bc10775494ff38e78ecb62074869332d96c5cb55 SHA256 40ff07a4186c1fd01ea23d1753a2cb3bef25f92cc496ddddc6abde6a574cd60a
-EBUILD g15daemon-1.2.6a-r1.ebuild 3522 RMD160 e452c5d1474e2a671e9f937ae7ade95e0f72b21e SHA1 3748a4a2d0acad583d95eefc0d094a3a3721d991 SHA256 b1d9a6fa461c6290f8dfae5684dbc470ff12de840971db3302a8208007cdce07
 EBUILD g15daemon-1.2.7-r1.ebuild 3443 RMD160 12f9b92f4f09afaa58a927de482a5417077804c6 SHA1 99ac4db23434a2c6b2070d502167ad5e9ea8489a SHA256 6d6acf08709ad28993074d6ef4409669993587a633424d411e93efc711f4d8e4
 EBUILD g15daemon-1.2.7.ebuild 3436 RMD160 e1dfb37e3071f59e48d75a52ab168998af466ace SHA1 8e0d881d4252f20d6eb31f6d99f8a6644e0fe9fe SHA256 fcc8da38768c3576cd4c9de214aeaae77639650ed2db207511699c9cdf7e2139
-EBUILD g15daemon-1.9.0-r1.ebuild 3469 RMD160 d5227f61afd83bfb9d88b3d5e1e6a26dae6e4f6b SHA1 b30b06d22700660cafce41e0d0fa1cdf40018bf9 SHA256 01371047c1581987215a24659b8cec6b475a9a4abdf26e444be4d3f054de9a03
-EBUILD g15daemon-1.9.1.ebuild 3466 RMD160 06ace6ccd2bee01d220ac859d5517a139d747b56 SHA1 3accd8154c8506ed7777b2560ef88191eda9c2c4 SHA256 ec65cb872398f7ac898059b9935d92afcf0e1b099038f143e8646852bef6c103
-EBUILD g15daemon-1.9.2.ebuild 3465 RMD160 10a137d277e56876158d6ad67d77acdf61e2a352 SHA1 42eedbcb38f5714329581db52dafae4e6aa1ce2f SHA256 923ecc95a79ac0efade0cef328b06644aaeb913f9cdb0377d5a1277a4078a5df
-EBUILD g15daemon-1.9.3.ebuild 3465 RMD160 ee0c94a836fc5535e8d6b0303a0b2910dbdcc238 SHA1 eb3ca6207f2c0cc74e9d8238d5a1e7c3e8144fb0 SHA256 bf6fbbc62cb2e07cbdf9e6dd83f49733825918a2e17e9ca53a8bb5749f6adad2
 EBUILD g15daemon-1.9.5.3-r1.ebuild 3577 RMD160 a6a44c503b495534d44cefc1312408df30a7d1e8 SHA1 d0e8c021dee6ffdbdaef6e375354295dadb4aaab SHA256 cc2df5ce17d66680845e3a8cc12055ded4343618d0c38422f3378a22306d569c
-EBUILD g15daemon-1.9.5.3.ebuild 3467 RMD160 fb712dce080e7b503a887373ffa6b681fb0f7fe1 SHA1 836d591f442031df402f35545dfde4d331e75dfb SHA256 d551ed858cd6d169b5a7f7cff7d21629c764dd38de98e15d3518669f17186dfe
-MISC ChangeLog 4762 RMD160 689c2f9510482b07ada06d3a3e5c1fd3b5453132 SHA1 58b0964c3133825e3e1eafeeca6651f38ef7560d SHA256 0bec4a02bbb67baa95bdd6d62da471b4e636f21c1b174b4f1b84440c4461618a
+EBUILD g15daemon-1.9.5.3-r2.ebuild 3657 RMD160 72e892ae1ed091ed1c3cb2aa007c869224111b1d SHA1 4c52451b38493d71ca071727d23bf3ac1f4aa094 SHA256 a1d4d06d84d62d3aae811d969b726452dae8c6e12e8e8be90d872528af826227
+MISC ChangeLog 5176 RMD160 c8f649fc352f66e260f0f114c28f7d8293428e39 SHA1 03ad1dd3a972bb9165465eee70693ba017676c33 SHA256 26273d41f29e21723f0428b0a111f0405886ecfe4ed96ded22c43c29c2b92ef7
 MISC metadata.xml 249 RMD160 3a959d6b2d70ee342ccdf4abcaa3107d6f2897ed SHA1 942405176c914e1682a8a0daa6c5b9d7b6a2a94d SHA256 5a7fbdf3050c5c4c8f1dc154e8c715162b71ef329ec3e59facb4965dea2c9a81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjFEAwACgkQp5vW4rUFj5qpIwCfbkn3C+J6kkST5eU0BQkDEUuN
-KYsAmwcOal7eZDKM7NNMjUb/rXCS6+E2
-=gUrk
------END PGP SIGNATURE-----
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
new file mode 100644
index 000000000000..b475f1d58d69
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-forgotten-open-mode.patch
@@ -0,0 +1,11 @@
+--- ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c	2008-01-26 06:02:07.000000000 +0100
++++ ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c	2009-02-01 17:00:55.203009264 +0100
+@@ -356,7 +356,7 @@
+     config_items_t * item=NULL;
+     char line[1024];
+     
+-    config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC);
++    config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC,0664);
+     if(config_fd){
+     snprintf(line,1024,"# G15Daemon Configuration File\n# any items entered before a [section] header\n# will be in the Global config space\n# comments you wish to keep should start with a semicolon';'\n");
+     write(config_fd,line,strlen(line));
diff --git a/app-misc/g15daemon/files/g15daemon.conf b/app-misc/g15daemon/files/g15daemon.conf
new file mode 100644
index 000000000000..2d2bfc3cabde
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon.conf
@@ -0,0 +1,27 @@
+# G15Daemon Configuration File
+# any items entered before a [section] header
+# will be in the Global config space
+# comments you wish to keep should start with a semicolon';'
+
+[Global]
+Use MR as Cycle Key: Off
+
+[PLUGIN_LOAD_ORDER]
+0: g15plugin_uinput.so
+1: g15plugin_clock.so
+2: g15plugin_tcpserver.so
+TotalPlugins: 3
+
+[PLUGINS]
+Linux UINPUT Keyboard Output: Load
+Clock: Load
+LCDServer: Load
+
+[Keyboard OS Mapping (uinput)]
+device: /dev/input/uinput
+Lkeys.mapped: 0
+
+[Clock]
+24hrFormat: On
+ShowDate: Off
+Digital: On
diff --git a/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild b/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild
deleted file mode 100644
index e169ef810b86..000000000000
--- a/app-misc/g15daemon/g15daemon-1.2.6a-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2008 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.6 2008/05/29 15:41:32 hawking 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.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}" \
-		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_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/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 ""
-	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"
-	elog ""
-	elog "Note: the daemon now supports to use the small round key"
-	elog "instead of MR for switching LCD clients. see /etc/conf.d/g15daemon"
-}
-
-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-r1.ebuild b/app-misc/g15daemon/g15daemon-1.9.0-r1.ebuild
deleted file mode 100644
index cdeccc9ce255..000000000000
--- a/app-misc/g15daemon/g15daemon-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.2 2008/05/29 15:41:32 hawking 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}/${PN}-1.2.7.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-1.2.7-r1.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_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/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.1.ebuild b/app-misc/g15daemon/g15daemon-1.9.1.ebuild
deleted file mode 100644
index 26c56b908ab9..000000000000
--- a/app-misc/g15daemon/g15daemon-1.9.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2008 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.2 2008/05/29 15:41:32 hawking 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_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/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.2.ebuild b/app-misc/g15daemon/g15daemon-1.9.2.ebuild
deleted file mode 100644
index 93ba437c727a..000000000000
--- a/app-misc/g15daemon/g15daemon-1.9.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.2.ebuild,v 1.2 2008/05/29 15:41:32 hawking 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.gz"
-
-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_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/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.3.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r2.ebuild
index 2a51cc3887b6..03d3892b9d90 100644
--- a/app-misc/g15daemon/g15daemon-1.9.3.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.3.ebuild,v 1.2 2008/05/29 15:41:32 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r2.ebuild,v 1.1 2009/02/01 16:18:40 jokey Exp $
+
+EAPI=2
 
 inherit eutils linux-info perl-module python multilib
 
@@ -54,9 +56,11 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
-	econf || die "configure failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-forgotten-open-mode.patch
+}
 
+src_compile() {
 	emake || die "make failed"
 
 	if use perl; then
@@ -81,6 +85,12 @@ src_install() {
 
 	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.2.7-r2.initd" ${PN}
+	dobin "${FILESDIR}/g15daemon-hotplug"
+	insinto /etc/udev/rules.d
+	doins "${FILESDIR}/99-g15daemon.rules"
+
+	insinto /etc
+	doins "${FILESDIR}"/g15daemon.conf
 
 	if use perl; then
 		ebegin "Installing Perl Bindings (G15Daemon.pm)"
@@ -100,8 +110,6 @@ src_install() {
 		docinto python
 		dodoc AUTHORS
 	fi
-
-	prepalldocs
 }
 
 pkg_postinst() {
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3.ebuild
deleted file mode 100644
index a17acced5637..000000000000
--- a/app-misc/g15daemon/g15daemon-1.9.5.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2008 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.ebuild,v 1.2 2008/05/29 15:41:32 hawking 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.gz"
-
-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_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/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
-}