gentoo Easter resync : 12.04.2020

5 files changed, 31 insertions, 81 deletions

diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index 04ed7a82eaec..d1b93bfdff0b 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -1,10 +1,7 @@
 AUX wmbiff-0.4.27-invalid-strncpy.patch 816 BLAKE2B 8c9dec1bb64014c4d99dcfe0214f8b07bdada1945d5992e131d7ae8edd4d23041c1b3a73a5f9a7c5fb4ae76bd7769270e96be5fbf24a8aa740ca5430da6e7f8d SHA512 7881bfa7b1febb4aeba8f530aa5670fba3b8a688876c2eb5b316ae34f5eddf44e90ce00973c1df34c571e14c55573653485e94b6d17a253edd041aa13e7a2dba
+AUX wmbiff-0.4.35-fno-common.patch 781 BLAKE2B fbde39e1df40b9f51128aceeb5adc90c8ef5852584d92fc1d31404306691e7639943363c5460f6abfcfe8aebfc647ad675c531805ba81369c63463502dc50260 SHA512 105abbe67deab8c2ac2f562c94d37418da69ee38cffbc5d91ca4e1cc976069dc2d92241c5de86c16a6276b01f8ed215cb6d84c43a613bf5b28e28bd6e08baff5
 DIST wmbiff-0.4.28.tar.gz 111398 BLAKE2B 39ba4dbf50639b02c8969ae72b696fa83353ec3dcd46802f8333eb597f068d3d0d209f39a352a8f53830695c19c897b7d6f970c5362c2910128b80b0cdb24d32 SHA512 a17fd4b4c3de09a907b7ffccc50f4560a7fddd5cb4dd01c72460806dc55259ba0b587d75f7505171a2a833f6735ddc4ded0a484d4227bfd552cc7343d79d7720
-DIST wmbiff-0.4.33.tar.gz 266114 BLAKE2B 06e5e454a2f8e78203dec66cc274d983e8ec1c0dc7bb82db4ec3c42a8671f0f7a399b79fc94f45e595dcd6fe56c87426dce3900f8fc0f12fbc704ad196390dc7 SHA512 9b88b5929e9234d17bfa5022eb95cbca1720c724827e078dbd44c0bcff77f386b7692a6576b3a96bb1f5fab602c274b3335c71543e5ad053c1cc476d114f818c
-DIST wmbiff-0.4.34.tar.gz 265020 BLAKE2B af4160b983ff46557c78f2f363f8a6b73841050a99d89d953ba4bd493bf016da00457c38bb8130e329f742ad244d62df4b47519b90ee0e8858c88acb0b1184ab SHA512 28a80b635cf6ef03fe688686dd52ed965c2bb17d009aa904967b381f6717ad99014c2c514e9eb973fb2ea83c99a388beb9568f4ac940cbd4631f61c8a13f8cf4
 DIST wmbiff-0.4.35.tar.gz 265332 BLAKE2B 049f01dafaf71af614c47379fa1e59593e6d7904ecc7e63721edc06d06a4705141c5a339f773b7352984b288c32cb7d324fcca72c4459890328672b0d0a4b4e8 SHA512 7a276c33545351dd1e3c072b4b702fabb293744c3b26326739ebc278f18eda3fe971eeaa8392445eb49514eeb430677638b100076409ec6216915a1388a491c4
 EBUILD wmbiff-0.4.28.ebuild 825 BLAKE2B 3e27116ec3256f882303581d48c4911aee3f360e581bb58c5da55244e94edc89a978333cd2654b2d49d2e8e141df6b05a236456c5768bb5fd5f7f0c8156518d6 SHA512 cf73dca2d7798577fed2e223f25e66261915220d198edc90884181c7d71c9b6b909e29aee41a7a9a5e284221048b4dc29b97388bba9e3a117cdad73adf2cf283
