[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpiload-ac/files/, x11-plugins/wmacpiload-ac/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpiload-ac/files/, x11-plugins/wmacpiload-ac/

[Aaron Bauman]

commit:     92f8c7bdb4ddb721854b7b14c7dfd06ef64e6278
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 23:53:58 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue May 29 13:17:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f8c7bd

x11-plugins/wmacpiload-ac: bump EAPI and drop eutils

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../wmacpiload-ac-acpi-fix-battery-unit.patch      |  6 +++---
 .../files/wmacpiload-ac-acpi-segfault.patch        | 14 ++++++-------
 .../files/wmacpiload-ac-acpi-sys-temp-hwmon.patch  | 14 ++++++-------
 .../wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild    | 24 +++++++---------------
 4 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
index 6bf6179e7fc..d0eabc16637 100644
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
@@ -1,5 +1,5 @@
---- wmacpiload-0.2.0/src/battery.c	2012-10-18 15:42:04.000000000 +0200
-+++ wmacpiload-0.2.0.new/src/battery.c	2012-10-18 15:43:33.000000000 +0200
+--- a/src/battery.c	2012-10-18 15:42:04.000000000 +0200
++++ b/src/battery.c	2012-10-18 15:43:33.000000000 +0200
 @@ -42,7 +42,8 @@
   ************************************************************************/
  
@@ -27,4 +27,4 @@
 +            if (strcmp(endptr, CAPACITY_UNIT1) == 0 || strcmp(endptr, CAPACITY_UNIT2) == 0)
                  bat->percentage = (int) ((remain * 100.0) / bat->capacity);
              else
-                 bat->percentage = -1;
\ No newline at end of file
+                 bat->percentage = -1;

diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
index 15f8e05579a..2f43cd358b7 100644
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
@@ -1,6 +1,6 @@
-diff -ru wmacpiload-0.2.0/include/lib_acpi.h wmacpiload-0.2.0.new//include/lib_acpi.h
---- wmacpiload-0.2.0/include/lib_acpi.h	2005-07-21 21:33:19.000000000 -0400
-+++ wmacpiload-0.2.0.new//include/lib_acpi.h	2011-06-20 19:53:30.458953984 -0400
+diff -ru a/include/lib_acpi.h b/include/lib_acpi.h
+--- a/include/lib_acpi.h	2005-07-21 21:33:19.000000000 -0400
++++ b/include/lib_acpi.h	2011-06-20 19:53:30.458953984 -0400
 @@ -32,7 +32,7 @@
   * Macros
   ************************************************************************/
@@ -10,13 +10,13 @@ diff -ru wmacpiload-0.2.0/include/lib_acpi.h wmacpiload-0.2.0.new//include/lib_a
  
    /* use ? */
  #  ifndef ACPI_32_BIT_SUPPORT
-diff -ru wmacpiload-0.2.0/src/dockapp.c wmacpiload-0.2.0.new//src/dockapp.c
---- wmacpiload-0.2.0/src/dockapp.c	2005-08-16 18:38:36.000000000 -0400
-+++ wmacpiload-0.2.0.new//src/dockapp.c	2011-06-20 19:44:20.022684448 -0400
+diff -ru a/src/dockapp.c b/src/dockapp.c
+--- a/src/dockapp.c	2005-08-16 18:38:36.000000000 -0400
++++ b/src/dockapp.c	2011-06-20 19:44:20.022684448 -0400
 @@ -431,5 +431,6 @@
  void
  dockapp_cleanup(void)
  {
 +  if (display != NULL)
      XCloseDisplay(display);
- }
\ No newline at end of file
+ }

diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
index 69857717dae..7fb8586ed1e 100644
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
@@ -1,6 +1,6 @@
-diff -ru wmacpiload-0.2.0/src/lib_acpi.c wmacpiload-0.2.0.new//src/lib_acpi.c
---- wmacpiload-0.2.0/src/lib_acpi.c	2005-07-21 21:41:31.000000000 -0400
-+++ wmacpiload-0.2.0.new//src/lib_acpi.c	2011-06-28 23:37:50.148092904 -0400
+diff -ru a/src/lib_acpi.c b/src/lib_acpi.c
+--- a/src/lib_acpi.c	2005-07-21 21:41:31.000000000 -0400
++++ b/src/lib_acpi.c	2011-06-28 23:37:50.148092904 -0400
 @@ -83,7 +83,7 @@
          if (!k->ac)
              fprintf(stderr, "%s : no AC adapter detected\n", PACKAGE);
@@ -23,9 +23,9 @@ diff -ru wmacpiload-0.2.0/src/lib_acpi.c wmacpiload-0.2.0.new//src/lib_acpi.c
                  char *src;
                  char *end;
                  size_t len;
-diff -ru wmacpiload-0.2.0/src/thermal.c wmacpiload-0.2.0.new//src/thermal.c
---- wmacpiload-0.2.0/src/thermal.c	2005-09-29 19:32:46.000000000 -0400
-+++ wmacpiload-0.2.0.new//src/thermal.c	2011-06-29 00:18:24.851904854 -0400
+diff -ru a/src/thermal.c b/src/thermal.c
+--- a/src/thermal.c	2005-09-29 19:32:46.000000000 -0400
++++ b/src/thermal.c	2011-06-29 00:18:24.851904854 -0400
 @@ -30,12 +30,17 @@
  #endif
  
@@ -118,4 +118,4 @@ diff -ru wmacpiload-0.2.0/src/thermal.c wmacpiload-0.2.0.new//src/thermal.c
 +        tz->temp = temp / 1000;
      }
  }
- 
\ No newline at end of file
+ 

diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
index 5336ef10ddd..05c5ee785de 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=7
 
 MY_P=${P/-ac}
+
 DESCRIPTION="WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels"
 HOMEPAGE="http://wmacpiload.tuxfamily.org/"
 SRC_URI="http://wmacpiload.tuxfamily.org/download/${MY_P}.tar.bz2"
@@ -25,21 +24,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-acpi-segfault.patch" || die "epatch failed"
-	epatch "${FILESDIR}/${PN}-acpi-sys-temp-hwmon.patch" || die "epatch failed"
-	epatch "${FILESDIR}/${PN}-acpi-fix-battery-unit.patch" || die "epatch failed"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-acpi-segfault.patch"
+	"${FILESDIR}/${PN}-acpi-sys-temp-hwmon.patch"
+	"${FILESDIR}/${PN}-acpi-fix-battery-unit.patch"
+)
 
 src_configure() {
 	econf $(use_enable debug)
 }
-
-src_compile() {
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}