gentoo resync : 02.08.2019

4 files changed, 87 insertions, 5 deletions

diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest
index a223d7c525c6..14dc2a82d5dc 100644
--- a/x11-misc/xdesktopwaves/Manifest
+++ b/x11-misc/xdesktopwaves/Manifest
@@ -1,4 +1,7 @@
-AUX xdesktopwaves-1.3-gentoo.patch 1166 BLAKE2B bf494fccc21a446f3b767e40fdc53ad87a6cd5be2b7f3743b02a9570a66b56ffaa93ff7555d42a20e2a9311bf12b2ce73bbf0f61a1e86e6055f54ad429b5aa3d SHA512 03543f5244d6c22da32d845546db6ca36cf5f9c59dde9d248ef160d2824556055efb57f4becd84541b16ac82ae1bd661272fc92e8c0ac096deb32764cc849f05
+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
 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
index accbb4d9baec..80e219edc6a8 100644
--- a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch
+++ b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch
@@ -1,5 +1,5 @@
---- xdesktopwaves-1.3/Makefile.org	2004-12-18 06:47:40.000000000 +0100
-+++ xdesktopwaves-1.3/Makefile	2010-02-08 20:05:31.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -11,14 +11,13 @@
  
  #=========================== C compiler configuration ==========================
@@ -19,8 +19,8 @@
  
  #============================ Installer configuration ==========================
  
---- xdesktopwaves-1.3/xdwapi/Makefile.org	2004-12-18 06:47:40.000000000 +0100
-+++ xdesktopwaves-1.3/xdwapi/Makefile	2010-02-08 20:08:14.000000000 +0100
+--- a/xdwapi/Makefile
++++ b/xdwapi/Makefile
 @@ -1,10 +1,9 @@
  # Makefile for the xdesktopwaves API and its demo program
  
diff --git a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.4-gentoo.patch b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.4-gentoo.patch
new file mode 100644
index 000000000000..528e4780f6f7
--- /dev/null
+++ b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.4-gentoo.patch
@@ -0,0 +1,40 @@
+--- a/Makefile
++++ b/Makefile
+@@ -11,14 +11,14 @@
+ 
+ #=========================== C compiler configuration ==========================
+ 
+-CC     = gcc
+-CFLAGS = -I/usr/X11R6/include -O2
++CC ?= gcc
++CFLAGS += $(shell $(PKG_CONFIG) --cflags x11 xext)
+ 
+ #============================= Linker configuration ============================
+ 
+-LINK   = gcc
+-LFLAGS = -L/usr/X11R6/lib64 -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,10 @@
+ # Makefile for the xdesktopwaves API and its demo program
+ 
+-CC     = gcc
+-CFLAGS = -I/usr/X11R6/include -O2
+-LINK   = gcc
+-LFLAGS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib
+-LIBS   = -lm -lX11
++CC     ?= gcc
++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.4.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild
new file mode 100644
index 000000000000..901b11eb7789
--- /dev/null
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop 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"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-gentoo.patch
+)
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	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
+}