gentoo resync : 22.10.2018

3 files changed, 3 insertions, 49 deletions

diff --git a/x11-plugins/wmdots/Manifest b/x11-plugins/wmdots/Manifest
index 7b9d82fe1e40..f2dc89530a1a 100644
--- a/x11-plugins/wmdots/Manifest
+++ b/x11-plugins/wmdots/Manifest
@@ -1,5 +1,4 @@
 AUX wmdots-0.2_beta-stringh.patch 325 BLAKE2B fdd3cc86c6eab458926bdb1a33f6050c36716e9840e2d20b60e4835a4895cd3083760c0f01953ab9470691b23fda40e7001f135dfa994d16aee3253205d6e741 SHA512 b2da0950f0b74f6a25bb57d5fd27e315e5e4a1cca41c5cf413bbcf5a7d50ff5312a8d2903a646b2ba7c79007b8804e6518fb9a14b25fdd1028104d7800726f60
 DIST wmdots-0.2beta.tar.gz 94933 BLAKE2B 76a722b60989855b47dcf08539299c7bdf57485595d0f452d8ec10ef57f350810396bda396757c266dda8cb1db9bb3f1823b0f9759b1cb85c7e1ff469f5d2a60 SHA512 2e9d42c4086f240ece0a29cb6131bad2d499bb7f08e8a444cf72ce1a9813f9919f9d47c4dd5ae015e6c2e76601f1e7ab421a67daed1cefed45dcb06e4cbd8488
-EBUILD wmdots-0.2_beta-r1.ebuild 867 BLAKE2B 8daaf77c265bc72e6087980fc5e6ea821ad236b48e3a058e42df947e00971b40fc257ef8c42051dbc046802db0c0d7510cd29e2148c475e67b01d127199d5472 SHA512 fd39e44775eef5edf67978d601472fe269bd86db177a12e9a1c7ea4785a7ade1b03df231d265a6e10f404fe7725a2de7773a8036608932ba13e5ac0ab105d7f3
-EBUILD wmdots-0.2_beta.ebuild 933 BLAKE2B fc9b12cd3d4fedfae8418b7e11c3e73d3b55cd9739de1814d5894e8572cebdee24e55b30f84aabf25c533796262ea2e2d5e97465e4b36f9958d319b6b8d6bbfc SHA512 ec5c90f87ffecafc15efa1863a6800a6f0e831b98ed9c767aff4ca18f36ca8f98087b062b3466bf8cb21e301c17ff36bdb917d8a6873da4b8c5c28e4f5cebe75
+EBUILD wmdots-0.2_beta-r1.ebuild 863 BLAKE2B 237b2450c2300672a91c38ac221cfaf2f730a7a1b2983be57214158110d59ea8fa8de36dbbdd1fa53acd52a9e53f2b1d717976f48e1d95711e898c05e987621b SHA512 4b0feedf8be98b9efa773840745740e768f35ed7b314c0bcb289f57683c6b01663fbfe4ad56caf4ab2850d2b35cb9efd1d471f99ff2abc1e65b207fc9e998695
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
index 239c3539f11e..e38905e13292 100644
--- a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
+++ b/x11-plugins/wmdots/wmdots-0.2_beta-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="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
deleted file mode 100644
index 4883a2add90f..000000000000
--- a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
+++ /dev/null
@@ -1,45 +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="multishape 3d rotating dots"
-HOMEPAGE="https://www.dockapps.net/wmdots"
-SRC_URI="https://www.dockapps.net/download/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-stringh.patch
-	sed -e "s:cc:$(tc-getCC):g" \
-		-e "s:-g -O2:${CFLAGS}:g" -i Makefile
-
-	#Fix compilation target
-	sed -e "s:wmifs:wmdots:" -i Makefile
-
-	#Honour Gentoo LDFLAGS, see bug #336982
-	sed -e "s:-o wmdots:\$(LDFLAGS) -o wmdots:" -i Makefile
-}
-
-src_compile() {
-	emake clean || die "emake clean failed."
-	emake LIBDIR="-L/usr/$(get_libdir)" || die "emake failed."
-}
-
-src_install() {
-	dobin wmdots
-}