gentoo resync : 21.09.2018

3 files changed, 2 insertions, 43 deletions

diff --git a/x11-plugins/wmxres/Manifest b/x11-plugins/wmxres/Manifest
index ac53fb3f694f..b08b2059451a 100644
--- a/x11-plugins/wmxres/Manifest
+++ b/x11-plugins/wmxres/Manifest
@@ -1,6 +1,5 @@
 AUX wmxres-1.2-r1-fix-build-system.patch 584 BLAKE2B 2ea4860274791edb2dcd1c03ee0753c413f919ab1648c7a2c684e8f45698355d0a7132052705b71210b9ba3eeddb35815bd1219dc151484a919d5b67b0caecc6 SHA512 c505490234aa5ec366ae37b5bc95c04cefed93599dfd37d14a015c03daacf0b71fc611bc6962c31be12a60c61c82e7b1f29db80e7826e058433abf9f9f2279eb
 AUX wmxres-debian-1.1-1.2.patch 1699 BLAKE2B a07ed3bc2c26d9bc73d4340d658ff9754eb9109fbd5bd0ffe973d90af32bf0b5e8e9edc6a03ee822c41d89a934e5270ad81774f35c0d62867f6b788071ea0fca SHA512 d2043b9ff22415f03ec7a3c46770562b7d6ee0180d1048dbd447f27c49149b405faca3c2e863a91abc71c766ce461464f6c4fdea54d2b5916c88a85e8f2d8051
 DIST wmxres-1.1-0.tar.gz 9948 BLAKE2B e9d0952a0cba30733f0b28ab0b1f37e7b0215ba71abda255646321ee673a09f8510384466919dd27679a6b91c68f7a31fe3ff646c7eb453193c9de29b46c5710 SHA512 e7b5bfb061822fb827da50b24287ab9c6b14d3ddf9a89ff6cd5e1bb61939905c901b4a0ff7a6492e0ccce3b39b8bb4d8ffb13cbf7978075a73a30080e25c18ad
-EBUILD wmxres-1.2-r1.ebuild 728 BLAKE2B 9040ad1768ace4402ca95f8677ce69e91266e94afc06cdbe48983f68407aaa3dba7234454162e60fc98bb68ef6fac244c950e3648cfc16b517c305949565a300 SHA512 e23565d6a9fc59f73e7735dd0c1b9f158b28f803d1cd908adcb5282ab0fe169b1c4cbca8e3c1463930fe77d6b9e49ab17f9969632a2e123c1b2b3fb9ec336773
-EBUILD wmxres-1.2.ebuild 875 BLAKE2B 275175f1dc0385cf99249e8ebec69121b1d5da4933075e930104ab509adb112695a58d40d35505f0de7d645cf4b3da4e78d5db56c6d419af7908606f5cd41853 SHA512 caacacc4f8b394913af287b6d559f51986b46a4c66bc43f5ae90f5d8e0235d950bb62fd80756a7b2b8d871054ab970f3a9a746565cf63c322640209a1867e9b0
+EBUILD wmxres-1.2-r1.ebuild 727 BLAKE2B 7da58ff45b7c0fb5b9f3f05e5b22cd72271097baf51cab5786024c534a5f6af3d2c41167b6bdf8325df67f2a274b10151a51213175391ac291f82c67758ee411 SHA512 8e24591c5f34553a205ea69c9ec3d19d91347ecfb6b5477077c0ba7d8b2fd1dd3e75b92bfd4c1f57b4083fa59a5d7c0abf3130cbc495f0b429b0469d497df24c
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
index cd415d8686c2..993a4f040d46 100644
--- a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
+++ b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://yalla.free.fr/wn/${PN}-1.1-0.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmxres/wmxres-1.2.ebuild b/x11-plugins/wmxres/wmxres-1.2.ebuild
deleted file mode 100644
index 793229458363..000000000000
--- a/x11-plugins/wmxres/wmxres-1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Dock application to select your display mode among those possible"
-HOMEPAGE="http://yalla.free.fr/wn"
-SRC_URI="http://yalla.free.fr/wn/${PN}-1.1-0.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 x86 ~ppc"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXxf86dga"
-
-S=${WORKDIR}/${PN}.app
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-debian-1.1-1.2.patch
-	sed -e "s:-g -c -O2:${CFLAGS} -c:" \
-		-e "s:\tcc :\t $(tc-getCC) \$(LDFLAGS) :g" \
-		-i Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake INCDIR="-I/usr/include" LIBDIR="-L/usr/$(get_libdir)"
-}
-
-src_install() {
-	dobin ${PN}/${PN}
-	doman ${PN}.1
-}