gentoo resync : 30.05.2020

6 files changed, 46 insertions, 10 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index a17da4bcb0b6..ed74fe3332c6 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/purple-mattermost/Manifest b/x11-plugins/purple-mattermost/Manifest
index 07950bc0c6a3..9b08e61c52a7 100644
--- a/x11-plugins/purple-mattermost/Manifest
+++ b/x11-plugins/purple-mattermost/Manifest
@@ -1,3 +1,3 @@
 DIST purple-mattermost-1.2.tar.gz 65402 BLAKE2B c9f99d61622e0ce1a7aded42f3da44c414615f24a7265b9a2e2bda82dd6afa2ddf6a5063453eead902b140f7e415a043fee2d2f5ff1015bc34f746de5d1793ea SHA512 75e80c1021393c5fe78404a4439b5454f8a4495c1510bf8a3a449acdf1807b8620ac19680607de29bd1599eb0f1354f93c6fa7b21b4294b36649b6e1455760d6
-EBUILD purple-mattermost-1.2.ebuild 545 BLAKE2B 0fa1775393135b6290e546c6a45f1d45c9d9e9d8d65ff937e8aa4b35b6b6df8129e979e33f1f28da280b0d0f0b98b4216c09b9a2de0b8c1c509d610ec71c420f SHA512 69f0bc46614406ef868f9246ad5591285a79c1f8ad476fa9cf78e5145564b2a0bd6b250c8107172b127545ebd229688a8d4d54dd0d2345b8ca2cc376f96bfff2
+EBUILD purple-mattermost-1.2-r1.ebuild 549 BLAKE2B c17185412db9c22ea10b59fc16b2733c9e83b7ca16549cbf87ee2bfde82b33ecaa461d1ff8a6a33130a6ad47d582f4093be81147d607b9e62b3b9d2da86c83f3 SHA512 25f49e504cdacae0c546d7d286200f520c5ac403ae1e813123dac4f715434d35bac0be3e04bc6b5272cc5ddb87af25dc8cc8efd689f8e8811a81ec095ce691fc
 MISC metadata.xml 342 BLAKE2B 442792746b7c1a6892cc0d86d47b23c5299887244fa49e1cde4748f4c175d3a2d6e81f979c33f92c3c861b3fbeae6306ef304169da367dc44b6c73db9e3d8fe8 SHA512 ab1ddf1a079239ac490e856785f73650a4b3e32d3f24a798d771347645899b23799f0eee76df8363858fb2f13e23769f0cf552ba12a276ce9ea68aa50ceef0e4
diff --git a/x11-plugins/purple-mattermost/purple-mattermost-1.2.ebuild b/x11-plugins/purple-mattermost/purple-mattermost-1.2-r1.ebuild
index d4b6347b6757..b7032a565aa9 100644
--- a/x11-plugins/purple-mattermost/purple-mattermost-1.2.ebuild
+++ b/x11-plugins/purple-mattermost/purple-mattermost-1.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -14,12 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="app-text/discount
+RDEPEND="
+	app-text/discount
 	dev-libs/glib
 	dev-libs/json-glib
-	net-im/pidgin"
+	net-im/pidgin
+"
 DEPEND="${RDEPEND}"
 
