gentoo resync : 25.11.2020

18 files changed, 114 insertions, 69 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 2b17eb6f27a8..ccdbdad619c6 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/asmon/Manifest b/x11-plugins/asmon/Manifest
index 7926600dcf1f..c95785eab983 100644
--- a/x11-plugins/asmon/Manifest
+++ b/x11-plugins/asmon/Manifest
@@ -1,4 +1,5 @@
-AUX asmon-0.71-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
+AUX asmon-0.71-fno-common.patch 451 BLAKE2B 81b60caf28ded54bb0311f3ca83e9f01acc3122c65338d7d8d4364413dc9be5bef0226037f8f0b74856a004552ddf70f74bd01dd34926d35cff481db27e54e09 SHA512 7f1851289a3400b147bcef27732091a0b1a365596bd524f9e8f229f447895a1d73ab51f6eaac9550a2cd49229edfce4152370ac668f4c1629f597282083afac9
+AUX asmon-0.71-list.patch 2632 BLAKE2B b7221d48285441cbab3fb13f4b406deb02dfadc3d3dd8dabdfab886cf26d89b397133fc7ff9b0c7baaa9fe4ede8deb3cb2752ba79f7de0d4bb23dcfd76b02010 SHA512 7ceabc659ff3059dc782f72039a25a78e988a5c9b31b67662f2da92084d46411d08507fecfcbca806e9eb96680b7c0654b9c41fca4f3236d8db4d367917da297
 DIST asmon-0.71.tar.bz2 42235 BLAKE2B 5e82638ae115ea088e4936615e8a67074cb8a1bde42607f37837edb1d774f24bb71d3db1d69780e4810eafcdaef681306fc07ce50e8eed1a96edf610cc081cbc SHA512 20d321b228e0157e9e2611eeac017fdf6a9e9eb8ba6e02c7c30adadb411529da408b7a543e18b30de0659ccf4f86bfde21bef392e2a4756803c58a9f28c31c45
-EBUILD asmon-0.71-r1.ebuild 744 BLAKE2B 739091e78a857114e4f5ce97b2c3bcf37828cb8ba6d7ff82b9aad951f50522250378f191cb891838c2fe0ff59bb31f1a7cc413b1581dd82ee172e22d3ce1ff49 SHA512 71d918d326d5da7d7eac357fe71c1ef15d6a97753006ab33094d3d3b99d995298d801e77d16cc437ede79dbef43d697536f0b7679a5e36db1e4026a60be7742e
+EBUILD asmon-0.71-r1.ebuild 782 BLAKE2B a9975298aabc0d07df1d89465795837e530eea8aa3ba4b8c1fdd6bed8e1ae3e98f64b07ce996f6e44c2f4343ba3011ec45668db82a19922bcef38ca4b3977bc6 SHA512 0640ce1569ffeb8b39059bd4d063265373176b6da2f5460e02a0100e37c2677ceb84e40d25f6ffb96fb76d6de61d5e1a216491a1c40f2a535e023190aaab9782
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild
index 2c91504fc699..2d2ce19ee4ef 100644
--- a/x11-plugins/asmon/asmon-0.71-r1.ebuild
+++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="WindowMaker/AfterStep system monitor dockapp"
 HOMEPAGE="http://rio.vg/asmon"
 SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2"
+S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE=""
 
 RDEPEND="x11-libs/libXext
 	x11-libs/libXpm
