gentoo resync : 18.11.2018

3 files changed, 3 insertions, 43 deletions

diff --git a/x11-plugins/wmCalClock/Manifest b/x11-plugins/wmCalClock/Manifest
index 0ea623b009e1..64d3187cf247 100644
--- a/x11-plugins/wmCalClock/Manifest
+++ b/x11-plugins/wmCalClock/Manifest
@@ -1,5 +1,4 @@
 AUX wmCalClock-1.25-makefile.patch 1054 BLAKE2B 4928c86294dffbf353d88910db3f6757746934738cd5027f5a12719f85dbd933a2d07f4cee5b1d856a6201ef97aa5591a0683a5554cabe15fe12cedd64861df0 SHA512 fc062a5cd3a18d6ac1485d953052e8519c6ba375fb6cfb61511e6526ba24cb7fb391dd0971422c78743cd8cf4cdcc3abb68910939e7f7b8160191f1c6eaff14c
 DIST wmCalClock-1.25.tar.gz 71574 BLAKE2B b1e308d99ee1b66fa9bb7cfcf0c83ae5e637ff7f17a2d07bb43a57d941c654d53f37ee9941e0fafedd617d64cde8c2880cfcbf664c03e109e80fa523ea9a6e09 SHA512 499f91856e79fee4fb776b3fa8cbcc70cae2e28a1e9ea5d2c1dbf5a7684cff4be4e5e9362d672aa7cf459d0bfe14f68ec51a10376558a9635d77e5e6ce7f149f
-EBUILD wmCalClock-1.25-r2.ebuild 840 BLAKE2B 93955ebc51f859e6a6aafe9d3ebaf99235c848c423afd09d5d83f591e62b46fc50af716243fa95fa77bd97375fbd1bd49df586fd32a98ad48aee402c07f1ad1d SHA512 8bb5cd95aa5b9552e8e368668fbfadfd9bd79097112fee323adfd904120e9535a228ef35df9075fad0c4e4ce935174717c3fed05e8d4f564513d690d8853ac2a
-EBUILD wmCalClock-1.25-r3.ebuild 693 BLAKE2B d38e69dfc786df9d2d1ba6c7229d08748638c403eef25f731b0267caddb63e6fab798bdbc9bb4c586611995830f4a251828d0bd543cb1b6bde2ff0c7b25d036c SHA512 01ff03edecb79bb0543b8d114e4b6700359b7358c504d1615c5263984bd617e8b976185133fd78c278a7004ff76eec791de44273738343752d65a13fc386db72
+EBUILD wmCalClock-1.25-r3.ebuild 689 BLAKE2B 1f2d911653120c9fd463e222dd9689d94913f046e38b74e4482c1a68ae9d630b08734464d4e3ade4f016610d61cad84480918502acd85c5ce93b0535f19a4a5e SHA512 69528315f774ef2fb528ee9a168248e220ab1878e3ecf60975d034168f4f5d90355b09a6711aa9b3aebc8940455c4fa435c0f326fb0e93bbd8754521739e13ec
 MISC metadata.xml 476 BLAKE2B 743b22ba315a1e4f01909148a31b652ff649a05bed840f8c2a2a2c69ddc45afc32b5604083ec9e5c623621291a7603b66c5e0153e782fce98353c513655f049d SHA512 2281d53175fc5377c916eed033127c71d17b572982fb0c0c9264349866f9c0cc784771fb9d34b7542972b623e784c4bb76c0c4524db160884ad1d1e08e29aa43
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
deleted file mode 100644
index c78e78b51b63..000000000000
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="WMaker DockApp: A Calendar clock with antialiased text"
-HOMEPAGE="https://www.dockapps.net/wmcalclock"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${P}/Src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc ../{BUGS,CHANGES,HINTS,README,TODO}
-}
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
index a59a7b2e157f..5acbd4856b4b 100644
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-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
@@ -17,7 +17,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${P}/Src"