gentoo resync : 30.09.2018

3 files changed, 2 insertions, 44 deletions

diff --git a/x11-plugins/wmfortune/Manifest b/x11-plugins/wmfortune/Manifest
index 1065eab23016..4c562cd6b629 100644
--- a/x11-plugins/wmfortune/Manifest
+++ b/x11-plugins/wmfortune/Manifest
@@ -1,5 +1,4 @@
 AUX wmfortune-0.241-stringh.patch 316 BLAKE2B 3c045766680c8581a4d8e4d312863e7b158d3e840000e9c767d8fa40c2c898be763ecd7b8ddf76e35a14fe99fed3734f0a84fe69d6102a38c993279e6f53c122 SHA512 8b4982a59604110800506d10ad10ef95964d8281a439506437c8311836aff4daa250aac9208e4f7e105cafee167acbec4d3e8631fed4d6c3a94277b338604025
 DIST wmfortune-0.241.tar.gz 23406 BLAKE2B 2a104d4f5d9ca1865618b95c2d6e4bb49cb841325442f58712c4bca1d971b9ef6512d509e80753b8a96e7978d5198b3a4f6fc2d54c6182b439b4d30cbe73d6df SHA512 d5640090c2f2ba788ab9367b70d948d4f1d846174714e2415e81500f5fef6c3e7e81b12575274bdb3a760fa3e2e9ab499880713a923add136089969b394f9409
-EBUILD wmfortune-0.241-r1.ebuild 804 BLAKE2B 1350230e1cd9003aaf341c617f73aefd821e6f72da01e4939dd887709961c5c2ec15ca29e0699963191800970c30b159e23742a88b35bfdaa1a01a13af35e1f9 SHA512 95f0e54e1308186eb2ddda47eebe28bc639578ac6617bee17c8972cf8a39589110fcd4235dbd4b19b042fc0c492dede1ef9a8f711e359300be3a696df808464d
-EBUILD wmfortune-0.241.ebuild 858 BLAKE2B d3d381158f20297d56a5c8aa2b0ba803de51bff7befcf34a8747da87a4edc0833bdb93fa175865d0bc4ab341f8ad90fbe76bf2edc921113bd55e93bb7aa04887 SHA512 a4aa8c41f1e0314095f49bb1f544e605aa762c70676757e745bab0f6deb5b1a447d492b8394c6897f9c2425b7c8f43bab70663d51f1d675fa1024b58d9bcba3f
+EBUILD wmfortune-0.241-r1.ebuild 803 BLAKE2B c0e36186e13abaf3119bc19bfe19678ec2ea9deea5a7318f0e0c4f39472eb368185756e7042d487dd881c5c0174907a781d1266b987ce3044d0d97095217a19a SHA512 60e6cef64889d647aaf1a1a15bf39d689bdd7a35a6b276bc8c26acb68aa28cb994fdb46c64cbe1cb5d5beacf688ac62fef45a68deb5dc9b68c3352dd8c5aa23e
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild b/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild
index c70c20c480c6..ecf621d042fe 100644
--- a/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild
+++ b/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod
diff --git a/x11-plugins/wmfortune/wmfortune-0.241.ebuild b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
deleted file mode 100644
index f4d577617bb1..000000000000
--- a/x11-plugins/wmfortune/wmfortune-0.241.ebuild
+++ /dev/null
@@ -1,41 +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 dockapp showing fortune-mod messages"
-HOMEPAGE="https://www.dockapps.net/wmfortune"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-stringh.patch
-
-	# Honour Gentoo LDFLAGS. Closes bug #336446.
-	sed -i 's/-o $(DEST)/$(LDFLAGS) -o $(DEST)/' Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" \
-		XLIBDIR="/usr/$(get_libdir)" || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc CHANGES README TODO
-}