update g15daemon ebuilds for latest usage

6 files changed, 18 insertions, 44 deletions

diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index 0f01743..150572e 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -1,38 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX 20g15daemon 173 SHA256 27be8c2dfa6b4b09203b783b64615947434087d405363141b62dd12bdb17bad6 SHA512 daee2c432860dd3147209724417cbf04ec1ed0c8e882900900722420cbe67d88f32efc81422e04221e54796b66d69e050135b72a96baf40137da58023202d3ca WHIRLPOOL 5ad5f7fd2b4da69d64ba90d5334d8cbe5d8e8fdcc66ff4fa862cb8636a95337a9104a97dfabbd84a4b78710def245a2789a5d18d819ac6428c5413893e429646
-AUX 99-g15daemon.rules 90 SHA256 dab916b3cb839bb55f4b6f599f83de2c4dbdd87005394f737dc59ab4df7d4e84 SHA512 f3ff958bb4e0344b600328fcab86674ce14d852287ec2e083751d0eb855a0591aa17fdae767de4517bcd8a1fa542ab9b559ee79fe284207d2872b8901f2c77f7 WHIRLPOOL 68345a96a004a0a6e1a4aa93f5f91581e210621b9e4b3c2e42de12c57dbd112de6a698ea08b2bab00392d953031fe1765c2b959e42780f5c963e4593708d52e5
-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-1.9.5.3.initd 1051 SHA256 7f11b0d8686953dae10abf07d0aeda1e52f97b818c370d36d2f6fb31b2663869 SHA512 616558c9d127b8e4af23a8bb590d0a1233ec8643014b9b00df33ac40f193d1bef802765a060e62b3517977efece7aba9947a74077c236f190cd7377109b1e183 WHIRLPOOL 86015624169103e424c51730513ef38feb0edd460fffc00849ce2a4e020b3394586614a32a7d6e8784ee7a9199c84262552c876e9b7d3f59e5a2df04080b716b
-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
-EBUILD g15daemon-1.9.5.3-r7.ebuild 4160 SHA256 8533bc7ab783f105e858c983a6cab5d57c718f5077d84c3bab581393130f4e7b SHA512 3f49cfec47537b5655751bcd853c08274c842d9823d20911ab2560ecda5ba1da8021b22a63528249ae00b0c186a177ff86bc589e8e51b98823bd96f07bff0d33 WHIRLPOOL b7bddbd5de189dd6f9123b34cb25cb2090f2e6817e454a93e038c6392bf3cc677a8e8407f5d0993bb43419d544d3eac07d01defe594e6589ac925ebe022d683b
-EBUILD g15daemon-1.9.5.3-r8.ebuild 4186 SHA256 12cc69e35cca34967a706a6b8b84cbb2f824721364fb072d28db194b1ce72289 SHA512 3ccd32dcd72c1776f08e08ab70ba02f7185c106d8dc50845b0bf559f6951ed7388acc46323aea4c84352db9119543bc6325be71783e29bf18a01934f021c7f35 WHIRLPOOL da86c9b5f4f824f3857800e2a5b6cd8a60530ed6499c4e3361ea0eec1b39576a6eaba718320422cd3aecae59b3c7afb738ea2c979c631bb763faa7223e394df2
-EBUILD g15daemon-9999.ebuild 4535 SHA256 8238c3e310972fbe317360ee4bf9739759bf065c65e8ead6778590e543d5f958 SHA512 d46c03e40cdeabdb8166dfddc8871f2073d5720a853c784a221356c2a5e78e0d61625c4df6ea609fb0bf5d84b3040f25b77029f5fdd950f81c9f31d21473913e WHIRLPOOL 6422fcc181a527f964cf2e9d2971e964ef34c333a242afebbbfea49ccedeab5b1c4534b8aa3d5796eb712ab1e1ecec4a3699c2748f622fe4551cbacf7be419a2
-MISC ChangeLog 9814 SHA256 75209dd53116a177c5f12946f6e867089d627765fce713f9600bf3be1aa5593d SHA512 59a494b78b35416e4ba6282faee4138d22a7817a3e66c1b57388c11df28758d7a7b0b09935257701f4f4f1ac0c4c9c6d55aa37582d8b09696bf0c21c6cd71e27 WHIRLPOOL f0e8b5bb38276402605e3f27c74f602182057c87934498214242a27d28788d9cc98c7be05d677d3f61e367d9fffa1c6a0e5f6d2dd97072e88edc21d7afb9296f
-MISC metadata.xml 204 SHA256 f3aeb60df346d19b4d43cea2b2916d51674d99dabfce252723548687909cbd6b SHA512 f97ac61dcf6e780d89337c14c3cebae1af93a1246bf521bbec4f008ae43324dd6f3869cd5aec03e4ddde5220b57a9decaa6612dbae880d21a9c59267635e688f WHIRLPOOL aa295b44397d48d7d0ff8917d1812d73389288c4e6fa9d226bbdfc108ffe386cf83d67bfc019428fd28b119fb73cc185df80d377a55399cfadd61acc3853edc3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSAkqbAAoJELp701BxlEWfL9wQAL304tU681pH3PJSwpksJP1q
-QYqK2PFmbDnW1HCIBvJMKhVqPc6FVFQuZ9fIxLm2IrkOvrTsjEpUJduwe3zzNLLL
-tJ5YMzuTTVt2a7H7ct3GRKs5L7Sm5ddS703R/qIs9cO/NWJ/qtsKAJjgXxrRoTwR
-m8yxXMB0AMvFOlJ71N4FddOxJbGS3FsBF2FPMcLM/9fYb8zT7+oARkw7oTDcNxs1
-5Scg/unRK6deCZLdWUW4k28doBLBxZb8eJUfQVfuCLAoZBavyj9uOMcepr8ca8r3
-p8ePkNmF4ja93ytew61J+Uhc/O0mKyIzlu2DGXh+9l6dYjOIz8FCFfYY3PqHqRQu
-B2DFAeXXthSZMQEpJe4qiaksbj8ofCI2p/RB2feYuWVU2ROZzzTnPaKbERDxDJQi
-Ltf7JGb82EzbFeNo79u6AmxdDlrCgOP4OuAB6MDXiC/RUY9cEH78Pj5i2QYyARwo
-PkfvEqmUs5vCHZ1ePO4qr7ykCv35PMAO1Y/aLsqW0Beqd0FJ8Rq107YmKvVS/0Qk
-7GY762355lv+4vH4UZXE6vQPmdRCzKfe+0znpoqN7sCM0FhF08ibfImzj8m4dYzl
-X8kp/4LqHjGeS1A79egmbayy8Yomwa1TcdzUNVmOi79vNU9q9wgneutJrnVYN2yD
-4YUYbSckdQ37St6cYfoJ
-=WIyG
------END PGP SIGNATURE-----
diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3.confd b/app-misc/g15daemon/files/g15daemon-1.9.5.3.confd
new file mode 100644
index 0000000..14c062e
--- /dev/null
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3.confd
@@ -0,0 +1,8 @@
+# /etc/conf.d/g15daemon: Configuration for the g15daemon
+
+# Key to switch the client-screens. Default is the L1 key,
+# Set to "yes" to use macro record (MR) key instead.
+CLIENT_SWITCH_MR="no"
+
+# Set to "yes" to switch off the lcd backlight when stopping g15daemon.
+BACKLIGHT_OFF="no"
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 7976cff..d9907ed 100644
--- a/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd
+++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3.initd
@@ -25,9 +25,9 @@ start_pre() {
 			/sbin/modprobe uinput > /dev/null 2> /dev/null
 		fi
 	fi
-
-	local SWITCHKEY=""
-	[ "${CLIENT_SWITCH_L1}" = "yes" ] && command_args="--switch"
+	if [ "${CLIENT_SWITCH_MR}" = "yes" ]; then
+		command_args="-s"
+	fi
 }
 
 stop() {
@@ -36,6 +36,9 @@ stop() {
 	if [ $BACKLIGHT_OFF = "yes" ]; then
 		KILLOPT="-K"
 	fi
-	start-stop-daemon -R 5 --exec ${command} -- ${KILLOPT}
+	local PID=$(cat $pidfile)
+	while [ -e "/proc/$PID" ]; do
+		start-stop-daemon --exec ${command} -- ${KILLOPT}
+	done
 	eend $?
 }
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild
index 860bbb5..2495a12 100644
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild
@@ -114,7 +114,7 @@ src_install() {
 		doins contrib/testbindings.pl
 	fi
 
-	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+	newconfd "${FILESDIR}/${PN}-1.9.5.3.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
 	dobin "${FILESDIR}/g15daemon-hotplug"
 	insinto /lib/udev/rules.d
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r8.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r8.ebuild
index dbf1343..6ba6027 100644
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r8.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r8.ebuild
@@ -116,7 +116,7 @@ src_install() {
 		doins contrib/testbindings.pl
 	fi
 
-	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+	newconfd "${FILESDIR}/${PN}-1.9.5.3.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
 	dobin "${FILESDIR}/g15daemon-hotplug"
 	insinto /lib/udev/rules.d
diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild
index 3169fcf..427e8a2 100644
--- a/app-misc/g15daemon/g15daemon-9999.ebuild
+++ b/app-misc/g15daemon/g15daemon-9999.ebuild
@@ -128,7 +128,7 @@ src_install() {
 		doins contrib/testbindings.pl
 	fi
 
-	newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
+	newconfd "${FILESDIR}/${PN}-1.9.5.3.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
 	dobin "${FILESDIR}/g15daemon-hotplug"
 	insinto /lib/udev/rules.d