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

[Lars Wendler]

commit:     1eb5d8b932fe2f5aa4c5f53d491c9c3fe5a7d5ae
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  9 11:48:13 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Sep  9 12:29:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb5d8b9

app-misc/g15stats: EAPI-7 revbump

- Fixed docdir

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../g15stats/files/g15stats-1.9.7-docdir.patch     | 11 +++++++++
 ...stats-1.9.7.ebuild => g15stats-1.9.7-r1.ebuild} | 26 ++++++++++++----------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/app-misc/g15stats/files/g15stats-1.9.7-docdir.patch b/app-misc/g15stats/files/g15stats-1.9.7-docdir.patch
new file mode 100644
index 00000000000..e4d9c472581
--- /dev/null
+++ b/app-misc/g15stats/files/g15stats-1.9.7-docdir.patch
@@ -0,0 +1,11 @@
+--- g15stats-1.9.7/Makefile.am
++++ g15stats-1.9.7/Makefile.am
+@@ -4,7 +4,7 @@
+ bin_PROGRAMS = g15stats
+ noinst_HEADERS = g15stats.h
+ 
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = README ChangeLog AUTHORS NEWS COPYING
+ 
+ LIBS = -lg15daemon_client -lg15render -lpthread -lm -lrt

diff --git a/app-misc/g15stats/g15stats-1.9.7.ebuild b/app-misc/g15stats/g15stats-1.9.7-r1.ebuild
similarity index 69%
rename from app-misc/g15stats/g15stats-1.9.7.ebuild
rename to app-misc/g15stats/g15stats-1.9.7-r1.ebuild
index c46f9b7e499..199760efdca 100644
--- a/app-misc/g15stats/g15stats-1.9.7.ebuild
+++ b/app-misc/g15stats/g15stats-1.9.7-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="CPU, memory, swap, network stats for G15 Keyboard"
 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
@@ -18,25 +20,25 @@ RDEPEND=">=app-misc/g15daemon-1.9.0
 	sys-libs/zlib
 	gnome-base/libgtop"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-docdir.patch" )
 
 src_prepare() {
-	sh autogen.sh
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_configure() {
-	export CPPFLAGS=$CFLAGS
+	export CPPFLAGS="${CFLAGS}"
 	econf
 }
 
-src_compile() {
-	emake
-}
-
 src_install() {
-	emake DESTDIR="${D}" install
-	rm "$D"/usr/share/doc/${P}/{COPYING,NEWS}
+	default
+	rm "${D}"/usr/share/doc/${PF}/{COPYING,NEWS} || die
 
 	newconfd "${FILESDIR}/${PN}-1.9.7.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}-1.9.7.initd" ${PN}