@@ -19,13 +20,14 @@ RDEPEND="x11-libs/libXext
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-S=${WORKDIR}/${P}/${PN}
-
 src_prepare() {
+	default
+
 	sed -i -e "s:gcc:$(tc-getCC):g" Makefile || die
 
-	cd "${WORKDIR}"/${P} || die
-	epatch "${FILESDIR}"/${P}-list.patch
+	cd "../wmgeneral" || die
+	eapply "${FILESDIR}/${P}-list.patch"
+	eapply "${FILESDIR}/${P}-fno-common.patch"
 }
 
 src_compile() {
diff --git a/x11-plugins/asmon/files/asmon-0.71-fno-common.patch b/x11-plugins/asmon/files/asmon-0.71-fno-common.patch
new file mode 100644
index 000000000000..831d6b258163
--- /dev/null
+++ b/x11-plugins/asmon/files/asmon-0.71-fno-common.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/708118
+--- a/wmgeneral.c
++++ b/wmgeneral.c
+@@ -50,6 +50,7 @@ Window		iconwin, win;
+ GC			NormalGC;
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
++Display		*display;
+ 
+   /*****************/
+  /* Mouse Regions */
+--- a/wmgeneral.h
++++ b/wmgeneral.h
+@@ -28,7 +28,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/asmon/files/asmon-0.71-list.patch b/x11-plugins/asmon/files/asmon-0.71-list.patch
index 1b1ac317669e..89e9ef321673 100644
--- a/x11-plugins/asmon/files/asmon-0.71-list.patch
+++ b/x11-plugins/asmon/files/asmon-0.71-list.patch
@@ -1,6 +1,5 @@
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
---- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
+--- a/list.c
++++ b/list.c
 @@ -38,7 +38,7 @@
  
  /* Return a cons cell produced from (head . tail)
@@ -82,9 +81,8 @@ diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
  list_mapcar(LinkedList* list, void(*function)(void*))
  {
    while(list)
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
---- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
+--- a/list.h
++++ b/list.h
 @@ -29,31 +29,25 @@
  #ifndef __LIST_H_
  #define __LIST_H_
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 9834e62855bc..41a70dac40aa 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,10 +1,10 @@
 AUX enigmail-2.0.12-enable_seamonkey_support.patch 646 BLAKE2B a7c16bcc7f220997fec4309aaccc6e5ee62ec4ed1c82698a1aa7fbeb6badd0e972b8adcceaa1697d454c3f1d63bb913dce86fe5d85b184d78e3616c34d6c0122 SHA512 f775f3608b6078e51ba335eacf5858f03956c592f31fd9184341f773fd13376e8216cf05e762f83f04e47e251b2485657eb1f7cd8779cafbc8d2a321cb42b851
 AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de75130372343b7118ea3dc3c0a421d04a8a8b12a9695ba515b7dc3d566b4a0686c2bf4d12fc72b722ceb0d4dc9985eaeedaf67c90210 SHA512 1b5ff31a7ed8d17224ec915d56ee61e817dd41d035445d16a2b0caedd315215c37d2f98e42597fc599c60a39ba4d276a57c644268d12c2929a89f8802164a3d2
 DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
-DIST enigmail-2.1.7.tar.gz 2851632 BLAKE2B 8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69 SHA512 1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41
 DIST enigmail-2.1.8.tar.gz 2867390 BLAKE2B 8908705a05277b018d40260ea095d2a2d9dee9300c7c4b06a708846e93a68242f60599fd92a2dc4c6d53026723433b7548b55e9fc97fdbe667af38a526f03f8a SHA512 b21867c08b5e51af4e82a9ecc6e0a7fc056fb165e6cec8fc11d8ed54fd97b30ca5597b5a23243da0803d08aa04a4a3732d56eae9454db89ecd10fcd750b0b1fb
+DIST enigmail-2.2.4.tar.gz 432157 BLAKE2B e6d5eab4cba2cd66669ddf38f8152511606c48ce995be331551a7b403ecbd06967c22702a06e06aa89219b5c905e835ddb4d146c0fc2cb11e1a647e46854dd1f SHA512 bf23f52ed61002b05e2e432a0abd1f576fe6eb97d94ab2241e17be86138cee153d668747f5759b967d9a4977be3dc901ee78ddb168347bdbbfed9229d27f786d
 EBUILD enigmail-2.0.12-r1.ebuild 2181 BLAKE2B 50b69ab4765ae278d6222b45663bc1869d46142b7eb8f9fc89dbbd414b65857d49d836de6bee8fab65694b989a696bf2ca9b28e62ddc97a55ff72a1c443e770e SHA512 cad36763177ebcc2d40e57eb3c80143c08dfcfe0cbd3d8d7968bc0cbf6f0767c0503a1c4acee37e199ea52d562588031bed24e99dbb25e0f2963ce1d8c7a4937
-EBUILD enigmail-2.1.7.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0
-EBUILD enigmail-2.1.8.ebuild 2254 BLAKE2B 901ad5c969a2b82c8be8d683323258981ca28f260642761e7ff94df6c76e8b4b81afab67c321f106be414ffdc17b5fdc08336fca53cbacb2c198a5611e1e0967 SHA512 238a2aee1fd06d61d99c495a625cc191b404ff0efe631b79b031882ff774752221e4ca58c445d958b9d167dbb0199ab9647caf7b8cd7642b9bafaa869802bce3
-EBUILD enigmail-9999.ebuild 2188 BLAKE2B ed979ec62c674c60769027d73ced5a402894b3240be4ea93fcd5f1808b8066791836f019ecb497b236d9702efd0c4b01f1e30e65720b243cc1407615e32ebeb8 SHA512 ef2b530bd9cd0cd7e8a002b6e01bc21fd4d8331ee074ef676c12c37a315744dcd7fb2f24c49622fcb91cca9aa42067a17fbfbb825f94c016bb742df920f764b6
+EBUILD enigmail-2.1.8.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0
+EBUILD enigmail-2.2.4.ebuild 2019 BLAKE2B 78a2e43af9cfbfe128313aa6cfa0575aeb15248a850c62cbe902e3fc05b4396f5c187f675640ad610e00330ddbeaa652a2ddf7276caf14ca8e35e82bb7b59094 SHA512 e13cf5623532dc6f58b1c33be8d1d373edb829bfd2bd55fa7f0d773edc0909ba7848dc473ed6e8a8d9b45dbdb90f965c6b521122ce409c406870ed3623973e72
+EBUILD enigmail-9999.ebuild 2023 BLAKE2B 4d060acb5ba2aa75037f191f775ef673e50946b3435c4a63c1b21e3e9db67499908f1cfc0a290afca47417301716832991a4301c03d7664eea4e0303ef0b2e58 SHA512 7a6e2fa7e3ac1fbb1de05c8045efc9f7987c17bb06f1935e72aae79bef78bced0cea04534ccc8165d065b35330a17c9f2e1ec75f650380e84378f12525098aa2
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.1.8.ebuild b/x11-plugins/enigmail/enigmail-2.1.8.ebuild
index 665dd902895c..53f90a93be8c 100644
--- a/x11-plugins/enigmail/enigmail-2.1.8.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.1.8.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
 	else
 		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+		KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 	fi
 	S="${WORKDIR}/${PN}"
 fi
diff --git a/x11-plugins/enigmail/enigmail-2.1.7.ebuild b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
index 53f90a93be8c..3d4a1620e642 100644
--- a/x11-plugins/enigmail/enigmail-2.1.7.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit python-any-r1
 
@@ -33,7 +33,7 @@ RDEPEND="
 			app-crypt/pinentry[qt5(-)]
 		)
 	)
-	!<mail-client/thunderbird-52.5.0
+	!<mail-client/thunderbird-78
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -43,12 +43,10 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
 
-src_compile() {
-	# Required or parallel make fails
-	emake -C stdlib createlib
+src_prepare() {
+	default
 
-	emake ipc public ui package lang stdlib
-	emake xpi
+	export MAKEOPTS=-j1
 }
 
 src_install() {
@@ -61,10 +59,6 @@ src_install() {
 	# thunderbird
 	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
 	doins ${build_dir}/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins ${build_dir}/"${emid}.xpi"
 }
 
 pkg_postinst() {
@@ -78,7 +72,7 @@ pkg_postinst() {
 	esac
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "Please restart thunderbird in order for them to use"
 		elog "the newly installed version of enigmail."
 	fi
 }
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
index 7369918278b0..b990489fba08 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit python-any-r1
 
@@ -33,7 +33,7 @@ RDEPEND="
 			app-crypt/pinentry[qt5(-)]
 		)
 	)
-	!<mail-client/thunderbird-52.5.0
+	!<mail-client/thunderbird-78
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -41,30 +41,24 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	"
 
-PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
+PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
 
-src_compile() {
-	# Required or parallel make fails
-	emake -C stdlib createlib
-
-	emake ipc public ui package lang stdlib
-	emake xpi
+src_prepare() {
+	default
 
+	export MAKEOPTS=-j1
 }
 
 src_install() {
-	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json)
+	local build_dir=build-tb
+	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/dist/manifest.json)
 	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
 
-	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+	mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
 
 	# thunderbird
 	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins build/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
+	doins ${build_dir}/"${emid}.xpi"
 }
 
 pkg_postinst() {
@@ -78,7 +72,7 @@ pkg_postinst() {
 	esac
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "Please restart thunderbird in order for them to use"
 		elog "the newly installed version of enigmail."
 	fi
 }
diff --git a/x11-plugins/pidgin-extprefs/Manifest b/x11-plugins/pidgin-extprefs/Manifest
index 1dd1f2256d57..482b7a6020d1 100644
--- a/x11-plugins/pidgin-extprefs/Manifest
+++ b/x11-plugins/pidgin-extprefs/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-extprefs-0.7.tar.gz 332742 BLAKE2B 39a12a595f6eb7a66b071ef4d3e94d7e4d54201baa29280f3dc24e790976dfd57e7f3a656cea398c76759d02b258429b0cae46fd4ed7c07ec9f2219f5b0e97e4 SHA512 f2157403463c1a9621396c84ea71c4e02a853796d5c7b7aa33def03f9b6eccc52a0fad7f5edcfa1506cdc2c6e9dfb056a445cdfa985b0c3885d7ffe666150c3a
-EBUILD pidgin-extprefs-0.7-r1.ebuild 433 BLAKE2B 3a6445c308e2ab981a62886019f17dbf0f615c203b7afa871173d77626fdbf84f704d69bc94d076da96ac3515dc93a0ef98c34f9cc7e14afdf237b2fd1629d8f SHA512 ceeea01c8b875cc6fdfff3ffd0618f81477edce4302b02a9023bf3f52b73df65870ce091d844f4c3b89f6c2bbc0431ad774fd3ab0db8617ea0c62e96de919559
+EBUILD pidgin-extprefs-0.7-r1.ebuild 547 BLAKE2B 7e057b8d72e4d6a97f65d382fa1dc7d9b7126508967c40a3f69141880c5bf5529be5bd70030eb6f13c9f16064021d2dad76fa2a7d4a58fe10ca2d4b12a520e7d SHA512 e1e02c37035e977a14ab9b950c2b6f8bbf57bcdf32ceee46912b8af3a249cd6ffbeea0f5a65bc7bcb9f8a392fe33092f6998e9f013f5cb1137ca8b3d1b61b597
 MISC metadata.xml 429 BLAKE2B bd54667274f11c399f2feb083848551bea785a62668c034fca214afaded40f4b798ffafd6393bd99a9c6db7c3d1abca893adff6163aae3dd1f98e7fafdcf02c0 SHA512 45d92936f57d4de39761a5c6f6b3a9b2645041109857a96b3910ec097c3e8fe140439953defb65dae391474d8ae3bb54f0e10fd9142c322b09fa7c916f4bddf0
diff --git a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
index eaa00ed1dce3..bd365bd9122f 100644
--- a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
+++ b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Extra preferences that are desired but are not worthy for Pidgin"
 HOMEPAGE="http://gaim-extprefs.sourceforge.net"
@@ -10,9 +10,16 @@ SRC_URI="mirror://sourceforge/gaim-extprefs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-plugins/purple-libnotify-plus/Manifest b/x11-plugins/purple-libnotify-plus/Manifest
index 802786ebd2b9..c19d2fa4600d 100644
--- a/x11-plugins/purple-libnotify-plus/Manifest
+++ b/x11-plugins/purple-libnotify-plus/Manifest
@@ -1,3 +1,4 @@
+AUX purple-libnotify-plus-2.99.1-fno-common.patch 209 BLAKE2B bf9349d0700913d19d0d39372d439fc37d6e17c20951183f8ab7cb025531742dd752ea46b7bd30096fd10dc30afcb65b0a84dac30d72ad633cf8c01002ab488f SHA512 e635f984846b25d24172b138928cc9c7e8f87c953ef45d8bcfc10f0ead18c87bd0c7c700d9973606d040d123fa68675cbcdc21c7d916d90216651222390b3460
 DIST purple-libnotify-plus-2.99.1.tar.gz 20168 BLAKE2B bab24be1a541ae50fbbbacb0fa507f0e6000c3e74f1fa75ccceb809de88012f7492ec29ae96cf303cb38463e3af0c916aaead9365d5dce18904b34844e1e8c64 SHA512 436c2363c05b21f0a980e020fe09f3f285e8c9a4d131377f20ec13ecf5ce6ef1bea8ca6ae16de6154657e5d4a9b0229204e7f48a6807d36e516b95248daf11bf
-EBUILD purple-libnotify-plus-2.99.1.ebuild 628 BLAKE2B 1e263008e2ffd7b3b5843c12f8055086f731fd8dcb5a33cbc5ab4f789aa31a0d2a8b56a616f86a74614f0c6b7ead0185d61ddd499dfcb9c8e1dd51b3aba55301 SHA512 6c55ce73a66e73cc86ff7f82b61234c2b622a79cc6935ed3c56daeee7b944298f09691a4b25c471bcedfc29e992cce4c1a9f61cf32e3d31992927c0f3cdb2437
+EBUILD purple-libnotify-plus-2.99.1.ebuild 679 BLAKE2B 3c34bb1090d54a9b9a9de889ae61ece45b57ef71aa9e878e815c398a6083da900b6e5185be7b00162afef958df3904f186ef3b3a7de30b14b12ae84b786def85 SHA512 69160b0a9911b6856b512e17a4b97bccfae4181c99afbc502a2617b318d3de6888d82534561c7251040f6b5edc32a5ec6ce43e10f9be4b37e289942b9028c9a3
 MISC metadata.xml 405 BLAKE2B bf9f55c54fb72b1968b11f4daf448f38de88da1a17f7c1518b7b54fc4feb4771def0a6d613df516a55e6c9294f6bc7351ad7a519cba2c44227526404340069a7 SHA512 d8b6bd1c5a564441dd5a205059b228a4efa92dfa36d6535ea78a69baaf7406741c1888448f8281927fed96cb2666a28892d6291da543477015bce6dbb285510b
diff --git a/x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch b/x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch
new file mode 100644
index 000000000000..12d2cdda8de6
--- /dev/null
+++ b/x11-plugins/purple-libnotify-plus/files/purple-libnotify-plus-2.99.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/purple-libnotify+-common.h
++++ b/src/purple-libnotify+-common.h
+@@ -27,7 +27,7 @@
+ 
+ extern PurplePlugin *notify_plus;
+ 
+-struct
++extern struct
+ {
+ 	gboolean modify_notification;
+ 	gboolean use_svg;
diff --git a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
index 5a3198f74a14..54ed903d1c51 100644
--- a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
+++ b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Provide libnotify interface to Pidgin and Finch"
 HOMEPAGE="http://purple-libnotify-plus.sardemff7.net/"
@@ -12,18 +12,21 @@ SRC_URI="https://github.com/sardemff7/purple-libnotify-plus/archive/v${PV}.tar.g
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	net-im/pidgin
 	>=net-im/purple-events-0.99.1
 	x11-libs/gdk-pixbuf
 	>=x11-libs/libnotify-0.7.0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_prepare() {
+	default
 	eautoreconf
 }
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index e8886f088668..75117df95745 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,4 +1,4 @@
 AUX wmdrawer-0.10.5-gtk+-2.patch 370 BLAKE2B f308ef901a7d609bd257253ed092b2bf8a53e8b87afc973024b4249f56c4ae0a9b757a203ce5df180a31feb512bf6dff559a93081c0ae5314d6b3afe3785fa84 SHA512 4ee57e974cb4828a20fe5313746a0c646f793793a89ce70fb3bbdf28cf397fb4112121eb7f4274a67601f5e18487cbabf2b655161d575b8a58740eaa6aec87e6
 DIST wmdrawer-0.10.5.tar.gz 49413 BLAKE2B df77a7e7fedc1a648fccb6efc4315f1f7c4d316a475b3d0044578df0cc0ef5f5d481eec11a23a33682fd8f8bb5faeedb66e82916becb668546cbc5b9e5a61dd7 SHA512 f1e7cb7dc16841a7176e628f42ba5834200707dc162838e62fc7233e383d0aab6ce7fe22017286d26ce6ddc2e3cb6f1d0d21acd176fd36a0cdcd7ab04a2dbae1
-EBUILD wmdrawer-0.10.5-r3.ebuild 1165 BLAKE2B 28c33506888835d60f69cd1195d86a640ff09adc6072955e104d855401bc2c68ae71901a717e95e00f8f4013d38bb4abdbedc93f61d7f37ade94a7ba162db1c6 SHA512 88c6753ff421cc141af530573fbfbf322cc30f400d3ae3268445a3c23a1d7443f714f0e8937f63430d91a9b432a952077025b4ee5b7afad9e1981564d609bd61
+EBUILD wmdrawer-0.10.5-r3.ebuild 1265 BLAKE2B a0eac5c13fa6bb1526a8b0809c31039fa47586b7290eabd296c1e7aa116c8a34df7311b38667c749b66f9217f1159c1761779c0e8e68aceb3903d885a13dd3b2 SHA512 04f7f5226b460ef85380afc3b745d1551c69334e4471826b73352e4640e867b869ae2d067e81eed22c74cdb7ee3c1b1af9e9e2fa525b1bf7797bb4dfae320b46
 MISC metadata.xml 248 BLAKE2B 3bcf0ee104a13db738bdf65e81d29625755b774b02b80f25f9d3dc69527dcc7b866ebcc3816066aefe754b833106ac31a789ced1559af40f9f3fe674798eec75 SHA512 7c4fcd1eada270e859ab889e58c5c2cbe8359bc9cb90351c7245e2d211f8f62b5e27f355d2e311bf763062ad2ac9e885ac7f0c093bda0d20964bf67f6b712ed4
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
index 9bec6c6314a4..214c076d82cf 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
-RDEPEND="x11-libs/gdk-pixbuf:2[X]
+RDEPEND="|| (
+				(
+					x11-libs/gdk-pixbuf:2[X]
+					>=x11-libs/gdk-pixbuf-2.42.0:2
+				)
+				<x11-libs/gdk-pixbuf-2.42.0:2[X]
+			)
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/x11-plugins/wmmenu/Manifest b/x11-plugins/wmmenu/Manifest
index fd7d42ebcfe3..0251435cc968 100644
--- a/x11-plugins/wmmenu/Manifest
+++ b/x11-plugins/wmmenu/Manifest
@@ -1,4 +1,4 @@
 AUX wmmenu-1.3-Makefile.patch 577 BLAKE2B 67ce17eb16ee1d53fb2485a9bbc38e6ac37ce89099defd3840182e052bb1b5a47ba02e94e3a1c1296205085d6de3ea099b61dbd9fff3756020570874ee5854ee SHA512 485a6f902418076fadf157ebd07f5014bda958dcfaeff3500daac13ae3a08650e783a03b95c2726ed8bc98c3db96e7f2971e3a0bf874fed64e1e3bc4f6c5de8a
 DIST wmmenu-1.3.tar.gz 33766 BLAKE2B aaed2a54781a1daa475d0757a4dd97d50e3d200dc72bcc9a7d2c833c6207a73f8f632aa66dc6746f5992edc94cfcb24a722e4dcae06496b9a811577329aeeb98 SHA512 4c8738c9a81d56e084754f4db28da6d3171475b5967ceddaa5646b3d87679112e4f272e1bee2c2a81dd072cc948b3652d843a3ddff9bc31cfac4f787b337e767
-EBUILD wmmenu-1.3-r2.ebuild 779 BLAKE2B fc82802154c6f9e8d566ffa8c01e14473c764c6123f4d536ce771f73c00dd739b9bd5efcb751e2e47b18f26b232ac5ac84fb22c382df7e2329a60dc3571eace4 SHA512 cfdb781afc6ba14a5749c242d816483c251a5c19c33636da5c4f7b81787be32db463b881d304fd11af245c64d3d9e5b3303dc02f049824a49b5a418185319d17
+EBUILD wmmenu-1.3-r2.ebuild 878 BLAKE2B 4e521ae507faec57b7ac767976be15839394e57c0ea3325d06935296f5482cc980e0801c66e5d62f491a7ebbc59ae6095f36d9590c1cc438ec0e4bdd9256ca4f SHA512 fe43232150cac2bf984563e398663afa4f1de3d4c1876fcd400650db76a9bde2c5f06d105dda2076cd693dd4b3ac246fcd1cb67bee4f177224622d810ea0529b
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
index 9022ddb6b31e..3cce437b9804 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r2.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
@@ -12,7 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="x11-libs/gdk-pixbuf[X]
+RDEPEND="|| (
+				(
+					x11-libs/gdk-pixbuf:2[X]
+					>=x11-libs/gdk-pixbuf-2.42.0:2
+				)
+				<x11-libs/gdk-pixbuf-2.42.0:2[X]
+			)
 	>=x11-libs/libdockapp-0.7:="
 DEPEND="${RDEPEND}"