gentoo resync : 07.05.2021

3 files changed, 20 insertions, 17 deletions

diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index f6d06745ebfe..42a4aba8b390 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,8 +1,8 @@
 AUX wmacpi-2.3-fno-common.patch 790 BLAKE2B 8ffbc5c6549c8f57ff768f6a3c171b6961121458a6ce9e7fa13dc9e33223493ded768f1e91ec2786fb5bd7d3d62dc13fd805155eccc560a4c7806726a2dccd12 SHA512 c1c17e68c4605ea885bf335e4f55e0fbb5427ec8405dbab0f3c3cc76f3cc9f61e43d90b2d3fb7c69d7b2e516716b53288a255b3bdbee4c6b134fa876adc878ac
-AUX wmacpi-2.3-makefile.patch 1103 BLAKE2B 8f0d0f15d322d0b318e9d5e94f120bf0eab00fc9559de72f5449abe4b0f78315cbb513ce7d8d84100257e21205d47136d2e9308c1f266d2ed26fe956eca17f14 SHA512 0c7e46514604b5f9e36e0ffbfda7a3a5d86d7932bd31cf88286e937db61fc516b5f5c0fac0edb96d6e1f657cb12d694b4b1505f7fd1e901872fc80e6aae50ab7
+AUX wmacpi-2.3-makefile.patch 1218 BLAKE2B bdd0e950665f56c746a8d0c00176edb09db4c8b9c26f27f293bed8209d10771049e629707cb7eb44937ee9b95ab3650912b7e4f2edfa6c1b7a60e9f2eafcc375 SHA512 17a595e54de9e6161d9b1b6284421f11c0eb1307bc62015c64312e9929777affa53f3f683fafd64f0a26a10688d77ddfd0bb1b0deef64d5f2e03900426ce0f62
 AUX wmacpi-2.4-makefile.patch 1217 BLAKE2B a55fb93f1d716439b1032ab73fede38325457447d3a25901bc9acc297937227f9439591682e5cc9f13d847cee5f98f8a07baff3affcf19b9c1890256f17bd2f9 SHA512 026c120bdfd0c41706c68cca3d79ef3c30150bcca42442633831ce4ca4aafda45378daa3285b478070d6d2b95c0730f209a254c3fe5a1478b7276820dc256bbf
 DIST wmacpi-2.3.tar.gz 39374 BLAKE2B bcf55a801fbc7b7c4484cc8987366786e1a1dbaf4d9ff6800975de14bd295ced774eaeedfe0c9da524b774de7633d5d250e7be55742fca7893f7314b8b4fe6fc SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9
 DIST wmacpi-2.4.tar.gz 40265 BLAKE2B 5acd0b8506b762909893bb8d3ac28dc193166db67195bc14fb321b1d7f3a177cf60412b5d854d039ec0d6289dfefd9ea660a98e69a41148930b71437405ca65a SHA512 56a2967354a16f1ae03ee159dfe787a96c0d7ecf654852833ed71c7f65ca9a3717d9a582f2900a9fd925b0648ef5fcdf08cc4c68e78e75dedbd44a0a35ce752b
-EBUILD wmacpi-2.3-r1.ebuild 656 BLAKE2B 4ade245a55e1efc25e18eb8049f0ead5ce64cbb453c9a0190dcdbe7df1ffd1ca9650302f7adc8fc4f6454c6dc03eedf79bdc90ee4cb46da658a80fed5ca15516 SHA512 5cdcc29e02a2b1574af2aecd34cf20a2985b5e76293efd8a653d5b1082e57eed8b7626ce91641ab4d0e430c7156ac3867267261ef2e472a43d185bf269f1ca5b
+EBUILD wmacpi-2.3-r1.ebuild 672 BLAKE2B 4ad838ab8052198f156796ab52dd791089457ff6a86fee8a34d54f1839847c841e38f401c9f522986b4d8c5cd8290ce0ad595449d7a065320eb144ef8ff27a4f SHA512 44bc8f6af8bb406bc8b9a8f1cece94441f156030254d52b93fd641b80520e9681216068c1010812ea7f1aa172804f1bc7424db5655730b07e5de6466f18a7f23
 EBUILD wmacpi-2.4.ebuild 498 BLAKE2B be2a3bde74d74fe7be0aae77e01e33c171db7e5fcae8476f971d625ce61b38d913dc90f986e34e8a861691ac632b28915d903edc19bc051f5582100cd6594149 SHA512 614c8aaac2f0bf78a8d0211fabee79094f98f3570d6d3b2a0e0db7ca17e5ceb2d4a25fd9b4df111dd9f5f752b9d8d09aaca1de6ae6816eb90f7aa78dce7bf2e8
 MISC metadata.xml 248 BLAKE2B 3bcf0ee104a13db738bdf65e81d29625755b774b02b80f25f9d3dc69527dcc7b866ebcc3816066aefe754b833106ac31a789ced1559af40f9f3fe674798eec75 SHA512 7c4fcd1eada270e859ab889e58c5c2cbe8359bc9cb90351c7245e2d211f8f62b5e27f355d2e311bf763062ad2ac9e885ac7f0c093bda0d20964bf67f6b712ed4
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
index 2bf80a3190db..60629e22ad26 100644
--- a/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
@@ -1,17 +1,18 @@
---- a/Makefile	2015-01-12 11:27:07.396319323 +0100
-+++ b/Makefile	2015-01-12 11:29:21.531298827 +0100
-@@ -13,8 +13,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,9 +12,8 @@ BUILD_CLI = 1
+ # debugging options (don't bother with these)
  #OPT	= -pg -g
  
- CC	:= gcc
+-CC	:= gcc
 -CFLAGS	+= $(OPT) -Wall -W -g -ansi
 -LDFLAGS += $(OPT) -lX11 -ldockapp
-+CFLAGS	:= -Wall -W -g -ansi
-+LIBS := -lX11 -ldockapp
++CFLAGS	?= -Wall -W -g -ansi
++LIBS += -lX11 -ldockapp
  
  WMSRC	:= wmacpi.c libacpi.c
  HEADERS := libacpi.h wmacpi.h
-@@ -26,7 +26,7 @@
+@@ -26,7 +25,7 @@ targets += wmacpi-cli
  doc_targets += wmacpi-cli.1
  endif
  
@@ -20,7 +21,7 @@
  
  all: $(targets)
  
-@@ -37,7 +37,7 @@
+@@ -37,7 +36,7 @@ WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC)))
  -include $(WMOBJ:.o=.d)
  
  wmacpi:	$(WMOBJ)
@@ -29,7 +30,7 @@
  
  # for the Debian package, we want to make building the command line tools
  # optional. So, we hide all the necessary stuff here . . .
-@@ -47,13 +47,13 @@
+@@ -47,13 +46,13 @@ CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC)))
  -include $(CLOBJ:.o=.d)
  
  wmacpi-cli: $(CLOBJ)
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
index 9ee992963caf..1c24cbb6058c 100644
--- a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="DockApp ACPI status monitor for laptops"
 HOMEPAGE="https://www.dockapps.net/wmacpi"
 SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+S="${WORKDIR}/dockapps"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 -ppc -sparc x86"
 
-DEPEND=">=x11-libs/libdockapp-0.7:=
+DEPEND="
+	>=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11"
-
-S=${WORKDIR}/dockapps
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
@@ -28,6 +30,6 @@ src_prepare() {
 	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)"
+src_configure() {
+	tc-export CC
 }