-src_compile() {
-	emake CC="$(tc-getCC)"
+src_prepare() {
+	default
+
+	tc-export CC CPP
 }
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index 21495bd9fbf3..b5ffd2325285 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,4 +1,5 @@
+AUX wmacpi-2.3-fno-common.patch 790 BLAKE2B 8ffbc5c6549c8f57ff768f6a3c171b6961121458a6ce9e7fa13dc9e33223493ded768f1e91ec2786fb5bd7d3d62dc13fd805155eccc560a4c7806726a2dccd12 SHA512 c1c17e68c4605ea885bf335e4f55e0fbb5427ec8405dbab0f3c3cc76f3cc9f61e43d90b2d3fb7c69d7b2e516716b53288a255b3bdbee4c6b134fa876adc878ac
 AUX wmacpi-2.3-makefile.patch 1103 BLAKE2B 8f0d0f15d322d0b318e9d5e94f120bf0eab00fc9559de72f5449abe4b0f78315cbb513ce7d8d84100257e21205d47136d2e9308c1f266d2ed26fe956eca17f14 SHA512 0c7e46514604b5f9e36e0ffbfda7a3a5d86d7932bd31cf88286e937db61fc516b5f5c0fac0edb96d6e1f657cb12d694b4b1505f7fd1e901872fc80e6aae50ab7
 DIST wmacpi-2.3.tar.gz 39374 BLAKE2B bcf55a801fbc7b7c4484cc8987366786e1a1dbaf4d9ff6800975de14bd295ced774eaeedfe0c9da524b774de7633d5d250e7be55742fca7893f7314b8b4fe6fc SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9
-EBUILD wmacpi-2.3-r1.ebuild 615 BLAKE2B f9a72aa134b869388724eef81fe7d80b99aa28ca8a2e7cc680942023790e431efb3513777d9776da9c0dc035bc3ca27cd607db5c9713212a08fdb34c6d3647da SHA512 6a8382be50b54718aafe328f26144131d4d61ff44175e6b6b36a214e92e0e229da809c5c6c75cfab1d1e7d58b15c893e1d143344a691cd1f6e04589e0c3383a7
+EBUILD wmacpi-2.3-r1.ebuild 656 BLAKE2B 4ade245a55e1efc25e18eb8049f0ead5ce64cbb453c9a0190dcdbe7df1ffd1ca9650302f7adc8fc4f6454c6dc03eedf79bdc90ee4cb46da658a80fed5ca15516 SHA512 5cdcc29e02a2b1574af2aecd34cf20a2985b5e76293efd8a653d5b1082e57eed8b7626ce91641ab4d0e430c7156ac3867267261ef2e472a43d185bf269f1ca5b
 MISC metadata.xml 334 BLAKE2B f36478f76f93ad154022208ad0f1417400de70c9091166fb46e60a05c1f920f20e736f45628f7681c3f1e607d077c0a93689529fde8866c15b2dda7d07838e18 SHA512 708cecfa079327ebfa542b48b792e049348df0664e197c68cc148931820882aaa423ddcb996b47db98a05a87d1b65824ae7fb60492f77936592e3817c0af71b9
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
new file mode 100644
index 000000000000..49ee8446fc44
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
@@ -0,0 +1,27 @@
+diff -Naur dockapps.orig/libacpi.c dockapps/libacpi.c
+--- dockapps.orig/libacpi.c	2015-01-12 11:24:15.000000000 +0100
++++ dockapps/libacpi.c	2020-05-29 22:33:52.526826841 +0200
+@@ -17,6 +17,9 @@
+ #define SYSFS_DATA_SOURCE   1
+ static int data_source;
+ 
++battery_t batteries[MAXBATT];
++int verbosity;
++
+ /* local proto */
+ int acpi_get_design_cap(int batt);
+ 
+diff -Naur dockapps.orig/libacpi.h dockapps/libacpi.h
+--- dockapps.orig/libacpi.h	2015-01-12 11:24:15.000000000 +0100
++++ dockapps/libacpi.h	2020-05-29 22:33:36.393811163 +0200
+@@ -128,8 +128,8 @@
+ 
+ 
+ /* Since these /are/ needed here . . . */
+-battery_t batteries[MAXBATT];
+-int verbosity;
++extern battery_t batteries[MAXBATT];
++extern int verbosity;
+ 
+ /* check if apm/acpi is enabled, etc */
+ int power_init(global_t *globals);
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
index 5a0d2945eb42..9ee992963caf 100644
--- a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,13 @@ DEPEND=">=x11-libs/libdockapp-0.7:=
 
 S=${WORKDIR}/dockapps
 
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
+
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/${P}-makefile.patch
 
 	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
 }