gentoo resync : 07.10.2018

3 files changed, 3 insertions, 52 deletions

diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index 9d0bacb27c96..e06c33649c8d 100644
--- a/x11-plugins/wmsystray/Manifest
+++ b/x11-plugins/wmsystray/Manifest
@@ -2,6 +2,5 @@ AUX wmsystray-0.1.1-Makefile.patch 1551 BLAKE2B b58ebdc03508d47d1eb6c58913493bbf
 AUX wmsystray-0.1.1-gcc-3.4.patch 269 BLAKE2B c3b126db45c7d2dcf38dfce5db9965f9f5c7bf9636a5f9f194d4f0209a737cf11d115ac42430b5ae6f00ad9770256a95e8f03cf47f23127251927172f2e8783a SHA512 ee03a2986af6e1f3de6751a2d90738ffeec2fff0c1f7f0ddc686cc4baeeb010bf2fca764b886e9ee1af82ac2926d4571519ae2371c172053834f3d6bac7e2570
 AUX wmsystray.desktop 185 BLAKE2B 5d4f524ddcc939ef335a043fad6c136e03f2a2cc7fdcc9a4703e210ad301d5e101f8c03caa6c5a069ca805ca44abdf6e56a18fcb8e98596f80f469482b8927e5 SHA512 f7a2c0391257d76c9024f2804de067b07f3669fbba6fd0af6471297f4c0fb876ecfdd7cd6b931187d657d6558ff27d01766c299048f7c16c4d4eed5c4586213b
 DIST wmsystray-0.1.1.tar.bz2 18261 BLAKE2B d232dcfd3077760d7990ec8e22249aafa9dacf415e71b6a662a1a32464e233cd5460f9b99d6e1c478ce69c6ad0e9973febfce2292992d5619792d4bf4dcc1d7c SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604
-EBUILD wmsystray-0.1.1-r1.ebuild 1180 BLAKE2B 8b0ad145eb5f3e4b7cc38afba7d25bf950b0aed22fb3cf88213ce675e9d1deab7288e1135a86bcb126b4690183efe92b34884d1d52e03e2ca0fae932d7d7d964 SHA512 f7f3b446527f88eb08e294cfc9147a8bbfd97498ba5051f8b0de42623bae14b3d55dda6079f8c55ea5ba22080a80c2224e1b5e4cfa0ee91dfe173c9fac201f63
-EBUILD wmsystray-0.1.1.ebuild 1204 BLAKE2B 8e9235f29442507f9f54ed5ec6e7680b9153d1a5a0a5d8d0dcbe0475faa62e831d8b2333d2e5141696bd17bfd1351210acaee59e6935f049c1a4ca44cf8788ce SHA512 dc8ba563e2c1da0e05f79541d701d89d3ad11d335eda486f00bd557aa141c27711ba92e7ee1cf5328733d6e7907e18bfb2fb42f959bfe1d9710825d9036ec522
+EBUILD wmsystray-0.1.1-r1.ebuild 1176 BLAKE2B ef119e6cff86bc2a4a07d86ac099ec6452ea8b1fb8e5d52f67e35090d604a05a02b3239182ad96d27e8d186c2232a9ca0e25ff2e4b3654c3814c242e161fc39d SHA512 85cf15c7ce31786d0d8551ecbb408d0d380d6e339a9d2600b84def259945ad218e12579b5f4b2054073c9db8853dda7141e433787667c9f7a7f4158c69195d81
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
index 0522567eab76..4756f31445fd 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.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
@@ -15,7 +15,7 @@ DEPEND="${RDEPEND}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 # Let's honour Gentoo CFLAGS and use correct install program
 # Fix for #61704, cannot compile with gcc 3.4.1:
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
deleted file mode 100644
index 470cb2956245..000000000000
--- a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
-HOMEPAGE="https://github.com/bbidulock/wmsystray"
-SRC_URI="https://github.com/bbidulock/wmsystray/releases/download/${PV}/${P}.tar.bz2"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Let's honour Gentoo CFLAGS and use correct install program
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-
-	# Fix for #61704, cannot compile with gcc 3.4.1:
-	# it's a trivial change and does not affect other compilers...
-	epatch "${FILESDIR}/${P}-gcc-3.4.patch"
-
-	# Fix parallel compilation
-	sed -ie "s/make EXTRACFLAGS/make \${MAKEOPTS} EXTRACFLAGS/" Makefile
-
-	# Honour Gentoo LDFLAGS, see bug #336296
-	sed -ie "s/-o wmsystray/${LDFLAGS} -o wmsystray/" wmsystray/Makefile
-}
-
-src_compile() {
-	emake EXTRACFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	dodoc AUTHORS HACKING README || die
-
-	domenu "${FILESDIR}/${PN}.desktop"
-}