More g510 fun. 1.9.5.3-r6 will give you partial support, 9999 will give you full support.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

5 files changed, 724 insertions, 3 deletions

diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog
index 93695377d137..4dec2d581937 100644
--- a/app-misc/g15daemon/ChangeLog
+++ b/app-misc/g15daemon/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/g15daemon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.41 2012/03/08 15:17:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.42 2012/10/12 20:22:20 robbat2 Exp $
+
+*g15daemon-1.9.5.3-r6 (12 Oct 2012)
+*g15daemon-9999 (12 Oct 2012)
+
+  12 Oct 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +files/g15daemon-1.9.5.3-g510-keys.patch, +g15daemon-1.9.5.3-r6.ebuild,
+  +g15daemon-9999.ebuild:
+  More g510 fun. 1.9.5.3-r6 will give you partial support, 9999 will give you
+  full support.
 
   08 Mar 2012; Brent Baude <ranger@gentoo.org> g15daemon-1.9.5.3-r5.ebuild:
   Marking g15daemon-1.9.5.3-r5 ppc64 for bug 399941
@@ -220,4 +229,3 @@
   +metadata.xml, +g15daemon-1.2.1.ebuild:
   Initial import, thanks to Alessio Cassibba in bug #148769 for providing an
   ebuild
-
diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index 51196ce0ab39..fe4bff48aa0a 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -3,11 +3,14 @@ AUX 99-g15daemon.rules 90 SHA256 dab916b3cb839bb55f4b6f599f83de2c4dbdd87005394f7
 AUX g15daemon-1.2.7-r2.initd 1107 SHA256 37d29b422cdc680bd066d8b0dca874781396aded214cf080014454421c9bb26d SHA512 01c5c6559c42e78df0488886345d67c6be5bad1090ed8cef7675da9d0299efa75fd6cd725e62a426695f1e32ba64220de2ccb1da5745b7342a2564ad850f9228 WHIRLPOOL 338247666a6361e55de34390163cc59b27efba84b9952902512ef570850e90af09ab8b1d8df66c8fe8a0b60e04176bbe6a1622648408d7f5c34e9dc9beef3e1d
 AUX g15daemon-1.2.7.confd 329 SHA256 a7977e03f0faaed85f659b077fddc3a589c2e2d4386df1e9afc89133c25bc613 SHA512 ea94ab43c78566c570a510cccb6860ade6c26a281956b6e37ea746eb06608a5a00ed55773752c7aad44bf86cdfec5788e9f1137667fd5030d54b20b97811b43a WHIRLPOOL e3a3a79d94fdbc6a325ad31f61d0e8350d74f3fe8e1f233a1cd475beae52d838d17503c716e4fba975abc8d8bd6c9b588ef6b5a7f3ef5cede7a45150e2133dc0
 AUX g15daemon-1.9.5.3-forgotten-open-mode.patch 639 SHA256 0d97a53d63052d2da325b39b6186330432fbf1a16be3e09eef4f250410f79e38 SHA512 dc603a576eaf6bd8512827de712c3ba6a116905d5f6c692dccda1b499a3bab8480a785155d3b0189b41e2dff099fc5896cb958bcc83357ff54333a82f4b6ca93 WHIRLPOOL b2e8194e4bc32426b498a4852e744c57c5c928c24f331c3629718ca4153438d190ce71f7dcfd418216a7b1527f6703141a2aee375b3a11c0122dd406861a5b5e
