From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E7A2138330 for ; Tue, 29 May 2018 13:18:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC331E07EF; Tue, 29 May 2018 13:18:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97A52E07EF for ; Tue, 29 May 2018 13:18:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2580A335C76 for ; Tue, 29 May 2018 13:18:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A31C2B7 for ; Tue, 29 May 2018 13:18:06 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1527599871.92f8c7bdb4ddb721854b7b14c7dfd06ef64e6278.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmacpiload-ac/files/, x11-plugins/wmacpiload-ac/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild X-VCS-Directories: x11-plugins/wmacpiload-ac/ x11-plugins/wmacpiload-ac/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 92f8c7bdb4ddb721854b7b14c7dfd06ef64e6278 X-VCS-Branch: master Date: Tue, 29 May 2018 13:18:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9532622d-1785-4b17-be2e-9f9b01dc5685 X-Archives-Hash: 9532a1acacd47f765c5779f88f879411 commit: 92f8c7bdb4ddb721854b7b14c7dfd06ef64e6278 Author: Aaron Bauman gentoo org> AuthorDate: Mon May 28 23:53:58 2018 +0000 Commit: Aaron Bauman gentoo 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 -}