diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 10:47:13 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 10:47:13 +0100 |
commit | 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec (patch) | |
tree | 401ffbc2ade49ce18f6182969ec5fb697a57ce48 /x11-plugins/wmacpiload-ac | |
parent | d4bd6695641f6d2ec7ff8681913d304e995902f5 (diff) |
gentoo resync : 02.06.2018
Diffstat (limited to 'x11-plugins/wmacpiload-ac')
6 files changed, 32 insertions, 47 deletions
diff --git a/x11-plugins/wmacpiload-ac/Manifest b/x11-plugins/wmacpiload-ac/Manifest index f45c519aa62e..1e32dca884e6 100644 --- a/x11-plugins/wmacpiload-ac/Manifest +++ b/x11-plugins/wmacpiload-ac/Manifest @@ -1,7 +1,7 @@ -AUX wmacpiload-ac-acpi-fix-battery-unit.patch 1270 BLAKE2B 07a3db0e0ad32778fe9945b1460f6b327c572f747430a00aec99fbef034a3b59304fd5b5e95dc3acd1d5792f5f56b7302c2b35710f9e3eaa4ce418cf3fb2099c SHA512 46d5ab6cea2b7dd85bcec20ecf5f917f9025ae2c06f578c677c9defd1a8da3cc970f8158aacc87631d2f96b2c1017bc8c8d88271792200e809fd8623d24981f6 -AUX wmacpiload-ac-acpi-segfault.patch 805 BLAKE2B 00f5d87fda529f3afcc11e4ddcff09c25cc940cad28181514fff77685c93de2839885da32e692660d0f0bdf86cad521629d8b6b5cb2b317223e4a5c00acd21b8 SHA512 9903f06b95e0a372c980d9ca649fa5c11a47ffce709e98e03507303234fd8111cb0bd1e1204b69af332cfe0bb5293a6f758a7a593cc72244ee37547b579735d1 -AUX wmacpiload-ac-acpi-sys-temp-hwmon.patch 4320 BLAKE2B 9d36a49fc206b0395d2a388730a8ec3adbce25a8a454b3be70a7452a8a7de1c26e3db00b6ec5589ffbc99b3d1268a598b37b0bbef04167fe2f72e572921fa06d SHA512 fd7a08c6d7473c48c98d741827d33d6ccef592936379323d0c54ec588dde16b7131f2c6517ddac38e61350a122227818a51d4bf68da1121b71915d4bdb3c4467 +AUX wmacpiload-ac-acpi-fix-battery-unit.patch 1237 BLAKE2B 68b710b8d2fa4f06008cc89ac4f7d43d5cbf113a20bc0ebe8b9e4d7c347d091fc6892bf59c3eae7558fd50d79cf75afb8a8a0f059f4ab2d644560d77db63378c SHA512 b25701c576bc57db493e7560f67960e44d0a28412faca2e1bd92deaa67b78fe9baac5e56a68df00a5657d3bf7f4371720906e94bbe41e0f2293f5fbf426a9855 +AUX wmacpiload-ac-acpi-segfault.patch 666 BLAKE2B 2d936ce5685453332c188479a4d53f3151db143ccc09220196614db190ee434d41b154acfc7d32b8f459446b3305733c758576f67ebc5d7b9e7336347abc83c0 SHA512 b5110926503e197f3ef368e84bb99b9c8ba587fdbd143da9bea824d67f38e02b8978109201cf2eb63d6553ed7a4f7f6a3050220a1c2e1f4ee1b7a43a65d8ff52 +AUX wmacpiload-ac-acpi-sys-temp-hwmon.patch 4181 BLAKE2B e725a6679d53c3172a721d67bd0c74f59909ef1d8fe5799cc1878792b770ba34b284a0e61f0dbe48c8dea127d9347d869d93ec6bcbf40a0fa30ed16687d04ed9 SHA512 ac7d4c10fc5abffeb83e5a8efa79316505cb1560baaf29a9bfad9991aa0d543d366e9b48b47679853a92e53b39c51f3718b92d3c1df3406ec54908f21344fa01 DIST wmacpiload-0.2.0.tar.bz2 112858 BLAKE2B a981f43e4a4738b662f8a302a0737d9f7ab9ce18fb5cbc40a84608ab75916af3b47cb2da93c130461280492f2624b23712a81d6cabc786a73e4bc83c043b3358 SHA512 f0256ae313ad4ecbaf1604578321b45173912f250ba6fb7abf88edbcf6875dee30f8d2f7547cc207768c9229697dbfd48e77617c590e0ca27113b8c675e32714 -EBUILD wmacpiload-ac-0.2.0-r1.ebuild 1023 BLAKE2B 39c62fb88a686f8e31c4d416f9b95f9f169d5b2c47b824833b30a4ad5f46cb8b88ca7bf33ba4377a38ee57566172e6e812c15fd57e72cddaab8f4cd34abc07d7 SHA512 f7183624746cb0ed317f607603d222448e9b9bf0d22075df9fe24bd1af4d0aa8eab668dbc8439a07711e9103b745af035dd820b850b791825bc671a0df4d3077 -EBUILD wmacpiload-ac-0.2.0.ebuild 736 BLAKE2B 074da7060ffdd7f243504111eb148b5e5c22be786af67b39bb3ed00401c19ada93bd72f013e214b5c231c57da62524292d5927bec99515db10870b1ff0c6dc5c SHA512 b264cd346cd08036bd9e219afe29afddcaa1f316a70c0de4d6d8526c64d2ca6f99ca6f76d329fb4143ffa0a8fd66e067c3e3fbbb78c413eb787a859f7fb297c6 +EBUILD wmacpiload-ac-0.2.0-r1.ebuild 738 BLAKE2B e1c2f3eebc3e70a219b77a0a5a2e870a5ca7096ec707d833553f9ba61eef96568c16ca7258780db4eead0065cba6429d135e5a52c91fee89ee5cede249f29a16 SHA512 3d5028c68474af13ca60f38719e6e5bb37b31990daab2d0cea90010ee759ec6c1af69322c2d612b35e87e55eb5b330bcc9bb415af668348fd7e574be5dbe910c +EBUILD wmacpiload-ac-0.2.0.ebuild 586 BLAKE2B 9398e8dc82dbb412c0434028ce6dd920e5bb2722713aa5088bce17948a29cddb0ca799cbc89ba682b702a6a4612563935378166684b85077b77570f297f4bc31 SHA512 0ea6b2242f3a1688b2e6bc13dda2477cffc0009c5fd95a57439410401d5764816da1eff113a7a6953408f79d9a5d161afea03cc4e955616ad993993ae1b2bae4 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d 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 6bf6179e7fc6..d0eabc166377 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 15f8e05579a2..2f43cd358b70 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 69857717daeb..7fb8586ed1ee 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 5336ef10ddd1..05c5ee785dea 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 -} diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild index ca8e850f9a53..5dd7b6116524 100644 --- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild +++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=6 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" @@ -22,12 +23,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" -src_compile() { +src_configure() { econf $(use_enable debug) - emake || die "compile failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO } |