gentoo resync : 29.01.2021

8 files changed, 22 insertions, 87 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 16cf204f8cc0..8d3c524c94fe 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 47951e99fcdb..b9713b2ed438 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,5 +1,5 @@
 DIST pidgin-sipe-1.23.3.tar.gz 1298459 BLAKE2B e15ad7658771fc0d7f5320f6b145e67a6f33603dfe49dd83edbf42fd2e57f117f4cdac53c6b6dba401266ae6c2593bb6078a604c164aa365aa94aa64eb94f1c7 SHA512 3c7481e02f9541818a980df31d135c3eefd8f1e921dcb6cfe3d1ce194b1591531db2c23364b545a912eb3818af207ffc0a19d3310d495db503de954f0547ea31
 DIST pidgin-sipe-1.25.0.tar.gz 1395316 BLAKE2B 854832768a5c6605c28fcc02abd2444cd15b58be3be89009ce08aad390664a09235ca4fc6c6288c0e0f8677ba920a30b7e3a418312308dcb229a08817bbf4a3c SHA512 e9f1f38bb27cfd8e464f2f03aea3153b7d9a1ff7c45876ff06fc8b391e5d69506b793edda5cef0f4b5f281ddd0281ad0f97c82457e1bcc977965805a323d6f0c
 EBUILD pidgin-sipe-1.23.3.ebuild 1339 BLAKE2B 6de8452d55f045ed0340663915734c83b010b965533d644c14305fc26471dfe005555d24881203692ff920eedaccfd0e841ed90c2e58a7ebbbbc21739568fc7b SHA512 d93ec9a9b02fbe093d0f3e607627eec09944cd6a7bc8528403c493bf71d1cbb6f5f57e4635d1f206f78a05f743fc79da8d4303b983bfe84245f7135ec839a816
-EBUILD pidgin-sipe-1.25.0.ebuild 1281 BLAKE2B d3199d412ba3058f91a431048f271c7bc4325939f0117633bd72830fd3cee98b073124f5dbe233e6418999ed3a8c25df1a41a7537bd13bc71f05618abf816ccf SHA512 4139aac16b7c4036e56b58a549c862adf4a2c29d09b908690b7b3e8d06ab79e63696d89e6a890163b382efce680959367f171fa98007f85da784c1bbdd54d7d9
+EBUILD pidgin-sipe-1.25.0-r1.ebuild 1367 BLAKE2B 1a7ceb9d5e281d41b9f4240d62c79050abd8577f105963fc2710e78f6f4e37475dcf8e5bca1e1509a4b908d6c57ff4d0fc39838f6127113c88f5dd1e7d15ca37 SHA512 0981b15c4ffc12d268629976b5c2c84528f7cc8fb846ca7afaeb5aac5cf59dd65e48e16f0bcb34c61e4315524649df6e373ce85162e8bde94144b5399f922478
 MISC metadata.xml 862 BLAKE2B a48a0574208ea31609e18d48b4676763e509d97e28f562bc7a103d99183ee75184b8d674245e24b19e0d1adcda6b8091fbfc1c7e3cdb42569094fb9aeb02e932 SHA512 ff38f1be40af0b781cb545c216873eff77f07f0142b1c3db8a1ce2ca43b53fa9f2ce6a9b4940ff8843f26bb5f024d2ed8d3917762cf74b4820550bb704cc4b14
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
index dcc5117625f6..2e14f7d593d8 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,26 +37,31 @@ RDEPEND="
 	)
 "
 
-DEPEND="dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
 	virtual/pkgconfig
