gentoo resync : 22.10.2018

3 files changed, 3 insertions, 50 deletions

diff --git a/x11-plugins/wmpop3lb/Manifest b/x11-plugins/wmpop3lb/Manifest
index e920043680e2..4864fd5d4065 100644
--- a/x11-plugins/wmpop3lb/Manifest
+++ b/x11-plugins/wmpop3lb/Manifest
@@ -1,6 +1,5 @@
 AUX wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch 5642 BLAKE2B 50c94971c380b01abb1bc7797d286bc8fc484105969583c4ada10f07dd3bfef60f9382208d961a54113d59b7ecb6e6fd253b6f72c6f7d9b914567b6a504f82be SHA512 d0f5696c8db4fd8fadd95325abfaabe8f72cd5fff87cab5d36e927b60a582857ec0fac114d6e895d749a3aded0f439c71a655947c4bab9308bc346906938982a
 AUX wmpop3lb-2.4.2-list.patch 2941 BLAKE2B 387a8b4cb87d0ca0ba865539e3c17ca54ac5056f9229832308d5dd89b62b2bf5b9912c394aba1951fb999bc3a7ad257987228c0f3a69e50092735e640fec0c66 SHA512 0a8f5cb7da8ed6143276eb081585621b108a92865de7d6780aaf3c98144a22af6eae89e2ed661926552196fa351fa805d4e6f51e243693f1c537ee96f91b958f
 DIST wmpop3lb2.4.2.tar.gz 37391 BLAKE2B a9e1acaa35b965db90d5e272382629d02b127b19e9501a6e26094f204463a1f33023cdcf4b7910a045abd2e412c0a41cd3d67fb98378b164f2a3c3f0f457f8af SHA512 6d9d12261c457542ba45bbbb2f07ea9895a456d87c60187e2df0f0cc6e6da57fb498ea642346d113749b9529f1bebc623ec9dad48ee84e5016925b2440211e0f
-EBUILD wmpop3lb-2.4.2-r2.ebuild 1007 BLAKE2B 538816729c0378e654d8e54a0ddf4f88fc1790ac6ba69cd8d0710e2a3b1863854e2197b5d5f101ffc5e0f65798844135edd207d80d4d0525c8c8012132a8cd04 SHA512 c7ccc12d81c13a3e53211daf426d7a2575f954d244cd1127fedb91eeb78e2f98ae0eb5666072fd5c589aaebb8c155ae1f3f18bfe3621554da9097513362ebe76
-EBUILD wmpop3lb-2.4.2-r3.ebuild 971 BLAKE2B 93116c6b91f500e9dd76fbf3cb3106abc2a7631504306b6d1d7bb8019b7a7b24f6be573ce248e2abff0f8ff02ddb86c51a202e4b2a68337dba0ef112e9d1a3d3 SHA512 9f81056511c89e6cadc96bd52a6f17a4c011714386f16a14734e6d301ccff95915e34ef2cec52838cf9b7f86cb2a27c2faa1407f5309a6dd6005607c7c0c9291
+EBUILD wmpop3lb-2.4.2-r3.ebuild 967 BLAKE2B c35eb1ad6634f803a54e1b26d2507a56553735e278ee7c3764b317d96f01badff9baffa4f64fb769f41ce9fc1481a1e1231fc45092a473e9e8660bf668471bc3 SHA512 1312de99c811f36301a49b266dce5b2883aec8f436dd3fc8d75e3edef3d34781b077c08825ea1f140927f0fdc619027bcec38773d681a4f4e333c08bb8d25169
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
deleted file mode 100644
index ba983fab624c..000000000000
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="dockapp for checking up to 7 pop3 accounts"
-HOMEPAGE="https://www.dockapps.net/wmpop3lb"
-SRC_URI="https://www.dockapps.net/download/${P/-}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	#Honour Gentoo CFLAGS
-	sed -i -e "s:-g2 -D_DEBUG:${CFLAGS}:" "wmpop3/Makefile"
-
-	#Fix bug #161530
-	epatch "${FILESDIR}"/${P}-fix-RECV-and-try-STAT-if-LAST-wont-work.patch
-
-	#De-hardcode compiler
-	sed -i -e "s:cc:\$(CC):g" "wmpop3/Makefile"
-
-	#Honour Gentoo LDFLAGS - bug #335986
-	sed -i -e "s:\$(FLAGS) -o wmpop3lb:\$(LDFLAGS) -o wmpop3lb:" "wmpop3/Makefile"
-
-	epatch "${FILESDIR}"/${P}-list.patch
-}
-
-src_compile() {
-	emake -C wmpop3 || die "parallel make failed"
-}
-
-src_install() {
-	dobin wmpop3/wmpop3lb
-	dodoc CHANGE_LOG README
-}
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
index d32a540ca69a..99e7ab4db582 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P/-}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11