gentoo resync : 07.10.2018

3 files changed, 3 insertions, 42 deletions

diff --git a/x11-plugins/wmSMPmon/Manifest b/x11-plugins/wmSMPmon/Manifest
index eb005713fed8..f1ca3925b967 100644
--- a/x11-plugins/wmSMPmon/Manifest
+++ b/x11-plugins/wmSMPmon/Manifest
@@ -1,5 +1,4 @@
 AUX wmSMPmon-3.1-makefile.patch 1300 BLAKE2B d017661312fe29484eaeffe05a5f8cbacd54c19c3ebc9f52ca6605704427292b23ec695b9403360aaec0d48c61453cf69d4e269f777cbffd8b194a3d078150bc SHA512 e94f9a66d782aaaab3bd637c2657cd34efe1b5e1f556c932171e30814551236f67a1846b688bda8983a072ba1622d37f8aa14528c657e9542404fa8b96358826
 DIST wmSMPmon-3.1.tar.gz 24834 BLAKE2B c02c49810f69b9d28d42f24e7fde6556d46f214d4cb5b47cd705bed2ff5c2c00205829018179ecd6c63162a58d0a957d5fa35d33f0075532c72d3d6876ac6c40 SHA512 b13caa3c4bc7971d35bc52bb66c1f6da482b55a5073b61b3f059fac97f6affbf091816c933981c1c88c17127ab8d21c09c59d0f3c93364e659ca409f13de43b7
-EBUILD wmSMPmon-3.1-r1.ebuild 756 BLAKE2B 66ba5e71a613e7eb4e0ff34afa1d36d043a564c00450f2049f64364d50adc1b3cc6b967f84a1166c8c111584de69bfc527bcc5265353b72f10b8d4e8c0385cb0 SHA512 c3ada7218117596b7472613c96d54515ed16b9b54afa3aca675ce951c3ff5ae00e58187d030ffc0d33929d99bdf6400efcedf51a676cc964d69aa540491a0d6a
-EBUILD wmSMPmon-3.1-r2.ebuild 610 BLAKE2B 3a9012afdded56e4257dc955b67ccd6ee2fc1d0d1cfb009a15f608cf416c32a7cb140f1545432a50305c520b5bd63c0a08f2aca71dc0f3b6f20ab7be0f98436d SHA512 2e46edf7078a58e07467b155312b083a39c941a6c64ca1536ad44388be6069853b412046210403f05ab67b90af79006aa4867b850736d08a92ee9bc4aa34bb14
+EBUILD wmSMPmon-3.1-r2.ebuild 606 BLAKE2B cb23f1aa1c267ed95ad3387aab7a4df80c3d19dabf92d29c2466b72a58874723027527db5c2f26b0480b99d37eee45e7f4fd58d1f3d1ed54122d02cae4ec51dc SHA512 9258edec15c7ad331f3fb13d9c6fa7db32c0e6f374a7c219dc20fbc9fb24bda8b0f418a93b7e4d0c1491b056a761e8f8140dde473ff5eb4d80e4cdb7ac52de99
 MISC metadata.xml 379 BLAKE2B 8d029b244f6cba1311fc8af0fa96705ad2701ffe2d4aad6a45e3e86d6a7b07c1749f7ffdd171217c5f610681921006400f6641618a6cf93541e7b257f2441198 SHA512 2fc60cceb3fbdbbb8fd85048bc50b6777461a9c7cf37d8b672ac09d1556f284acfa5df747d704c9335bfe91f93142be1cf39cd4eb19c808a50eb8fe5a27f67d5
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
deleted file mode 100644
index 8005c831f09c..000000000000
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
+++ /dev/null
@@ -1,38 +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="SMP system monitor dockapp"
-HOMEPAGE="https://www.dockapps.net/wmsmpmon"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc ../Changelog
-}
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
index 268d59eb5219..9619fe673e8c 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.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
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11