gentoo resync : 20.03.2021

4 files changed, 3 insertions, 85 deletions

diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest
index 14dc2a82d5dc..166bdaacabee 100644
--- a/x11-misc/xdesktopwaves/Manifest
+++ b/x11-misc/xdesktopwaves/Manifest
@@ -1,7 +1,4 @@
-AUX xdesktopwaves-1.3-gentoo.patch 950 BLAKE2B 4c8101e7eb1b1bc7b4cfaa5fda8c9391c8eb1853480cbed0cd00994bf673fcf7c84e22c2d26386645eaac30645f2d6f89dc9ac52f7c82ee0358022f41eb3c8c6 SHA512 d1c643b697acccdf2172d2555e1cc6e0e7f860741b6c2c6e9c60b51d47772883b0c47a5a5ca6efc797f7e31e9e202c295e956b16038b8a926a485c6abdb91373
 AUX xdesktopwaves-1.4-gentoo.patch 1028 BLAKE2B 061d66954cf8cade631e954dfc39c16e6ce0d6be66787dd9aa84fb59a83a7865335f9e5ab95ed111f8f7764aecd4b7bbdaf53d4ae21e9acff82022e1788b5117 SHA512 f42d392daef8abaf25be0f420f0f365fe29f821732ffbabbeafa5836bb653ba28c1c45aa7b33060449d8c59f5a38752f6a2854fa5a33eb5115f427ce1254e094
-DIST xdesktopwaves-1.3.tar.gz 49302 BLAKE2B 96348d80ba71a179df09afbaa8f2fb79725e049203e9644769e5a41b7fa8a9cae06ef2002ac3062f317f84419ae2ef739e7a90142b9b06118f51754d295e70ed SHA512 7dd3eb4f3a9291e9afab7aab7385cc271af2754adecde85ef3a2dfbc6a0bd96bab440cdb9f34cabb9e7c6d9ee25cdc64bf57ba7edc4df03f344b5b10404cd52e
 DIST xdesktopwaves-1.4.tar.gz 50259 BLAKE2B 5512746c9a035878f50abfc35c088f2953c5a0decaab6e0fc3cd31e29e75d100430c36df5a0043f64222521e939797ad24b9147a66cf5ba20f7f4c22fc78767d SHA512 06ec5bea51737d066beccad57db63ef7e56e59c18bb7c1dcaf06f6691940ac32a32b7cd06d9e3f16ad472e3d793c391b072a753e0088ab71ae7304b20b2fa3ba
-EBUILD xdesktopwaves-1.3-r2.ebuild 952 BLAKE2B 37fd7a122bf3c4af5336c7827b9e1533992e766d7c3e9ff44a52e40865b9fb108c61f0c6fbfe30d0ce5deb92023bb322c4f4b7bb34f99502f44e1d174e1aaa34 SHA512 d1d6dacc91cf72b1a3ab091376c477e2b48a99ee7a67d57348ce6adb2f9618fe5e7c48635f5b279cab4ed36df10a7af4337dcbcd3e1489624bf978cdf8c1f316
-EBUILD xdesktopwaves-1.4.ebuild 767 BLAKE2B 7726ae9d255e86e890f2c87b3ff4d945481e1d33058b552111522ee49d5b40a67207fdee4bfb84669b2c26b5884603e6941b73d9e0247037f8b87473b0a9b404 SHA512 7db4c54893753cd9e0b75fd4eadf79f9453baf29de948bdf3d2e18477c715aca47253c60b551662e18b0453ac052bb49af6284611a04c4296427f71a5ff71bd3
+EBUILD xdesktopwaves-1.4.ebuild 764 BLAKE2B c16d443983be21ce27f2230b9963297f577ae6a29989cd43348915a442c8d983e7fb264ac4b4c17359b21578b8b068ca5dc836cb11ca125db9abb456d2d1ac31 SHA512 8a01fcef1fba7fc74426a256f9aabe63356574ac53212be3429ca18a47918eecd88e107f8f2c9e9ee955db945fb42520f888f7d17a95986ee0cecc7bcb7fddaa
 MISC metadata.xml 663 BLAKE2B 67655f76c1b276f5eceb77901fb479938a5ee591461f0f1e4a67315f8cc16fab52b52df5fdf4fcefdec0e277dbdf10cfc2d6ada8e740f69ce41fed05299c0d11 SHA512 e070ee728003491fe3537f9c8da175c576e3f21ddf42dea6c0476a849f1b0b93b30fe4407ec2a7dbe6df04219e90c0da2624ce9f709585d43517297223f2e202
diff --git a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch
deleted file mode 100644
index 80e219edc6a8..000000000000
--- a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -11,14 +11,13 @@
- 
- #=========================== C compiler configuration ==========================
- 
--CC     = gcc
--CFLAGS = -I/usr/X11R6/include -O2
-+CFLAGS += $(shell pkg-config --cflags x11 xext)
- 
- #============================= Linker configuration ============================
- 
--LINK   = gcc
--LFLAGS = -L/usr/X11R6/lib
--LIBS   = -lm -lX11 -lXext
-+LINK   = $(CC)
-+LFLAGS = $(LDFLAGS)
-+LIBS   = -lm $(shell pkg-config --libs x11 xext)
- 
- #============================ Installer configuration ==========================
- 
---- a/xdwapi/Makefile
-+++ b/xdwapi/Makefile
-@@ -1,10 +1,9 @@
- # Makefile for the xdesktopwaves API and its demo program
- 
--CC     = gcc
--CFLAGS = -I/usr/X11R6/include -O2
--LINK   = gcc
--LFLAGS = -L/usr/X11R6/lib
--LIBS   = -lm -lX11
-+CFLAGS += $(shell pkg-config --cflags x11 xext)
-+LINK   = $(CC)
-+LFLAGS = $(LDFLAGS)
-+LIBS   = -lm $(shell pkg-config --libs x11 xext)
- 
- all: xdwapidemo
- 
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
deleted file mode 100644
index 2104e57383da..000000000000
--- a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water"
-HOMEPAGE="http://xdesktopwaves.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-RDEPEND="x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	tc-export CC
-	emake
-	emake -C xdwapi
-}
-
-src_install() {
-	dobin xdesktopwaves xdwapi/xdwapidemo
-	doman xdesktopwaves.1
-	insinto /usr/share/pixmaps
-	doins xdesktopwaves.xpm
-	make_desktop_entry xdesktopwaves
-	einstalldocs
-}
-
-pkg_preinst() {
-	elog "To see what xdesktopwaves is able to do, start it by running"
-	elog "'xdesktopwaves' and then run 'xdwapidemo'. You should see the"
-	elog "supported effects on your desktop"
-}
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild
index 901b11eb7789..1e5d62650fd1 100644
--- a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 "
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4-gentoo.patch