From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- app-misc/g15daemon/Manifest | 18 ++- 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 +- app-misc/g15daemon/files/g15daemon.service | 11 ++ app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild | 160 --------------------- app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild | 150 +++++++++++++++++++ app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild | 151 +++++++++++++++++++ app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild | 70 ++++----- app-misc/g15daemon/g15daemon-9999.ebuild | 77 +++++----- 13 files changed, 423 insertions(+), 260 deletions(-) create mode 100644 app-misc/g15daemon/files/g15daemon-1.9.5.3-avoid_bashisms.patch create mode 100644 app-misc/g15daemon/files/g15daemon-1.9.5.3-docdir.patch create mode 100644 app-misc/g15daemon/files/g15daemon.service delete mode 100644 app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild create mode 100644 app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild create mode 100644 app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild (limited to 'app-misc/g15daemon') diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest index ac06d8919aa6..5e2543ee7e63 100644 --- a/app-misc/g15daemon/Manifest +++ b/app-misc/g15daemon/Manifest @@ -1,14 +1,18 @@ AUX 20g15daemon 173 BLAKE2B 70c9a7e6769d98f2f8195a8d8e120fc514e956125c5d887412a165c2c038006060169f8fddc31a0334c543dde083136682cdec34b27418fd99cb4776a0cdac2c SHA512 daee2c432860dd3147209724417cbf04ec1ed0c8e882900900722420cbe67d88f32efc81422e04221e54796b66d69e050135b72a96baf40137da58023202d3ca AUX 99-g15daemon.rules 90 BLAKE2B ffcee5b3039d9aa1d63ff6d58fb29d84a2c9988dc4815407ec8c529e874d3af1d8f05f0623588a3264e3ece6cf23168b4c6a102316c249ae26b68f4311dd2359 SHA512 f3ff958bb4e0344b600328fcab86674ce14d852287ec2e083751d0eb855a0591aa17fdae767de4517bcd8a1fa542ab9b559ee79fe284207d2872b8901f2c77f7 -AUX g15daemon-1.2.7.confd 329 BLAKE2B 1c28f1ee1c6400cc1067df7bfddf66a138abcaf0168b548511c390233392eb722d3c5c5c9d03d6106eecdec5c37fd4588d80713bb0793879cfe6701c89368cfb SHA512 ea94ab43c78566c570a510cccb6860ade6c26a281956b6e37ea746eb06608a5a00ed55773752c7aad44bf86cdfec5788e9f1137667fd5030d54b20b97811b43a -AUX g15daemon-1.9.5.3-forgotten-open-mode.patch 639 BLAKE2B dcd28ba55f823c26cf38d273a5bd9893715de3e361cdca73cb9e0baf015da04a23f239bcc9471b8d52a623e82c5b2bb6e39bb5cb28dc7d92b4b5397544ccdb71 SHA512 dc603a576eaf6bd8512827de712c3ba6a116905d5f6c692dccda1b499a3bab8480a785155d3b0189b41e2dff099fc5896cb958bcc83357ff54333a82f4b6ca93 -AUX g15daemon-1.9.5.3-g510-keys.patch 14095 BLAKE2B 51e0fc084298923a44fc7453cb7d91dd39f54685c67a09eaf90628e1f0005569f9cb702f66425bb5ca243d97b70c74b68e512bf89a6f509a6f8240b08004ba5a SHA512 ac43f573175a8842ac571fe4d30fe2b2bb901d46da75fb9a7fe591b6a144df6308c5aecb65319667e01a316414cbccf44dbb492412e0d28bd9fb1cd09ce9bb75 -AUX g15daemon-1.9.5.3-overflow-fix.patch 619 BLAKE2B 8d7f71d946315b1844c25ad3687fcceb0e7c1e87ad818b6b70b4accda951d10a271214945f4b03360e4b999a3229405b7728b3154cfa74a65c0f1d47ca223616 SHA512 e5f4494c0890ce985391d5a07d809e7168f765549c17b55457d93436ce816074aa97f991b894067badacf5e0bcc7f482d6b7e1623b0157a04d728f2ca4b1bf27 +AUX g15daemon-1.2.7.confd 330 BLAKE2B e25cf425e9d26946d617759cc07d3a9a73591539a7d6c7e1e09c5803032841b7c343d83156034ef01276454acb6853b291888346438a59908320a549378743d9 SHA512 0274394bc9442686b89e94bad80b4df352a772ca0b51a8b0d05a8de0551f747e8eceb9c10d290f22e9e8a433a2e2c94b061866d32db45bd3ef0d050facc484bf +AUX g15daemon-1.9.5.3-avoid_bashisms.patch 839 BLAKE2B 49269760a077a39924c39bd8182365ea767f4f57d3bd2ddefa3c6aadc1a84ec8ee773a802a483d859e693d0051b1dd256abd373d4558c95db88713a442844abc SHA512 5eac0f9bb87bbdab08ffb05dc17122f0090cb78ce068e6acdaac16dfc3bba0d1bc150445c02f48fb155af255368b89e3d90b6d109243185c7a5abbd01004cd05 +AUX g15daemon-1.9.5.3-docdir.patch 473 BLAKE2B 5370c2e89d45b7cd1255dd987210b37b5019b636643f68399a05bbbabccf867e6bd219e7f89f0ee2d1f2408e6a9d6f3da38853d19a486028bcee1a726b45daae SHA512 e1ef8f9f290b37a3a5648109e1340ec984684fff50ec7e9c5d7baa9b1ab4209432ecac5da64b917dd13de0141662b0ebc958bd04cc4b7789d626a3fc4fbe11d2 +AUX g15daemon-1.9.5.3-forgotten-open-mode.patch 563 BLAKE2B 33d2b9ff82d9fbdd490f31d539c0432c9ef65fb14f23bedadc497d76732c32aaafac1ac64ff3c59c7b5098ddcbbfa44f8087e61a57147cf9293c39c0f34cce2b SHA512 8eced9d04c4880c5883d536bc3c4d8cdd452e182e434b2314abd8c8bb0e036c377424c0f757a0c2596972da2b87befc6442f6880e1e580597a1cb3b1357beea4 +AUX g15daemon-1.9.5.3-g510-keys.patch 13908 BLAKE2B 4fd1141b6e739f1b07356e9a06489251eb7d247e0e5f9ba0f454389e05513681260370330a28ea2ac5be7f064c006020afee8bc8676cd9a702a3058e6eb7e761 SHA512 06a170a8c405fd84aba39b2b511c257a1152d0d4e1c17e220a01ef3ad1962e44870cd2ca355b07f9b54a028775ddcb3c93eeec1f6cdf9f65068d5d7755169677 +AUX g15daemon-1.9.5.3-overflow-fix.patch 543 BLAKE2B fafc620e8f8338208a8fbb093308d1bd36e09d1fc136442eaac05b467871aac7fbac1daba8a354ee0798cef48bf316e5b32a8001a48d65a1f7daee091c970499 SHA512 6aa9c56ebfb6735ceeee982c4d9ee71a3e5cfb3b35d5806203cfeec2630f4dd3f349aeec644540bf665dd163f39be75a545644b69c7373f9a805a0e30bc8ebf2 AUX g15daemon-1.9.5.3.initd 955 BLAKE2B fe4c71358d206768dde9d0361ab926f8e36d2fce1d46a15992ec4880c0df37ec2ae26808902d7593c5c1783f679c1c12d163d8a6f409f2d6931f432b08f8a7c4 SHA512 a2e21fe65f730e0a3f0062da07a9896884329e3d3b2cb89ce41b96f33851868c0c27281fc87a13eb7bb7ba934175df19dddfd78b695339b4a89512c42951fd1a AUX g15daemon-hotplug 224 BLAKE2B 6348dfec6c942d28c2db287b82765f194ffd7d1e9c58faaf03670ff6222f0a32fb70428873452d8229a967849f49b3042ef20352d677b0e5d4dc05b7f769caee SHA512 6384aa8267a665b0b26f45f7339856647374ad5b1860f299b2e19afb0209b8637919f00b3638affbe4fb86adaf115eb93e814b70c17d52f1c878d840e1e464e8 AUX g15daemon.conf 516 BLAKE2B 9a003040306ddfeccccb5b12730c6c1c478ab39cf44abbacfaed37b7154f2485cbc0979f900523457e14a5ca14041b41bf2da0c3b4d7519f2e798b0cb291f4c4 SHA512 e575fd8a91c87f226481ae406a1b66de6d8eb66f061b0ce7f2b89ce63f7bda88470eac50adcc9de97ef866970ee835af8a1bb0402a2e4b4d214251d0b8ebe25c +AUX g15daemon.service 209 BLAKE2B 0b909fd73dc8d0961f35257d430e4c8b321bf12671a77838eb1bbc0044ed6d98a5d90421367a77c0117dee66cbb7a6f54a71ce066905ec550ebfbd0709dbf2e5 SHA512 3b4d7e22665e360271807e2de356af79038a6474aeb8c862665714b717f62d105ce57f5acd8078520ab92b9b7963a956617998074b8752ce99ce97ce860b4c25 DIST g15daemon-1.9.5.3.tar.gz 414603 BLAKE2B 4f683bab47f6cbde3a028b306c1999ea4fcb84c0c05160a17374be93f953d21588f332e8fbf040c607545c31ee09e30b56b1068db95a801472c9d72ee9fe8e43 SHA512 7a1770d08d1d4155866bba3b676d33bf943363f4519af41a13ab6ec73cc5d6c536b173977b3e3583b594b149b7f01ffbc51123a4678c2a249a51ff0b42c8b69a -EBUILD g15daemon-1.9.5.3-r13.ebuild 3844 BLAKE2B c729568b5b17b7f0e1fab0baa447c08754522cc64d6ae4ea44069af01c77b8df1c5b3aa2766c5595403bbe0825ef107513dbb7a3e3ad2cb93afc4eb2b9b21f76 SHA512 f04650f6cedf3924460827ac4ddfa43e6ec65dd810e11cf6d345f3dd7c81b1069cc5812ba25d52d979ba0b54d69b435c2cb0fd1f82301ca69db6b4a5ad69c54e -EBUILD g15daemon-1.9.5.3-r21.ebuild 3861 BLAKE2B 07d5c7ba8973c98b821023110f4e9fbcf4992a35ed0cbeef3d404e867782faaa51cace995db969d74da64f5b81cfedef04ee4825fdfa0198f00bd5f07ea5475d SHA512 0756e936b6938f1c9ae69201005a8b1602d03bd5e09ea042925d043f112a576133c62d5b6f6f32e5beb749faf04f366c9832c2f774b0084d6fd35cafe38518ca -EBUILD g15daemon-9999.ebuild 4201 BLAKE2B d93f82ca46892521cd0e609ba1cf5f23ca1de0fcd563a1aaf94248b87f535cf53aeebca5a98c20768571bd8abaa0a481124fc1b0e34c2036e0e94f0de39c5c2a SHA512 053af76acaf9c8dc01aa8194ccc262a84bcf938ffc6cbcd32dd1bcc93f03548c5032729ea0aabd2521ea2d73d32fcc65c53be17412058ff97604f920ba1d9d33 +EBUILD g15daemon-1.9.5.3-r14.ebuild 3618 BLAKE2B feb5d82e02c8a323b8b181026a3901900f7deb293f0a5ea5ae2fd8e646734d4a7831f63caed326a095b9cdc328229bb361b94d7757d3cb4f387f019e36a34aed SHA512 3af32ddd33081a202cf0c204d8463f6bbf7665a5ac56a5cb14ddb059b0a19ef9ee9abcc7df9d0a0dcf33f216a1226cf13bf39b1ccac8cc8d224bbd9c2389d233 +EBUILD g15daemon-1.9.5.3-r15.ebuild 3670 BLAKE2B 7fcc72a0ca0ded18c2900ab5c1875adcad9834b9dac8182842337e6ec77fe4686d7060eb1a275cdf317a7b11bd3b99fb40c05e62568de5412d3446527c347b99 SHA512 0da399aa499738c1cb4f7b613df740e55831b939985d79e975e97af25ef78568d2b213129dce897bc7c92e2f79bbcce846079214275975c3d2ff8e34449b28dc +EBUILD g15daemon-1.9.5.3-r21.ebuild 3686 BLAKE2B 3f01e34e4faa0543ec3dcb27b0e34d1372dcc38359289216f83854704c9a1ff1da2fb86b8b32fe98fc14a7c98e564edc562e6eafa0059fc2df98e6087caa3ecf SHA512 adac636f001da27d189c1f5b9ceeaed78b1fa956567cf802da13af93f99ec16812dd7aea5e6d44ffccf38cc33c5aae0306c78d86d574a676361c3d58c78bdd99 +EBUILD g15daemon-9999.ebuild 3920 BLAKE2B 2d9bb2d713a950b8955739a83701b91bd06b69ea3242a3444b03e022c2a2e5b2b365eded1bfea9737bfaf905f386b496c9357316a95ec917b8fbe388cb602938 SHA512 09012652885ced1ccccb3e44d18ee14fca634bddc88e537a2eaeed5b444cdaa4945b3ec0fa8c7b9a078c0a116e5c465c84ceeee557aa046f2eebe450bb88b8b2 MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e diff --git a/app-misc/g15daemon/files/g15daemon-1.2.7.confd b/app-misc/g15daemon/files/g15daemon-1.2.7.confd index 08ea97f49763..5ce5392b93b1 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 000000000000..194d68eefeea --- /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 000000000000..9c76e4cbc6aa --- /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 b475f1d58d69..d4a5381992e1 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.000000000 +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 e00836766795..a53001f1932d 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 https://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 +--- 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) diff --git a/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch b/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch index 71cbf914d839..07bb68601d76 100644 --- a/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch +++ b/app-misc/g15daemon/files/g15daemon-1.9.5.3-overflow-fix.patch @@ -1,5 +1,5 @@ ---- ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c 2008-01-25 05:45:05.000000000 +0100 -+++ ./g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c 2011-02-14 22:51:55.203009264 +0100 +--- g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c ++++ g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c @@ -217,7 +217,7 @@ if(poll(pfd,1,100)>0){ if(pfd[0].revents & POLLPRI && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) { diff --git a/app-misc/g15daemon/files/g15daemon.service b/app-misc/g15daemon/files/g15daemon.service new file mode 100644 index 000000000000..668b8ba13a86 --- /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-r13.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild deleted file mode 100644 index 9dd8a9dafdb0..000000000000 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_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="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 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 - ) - python? ( ${PYTHON_DEPS} )" -RDEPEND="${DEPEND}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -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 -} - -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" - - python_foreach_impl python_domodule g15daemon.py - - docinto python - dodoc AUTHORS - 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 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" -} diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild new file mode 100644 index 000000000000..407950bcbb25 --- /dev/null +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r14.ebuild @@ -0,0 +1,150 @@ +# 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 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=$? + + 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 + 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 /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" +} diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild new file mode 100644 index 000000000000..2042898ab06a --- /dev/null +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild @@ -0,0 +1,151 @@ +# 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="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=$? + + 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 /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" +} 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 0d6bc4d90920..5e6b82ace427 100644 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -PYTHON_COMPAT=( python2_7 ) GENTOO_DEPEND_ON_PERL="no" -inherit eutils linux-info perl-module python-r1 base +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/" @@ -15,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="perl python static-libs" +IUSE="perl static-libs" DEPEND="virtual/libusb:0 >=dev-libs/libg15-9999 @@ -24,15 +23,15 @@ DEPEND="virtual/libusb:0 dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 - ) - python? ( ${PYTHON_DEPS} )" + )" RDEPEND="${DEPEND}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" 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() { @@ -41,7 +40,7 @@ uinput_check() { linux_config_exists && linux_chkconfig_present INPUT_UINPUT rc=$? - if [[ $rc -ne 0 ]] ; then + 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 @@ -53,39 +52,40 @@ uinput_check() { } pkg_setup() { + export CC="$(tc-getCC)" #729294 + linux-info_pkg_setup uinput_check } src_unpack() { unpack ${A} - if use perl; then + 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 + if use perl ; then perl-module_src_prepare sed -i \ -e '1i#!/usr/bin/perl' \ - "${S}"/contrib/testbindings.pl + "${S}"/contrib/testbindings.pl || die else # perl-module_src_prepare always calls base_src_prepare - base_src_prepare + default fi + mv configure.{in,ac} || die + eautoreconf } src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable static-libs static) + append-cflags -fcommon #706712 - if use perl; then - cd "${WORKDIR}/G15Daemon-0.2" + econf $(use_enable static-libs static) + + if use perl ; then + cd "${WORKDIR}/G15Daemon-0.2" || die perl-module_src_configure fi } @@ -93,8 +93,8 @@ src_configure() { src_compile() { default - if use perl; then - cd "${WORKDIR}/G15Daemon-0.2" + if use perl ; then + cd "${WORKDIR}/G15Daemon-0.2" || die perl-module_src_compile fi } @@ -102,23 +102,23 @@ src_compile() { src_install() { default - find "${ED}" -name '*.la' -exec rm -f {} + + find "${ED}" -type f -name '*.la' -delete || die # remove odd docs installed my make - rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage} + 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 + 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" - insinto /lib/udev/rules.d - doins "${FILESDIR}/99-g15daemon.rules" + udev_dorules "${FILESDIR}/99-g15daemon.rules" insinto /etc doins "${FILESDIR}"/g15daemon.conf @@ -127,22 +127,12 @@ src_install() { exeinto /usr/lib/pm-utils/sleep.d doexe "${FILESDIR}"/20g15daemon - if use perl; then + if use perl ; then ebegin "Installing Perl Bindings (G15Daemon.pm)" - cd "${WORKDIR}/G15Daemon-0.2" + cd "${WORKDIR}/G15Daemon-0.2" || die docinto perl perl-module_src_install fi - - if use python; then - ebegin "Installing Python Bindings (g15daemon.py)" - cd "${WORKDIR}/pyg15daemon" - - python_foreach_impl python_domodule g15daemon.py - - docinto python - dodoc AUTHORS - fi } pkg_postinst() { diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild index 5e6baded32a9..71c34ecf83b2 100644 --- a/app-misc/g15daemon/g15daemon-9999.ebuild +++ b/app-misc/g15daemon/g15daemon-9999.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -PYTHON_COMPAT=( python2_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 eutils linux-info perl-module python-r1 base subversion autotools +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/" @@ -17,7 +16,7 @@ HOMEPAGE="https://sourceforge.net/projects/g15daemon/" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="perl python static-libs" +IUSE="perl static-libs" DEPEND="virtual/libusb:0 >=dev-libs/libg15-9999 @@ -26,16 +25,14 @@ DEPEND="virtual/libusb:0 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}/${PN}-1.9.5.3-docdir.patch" + "${FILESDIR}/${PN}-1.9.5.3-avoid_bashisms.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" @@ -43,7 +40,7 @@ uinput_check() { linux_config_exists && linux_chkconfig_present INPUT_UINPUT rc=$? - if [[ $rc -ne 0 ]] ; then + 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 @@ -55,49 +52,49 @@ uinput_check() { } pkg_setup() { + export CC="$(tc-getCC)" #729294 + linux-info_pkg_setup uinput_check } src_unpack() { - if [[ ${PV} = *9999* ]]; then + if [[ ${PV} = *9999* ]] ; then subversion_src_unpack else unpack ${A} fi - if use perl; then + 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 + if [[ ${PV} = *9999* ]] ; then subversion_wc_info fi - if use perl; then + if use perl ; then perl-module_src_prepare sed -i \ -e '1i#!/usr/bin/perl' \ - "${S}"/contrib/testbindings.pl + "${S}"/contrib/testbindings.pl || die else # perl-module_src_prepare always calls base_src_prepare - base_src_prepare + default fi - if [[ ${PV} = *9999* ]]; then + if [[ ${PV} = *9999* ]] ; then + mv configure.{in,ac} || die eautoreconf fi } src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable static-libs static) + append-cflags -fcommon #706712 - if use perl; then - cd "${WORKDIR}/G15Daemon-0.2" + econf $(use_enable static-libs static) + + if use perl ; then + cd "${WORKDIR}/G15Daemon-0.2" || die perl-module_src_configure fi } @@ -105,8 +102,8 @@ src_configure() { src_compile() { default - if use perl; then - cd "${WORKDIR}/G15Daemon-0.2" + if use perl ; then + cd "${WORKDIR}/G15Daemon-0.2" || die perl-module_src_compile fi } @@ -114,23 +111,23 @@ src_compile() { src_install() { default - find "${ED}" -name '*.la' -exec rm -f {} + + find "${ED}" -type f -name '*.la' -delete || die # remove odd docs installed my make - rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage} + 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 + 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" - insinto /lib/udev/rules.d - doins "${FILESDIR}/99-g15daemon.rules" + udev_dorules "${FILESDIR}/99-g15daemon.rules" insinto /etc doins "${FILESDIR}"/g15daemon.conf @@ -139,22 +136,12 @@ src_install() { exeinto /usr/lib/pm-utils/sleep.d doexe "${FILESDIR}"/20g15daemon - if use perl; then + if use perl ; then ebegin "Installing Perl Bindings (G15Daemon.pm)" - cd "${WORKDIR}/G15Daemon-0.2" + cd "${WORKDIR}/G15Daemon-0.2" || die docinto perl perl-module_src_install fi - - if use python; then - ebegin "Installing Python Bindings (g15daemon.py)" - cd "${WORKDIR}/pyg15daemon" - - python_foreach_impl python_domodule g15daemon.py - - docinto python - dodoc AUTHORS - fi } pkg_postinst() { -- cgit v1.2.3