gentoo resync : 08.01.2021

5 files changed, 21 insertions, 84 deletions

diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index 5e7344117bd7..ed486dd1d76f 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -1,9 +1,6 @@
 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.35.tar.gz 265332 BLAKE2B 049f01dafaf71af614c47379fa1e59593e6d7904ecc7e63721edc06d06a4705141c5a339f773b7352984b288c32cb7d324fcca72c4459890328672b0d0a4b4e8 SHA512 7a276c33545351dd1e3c072b4b702fabb293744c3b26326739ebc278f18eda3fe971eeaa8392445eb49514eeb430677638b100076409ec6216915a1388a491c4
+AUX wmbiff-0.4.36-ar.patch 357 BLAKE2B 974b8998f6dfa877e5f446d304b95cc99a071a047a2af54d4ebe946bcf165dd099452d0c43be50667af370d5faaf39e314f5df7dd9fd270225c1b72e65968313 SHA512 952545376eb91f37d2cd339bc7cd503f259d695a422c946f1b4f1e5398835df7c166052cdd8af1954647716d8a07fbabf27802f7ce77dc693313d3c45ee498b7
 DIST wmbiff-0.4.36.tar.gz 266288 BLAKE2B 7f90ae23ff228ed775c4693beffb3e71930bc594083d75cbe25d9eb992cae3a35bc8d57699da53b034a19486846d05625dee607b0da38519ddfc50faac4cf6da SHA512 b8b14f9676ebd576f9e568bd59638c3000337713c6ef8cf5d7799ed0adea59d1ca1fe0d9c67ceb997814b1e6d26590a0c4052b1f031cee28601d7273bbd3fd23
-EBUILD wmbiff-0.4.28.ebuild 825 BLAKE2B 3e27116ec3256f882303581d48c4911aee3f360e581bb58c5da55244e94edc89a978333cd2654b2d49d2e8e141df6b05a236456c5768bb5fd5f7f0c8156518d6 SHA512 cf73dca2d7798577fed2e223f25e66261915220d198edc90884181c7d71c9b6b909e29aee41a7a9a5e284221048b4dc29b97388bba9e3a117cdad73adf2cf283
-EBUILD wmbiff-0.4.35.ebuild 854 BLAKE2B fb2e3f070a2e668f729e5748330d98876ea7108bf8c20dc91d20b49eaf52e562897879249226bd67b717ed2a659009a896c8e955615255c7d447cb18eeee75c0 SHA512 1d69747b719985f878268f8111edfde765613dd31aa135d2eb8d4569b2237b63a384514183f90c118fe47e23a73319f4fda6bf783145438d9ec1bfcae283af88
-EBUILD wmbiff-0.4.36.ebuild 748 BLAKE2B df8b921c25613260d469fa9410456e74a7f6fdd677bdd38c37a79074ebebc3b0e19a3b39305b0a39edcb2e9741b33d8ff46b9f703f65ccf3b2bb215c6419e821 SHA512 1893570240517a5f0e9af38ba3a5308fe95036387604323c4d0e3dcaf7edd6fdf5b29a164da7479461b1f8a5f860b71c535b2d8758f66e3c9d59fc47111c3f32
+EBUILD wmbiff-0.4.36.ebuild 836 BLAKE2B 51aa7b699796556a77602c0568ecafd27ece0c56453a5e87b4629d0ce679d93def0cbefcc0dd0865f75670dcf45e40fc2c79ee94056159482dfa8a4e93b6db60 SHA512 af811a58193146df62d595ec2dd56677bbff573534eb234b6900492aa1b467e10cecddedae1b9555aca5e1f901f2bcb38ae52f9d5d15ad2a41291b54fe570469
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.36-ar.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.36-ar.patch
new file mode 100644
index 000000000000..da1f194dd4cf
--- /dev/null
+++ b/x11-plugins/wmbiff/files/wmbiff-0.4.36-ar.patch
@@ -0,0 +1,11 @@
+diff -Naur wmbiff-0.4.36.orig/configure.ac wmbiff-0.4.36/configure.ac
+--- wmbiff-0.4.36.orig/configure.ac	2020-04-17 19:30:26.000000000 +0200
++++ wmbiff-0.4.36/configure.ac	2021-01-03 00:27:57.522698494 +0100
+@@ -13,6 +13,7 @@
+ AH_TEMPLATE([VERSION], [wmbiff's release version])
+ AC_SUBST(VERSION)
+ 
++AM_PROG_AR
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_RANLIB
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
deleted file mode 100644
index 8e73b022cf3e..000000000000
--- a/x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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://dev.gentoo.org/~voyageur/distfiles/${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}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/dockapps
-
-DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
-
-src_prepare() {
-	epatch "${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
deleted file mode 100644
index 9200caafc51c..000000000000
--- a/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 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"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-	)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable crypt crypto)
-}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
index 9bc7ddb28d8b..7f44590d0960 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit autotools
 
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
 HOMEPAGE="https://www.dockapps.net/wmbiff"
@@ -26,8 +27,14 @@ BDEPEND="virtual/pkgconfig"
 DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch
+	"${FILESDIR}"/${P}-ar.patch
 	)
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf $(use_enable crypt crypto)
 }