+AUX g15daemon-1.9.5.3-g510-keys.patch 14094 SHA256 58401dbc85ba620553df236afe2cdfc89b93d0a98afe9d98b0666978a6a10a10 SHA512 1757a499d1bc2abe33db13dab8a5b17add8619494badd963209cbf8e7a14543bcff0ca48e10049a1e3cbd947e1de04560ea5163bf489e118a0e8d89fbb377898 WHIRLPOOL 5de64b9a4271aabecd7fccb70ded31918df686b1977de31c3b0bb0ded53ffcd449753e8803ba40551c82c708447e4bff2f77285ef27f73fecb51559f81f88688
 AUX g15daemon-1.9.5.3-overflow-fix.patch 619 SHA256 0c9c888c4f2e26cf51981714e917e963b371ed2b8d84c6e00b4c13df371afeda SHA512 e5f4494c0890ce985391d5a07d809e7168f765549c17b55457d93436ce816074aa97f991b894067badacf5e0bcc7f482d6b7e1623b0157a04d728f2ca4b1bf27 WHIRLPOOL 56a2674397e61c3c065e3ebe47b1da3617b3a91024ff213b5bbc4eb34ba85b98dc370842b331c7cb4d119355e98421b1f4b19cd700dbf120ca817f8646c99733
 AUX g15daemon-hotplug 224 SHA256 ff7fc4857cab25ab57c9ceca9e4c1f9ca365fc140da21e8cfa9788ee9544ba38 SHA512 6384aa8267a665b0b26f45f7339856647374ad5b1860f299b2e19afb0209b8637919f00b3638affbe4fb86adaf115eb93e814b70c17d52f1c878d840e1e464e8 WHIRLPOOL 80c477f97bebb55815746d6361da04139661da111e63497ee7d2c057074a76a67fff479d7beb47bc7acb77667348eb436372afd5bef16d1efb06114ce32d6d5b
 AUX g15daemon.conf 516 SHA256 94a79cea3ac0fa566cd6515e32eec22bb6a26e353c83608767dc65d1a2404037 SHA512 e575fd8a91c87f226481ae406a1b66de6d8eb66f061b0ce7f2b89ce63f7bda88470eac50adcc9de97ef866970ee835af8a1bb0402a2e4b4d214251d0b8ebe25c WHIRLPOOL 2b94c324074a8936343bc22bd9d58e2b58a4b9220000b6544d901ff718b2e055bd363e0202fd72fb212520cb8be7e325af3be3ac7423922c0f481339c8813d92
 DIST g15daemon-1.9.5.3.tar.gz 414603 SHA256 40ff07a4186c1fd01ea23d1753a2cb3bef25f92cc496ddddc6abde6a574cd60a SHA512 7a1770d08d1d4155866bba3b676d33bf943363f4519af41a13ab6ec73cc5d6c536b173977b3e3583b594b149b7f01ffbc51123a4678c2a249a51ff0b42c8b69a WHIRLPOOL 216e8d7ef3a79064e161e7b579271946215cbd49566672dccf9c69e0d478b1bf19b8b19334eb180c129bef03e900bd7fb532ba524a5cfd384f6abd9162ae3eb1
 EBUILD g15daemon-1.9.5.3-r3.ebuild 3978 SHA256 a9fe2935b56303c08282836ce857db559c2225123d2e80230c224d06bae33337 SHA512 37a2d1ad50902cdf9956c0539ae73102f10886d7193519c8c24a1eea2a5d5b53646370ed27c1f4d21ff625366fb665ac2f35428371240b4f6eb6d2f7cf391996 WHIRLPOOL a57335278aa6c1b6e509aa5364c2ccd276d36b4bfd4712c0e81416510c20aee1423d656fad8c663c2504d76a196eaa3700947279d923be99ed8fc6dae47e77ad
 EBUILD g15daemon-1.9.5.3-r5.ebuild 4164 SHA256 0ab88aed764c41d87420d06120a6b8fa94830cbede39d10a8c2b4c4f66b4f849 SHA512 8c5a89f74a5a7379e7860ac9a49e686fa1e9b3427e66d0509a45b61e4fff7eba913a1f1737bece5e090e01b58b39ea9f0406b618ee571e8b5e1991242fffdfd4 WHIRLPOOL 6279bf6792fd05b291a57d6d49beacf86b43e880e04ea9d99fa27486eacc2d9933e056eee11cb72a21473738780f393717520acb33cc717c51400fc578578a02