-EBUILD wmbiff-0.4.33.ebuild 811 BLAKE2B 8f730e206919070bf7051b095cdb18b917c2783ed7615c7c8d98c6e97465c11f7b14e77b748f92a21982f8ea2c9d4e85c5c5e967f0de1099fc515279b46038cb SHA512 39b794b52cc9dbbb10a22e91d1aaf3d6cd17ba86e3f9bda86834d9cb29c147efddd23dcce6438eab16beecb5376eca3680b6d430998c6f40543c452799a788c2
-EBUILD wmbiff-0.4.34.ebuild 811 BLAKE2B 8f730e206919070bf7051b095cdb18b917c2783ed7615c7c8d98c6e97465c11f7b14e77b748f92a21982f8ea2c9d4e85c5c5e967f0de1099fc515279b46038cb SHA512 39b794b52cc9dbbb10a22e91d1aaf3d6cd17ba86e3f9bda86834d9cb29c147efddd23dcce6438eab16beecb5376eca3680b6d430998c6f40543c452799a788c2
-EBUILD wmbiff-0.4.35.ebuild 811 BLAKE2B 8f730e206919070bf7051b095cdb18b917c2783ed7615c7c8d98c6e97465c11f7b14e77b748f92a21982f8ea2c9d4e85c5c5e967f0de1099fc515279b46038cb SHA512 39b794b52cc9dbbb10a22e91d1aaf3d6cd17ba86e3f9bda86834d9cb29c147efddd23dcce6438eab16beecb5376eca3680b6d430998c6f40543c452799a788c2
+EBUILD wmbiff-0.4.35.ebuild 854 BLAKE2B fb2e3f070a2e668f729e5748330d98876ea7108bf8c20dc91d20b49eaf52e562897879249226bd67b717ed2a659009a896c8e955615255c7d447cb18eeee75c0 SHA512 1d69747b719985f878268f8111edfde765613dd31aa135d2eb8d4569b2237b63a384514183f90c118fe47e23a73319f4fda6bf783145438d9ec1bfcae283af88
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch
new file mode 100644
index 000000000000..2320f17143de
--- /dev/null
+++ b/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch
@@ -0,0 +1,24 @@
+diff -Naur wmbiff-0.4.35.orig/wmbiff/wmbiff.c wmbiff-0.4.35/wmbiff/wmbiff.c
+--- wmbiff-0.4.35.orig/wmbiff/wmbiff.c	2019-07-23 15:58:58.000000000 +0200
++++ wmbiff-0.4.35/wmbiff/wmbiff.c	2020-03-08 12:25:32.766264038 +0100
+@@ -104,6 +104,8 @@
+ 
+ Cursor busy_cursor, ready_cursor;
+ 
++Display *display;
++
+ static __inline /*@out@ */ void *
+ malloc_ordie(size_t len)
+ {
+diff -Naur wmbiff-0.4.35.orig/wmgeneral/wmgeneral.h wmbiff-0.4.35/wmgeneral/wmgeneral.h
+--- wmbiff-0.4.35.orig/wmgeneral/wmgeneral.h	2019-07-23 15:57:57.000000000 +0200
++++ wmbiff-0.4.35/wmgeneral/wmgeneral.h	2020-03-08 12:25:16.223256712 +0100
+@@ -36,7 +36,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display *display;
++extern Display *display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.33.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.33.ebuild
deleted file mode 100644
index 4c3609d57973..000000000000
--- a/x11-plugins/wmbiff/wmbiff-0.4.33.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils
-
-DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
-HOMEPAGE="https://www.dockapps.net/wmbiff"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="crypt"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	crypt? (
-		>=dev-libs/libgcrypt-1.2.1:0
-		>=net-libs/gnutls-2.2.0
-		)"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable crypt crypto)
-}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.34.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.34.ebuild
deleted file mode 100644
index 4c3609d57973..000000000000
--- a/x11-plugins/wmbiff/wmbiff-0.4.34.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils
-
-DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
-HOMEPAGE="https://www.dockapps.net/wmbiff"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="crypt"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	crypt? (
-		>=dev-libs/libgcrypt-1.2.1:0
-		>=net-libs/gnutls-2.2.0
-		)"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable crypt crypto)
-}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
index 4c3609d57973..9200caafc51c 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,10 +25,13 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig"
 
 DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
 
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch
 	eautoreconf
 }