| 1 |
commit: 39820c0d0041648f1cf5714ee4402f20e9ac16d8 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 9 17:44:57 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 10 05:33:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39820c0d |
| 7 |
|
| 8 |
app-misc/g15daemon: add systemd unit |
| 9 |
|
| 10 |
This is what I have had running on my system for almost 10 years now. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/741458 |
| 13 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 14 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
| 15 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 16 |
|
| 17 |
app-misc/g15daemon/files/g15daemon.service | 11 +++++++++++ |
| 18 |
...daemon-1.9.5.3-r21.ebuild => g15daemon-1.9.5.3-r15.ebuild} | 8 ++++---- |
| 19 |
app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild | 3 ++- |
| 20 |
app-misc/g15daemon/g15daemon-9999.ebuild | 3 ++- |
| 21 |
4 files changed, 19 insertions(+), 6 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-misc/g15daemon/files/g15daemon.service b/app-misc/g15daemon/files/g15daemon.service |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..668b8ba13a8 |
| 26 |
--- /dev/null |
| 27 |
+++ b/app-misc/g15daemon/files/g15daemon.service |
| 28 |
@@ -0,0 +1,11 @@ |
| 29 |
+[Unit] |
| 30 |
+Description=Logitech G15 extra-key and LCD manager |
| 31 |
+ |
| 32 |
+[Service] |
| 33 |
+Type=forking |
| 34 |
+PIDFile=/run/g15daemon.pid |
| 35 |
+ExecStart=/usr/sbin/g15daemon |
| 36 |
+ExecStop=/usr/sbin/g15daemon -k |
| 37 |
+ |
| 38 |
+[Install] |
| 39 |
+WantedBy=multi-user.target |
| 40 |
|
| 41 |
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild |
| 42 |
similarity index 95% |
| 43 |
copy from app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild |
| 44 |
copy to app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild |
| 45 |
index 7955e66c251..2042898ab06 100644 |
| 46 |
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild |
| 47 |
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r15.ebuild |
| 48 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 49 |
|
| 50 |
GENTOO_DEPEND_ON_PERL="no" |
| 51 |
|
| 52 |
-inherit autotools flag-o-matic linux-info perl-module toolchain-funcs udev |
| 53 |
+inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev |
| 54 |
|
| 55 |
DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" |
| 56 |
HOMEPAGE="https://sourceforge.net/projects/g15daemon/" |
| 57 |
@@ -13,11 +13,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 58 |
|
| 59 |
LICENSE="GPL-2" |
| 60 |
SLOT="0" |
| 61 |
-KEYWORDS="" |
| 62 |
+KEYWORDS="amd64 ppc ppc64 x86" |
| 63 |
IUSE="perl static-libs" |
| 64 |
|
| 65 |
DEPEND="virtual/libusb:0 |
| 66 |
- >=dev-libs/libg15-9999 |
| 67 |
+ >=dev-libs/libg15-1.2.4 |
| 68 |
>=dev-libs/libg15render-1.2 |
| 69 |
perl? ( |
| 70 |
dev-lang/perl |
| 71 |
@@ -29,7 +29,6 @@ RDEPEND="${DEPEND}" |
| 72 |
PATCHES=( |
| 73 |
"${FILESDIR}/${P}-forgotten-open-mode.patch" |
| 74 |
"${FILESDIR}/${P}-overflow-fix.patch" |
| 75 |
- "${FILESDIR}/${P}-g510-keys.patch" |
| 76 |
"${FILESDIR}/${P}-docdir.patch" |
| 77 |
"${FILESDIR}/${P}-avoid_bashisms.patch" |
| 78 |
) |
| 79 |
@@ -116,6 +115,7 @@ src_install() { |
| 80 |
|
| 81 |
newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN} |
| 82 |
newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN} |
| 83 |
+ systemd_dounit "${FILESDIR}/${PN}.service" |
| 84 |
dobin "${FILESDIR}/g15daemon-hotplug" |
| 85 |
udev_dorules "${FILESDIR}/99-g15daemon.rules" |
| 86 |
|
| 87 |
|
| 88 |
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild |
| 89 |
index 7955e66c251..5e6b82ace42 100644 |
| 90 |
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild |
| 91 |
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild |
| 92 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 93 |
|
| 94 |
GENTOO_DEPEND_ON_PERL="no" |
| 95 |
|
| 96 |
-inherit autotools flag-o-matic linux-info perl-module toolchain-funcs udev |
| 97 |
+inherit autotools flag-o-matic linux-info perl-module systemd toolchain-funcs udev |
| 98 |
|
| 99 |
DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" |
| 100 |
HOMEPAGE="https://sourceforge.net/projects/g15daemon/" |
| 101 |
@@ -116,6 +116,7 @@ src_install() { |
| 102 |
|
| 103 |
newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN} |
| 104 |
newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN} |
| 105 |
+ systemd_dounit "${FILESDIR}/${PN}.service" |
| 106 |
dobin "${FILESDIR}/g15daemon-hotplug" |
| 107 |
udev_dorules "${FILESDIR}/99-g15daemon.rules" |
| 108 |
|
| 109 |
|
| 110 |
diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild |
| 111 |
index 23fb3430ee4..71c34ecf83b 100644 |
| 112 |
--- a/app-misc/g15daemon/g15daemon-9999.ebuild |
| 113 |
+++ b/app-misc/g15daemon/g15daemon-9999.ebuild |
| 114 |
@@ -7,7 +7,7 @@ GENTOO_DEPEND_ON_PERL="no" |
| 115 |
ESVN_PROJECT=${PN}/trunk |
| 116 |
ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk/${PN}-wip" |
| 117 |
|
| 118 |
-inherit autotools flag-o-matic linux-info perl-module subversion toolchain-funcs udev |
| 119 |
+inherit autotools flag-o-matic linux-info perl-module subversion systemd toolchain-funcs udev |
| 120 |
|
| 121 |
DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver" |
| 122 |
HOMEPAGE="https://sourceforge.net/projects/g15daemon/" |
| 123 |
@@ -125,6 +125,7 @@ src_install() { |
| 124 |
|
| 125 |
newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN} |
| 126 |
newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN} |
| 127 |
+ systemd_dounit "${FILESDIR}/${PN}.service" |
| 128 |
dobin "${FILESDIR}/g15daemon-hotplug" |
| 129 |
udev_dorules "${FILESDIR}/99-g15daemon.rules" |
Archives