-MISC ChangeLog 8264 SHA256 e42c74c5df44bc31a4bf5d6ebd709d74ba61b7d566a75f6c671c6439b76527e6 SHA512 b5d253eab1872486256925595838653cc6b5989e4e92af2aaa4cc4cff6d791a3f8fc347fb654bbebf085b7ab4cdb39752fafa05cab83940c25be4322be0fd5b9 WHIRLPOOL b1fdd985ac99160ab23a4c1ca5a6fc02cd8d772e56a66fc03d6708c1cae283e4c12011fa93af78943e29e80d50b5831f304b395c0a0760394fad36e7a0bc2893
+EBUILD g15daemon-1.9.5.3-r6.ebuild 4182 SHA256 08b8006c082ecfb8923f39336d25b51fcb6b6ada9a3cb0287b6134377893c09f SHA512 6ac347967df21f6f858572dececf2ef3450042b0f45b4ee5f859345da71a842edba76ea805957346c3718c25c2ed9803b74535bbaf5d4148493cff1d12bac9d3 WHIRLPOOL 5e5c7526e2dc3333ba5575393cfc07807885bfd2dd8e652fe768f35f0043154482ad4c8c77ec130a2240c5f0707ad272bb7cc900d9623a7a79d47155a7799f59
+EBUILD g15daemon-9999.ebuild 4531 SHA256 11c8b0b644d208b260485f1f08af6db5f897fb23318bc147b2ac2947e26ab7f9 SHA512 98d9310d3541db433fa5def3bf20985599549439d7a32785560cf75200e0061899017d2c71fe4ddbecf98426d783849cdfa54a134163298313258187b07b6a63 WHIRLPOOL 89783a22c1250ff44ae61d64e718b319a9ac3c3e70465f08391f5e542237d6386025324944eee0a1957e7cb81611d19290f633a057fed3e2083594986ab8008e
+MISC ChangeLog 8579 SHA256 b85b1448a5ed3b222f8f3a2116d7923a59346b717b530191cc95a684286999ed SHA512 a52464bc777fc0426488186abca45a0ff3bf3c8310cf532369f78a62a971708da041f133598d366b9cdde2f503175fe90a1efe01945dfcf9b86d566ec56a3a9b WHIRLPOOL c42bb28fc8d17985012885138f8d8a7b0620973f826eb129345d5190ecc4e5ce4d95172e6694ec8bf9fb2ae76d0df1930ef13bb69276378be25729b65eac488a
 MISC metadata.xml 222 SHA256 edd5f0f934fb8e9338e5a0ce8caaae6f6232dfb8cb4e0c0cfbac0363eb42b7c9 SHA512 15c47f038dfd87f28b1638cb2b8741434e1e22ba125314cca1d691e582f83e03d082959ebfbee59d53c2270a9301c749a38484d20032d5b45c0b57a8ac2cb332 WHIRLPOOL 14cf2020516c983921b1a7b2e689eb8ea2fcf2129ecd3cfac53969f8c67755c1c914b88d2cd3cfba2ffa55060c9f58918dc8a58d5f23c0d5695968be98f322a9
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
new file mode 100644
index 000000000000..240f21c385aa
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch
@@ -0,0 +1,340 @@
+From http://sourceforge.net/tracker/?func=detail&aid=3152167&group_id=167869&atid=844658
+
+diff -aNru trunk/g15daemon-wip/plugins/g15_plugin_uinput.c mod/g15daemon-wip/plugins/g15_plugin_uinput.c
+--- trunk/g15daemon-wip/plugins/g15_plugin_uinput.c	2011-06-26 06:50:50.000000000 +0000
++++ mod/g15daemon-wip/plugins/g15_plugin_uinput.c	2011-06-26 06:51:42.000000000 +0000
+@@ -164,146 +164,195 @@
+     
+ static void g15_process_keys(g15daemon_t *masterlist, unsigned int currentkeys, unsigned int lastkeys)
+ {
+-    /* 'G' keys */
+-    if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
+-        keydown(GKEY_OFFSET);
+-    else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
+-        keyup(GKEY_OFFSET);
+-
+-    if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
+-        keydown(GKEY_OFFSET+1);
+-    else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
+-        keyup(GKEY_OFFSET+1);
+-
+-    if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
+-        keydown(GKEY_OFFSET+2);
+-    else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
+-        keyup(GKEY_OFFSET+2);
+-
+-    if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
+-        keydown(GKEY_OFFSET+3);
+-    else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
+-        keyup(GKEY_OFFSET+3);
+-
+-    if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
+-        keydown(GKEY_OFFSET+4);
+-    else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
+-        keyup(GKEY_OFFSET+4);
+-
+-    if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
+-        keydown(GKEY_OFFSET+5);
+-    else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
+-        keyup(GKEY_OFFSET+5);
+-
+-    if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
+-        keydown(GKEY_OFFSET+6);
+-    else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
+-        keyup(GKEY_OFFSET+6);
+-
+-    if((currentkeys & G15_KEY_G8) && !(lastkeys & G15_KEY_G8))
+-        keydown(GKEY_OFFSET+7);
+-    else if(!(currentkeys & G15_KEY_G8) && (lastkeys & G15_KEY_G8))
+-        keyup(GKEY_OFFSET+7);
+-
+-    if((currentkeys & G15_KEY_G9) && !(lastkeys & G15_KEY_G9))
+-        keydown(GKEY_OFFSET+8);
+-    else if(!(currentkeys & G15_KEY_G9) && (lastkeys & G15_KEY_G9))
+-        keyup(GKEY_OFFSET+8);
+-
+-    if((currentkeys & G15_KEY_G10) && !(lastkeys & G15_KEY_G10))
+-        keydown(GKEY_OFFSET+9);
+-    else if(!(currentkeys & G15_KEY_G10) && (lastkeys & G15_KEY_G10))
+-        keyup(GKEY_OFFSET+9);
+-
+-    if((currentkeys & G15_KEY_G11) && !(lastkeys & G15_KEY_G11))
+-        keydown(GKEY_OFFSET+10);
+-    else if(!(currentkeys & G15_KEY_G11) && (lastkeys & G15_KEY_G11))
+-        keyup(GKEY_OFFSET+10);
+-
+-    if((currentkeys & G15_KEY_G12) && !(lastkeys & G15_KEY_G12))
+-        keydown(GKEY_OFFSET+11);
+-    else if(!(currentkeys & G15_KEY_G12) && (lastkeys & G15_KEY_G12))
+-        keyup(GKEY_OFFSET+11);
+-
+-    if((currentkeys & G15_KEY_G13) && !(lastkeys & G15_KEY_G13))
+-        keydown(GKEY_OFFSET+12);
+-    else if(!(currentkeys & G15_KEY_G13) && (lastkeys & G15_KEY_G13))
+-        keyup(GKEY_OFFSET+12);
+-
+-    if((currentkeys & G15_KEY_G14) && !(lastkeys & G15_KEY_G14))
+-        keydown(GKEY_OFFSET+13);
+-    else if(!(currentkeys & G15_KEY_G14) && (lastkeys & G15_KEY_G14))
+-        keyup(GKEY_OFFSET+13);
+-
+-    if((currentkeys & G15_KEY_G15) && !(lastkeys & G15_KEY_G15))
+-        keydown(GKEY_OFFSET+14);
+-    else if(!(currentkeys & G15_KEY_G15) && (lastkeys & G15_KEY_G15))
+-        keyup(GKEY_OFFSET+14);
+-
+-    if((currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
+-        keydown(GKEY_OFFSET+15);
+-    else if(!(currentkeys & G15_KEY_G16) && (lastkeys & G15_KEY_G16))
+-        keyup(GKEY_OFFSET+15);
+-
+-    if((currentkeys & G15_KEY_G17) && !(lastkeys & G15_KEY_G17))
+-        keydown(GKEY_OFFSET+16);
+-    else if(!(currentkeys & G15_KEY_G17) && (lastkeys & G15_KEY_G17))
+-        keyup(GKEY_OFFSET+16);
+-
+-    if((currentkeys & G15_KEY_G18) && !(lastkeys & G15_KEY_G18))
+-        keydown(GKEY_OFFSET+17);
+-    else if(!(currentkeys & G15_KEY_G18) && (lastkeys & G15_KEY_G18))
+-        keyup(GKEY_OFFSET+17);
+-
+-    /* 'M' keys */
+-
+-    if((currentkeys & G15_KEY_M1) && !(lastkeys & G15_KEY_M1))
+-        keydown(MKEY_OFFSET);
+-    else if(!(currentkeys & G15_KEY_M1) && (lastkeys & G15_KEY_M1))
+-        keyup(MKEY_OFFSET);
+-
+-    if((currentkeys & G15_KEY_M2) && !(lastkeys & G15_KEY_M2))
+-        keydown(MKEY_OFFSET+1);
+-    else if(!(currentkeys & G15_KEY_M2) && (lastkeys & G15_KEY_M2))
+-        keyup(MKEY_OFFSET+1);
+-
+-    if((currentkeys & G15_KEY_M3) && !(lastkeys & G15_KEY_M3))
+-        keydown(MKEY_OFFSET+2);
+-    else if(!(currentkeys & G15_KEY_M3) && (lastkeys & G15_KEY_M3))
+-        keyup(MKEY_OFFSET+2);
+-
+-    if((currentkeys & G15_KEY_MR) && !(lastkeys & G15_KEY_MR))
+-        keydown(MKEY_OFFSET+3);
+-    else if(!(currentkeys & G15_KEY_MR) && (lastkeys & G15_KEY_MR))
+-        keyup(MKEY_OFFSET+3);
+-    
+-    if(map_Lkeys){
+-        /* 'L' keys...  */
+-        if((currentkeys & G15_KEY_L1) && !(lastkeys & G15_KEY_L1))
+-            keydown(LKEY_OFFSET);
+-        else if(!(currentkeys & G15_KEY_L1) && (lastkeys & G15_KEY_L1))
+-            keyup(LKEY_OFFSET);
+-
+-        if((currentkeys & G15_KEY_L2) && !(lastkeys & G15_KEY_L2))
+-            keydown(LKEY_OFFSET+1);
+-        else if(!(currentkeys & G15_KEY_L2) && (lastkeys & G15_KEY_L2))
+-            keyup(LKEY_OFFSET+1);
+-
+-        if((currentkeys & G15_KEY_L3) && !(lastkeys & G15_KEY_L3))
+-            keydown(LKEY_OFFSET+2);
+-        else if(!(currentkeys & G15_KEY_L3) && (lastkeys & G15_KEY_L3))
+-            keyup(LKEY_OFFSET+2);
+-
+-        if((currentkeys & G15_KEY_L4) && !(lastkeys & G15_KEY_L4))
+-            keydown(LKEY_OFFSET+3);
+-        else if(!(currentkeys & G15_KEY_L4) && (lastkeys & G15_KEY_L4))
+-            keyup(LKEY_OFFSET+3);
+-
+-        if((currentkeys & G15_KEY_L5) && !(lastkeys & G15_KEY_L5))
+-            keydown(LKEY_OFFSET+4);
+-        else if(!(currentkeys & G15_KEY_L5) && (lastkeys & G15_KEY_L5))
+-            keyup(LKEY_OFFSET+4);
++    if(!(currentkeys & G15_KEY_LIGHT))
++	 {
++        /* 'G' keys */
++        if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
++            keydown(GKEY_OFFSET);
++        else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
++            keyup(GKEY_OFFSET);
++    
++        if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
++            keydown(GKEY_OFFSET+1);
++        else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
++            keyup(GKEY_OFFSET+1);
++    
++        if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
++            keydown(GKEY_OFFSET+2);
++        else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
++            keyup(GKEY_OFFSET+2);
++    
++        if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
++            keydown(GKEY_OFFSET+3);
++        else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
++            keyup(GKEY_OFFSET+3);
++    
++        if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
++            keydown(GKEY_OFFSET+4);
++        else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
++            keyup(GKEY_OFFSET+4);
++    
++        if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
++            keydown(GKEY_OFFSET+5);
++        else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
++            keyup(GKEY_OFFSET+5);
++    
++        if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
++            keydown(GKEY_OFFSET+6);
++        else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
++            keyup(GKEY_OFFSET+6);
++    
++        if((currentkeys & G15_KEY_G8) && !(lastkeys & G15_KEY_G8))
++            keydown(GKEY_OFFSET+7);
++        else if(!(currentkeys & G15_KEY_G8) && (lastkeys & G15_KEY_G8))
++            keyup(GKEY_OFFSET+7);
++    
++        if((currentkeys & G15_KEY_G9) && !(lastkeys & G15_KEY_G9))
++            keydown(GKEY_OFFSET+8);
++        else if(!(currentkeys & G15_KEY_G9) && (lastkeys & G15_KEY_G9))
++            keyup(GKEY_OFFSET+8);
++    
++        if((currentkeys & G15_KEY_G10) && !(lastkeys & G15_KEY_G10))
++            keydown(GKEY_OFFSET+9);
++        else if(!(currentkeys & G15_KEY_G10) && (lastkeys & G15_KEY_G10))
++            keyup(GKEY_OFFSET+9);
++    
++        if((currentkeys & G15_KEY_G11) && !(lastkeys & G15_KEY_G11))
++            keydown(GKEY_OFFSET+10);
++        else if(!(currentkeys & G15_KEY_G11) && (lastkeys & G15_KEY_G11))
++            keyup(GKEY_OFFSET+10);
++    
++        if((currentkeys & G15_KEY_G12) && !(lastkeys & G15_KEY_G12))
++            keydown(GKEY_OFFSET+11);
++        else if(!(currentkeys & G15_KEY_G12) && (lastkeys & G15_KEY_G12))
++            keyup(GKEY_OFFSET+11);
++    
++        if((currentkeys & G15_KEY_G13) && !(lastkeys & G15_KEY_G13))
++            keydown(GKEY_OFFSET+12);
++        else if(!(currentkeys & G15_KEY_G13) && (lastkeys & G15_KEY_G13))
++            keyup(GKEY_OFFSET+12);
++    
++        if((currentkeys & G15_KEY_G14) && !(lastkeys & G15_KEY_G14))
++            keydown(GKEY_OFFSET+13);
++        else if(!(currentkeys & G15_KEY_G14) && (lastkeys & G15_KEY_G14))
++            keyup(GKEY_OFFSET+13);
++    
++        if((currentkeys & G15_KEY_G15) && !(lastkeys & G15_KEY_G15))
++            keydown(GKEY_OFFSET+14);
++        else if(!(currentkeys & G15_KEY_G15) && (lastkeys & G15_KEY_G15))
++            keyup(GKEY_OFFSET+14);
++    
++        if((currentkeys & G15_KEY_G16) && !(lastkeys & G15_KEY_G16))
++            keydown(GKEY_OFFSET+15);
++        else if(!(currentkeys & G15_KEY_G16) && (lastkeys & G15_KEY_G16))
++            keyup(GKEY_OFFSET+15);
++    
++        if((currentkeys & G15_KEY_G17) && !(lastkeys & G15_KEY_G17))
++            keydown(GKEY_OFFSET+16);
++        else if(!(currentkeys & G15_KEY_G17) && (lastkeys & G15_KEY_G17))
++            keyup(GKEY_OFFSET+16);
++    
++        if((currentkeys & G15_KEY_G18) && !(lastkeys & G15_KEY_G18))
++            keydown(GKEY_OFFSET+17);
++        else if(!(currentkeys & G15_KEY_G18) && (lastkeys & G15_KEY_G18))
++            keyup(GKEY_OFFSET+17);
++    
++        /* 'M' keys */
++    
++        if((currentkeys & G15_KEY_M1) && !(lastkeys & G15_KEY_M1))
++            keydown(MKEY_OFFSET);
++        else if(!(currentkeys & G15_KEY_M1) && (lastkeys & G15_KEY_M1))
++            keyup(MKEY_OFFSET);
++    
++        if((currentkeys & G15_KEY_M2) && !(lastkeys & G15_KEY_M2))
++            keydown(MKEY_OFFSET+1);
++        else if(!(currentkeys & G15_KEY_M2) && (lastkeys & G15_KEY_M2))
++            keyup(MKEY_OFFSET+1);
++    
++        if((currentkeys & G15_KEY_M3) && !(lastkeys & G15_KEY_M3))
++            keydown(MKEY_OFFSET+2);
++        else if(!(currentkeys & G15_KEY_M3) && (lastkeys & G15_KEY_M3))
++            keyup(MKEY_OFFSET+2);
++    
++        if((currentkeys & G15_KEY_MR) && !(lastkeys & G15_KEY_MR))
++            keydown(MKEY_OFFSET+3);
++        else if(!(currentkeys & G15_KEY_MR) && (lastkeys & G15_KEY_MR))
++            keyup(MKEY_OFFSET+3);
++        
++        if(map_Lkeys){
++            /* 'L' keys...  */
++            if((currentkeys & G15_KEY_L1) && !(lastkeys & G15_KEY_L1))
++                keydown(LKEY_OFFSET);
++            else if(!(currentkeys & G15_KEY_L1) && (lastkeys & G15_KEY_L1))
++                keyup(LKEY_OFFSET);
++    
++            if((currentkeys & G15_KEY_L2) && !(lastkeys & G15_KEY_L2))
++                keydown(LKEY_OFFSET+1);
++            else if(!(currentkeys & G15_KEY_L2) && (lastkeys & G15_KEY_L2))
++                keyup(LKEY_OFFSET+1);
++    
++            if((currentkeys & G15_KEY_L3) && !(lastkeys & G15_KEY_L3))
++                keydown(LKEY_OFFSET+2);
++            else if(!(currentkeys & G15_KEY_L3) && (lastkeys & G15_KEY_L3))
++                keyup(LKEY_OFFSET+2);
++    
++            if((currentkeys & G15_KEY_L4) && !(lastkeys & G15_KEY_L4))
++                keydown(LKEY_OFFSET+3);
++            else if(!(currentkeys & G15_KEY_L4) && (lastkeys & G15_KEY_L4))
++                keyup(LKEY_OFFSET+3);
++    
++            if((currentkeys & G15_KEY_L5) && !(lastkeys & G15_KEY_L5))
++                keydown(LKEY_OFFSET+4);
++            else if(!(currentkeys & G15_KEY_L5) && (lastkeys & G15_KEY_L5))
++                keyup(LKEY_OFFSET+4);
++        }
+     }
++	 else
++	 {
++        // G15_KEY_LIGHT - Key modifier for Logitech G510 Media Keys implementation
++
++        // XF86AudioPlay
++        if((currentkeys & G15_KEY_G1) && !(lastkeys & G15_KEY_G1))
++            keydown(KEY_PLAYPAUSE);
++        else if(!(currentkeys & G15_KEY_G1) && (lastkeys & G15_KEY_G1))
++            keyup(KEY_PLAYPAUSE);
++
++        // XF86AudioStop
++        if((currentkeys & G15_KEY_G2) && !(lastkeys & G15_KEY_G2))
++            keydown(KEY_STOPCD);
++        else if(!(currentkeys & G15_KEY_G2) && (lastkeys & G15_KEY_G2))
++            keyup(KEY_STOPCD);
++
++        // XF86AudioPrev
++        if((currentkeys & G15_KEY_G3) && !(lastkeys & G15_KEY_G3))
++            keydown(KEY_PREVIOUSSONG);
++        else if(!(currentkeys & G15_KEY_G3) && (lastkeys & G15_KEY_G3))
++            keyup(KEY_PREVIOUSSONG);
++
++        // XF86AudioNext
++        if((currentkeys & G15_KEY_G4) && !(lastkeys & G15_KEY_G4))
++            keydown(KEY_NEXTSONG);
++        else if(!(currentkeys & G15_KEY_G4) && (lastkeys & G15_KEY_G4))
++            keyup(KEY_NEXTSONG);
++
++        // XF86AudioMute
++        if((currentkeys & G15_KEY_G5) && !(lastkeys & G15_KEY_G5))
++            keydown(KEY_MUTE);
++        else if(!(currentkeys & G15_KEY_G5) && (lastkeys & G15_KEY_G5))
++            keyup(KEY_MUTE);
++
++        // XF86AudioRaiseVolume
++        if((currentkeys & G15_KEY_G6) && !(lastkeys & G15_KEY_G6))
++            keydown(KEY_VOLUMEUP);
++        else if(!(currentkeys & G15_KEY_G6) && (lastkeys & G15_KEY_G6))
++            keyup(KEY_VOLUMEUP);
++
++        // XF86AudioLowerVolume
++        if((currentkeys & G15_KEY_G7) && !(lastkeys & G15_KEY_G7))
++            keydown(KEY_VOLUMEDOWN);
++        else if(!(currentkeys & G15_KEY_G7) && (lastkeys & G15_KEY_G7))
++            keyup(KEY_VOLUMEDOWN);
++	 }
+ }
+ 
+ 
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild
new file mode 100644
index 000000000000..40e3ade073b0
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild
@@ -0,0 +1,179 @@
+# 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-r6.ebuild,v 1.1 2012/10/12 20:22:20 robbat2 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=""
+IUSE="perl python static-libs"
+
+DEPEND="virtual/libusb:0
+	>=dev-libs/libg15-9999
+	>=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"
+	"${FILESDIR}/${P}-g510-keys.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-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild
new file mode 100644
index 000000000000..0bb8fafc6a9b
--- /dev/null
+++ b/app-misc/g15daemon/g15daemon-9999.ebuild
@@ -0,0 +1,191 @@
+# 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-9999.ebuild,v 1.1 2012/10/12 20:22:20 robbat2 Exp $
+
+EAPI=4
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+ESVN_PROJECT=${PN}/trunk
+ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${ESVN_PROJECT}/${PN}-wip"
+
+inherit eutils linux-info perl-module python base subversion autotools
+
+DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
+HOMEPAGE="http://g15daemon.sourceforge.net/"
+[[ ${PV} = *9999* ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="perl python static-libs"
+
+DEPEND="virtual/libusb:0
+	>=dev-libs/libg15-9999
+	>=dev-libs/libg15render-9999
+	perl? (
+		dev-lang/perl
+		dev-perl/GDGraph
+		>=dev-perl/Inline-0.4
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
+)
+# "${FILESDIR}/${PN}-1.9.5.3-forgotten-open-mode.patch"
+# "${FILESDIR}/${PN}-1.9.5.3-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() {
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+	else
+		unpack ${A}
+	fi
+	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 [[ ${PV} = *9999* ]]; then
+		subversion_wc_info
+	fi
+	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
+	if [[ ${PV} = *9999* ]]; then
+		eautoreconf
+	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
+}