[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/files/, app-misc/g15daemon/

[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/files/, app-misc/g15daemon/

[Lars Wendler]

commit:     39820c0d0041648f1cf5714ee4402f20e9ac16d8
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  9 17:44:57 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 05:33:19 2020 +0000
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 <marecki <AT> gentoo.org>
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> 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-9999.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 00000000000..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-9999
+	>=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-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild
index 23fb3430ee4..71c34ecf83b 100644
--- a/app-misc/g15daemon/g15daemon-9999.ebuild
+++ b/app-misc/g15daemon/g15daemon-9999.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 "${FILESDIR}/99-g15daemon.rules"