gentoo resync : 03.11.2018

4 files changed, 3 insertions, 46 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 6e99537fc012..5b83188df3ed 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmcp/Manifest b/x11-plugins/wmcp/Manifest
index 091fd280e3d8..edd2989fa496 100644
--- a/x11-plugins/wmcp/Manifest
+++ b/x11-plugins/wmcp/Manifest
@@ -1,6 +1,5 @@
 AUX wmcp-1.2.8-gcc33.patch 2397 BLAKE2B faf1538bdd47573478ce79c71a9e273348ecccfe472f709cc39ffc4085aa13f3bbebe0046e8ded77bc7e17102c891e64a81bb737e451154dd613d3e30b9ba737 SHA512 92155c2213425ebab4938c00f9b9164b247c7e3437d332d7bd479dc5eec6394d63cfb3383f98f9508ae8c12d18dec862875a5b2da69bf7b8f97f30b72a29c716
 AUX wmcp-1.2.8-stdlibh.patch 321 BLAKE2B d32f57cdd8617ed1d511d0e2b3deca1513106bfa69b07a92b8485deaa356bb71e0b19d12e601193d8ac91bf186c8f3529e7679fd8f94f5a8e19abe297ec09ab8 SHA512 1fbc0c1a26539a989de20e4abc90663e52fa65cb4279e93e22f30b7bd818f6993eca69f5a6926e2d1d2fe76bdc9be1c5e556569dc2b335d6b308cd22c4726f11
 DIST wmcp-1.2.8.tar.gz 8673 BLAKE2B 28cad145f6c41829a740cbcef043fe54d940019ea42cbc6aebbc6b8022cf15c642f1c1dbbc0e34721442d4c3974224b498e436b5eae4ea30c766b2512f58939d SHA512 ac8db45800573810389d8103b5086966bd6bd5b03620338e736e05633fca570639d94e1ceaf24f882619f7de048c70e5ba9996849e0062407e32a74d971a3b01
-EBUILD wmcp-1.2.8-r1.ebuild 912 BLAKE2B 3c083a39a23f44594ec044ca98686a111829b104c1a14d3ec9a924dff0eb6c68e696aacf383f320dfc4291668f7cc1cea71cb187f8c95dd467a27b2975a7bb68 SHA512 65e45ee55b0a2f2c4854e251249e4127d23a73764930d9d9a68d8f3b678c0a39134b01cbeea663d8af9a3f4c1baa336b04e647f0ce95bc79a94efe9a0e3f9fcc
-EBUILD wmcp-1.2.8.ebuild 981 BLAKE2B 910a7c56ee2ff6af5dfbf441d10da264c9042853c56eb2ff1eeda25a2e490e5dfe43498a2b28d03ce03dbc35bc136f66ebaa38a75e8f96d187b0a387ef2eecc1 SHA512 3424ffb1b0f34e6e855f2d6ef07fb4817d33f64a08c14a6eacd58a315b9f95d34dca8f95d60b2c479f8a6a4881aa432824859eeaa882665609dbb6ee4a14c18a
+EBUILD wmcp-1.2.8-r1.ebuild 908 BLAKE2B 1e0ec0e8943a6f83cf64f56575de8b54abdfe85645db2d9ec805013d3bb4b88f46049fb44bfabea19cce30fa34ec387b7ecc3a8459117b0946c6e518a854c9f6 SHA512 672f8cfb45c60d70fc65e84c010574a58dd9b327966b492903cd26feb335eea6e1702876b13656ad7854e585f13fb9619676f157bd02107fa24ee3ea4ec46bf9
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild b/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
index d8056d2a0994..ba7862271712 100644
--- a/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8-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
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmcp/wmcp-1.2.8.ebuild b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
deleted file mode 100644
index eda159623e38..000000000000
--- a/x11-plugins/wmcp/wmcp-1.2.8.ebuild
+++ /dev/null
@@ -1,42 +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="A pager dockapp"
-HOMEPAGE="https://www.dockapps.net/wmcp"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc33.patch
-	epatch "${FILESDIR}"/${P}-stdlibh.patch
-	sed -i -e "s:gcc:$(tc-getCC):g" Makefile
-	sed -i -e "s:i686-pc-linux-gnu-gcc -g:i686-pc-linux-gnu-gcc:g" Makefile
-	sed -i -e "s:i686-pc-linux-gnu-gcc -o:i686-pc-linux-gnu-gcc ${LDFLAGS} -o:" Makefile
-}
-
-src_compile() {
-	emake -j1 INCLUDES="-I/usr/include/X11" \
-		LIBINC="-L/usr/$(get_libdir)" \
-		FLAGS="${CFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	dobin wmcp
-	dodoc README
-}