[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/files/
commit: 8b4d35a220a2ba16810fb5a177689a6c41899978 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon May 16 06:15:44 2022 + Commit: Sam James gentoo org> CommitDate: Thu May 19 02:12:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4d35a2 app-misc/g15daemon: remove unused patch Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/25511 Signed-off-by: Sam James gentoo.org> .../files/g15daemon-1.9.5.3-g510-keys.patch| 339 - 1 file changed, 339 deletions(-) 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 deleted file mode 100644 index a53001f1932d.. --- a/app-misc/g15daemon/files/g15daemon-1.9.5.3-g510-keys.patch +++ /dev/null @@ -1,339 +0,0 @@ -From https://sourceforge.net/tracker/?func=detail=3152167_id=167869=844658 - g15daemon-wip/plugins/g15_plugin_uinput.c -+++ g15daemon-wip/plugins/g15_plugin_uinput.c -@@ -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); -- --
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: c32871887d55283d057716665337417fbe6c697e Author: Lars Wendler gentoo org> AuthorDate: Sun May 15 18:38:15 2022 + Commit: Lars Wendler gentoo org> CommitDate: Sun May 15 18:42:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3287188 app-misc/g15daemon: Revbump to introduce sub-slot for libg15daemon_client.so Signed-off-by: Lars Wendler gentoo.org> .../g15daemon/{g15daemon-3.0.4.ebuild => g15daemon-3.0.4-r1.ebuild}| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-misc/g15daemon/g15daemon-3.0.4.ebuild b/app-misc/g15daemon/g15daemon-3.0.4-r1.ebuild similarity index 98% rename from app-misc/g15daemon/g15daemon-3.0.4.ebuild rename to app-misc/g15daemon/g15daemon-3.0.4-r1.ebuild index 991e249327e9..660ce78c17cd 100644 --- a/app-misc/g15daemon/g15daemon-3.0.4.ebuild +++ b/app-misc/g15daemon/g15daemon-3.0.4-r1.ebuild @@ -16,7 +16,8 @@ else fi LICENSE="GPL-2" -SLOT="0" +# Subslot = libg15daemon_client.so major version +SLOT="0/3" IUSE="perl static-libs" # Has no "test" target in Makefile
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 16b624ae78d8343916955cb2d30ddf851c1f Author: Lars Wendler gentoo org> AuthorDate: Sun May 15 18:39:34 2022 + Commit: Lars Wendler gentoo org> CommitDate: Sun May 15 18:42:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b624ae app-misc/g15daemon: Synced live ebuild Signed-off-by: Lars Wendler gentoo.org> app-misc/g15daemon/g15daemon-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-misc/g15daemon/g15daemon-.ebuild b/app-misc/g15daemon/g15daemon-.ebuild index 0d8e30618ef2..0e442d9fbcdc 100644 --- a/app-misc/g15daemon/g15daemon-.ebuild +++ b/app-misc/g15daemon/g15daemon-.ebuild @@ -16,7 +16,8 @@ else fi LICENSE="GPL-2" -SLOT="0" +# Subslot = libg15daemon_client.so major version +SLOT="0/3" IUSE="perl static-libs" # Has no "test" target in Makefile
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: a408da145fd50df02054ca80583b5417e477a112 Author: Lars Wendler gentoo org> AuthorDate: Sat May 14 16:36:37 2022 + Commit: Lars Wendler gentoo org> CommitDate: Sat May 14 22:56:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a408da14 app-misc/g15daemon: Bump to version 3.0.4 Signed-off-by: Lars Wendler gentoo.org> app-misc/g15daemon/Manifest | 1 + app-misc/g15daemon/g15daemon-3.0.4.ebuild | 157 ++ 2 files changed, 158 insertions(+) diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest index 7a3f74981600..876c54484337 100644 --- a/app-misc/g15daemon/Manifest +++ b/app-misc/g15daemon/Manifest @@ -1 +1,2 @@ DIST g15daemon-1.9.5.3.tar.gz 414603 BLAKE2B 4f683bab47f6cbde3a028b306c1999ea4fcb84c0c05160a17374be93f953d21588f332e8fbf040c607545c31ee09e30b56b1068db95a801472c9d72ee9fe8e43 SHA512 7a1770d08d1d4155866bba3b676d33bf943363f4519af41a13ab6ec73cc5d6c536b173977b3e3583b594b149b7f01ffbc51123a4678c2a249a51ff0b42c8b69a +DIST g15daemon-3.0.4.tar.bz2 372553 BLAKE2B 008cf2eda9e8cbc45a2fd2eef938438be73236f2bffbbc47bdce66f04d6860705572270994df09bc1d7c2c02dc75ca347199e02dc7aa9f71134985cff284c7c8 SHA512 4adbb11ca8128bbaff5ad1dee17ddcfcdfca589f7e8a1a264127dd9d5aec39e07e4986a4b78f4199fb7f3e12979fd8d50a851b047b6cb8cfa13410aa59df062a diff --git a/app-misc/g15daemon/g15daemon-3.0.4.ebuild b/app-misc/g15daemon/g15daemon-3.0.4.ebuild new file mode 100644 index ..991e249327e9 --- /dev/null +++ b/app-misc/g15daemon/g15daemon-3.0.4.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev + +DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" +HOMEPAGE="https://gitlab.com/menelkir/g15daemon; +if [[ ${PV} == ** ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/menelkir/g15daemon.git; +else + SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2; + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="perl static-libs" + +# Has no "test" target in Makefile +RESTRICT="test" + +DEPEND="virtual/libusb:0 + >=dev-libs/libg15-3.0 + >=dev-libs/libg15render-3.0 + perl? ( + dev-lang/perl + dev-perl/GDGraph + >=dev-perl/Inline-0.4 + )" +RDEPEND="${DEPEND}" + +uinput_check() { + ebegin "Checking for uinput support" + local rc=1 + linux_config_exists && linux_chkconfig_present INPUT_UINPUT + rc=$? + eend ${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() { + export CC="$(tc-getCC)" #729294 + + linux-info_pkg_setup + uinput_check +} + +src_unpack() { + if [[ ${PV} == ** ]] ; then + git-r3_src_unpack + else + default + fi + + if use perl ; then + unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz" + fi +} + +src_prepare() { + if use perl ; then + perl-module_src_prepare + sed -i \ + -e '1i#!/usr/bin/perl' \ + "${S}"/contrib/testbindings.pl || die + else + # perl-module_src_prepare always calls base_src_prepare + default + fi + eautoreconf +} + +src_configure() { + append-cflags -fcommon #706712 + + econf $(use_enable static-libs static) + + if use perl ; then + cd "${WORKDIR}/G15Daemon-0.2" || die + perl-module_src_configure + fi +} + +src_compile() { + default + + if use perl ; then + cd "${WORKDIR}/G15Daemon-0.2" || die + perl-module_src_compile + fi +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die + + # remove odd docs installed my make + rm "${ED}"/usr/share/doc/${PF}/README.usage || die + + insinto /usr/share/${PN}/contrib + doins contrib/xmodmaprc{,-alternative} + 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.9.5.3.initd" ${PN} + systemd_dounit
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 23d270d7102a5e7d7ac028a6a7414ef23bda0a55 Author: Lars Wendler gentoo org> AuthorDate: Sat May 14 16:34:21 2022 + Commit: Lars Wendler gentoo org> CommitDate: Sat May 14 22:56:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d270d7 app-misc/g15daemon: Updated live ebuild - new upstream - switch from svn to git - bump to EAPI-8 Signed-off-by: Lars Wendler gentoo.org> app-misc/g15daemon/g15daemon-.ebuild | 49 ++-- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/app-misc/g15daemon/g15daemon-.ebuild b/app-misc/g15daemon/g15daemon-.ebuild index 701a835b318c..0d8e30618ef2 100644 --- a/app-misc/g15daemon/g15daemon-.ebuild +++ b/app-misc/g15daemon/g15daemon-.ebuild @@ -1,26 +1,30 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -GENTOO_DEPEND_ON_PERL="no" -ESVN_PROJECT=${PN}/trunk -ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk/${PN}-wip; - -inherit autotools flag-o-matic linux-info perl-module subversion systemd toolchain-funcs udev +inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" -HOMEPAGE="https://sourceforge.net/projects/g15daemon/; -[[ ${PV} = ** ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://gitlab.com/menelkir/g15daemon; +if [[ ${PV} == ** ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/menelkir/g15daemon.git; +else + SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2; + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="perl static-libs" +# Has no "test" target in Makefile +RESTRICT="test" + DEPEND="virtual/libusb:0 - >=dev-libs/libg15- - >=dev-libs/libg15render- + >=dev-libs/libg15-3.0 + >=dev-libs/libg15render-3.0 perl? ( dev-lang/perl dev-perl/GDGraph @@ -28,12 +32,6 @@ DEPEND="virtual/libusb:0 )" RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch" - "${FILESDIR}/${PN}-1.9.5.3-docdir.patch" - "${FILESDIR}/${PN}-1.9.5.3-avoid_bashisms.patch" -) - uinput_check() { ebegin "Checking for uinput support" local rc=1 @@ -60,20 +58,18 @@ pkg_setup() { } src_unpack() { - if [[ ${PV} = ** ]] ; then - subversion_src_unpack + if [[ ${PV} == ** ]] ; then + git-r3_src_unpack else - unpack ${A} + default fi + if use perl ; then unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz" fi } src_prepare() { - if [[ ${PV} = ** ]] ; then - subversion_wc_info - fi if use perl ; then perl-module_src_prepare sed -i \ @@ -83,10 +79,7 @@ src_prepare() { # perl-module_src_prepare always calls base_src_prepare default fi - if [[ ${PV} = ** ]] ; then - mv configure.{in,ac} || die - eautoreconf - fi + eautoreconf } src_configure() { @@ -118,7 +111,7 @@ src_install() { rm "${ED}"/usr/share/doc/${PF}/README.usage || die insinto /usr/share/${PN}/contrib - doins contrib/xmodmaprc + doins contrib/Xmodmap{,-alternative} doins contrib/xmodmap.sh if use perl ; then doins contrib/testbindings.pl
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 4081f99f3678415a0da3c5a081fbec6ca9d336cb Author: Lars Wendler gentoo org> AuthorDate: Sat May 14 16:31:52 2022 + Commit: Lars Wendler gentoo org> CommitDate: Sat May 14 22:56:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4081f99f app-misc/g15daemon: Call udev_reload in pkg_postinst() Closes: https://bugs.gentoo.org/844139 Signed-off-by: Lars Wendler gentoo.org> app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild | 2 ++ app-misc/g15daemon/g15daemon-.ebuild| 2 ++ 2 files changed, 4 insertions(+) diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild index abd8cf26fdb9..1b4f7766b82e 100644 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild @@ -136,6 +136,8 @@ src_install() { } pkg_postinst() { + udev_reload + 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" diff --git a/app-misc/g15daemon/g15daemon-.ebuild b/app-misc/g15daemon/g15daemon-.ebuild index 472d44a00535..701a835b318c 100644 --- a/app-misc/g15daemon/g15daemon-.ebuild +++ b/app-misc/g15daemon/g15daemon-.ebuild @@ -146,6 +146,8 @@ src_install() { } pkg_postinst() { + udev_reload + 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"
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 2cfbc2cea1a09d90578b8950cbeac6121ad7dd3e Author: Lars Wendler gentoo org> AuthorDate: Sat May 14 16:30:43 2022 + Commit: Lars Wendler gentoo org> CommitDate: Sat May 14 22:56:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cfbc2ce app-misc/g15daemon: Removed old Signed-off-by: Lars Wendler gentoo.org> app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild | 151 1 file changed, 151 deletions(-) diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild deleted file mode 100644 index fcec05306914.. --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL="no" - -inherit autotools flag-o-matic linux-info perl-module toolchain-funcs udev - -DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" -HOMEPAGE="https://sourceforge.net/projects/g15daemon/; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="perl static-libs" - -DEPEND="virtual/libusb:0 - >=dev-libs/libg15-1.2.4 - >=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}-docdir.patch" - "${FILESDIR}/${P}-avoid_bashisms.patch" -) - -uinput_check() { - ebegin "Checking for uinput support" - local rc=1 - linux_config_exists && linux_chkconfig_present INPUT_UINPUT - rc=$? - eend ${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() { - export CC="$(tc-getCC)" #729294 - - 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 -} - -src_prepare() { - if use perl ; then - perl-module_src_prepare - sed -i \ - -e '1i#!/usr/bin/perl' \ - "${S}"/contrib/testbindings.pl || die - else - # perl-module_src_prepare always calls base_src_prepare - default - fi - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - append-cflags -fcommon #706712 - - econf $(use_enable static-libs static) - - if use perl ; then - cd "${WORKDIR}/G15Daemon-0.2" || die - perl-module_src_configure - fi -} - -src_compile() { - default - - if use perl ; then - cd "${WORKDIR}/G15Daemon-0.2" || die - perl-module_src_compile - fi -} - -src_install() { - default - - find "${ED}" -type f -name '*.la' -delete || die - - # remove odd docs installed my make - rm "${ED}"/usr/share/doc/${PF}/README.usage || die - - 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.9.5.3.initd" ${PN} - dobin "${FILESDIR}/g15daemon-hotplug" - udev_dorules "${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 - einfo "Installing Perl Bindings (G15Daemon.pm)" - cd "${WORKDIR}/G15Daemon-0.2" || die - docinto perl - perl-module_src_install - fi -} - -pkg_postinst() { - 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
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 05bbb798e8ac3c353a9677525a8aaddf7e936b22 Author: Thomas Bracht Laumann Jespersen laumann xyz> AuthorDate: Fri Apr 29 09:24:34 2022 + Commit: Sam James gentoo org> CommitDate: Fri May 13 20:03:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05bbb798 app-misc/g15daemon: [QA] properly close ebegin with eend Each ebuild had two instances of ebegin w/o a closing eend. In one case, just add the missing eend, there's an error code can be used. In the other case, change the ebegin to einfo. Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz> Closes: https://github.com/gentoo/gentoo/pull/25254 Signed-off-by: Sam James gentoo.org> app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild | 5 +++-- app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild | 5 +++-- app-misc/g15daemon/g15daemon-.ebuild| 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild index 407950bcbb25..fcec05306914 100644 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -38,6 +38,7 @@ uinput_check() { local rc=1 linux_config_exists && linux_chkconfig_present INPUT_UINPUT rc=$? + eend ${rc} if [[ ${rc} -ne 0 ]] ; then eerror "To use g15daemon, you need to compile your kernel with uinput support." @@ -126,7 +127,7 @@ src_install() { doexe "${FILESDIR}"/20g15daemon if use perl ; then - ebegin "Installing Perl Bindings (G15Daemon.pm)" + einfo "Installing Perl Bindings (G15Daemon.pm)" cd "${WORKDIR}/G15Daemon-0.2" || die docinto perl perl-module_src_install diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild index 2042898ab06a..abd8cf26fdb9 100644 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -38,6 +38,7 @@ uinput_check() { local rc=1 linux_config_exists && linux_chkconfig_present INPUT_UINPUT rc=$? + eend ${rc} if [[ ${rc} -ne 0 ]] ; then eerror "To use g15daemon, you need to compile your kernel with uinput support." @@ -127,7 +128,7 @@ src_install() { doexe "${FILESDIR}"/20g15daemon if use perl ; then - ebegin "Installing Perl Bindings (G15Daemon.pm)" + einfo "Installing Perl Bindings (G15Daemon.pm)" cd "${WORKDIR}/G15Daemon-0.2" || die docinto perl perl-module_src_install diff --git a/app-misc/g15daemon/g15daemon-.ebuild b/app-misc/g15daemon/g15daemon-.ebuild index 71c34ecf83b2..472d44a00535 100644 --- a/app-misc/g15daemon/g15daemon-.ebuild +++ b/app-misc/g15daemon/g15daemon-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -39,6 +39,7 @@ uinput_check() { local rc=1 linux_config_exists && linux_chkconfig_present INPUT_UINPUT rc=$? + eend ${rc} if [[ ${rc} -ne 0 ]] ; then eerror "To use g15daemon, you need to compile your kernel with uinput support." @@ -137,7 +138,7 @@ src_install() { doexe "${FILESDIR}"/20g15daemon if use perl ; then - ebegin "Installing Perl Bindings (G15Daemon.pm)" + einfo "Installing Perl Bindings (G15Daemon.pm)" cd "${WORKDIR}/G15Daemon-0.2" || die docinto perl perl-module_src_install
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 6001442e6a824e0170d1fe50fb08b80e8d41e614 Author: Lars Wendler gentoo org> AuthorDate: Wed Apr 7 11:40:44 2021 + Commit: Lars Wendler gentoo org> CommitDate: Wed Apr 7 11:40:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6001442e app-misc/g15daemon: Removed unkeyworded ebuild No way for me to test this due to lack of g510 hardware. Closes: https://bugs.gentoo.org/587008 Signed-off-by: Lars Wendler gentoo.org> app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild | 152 1 file changed, 152 deletions(-) diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild deleted file mode 100644 index 5e6b82ace42..000 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL="no" - -inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev - -DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" -HOMEPAGE="https://sourceforge.net/projects/g15daemon/; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="perl static-libs" - -DEPEND="virtual/libusb:0 - >=dev-libs/libg15- - >=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" - "${FILESDIR}/${P}-docdir.patch" - "${FILESDIR}/${P}-avoid_bashisms.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() { - export CC="$(tc-getCC)" #729294 - - 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 -} - -src_prepare() { - if use perl ; then - perl-module_src_prepare - sed -i \ - -e '1i#!/usr/bin/perl' \ - "${S}"/contrib/testbindings.pl || die - else - # perl-module_src_prepare always calls base_src_prepare - default - fi - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - append-cflags -fcommon #706712 - - econf $(use_enable static-libs static) - - if use perl ; then - cd "${WORKDIR}/G15Daemon-0.2" || die - perl-module_src_configure - fi -} - -src_compile() { - default - - if use perl ; then - cd "${WORKDIR}/G15Daemon-0.2" || die - perl-module_src_compile - fi -} - -src_install() { - default - - find "${ED}" -type f -name '*.la' -delete || die - - # remove odd docs installed my make - rm "${ED}"/usr/share/doc/${PF}/README.usage || die - - 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.9.5.3.initd" ${PN} - systemd_dounit "${FILESDIR}/${PN}.service" - dobin "${FILESDIR}/g15daemon-hotplug" - udev_dorules "${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" || die - docinto perl - perl-module_src_install - fi -} - -pkg_postinst() { - 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
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/files/, app-misc/g15daemon/
commit: 39820c0d0041648f1cf5714ee4402f20e9ac16d8 Author: Marek Szuba gentoo org> AuthorDate: Wed Sep 9 17:44:57 2020 + Commit: Lars Wendler gentoo org> CommitDate: Thu Sep 10 05:33:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39820c0d app-misc/g15daemon: add systemd unit This is what I have had running on my system for almost 10 years now. Closes: https://bugs.gentoo.org/741458 Signed-off-by: Marek Szuba gentoo.org> Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Lars Wendler gentoo.org> app-misc/g15daemon/files/g15daemon.service| 11 +++ ...daemon-1.9.5.3-r21.ebuild => g15daemon-1.9.5.3-r15.ebuild} | 8 app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild | 3 ++- app-misc/g15daemon/g15daemon-.ebuild | 3 ++- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app-misc/g15daemon/files/g15daemon.service b/app-misc/g15daemon/files/g15daemon.service new file mode 100644 index 000..668b8ba13a8 --- /dev/null +++ b/app-misc/g15daemon/files/g15daemon.service @@ -0,0 +1,11 @@ +[Unit] +Description=Logitech G15 extra-key and LCD manager + +[Service] +Type=forking +PIDFile=/run/g15daemon.pid +ExecStart=/usr/sbin/g15daemon +ExecStop=/usr/sbin/g15daemon -k + +[Install] +WantedBy=multi-user.target diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild similarity index 95% copy from app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild copy to app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild index 7955e66c251..2042898ab06 100644 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild @@ -5,7 +5,7 @@ EAPI=7 GENTOO_DEPEND_ON_PERL="no" -inherit autotools flag-o-matic linux-info perl-module toolchain-funcs udev +inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" HOMEPAGE="https://sourceforge.net/projects/g15daemon/; @@ -13,11 +13,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="perl static-libs" DEPEND="virtual/libusb:0 - >=dev-libs/libg15- + >=dev-libs/libg15-1.2.4 >=dev-libs/libg15render-1.2 perl? ( dev-lang/perl @@ -29,7 +29,6 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-forgotten-open-mode.patch" "${FILESDIR}/${P}-overflow-fix.patch" - "${FILESDIR}/${P}-g510-keys.patch" "${FILESDIR}/${P}-docdir.patch" "${FILESDIR}/${P}-avoid_bashisms.patch" ) @@ -116,6 +115,7 @@ src_install() { newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN} newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN} + systemd_dounit "${FILESDIR}/${PN}.service" dobin "${FILESDIR}/g15daemon-hotplug" udev_dorules "${FILESDIR}/99-g15daemon.rules" diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild index 7955e66c251..5e6b82ace42 100644 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild @@ -5,7 +5,7 @@ EAPI=7 GENTOO_DEPEND_ON_PERL="no" -inherit autotools flag-o-matic linux-info perl-module toolchain-funcs udev +inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" HOMEPAGE="https://sourceforge.net/projects/g15daemon/; @@ -116,6 +116,7 @@ src_install() { newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN} newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN} + systemd_dounit "${FILESDIR}/${PN}.service" dobin "${FILESDIR}/g15daemon-hotplug" udev_dorules "${FILESDIR}/99-g15daemon.rules" diff --git a/app-misc/g15daemon/g15daemon-.ebuild b/app-misc/g15daemon/g15daemon-.ebuild index 23fb3430ee4..71c34ecf83b 100644 --- a/app-misc/g15daemon/g15daemon-.ebuild +++ b/app-misc/g15daemon/g15daemon-.ebuild @@ -7,7 +7,7 @@ GENTOO_DEPEND_ON_PERL="no" ESVN_PROJECT=${PN}/trunk ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk/${PN}-wip; -inherit autotools flag-o-matic linux-info perl-module subversion toolchain-funcs udev +inherit autotools flag-o-matic linux-info perl-module subversion systemd toolchain-funcs udev DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" HOMEPAGE="https://sourceforge.net/projects/g15daemon/; @@ -125,6 +125,7 @@ src_install() { newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN} newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN} + systemd_dounit "${FILESDIR}/${PN}.service" dobin "${FILESDIR}/g15daemon-hotplug" udev_dorules
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/, app-misc/g15daemon/files/
commit: 32f13dc9e4d6a8643ef98cc5f4fb6b45532dd7fd Author: Lars Wendler gentoo org> AuthorDate: Wed Sep 9 11:12:50 2020 + Commit: Lars Wendler gentoo org> CommitDate: Wed Sep 9 12:29:21 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f13dc9 app-misc/g15daemon: Revbumps / ebuild overhauls - EAPI-7 bump - Added workaround for successful build with gcc-10 (#706712) - Fixed default config (#481454) - Fixed docdir - Attempt to fix direct call of CC (#729294) - Removed bashisms from configure Bug: https://bugs.gentoo.org/729294 Bug: https://bugs.gentoo.org/741382 Closes: https://bugs.gentoo.org/481454 Closes: https://bugs.gentoo.org/706712 Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Lars Wendler gentoo.org> app-misc/g15daemon/files/g15daemon-1.2.7.confd | 2 +- .../files/g15daemon-1.9.5.3-avoid_bashisms.patch | 20 .../g15daemon/files/g15daemon-1.9.5.3-docdir.patch | 11 + .../g15daemon-1.9.5.3-forgotten-open-mode.patch| 4 +- .../files/g15daemon-1.9.5.3-g510-keys.patch| 5 +- .../files/g15daemon-1.9.5.3-overflow-fix.patch | 4 +- ...5.3-r13.ebuild => g15daemon-1.9.5.3-r14.ebuild} | 48 ++- app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild| 47 ++- app-misc/g15daemon/g15daemon-.ebuild | 54 +++--- 9 files changed, 119 insertions(+), 76 deletions(-) diff --git a/app-misc/g15daemon/files/g15daemon-1.2.7.confd b/app-misc/g15daemon/files/g15daemon-1.2.7.confd index 08ea97f4976..5ce5392b93b 100644 --- a/app-misc/g15daemon/files/g15daemon-1.2.7.confd +++ b/app-misc/g15daemon/files/g15daemon-1.2.7.confd @@ -2,7 +2,7 @@ # 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" +CLIENT_SWITCH_L1="yes" # 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-avoid_bashisms.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-avoid_bashisms.patch new file mode 100644 index 000..194d68eefee --- /dev/null +++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-avoid_bashisms.patch @@ -0,0 +1,20 @@ +--- g15daemon-1.9.5.3/configure.in g15daemon-1.9.5.3/configure.in +@@ -53,7 +53,7 @@ + AC_ARG_ENABLE([--disable-uinput],[ --disable-uinput do not build linux uinput plugin (default: autodetect)]) + + if test "x$enable_uinput" != "xno"; then +- if test "x$have_linux_uinput_h" == "xyes"; then ++ if test "x$have_linux_uinput_h" = "xyes"; then + #if HAVE_LINUX_UINPUT_H + dnl check for uinput.h version 2.4 or 2.6 ? + AC_CHECK_MEMBER([struct uinput_user_dev.id], +@@ -110,7 +110,7 @@ + AM_CONDITIONAL(UINPUT_INTERFACE_PLUGIN, [test x$uinput = xtrue]) + + dnl Some versions of libusb do not honour timeout and block. Suns' version is one of them. +-if test "x$libusb_blocks" == "xtrue"; then ++if test "x$libusb_blocks" = "xtrue"; then + AC_DEFINE([LIBUSB_BLOCKS], [1],[Define if libusb implementation blocks on read or write]) + fi + diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-docdir.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-docdir.patch new file mode 100644 index 000..9c76e4cbc6a --- /dev/null +++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-docdir.patch @@ -0,0 +1,11 @@ +--- g15daemon-1.9.5.3/Makefile.am g15daemon-1.9.5.3/Makefile.am +@@ -5,7 +5,7 @@ + + EXTRA_DIST = debian contrib Documentation lang-bindings patches rpm README.usage FAQ LICENSE images README.Linux README.FreeBSD README.Solaris + +-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) ++docdir = @docdir@ + doc_DATA = FAQ README.usage README ChangeLog TODO AUTHORS NEWS LICENSE README.Linux README.FreeBSD README.Solaris + + man1_MANS = $(top_srcdir)/Documentation/g15daemon.1 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 index b475f1d58d6..d4a5381992e 100644 --- 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 @@ -1,5 +1,5 @@ ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c 2008-01-26 06:02:07.0 +0100 -+++ ./g15daemon-1.9.5.3/g15daemon/utility_funcs.c 2009-02-01 17:00:55.203009264 +0100 +--- g15daemon-1.9.5.3/g15daemon/utility_funcs.c g15daemon-1.9.5.3/g15daemon/utility_funcs.c @@ -356,7 +356,7 @@ config_items_t * item=NULL; char line[1024]; 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 index e0083676679..a53001f1932 100644 --- 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 @@ -1,8 +1,7 @@ From
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 919e30c8537670c6620e11197d5236d35ab1cbe6 Author: Harri Nieminen gmail com> AuthorDate: Sun Dec 10 10:56:49 2017 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Dec 14 22:11:27 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919e30c8 app-misc/g15daemon: Update homepage Package-Manager: Portage-2.3.17, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/6505 Signed-off-by: Robin H. Johnson gentoo.org> app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild | 2 +- app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild | 2 +- app-misc/g15daemon/g15daemon-.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild index d5f349cd4d0..9dd8a9dafdb 100644 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild @@ -9,7 +9,7 @@ GENTOO_DEPEND_ON_PERL="no" inherit eutils linux-info perl-module python-r1 base DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" -HOMEPAGE="http://g15daemon.sourceforge.net/; +HOMEPAGE="https://sourceforge.net/projects/g15daemon/; SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild index c6635310b01..0d6bc4d9092 100644 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild @@ -9,7 +9,7 @@ GENTOO_DEPEND_ON_PERL="no" inherit eutils linux-info perl-module python-r1 base DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" -HOMEPAGE="http://g15daemon.sourceforge.net/; +HOMEPAGE="https://sourceforge.net/projects/g15daemon/; SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/app-misc/g15daemon/g15daemon-.ebuild b/app-misc/g15daemon/g15daemon-.ebuild index 7d4ce15ed27..5e6baded32a 100644 --- a/app-misc/g15daemon/g15daemon-.ebuild +++ b/app-misc/g15daemon/g15daemon-.ebuild @@ -11,7 +11,7 @@ ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk/${PN}-wip; inherit eutils linux-info perl-module python-r1 base subversion autotools DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" -HOMEPAGE="http://g15daemon.sourceforge.net/; +HOMEPAGE="https://sourceforge.net/projects/g15daemon/; [[ ${PV} = ** ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 2d75f38da610b4cebe8e42358da2539f340db86e Author: Pacho Ramos gentoo org> AuthorDate: Sun Jan 15 10:09:17 2017 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Jan 15 10:31:29 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d75f38d app-misc/g15daemon: Drop old Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-misc/g15daemon/g15daemon-1.9.5.3-r11.ebuild | 177 --- app-misc/g15daemon/g15daemon-1.9.5.3-r20.ebuild | 179 2 files changed, 356 deletions(-) diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r11.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r11.ebuild deleted file mode 100644 index 48c26bd.. --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r11.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -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="amd64 ppc ppc64 x86" -IUSE="perl python static-libs" - -DEPEND="virtual/libusb:0 - >=dev-libs/libg15-1.2.4 - >=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" -) -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.9.5.3.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 - } -
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 4dfe6f1a395ac8285a37ba73244eadecf055c6d4 Author: Pacho Ramos gentoo org> AuthorDate: Tue Nov 1 10:22:19 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Nov 1 10:22:19 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dfe6f1a app-misc/g15daemon: amd64/x86 stable, bug #593194 Package-Manager: portage-2.3.2 app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild index ff12695..bb50ed2 100644 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="perl python static-libs" DEPEND="virtual/libusb:0
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 346e249e6aea5e79cc3050222b2fc3a0ead2b676 Author: Michał Górny gentoo org> AuthorDate: Sat Jun 25 07:16:44 2016 + Commit: Michał Górny gentoo org> CommitDate: Sat Jun 25 07:26:45 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=346e249e app-misc/g15daemon: Bump unkeyworded revision to make space .../{g15daemon-1.9.5.3-r12.ebuild => g15daemon-1.9.5.3-r20.ebuild}| 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r12.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r20.ebuild similarity index 100% rename from app-misc/g15daemon/g15daemon-1.9.5.3-r12.ebuild rename to app-misc/g15daemon/g15daemon-1.9.5.3-r20.ebuild
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 451cbc767eab1cd57bc32c875170f8703fd584db Author: Michał Górny gentoo org> AuthorDate: Sat Jun 25 07:19:51 2016 + Commit: Michał Górny gentoo org> CommitDate: Sat Jun 25 07:26:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=451cbc76 app-misc/g15daemon: Convert to python-r1 ...on-.ebuild => g15daemon-1.9.5.3-r13.ebuild} | 60 ++ ...on-.ebuild => g15daemon-1.9.5.3-r21.ebuild} | 56 +--- app-misc/g15daemon/g15daemon-.ebuild | 32 +++- 3 files changed, 37 insertions(+), 111 deletions(-) diff --git a/app-misc/g15daemon/g15daemon-.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild similarity index 76% copy from app-misc/g15daemon/g15daemon-.ebuild copy to app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild index e881884..ff12695 100644 --- a/app-misc/g15daemon/g15daemon-.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild @@ -1,41 +1,39 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 + +PYTHON_COMPAT=( python2_7 ) 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 +inherit eutils linux-info perl-module python-r1 base DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver" HOMEPAGE="http://g15daemon.sourceforge.net/; -[[ ${PV} = ** ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="perl python static-libs" DEPEND="virtual/libusb:0 - >=dev-libs/libg15- - >=dev-libs/libg15render- + >=dev-libs/libg15-1.2.4 + >=dev-libs/libg15render-1.2 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 - )" + ) + python? ( ${PYTHON_DEPS} )" RDEPEND="${DEPEND}" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" PATCHES=( - "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch" + "${FILESDIR}/${P}-forgotten-open-mode.patch" + "${FILESDIR}/${P}-overflow-fix.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 @@ -56,17 +54,10 @@ uinput_check() { pkg_setup() { linux-info_pkg_setup uinput_check - if use python; then - python_pkg_setup - fi } src_unpack() { - if [[ ${PV} = ** ]]; then - subversion_src_unpack - else - unpack ${A} - fi + unpack ${A} if use perl; then unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz" fi @@ -76,9 +67,6 @@ src_unpack() { } src_prepare() { - if [[ ${PV} = ** ]]; then - subversion_wc_info - fi if use perl; then perl-module_src_prepare sed -i \ @@ -88,9 +76,6 @@ src_prepare() { # perl-module_src_prepare always calls base_src_prepare base_src_prepare fi - if [[ ${PV} = ** ]]; then - eautoreconf - fi } src_configure() { @@ -152,11 +137,7 @@ src_install() { ebegin "Installing Python Bindings (g15daemon.py)" cd "${WORKDIR}/pyg15daemon" - installation() { - insinto $(python_get_sitedir) - doins g15daemon.py - } - python_execute_function installation + python_foreach_impl python_domodule g15daemon.py docinto python dodoc AUTHORS @@ -164,11 +145,6 @@ src_install() { } 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" @@ -183,9 +159,3 @@ pkg_postinst() { 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-.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild similarity index 76% copy from app-misc/g15daemon/g15daemon-.ebuild copy to app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild index e881884..9149ee0 100644 ---