-	${RDEPEND}
 "
 
 src_configure() {
-	econf \
-		--enable-purple \
-		--disable-quality-check \
-		$(use_enable telepathy) \
-		$(use_enable debug) \
-		$(use_enable ocs2005-message-hack) \
-		$(use_with dbus) \
-		$(use_with kerberos krb5) \
-		$(use_with voice vv) \
-		$(use_enable !openssl nss) \
+	local myeconfargs=(
+		--enable-purple
+		--disable-quality-check
+		$(use_enable telepathy)
+		$(use_enable debug)
+		$(use_enable ocs2005-message-hack)
+		$(use_with dbus)
+		$(use_with kerberos krb5)
+		$(use_with voice vv)
+		$(use_enable !openssl nss)
 		$(use_enable openssl)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	emake install DESTDIR="${D}"
 	dodoc AUTHORS ChangeLog NEWS TODO README
+
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index ed486dd1d76f..a88b467192a3 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -1,5 +1,4 @@
 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
 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.36.ebuild 836 BLAKE2B 51aa7b699796556a77602c0568ecafd27ece0c56453a5e87b4629d0ce679d93def0cbefcc0dd0865f75670dcf45e40fc2c79ee94056159482dfa8a4e93b6db60 SHA512 af811a58193146df62d595ec2dd56677bbff573534eb234b6900492aa1b467e10cecddedae1b9555aca5e1f901f2bcb38ae52f9d5d15ad2a41291b54fe570469
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
deleted file mode 100644
index 2320f17143de..000000000000
--- a/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/wmcoincoin/Manifest b/x11-plugins/wmcoincoin/Manifest
index a755fb104661..4c67cf12d1cc 100644
--- a/x11-plugins/wmcoincoin/Manifest
+++ b/x11-plugins/wmcoincoin/Manifest
@@ -1,5 +1,3 @@
-DIST wmcoincoin-2.6.2_p20140602.tar.gz 972358 BLAKE2B a30acaa7b20e88c1d2f4b5329f02321d6a7431bf22379e9d8074b48c1953bcd411b011097546b905f406e21f5de3e9057923109f0e63136cc19d5b5bdfbc47ef SHA512 ddf1b24d9c9021e9cb02817e80f3327074ef7d09ba7d8033d5d0c8b39a25106a1d54d32f211d31a910e2175d98bbda940f309cc137edd1b02b5a656891e89b2c
 DIST wmcoincoin-2.6.3.tar.gz 973973 BLAKE2B 4dcbb79ddb23c47fb891fde56137bb385ccf841eb54ce7a34cf060d4924d859a5a2ac40d504a26e763f1fe075796e09ec6a00a0080d214add2469db6b2f3a4d4 SHA512 daffd94387a03e780250877ae43e5431a7c0710862dd9fab04efc254e02e648215fa9c301bf1ed6d1a9ca5182a2a88d10ea4c385d92752d047492e6e9ad01d2d
-EBUILD wmcoincoin-2.6.2_p20140602.ebuild 978 BLAKE2B 74c122836e1bfcd89fc77117349d48dd88566f143a37c25426c2322362a2d586d3513bcd5559e0a73f58761b1b274eb037b422c37d67a1164deb5b286fe135b9 SHA512 ad01f83b53cd4a2d5dd9da3f8daa8830eb4c2b227ebae3279302c5afcedd56183c07f6ca70ebb0b4938b8d4f90c264c161e5b655f5a237f2133befa3586eafaa
-EBUILD wmcoincoin-2.6.3.ebuild 741 BLAKE2B d246c8288b155ca4810bf7fee0359edc622a91b48ae7cbd0d0a8ec4e2a0b5d5616ddcc5fad9e8576552d2f46370c5d9980ba08d2faa4997ad56f0b4856694c15 SHA512 ad734d06e91dbe98eba7534874165c16864c86265986f2614dbc9744b5c4bfc6502572ec18965dd6694f602ebdf639c7bb8039e758151f304144b61bd498b68d
+EBUILD wmcoincoin-2.6.3.ebuild 740 BLAKE2B 66e17f93da9cce72d15ec239df9dccb993594330a42afc2ba87b5d6b7774a948ad49e701c6b541e507c438fce4693486384ca1e7ff24c5a20e415cf1ce2a2723 SHA512 09a15f2d65a327472625f927413cd8d2d0521da57c824a39ed82e57fd3bb06f4390c283d8865cd340632096cc011bad69200b100317cb0281323c9ba44962318
 MISC metadata.xml 641 BLAKE2B 8ceb569e438dfe8de74de91d31c6b858db7dc20508257fa371504352664cd409c0339e356401cf68f8a59a5cae8aee10dba93134ca353d6a63c47405bc07a229 SHA512 e2d77f95ba4774261ec4ec669d18bc5cdc11558e935bfb3d4e759e9755e15e7ef88b9207a7498c44bab9061f01483c36b2c9624648fc05df526dc91f5637bc64
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
deleted file mode 100644
index a8546bdbafa0..000000000000
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="a dockapp for browsing dacode news and board sites"
-HOMEPAGE="http://hules.free.fr/wmcoincoin"
-# Grab matching tag and Debian patches
-SRC_URI="https://github.com/d-torrance/${PN}/archive/debian/${PV/_p/+}-1.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls xinerama"
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/imlib2
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libX11
-	x11-libs/libXft
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-debian-${PV/_p/-}-1
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	EPATCH_SOURCE="${S}/debian/patches" EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama)
-}
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
index 4d14c5ca8975..54cf2f2ec83e 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://hules.free.fr/${PN}/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls xinerama"
 
 RDEPEND="x11-libs/gtk+:2