gentoo resync : 18.08.2019

9 files changed, 120 insertions, 45 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 0819d08eaf76..5cabb8f084ac 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/c++robots/Manifest b/games-misc/c++robots/Manifest
index 5395a1f7d8ea..04412a0c79d6 100644
--- a/games-misc/c++robots/Manifest
+++ b/games-misc/c++robots/Manifest
@@ -1,4 +1,4 @@
-AUX proper-coding.patch 1081 BLAKE2B 4c7c3b77e2079a90ac195918e50e2408bb81632f930e9ef547cf09c234db2514db0651247ef6e271a58102400c7054dcbb1f141aea12a80f07805ce06a8c2762 SHA512 cb9fa8f26a9e4a0820d8810f6133d0cd9e0903bc7c01ad8ba07da2f5e40117e574406fa0b89b57c60a7ad535f8fcf1fc6f89f72d84fc524d8d8ddbe8a760305e
-DIST c++robots.tar.gz 10896 BLAKE2B 8ca61cccd2b08992ece77cedb98e86642d00b797b1d34cf7039d7e3788e91ac5b20426766284bc7e4bca1625fd96a649110cac3b3afea8afd17e9dc0ff23898b SHA512 410a08c920f8e54abe74b085d67607bcc381e768c0127cf98eabab894a106d5d1466a1cac4146924b53c29ccffddd5eb77c9383c42b6fe6e48c7e89691e691f3
-EBUILD c++robots-0-r1.ebuild 614 BLAKE2B a1cede661ecdd0bde0ea388030f15b5e0b2eaf2c4460eb547abb6e13be3da85874436c443830a4728ff0b518486e0a192b0998a58b2bdd12fadc474b06629a1b SHA512 6ef1085c4fc7aed24eab7a521369becbb774e07a475618c13bd8eb57bf71cf824081c0ab87775410864c5f7873190a0adf4fa15648e63f8a336c6d2ad89351c0
+AUX c++robots-0-fix-build-system.patch 1145 BLAKE2B 2c2dfd3f20bad3776696f3f69c0075cd393723bccf1c50e470e6bca6b0b5668d39db50df6762e1e082a0e14e5b21a2f7fa57486c677f1c7c20fab1ce58938f9d SHA512 ccc4038a568e9ee782cf9765a163571d2b1f92ae9e4caea78d869fbe7fbbf5936125a47bfa03ab854ea4598b44fd995696e66ff0fdd0dee1691c122e0caf96a7
+DIST c++robots-0.tar.gz 10896 BLAKE2B 8ca61cccd2b08992ece77cedb98e86642d00b797b1d34cf7039d7e3788e91ac5b20426766284bc7e4bca1625fd96a649110cac3b3afea8afd17e9dc0ff23898b SHA512 410a08c920f8e54abe74b085d67607bcc381e768c0127cf98eabab894a106d5d1466a1cac4146924b53c29ccffddd5eb77c9383c42b6fe6e48c7e89691e691f3
+EBUILD c++robots-0-r1.ebuild 513 BLAKE2B ba11effbd01203068acfe37e0f251252a79234392a8b641668b396d15b0fcc0d422eeee72a50a1d972bd8e56399fc9b4a9136f1c0abff8acef3ce7c94f8d7964 SHA512 fb2ac0cc87f37c024fbc5e62719ae0e46d05867adba3f7a57a1cb1c21779435cbee5b0ceb5204cfe26d54e39e318a2bc48f8742b004b6fe8eb542d78325f7e37
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/c++robots/c++robots-0-r1.ebuild b/games-misc/c++robots/c++robots-0-r1.ebuild
index bb398f5ac30a..06fad1c7d3c5 100644
--- a/games-misc/c++robots/c++robots-0-r1.ebuild
+++ b/games-misc/c++robots/c++robots-0-r1.ebuild
@@ -1,30 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="ongoing 'King of the Hill' (KotH) tournament"
 HOMEPAGE="http://www.gamerz.net/c++robots/"
-SRC_URI="http://www.gamerz.net/c++robots/c++robots.tar.gz"
+SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="static"
 
 S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-PATCHES=(
-	"${FILESDIR}/proper-coding.patch"
-)
-
-src_compile() {
-	local myldflags="${LDFLAGS}"
-	use static && myldflags="${myldflags} -static"
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${myldflags}"
+src_configure() {
+	tc-export CXX
 }
 
 src_install() {
 	dobin combat cylon target tracker
-	dodoc README
+	einstalldocs
 }
diff --git a/games-misc/c++robots/files/proper-coding.patch b/games-misc/c++robots/files/c++robots-0-fix-build-system.patch
index 93b87c1c1da5..ece48ff1c407 100644
--- a/games-misc/c++robots/files/proper-coding.patch
+++ b/games-misc/c++robots/files/c++robots-0-fix-build-system.patch
@@ -1,8 +1,7 @@
---- c++robots.orig/Makefile
-+++ c++robots/Makefile
-@@ -1,38 +1,37 @@
- CFLAGS=-g
-+LDFLAGS=
+--- a/Makefile
++++ b/Makefile
+@@ -1,38 +1,35 @@
+-CFLAGS=-g
  PROGRAMS=combat 
  ROBOTS=cylon tracker target
  
@@ -13,39 +12,41 @@
  clean:
  	rm -f $(PROGRAMS) $(ROBOTS) *.o core
  
- combat:	combat.o 
+-combat:	combat.o 
 -	$(CC) $(CFLAGS) -o $@ combat.o -lm
-+	$(CXX) -o $@ $(LDFLAGS) combat.o -lm
++combat: combat.o
++	$(CXX) $(LDFLAGS) -o $@ combat.o -lm
  
- combat.o:	combat.c 
+-combat.o:	combat.c 
 -	$(CC) $(CFLAGS) -c combat.c
-+	$(CXX) $(CXXFLAGS) -c combat.c
++combat.o: combat.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c combat.c
  
  robots.o: robots.C robots.h
 -	g++ -c robots.C
-+	$(CXX) $(CXXFLAGS) -c robots.C
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c robots.C
  
  cylon: cylon.o robots.o
 -	g++ -static -o $@ cylon.o robots.o 
-+	$(CXX) -o $@ $(LDFLAGS) cylon.o robots.o 
++	$(CXX) $(LDFLAGS) -o $@ cylon.o robots.o
  
  cylon.o: cylon.c robots.h
 -	g++ -c cylon.c
-+	$(CXX) $(CXXFLAGS) -c cylon.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c cylon.c
  
  tracker: tracker.o robots.o
 -	g++ -static -o $@ tracker.o robots.o 
-+	$(CXX) -o $@ $(LDFLAGS) tracker.o robots.o 
++	$(CXX) $(LDFLAGS) -o $@ tracker.o robots.o
  
  tracker.o: tracker.c robots.h
 -	g++ -c tracker.c
-+	$(CXX) $(CXXFLAGS) -c tracker.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c tracker.c
  
  target: target.o robots.o
 -	g++ -static -o $@ target.o robots.o 
-+	$(CXX) -o $@ $(LDFLAGS) target.o robots.o 
++	$(CXX) $(LDFLAGS) -o $@ target.o robots.o
  
  target.o: target.c robots.h
 -	g++ -c target.c
-+	$(CXX) $(CXXFLAGS) -c target.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c target.c
  
diff --git a/games-misc/rfksay/Manifest b/games-misc/rfksay/Manifest
index f467ab7a88e6..730aff75b445 100644
--- a/games-misc/rfksay/Manifest
+++ b/games-misc/rfksay/Manifest
@@ -1,3 +1,3 @@
-DIST rfksay.tar.gz 997 BLAKE2B dba9095fde7e533fcc7ad2a6a178a11f0b92b207ca63540f82fbe8bcb118bbcc01fe9e7270df071e63eebeb96eee02a5e55b78414fb9dcded5ee31469265ebd8 SHA512 8eb5766b8a3efc31a20a128be0ec95eba7f61599ca402dc48d7c247516ac9f221d9f72a471923da566645b53e119831e61a7caa94f7b8c17ee4af802c42f6714
-EBUILD rfksay-0.1-r1.ebuild 497 BLAKE2B 41a196054ccd5407060cf3a3c95def30f8e51bf9e327dcb3749fc0a765c3b0994721e8eaaffaff78f921f8f19475bc3e3ea1d10077eebc36d87ce64b41db60d4 SHA512 c3ae1a25929700a7d5365253a6fca5d20ae84072fa8d8b33a8f9a9168bbacfb0b7dced4177b003fed186afd7575a61d07d08fb85e6e4b9199193bbe6c5574a0a
+DIST rfksay-0.1.tar.gz 997 BLAKE2B dba9095fde7e533fcc7ad2a6a178a11f0b92b207ca63540f82fbe8bcb118bbcc01fe9e7270df071e63eebeb96eee02a5e55b78414fb9dcded5ee31469265ebd8 SHA512 8eb5766b8a3efc31a20a128be0ec95eba7f61599ca402dc48d7c247516ac9f221d9f72a471923da566645b53e119831e61a7caa94f7b8c17ee4af802c42f6714
+EBUILD rfksay-0.1-r1.ebuild 439 BLAKE2B c58b63a26f83ecd94d33a88fb7c86e48489a2ce896645afe0f4cbb587c36c0c33e52d112d258f0b45e72d9977ed02d86620dbeeccd58be1a77026fc53e600135 SHA512 bb57670400ed3da709082b297a82ca150c56ab09fba40917aecfe966f8ec8b0be12a42fa344f5ac953d6446ed18787eca19c06a17847f9bade366276bcb132cf
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/rfksay/rfksay-0.1-r1.ebuild b/games-misc/rfksay/rfksay-0.1-r1.ebuild
index 705771832222..4af4d2409383 100644
--- a/games-misc/rfksay/rfksay-0.1-r1.ebuild
+++ b/games-misc/rfksay/rfksay-0.1-r1.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Like cowsay, but different because it involves robots and kittens"
 HOMEPAGE="http://www.robotfindskitten.org/"
-#SRC_URI="http://www.redhotlunix.com/${PN}.tar.gz"
-SRC_URI="mirror://gentoo/${PN}.tar.gz"
+SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-lang/perl"
 
 S=${WORKDIR}
 
diff --git a/games-misc/xcowsay/Manifest b/games-misc/xcowsay/Manifest
index c9dbb4f222e7..15563e4cf357 100644
--- a/games-misc/xcowsay/Manifest
+++ b/games-misc/xcowsay/Manifest
@@ -1,3 +1,5 @@
 DIST xcowsay-1.3.tar.gz 269836 BLAKE2B 40eea935eb8784c182c03cf68c89f790c826f5162bbed526facee4d7488fb833e55bbecb9824d0b5e98abf3f5bc77068e150a1817f9745fb8ace11b7d7fdbb00 SHA512 b6f6493a988d8e8036ba9f2a0434627ffbd28eacd3330b256d8e6754b7be02eeb41390b28a8160091eca87d142e284adf2e2a37f22d715bca3b58ef1db8cdcf1
+DIST xcowsay-1.4.tar.gz 100014 BLAKE2B 59a82449bdefcfdb9f1fcf159e21374e36fb1e5af7db5bc61eb10166e5746bb0ce13f4321c904354f8e5b3bc8ae4625b0b12b339dd8013016e644c908f4b6ef0 SHA512 53370ba287ed2bf7d41cbf1bb8631e8da6933575956b38ee02f5aedae5bb49aede7e5e641fa7f93241f078a1a044920b387288ffbe2a10dd04fbe02932c67ca9
 EBUILD xcowsay-1.3.ebuild 753 BLAKE2B 4f891974dd52437b57ecf04b817b04ffe04a6b8ea40b0ce1738efe86b0e24947104e85f279f290ff1d28151090512a7a8a9995405b272234a3299c4cb7940acd SHA512 5fe53c78d754264a6f295ceebd377501b54ea8c441203b05cfe771d278b0f17a1711a7a93273a1d55becfc9a691b52b1368849849791fc4b2e12e534071eef1c
-MISC metadata.xml 245 BLAKE2B 4e9a30ee4c54054986a604c12e24d11e5bc515f4b46b1e36832370f856e78fc250a2aaf5e3091b411c61be11f3cba4f44ea3e8c677b2b0177960d6bb984b43a4 SHA512 ec4e7a6faede299b991ce94f0fbe1ba7e2e4640343c8961a1794f40432a6222ff54c086ff13509237d23cb181a814608db0dc0d230f54304402722aa88b7d510
+EBUILD xcowsay-1.4.ebuild 919 BLAKE2B b47acbbe7c5860a4673f80855a94d8fd23d020b9659acc376f514d877978982fcdb6da6f3b2c736fb12d47bf1e3e32580062ae4bf83186474ffbdfc13850bb08 SHA512 925eaf27c1a3005366c4e54743228eeef20b264f0bdb2cc00bcc6f87d0017675547125682b41455df8e9ac187af76b626ed9f9e7fbde5d6ca78adba88e31bc59
+MISC metadata.xml 1189 BLAKE2B e374b12d858c23d82f25e6d3a362db1e5b655ef5e0ec33bb27d312578e33e8de7b53d544ee044d48054e760d05cf03a39e6bfa54673d8144fe6db9072156fc15 SHA512 dec765c26969a6c5a995d4e8cfefd5cdd3de985989b9593689ea4e5c9602ca89cebf8099717bddc4b424b9d6294aa923902da785c651c4de82683acc85fdbdcb
diff --git a/games-misc/xcowsay/metadata.xml b/games-misc/xcowsay/metadata.xml
index 6d3b8a616845..1ed004f61256 100644
--- a/games-misc/xcowsay/metadata.xml
+++ b/games-misc/xcowsay/metadata.xml
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="fortune">Installs the fortune-mod xcow binary</flag>
-</use>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		xcowsay displays a cute cow and message on your desktop.
+		Inspired by the original cowsay. It includes all these amazing features:
+		- Fully configurable!
+		- Calculates display time from amount of text
+		- Dream mode - display images in the bubble
+		- Can draw thought and speech bubbles
+		- Daemon mode! Send your cow messages over DBus!
+		- Three different sized cows provided
+		- fortune(6) wrapper program: xcowfortune - cow will deliver pearls of wisdom!
+		- Replace the naffness that is xmessage(1)
+		- Should work with any window manager
+		- Supports UTF-8 characters properly
+		- Automatic word wrapping
+		- Use alternative non-cow images if you like
+	</longdescription>
+	<use>
+		<flag name="fortune">Enable support for fortune cookies via <pkg>games-misc/fortune-mod</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/games-misc/xcowsay/xcowsay-1.4.ebuild b/games-misc/xcowsay/xcowsay-1.4.ebuild
new file mode 100644
index 000000000000..12288119e0cd
--- /dev/null
+++ b/games-misc/xcowsay/xcowsay-1.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Displays a cute cow and message on your desktop"
+HOMEPAGE="
+	https://github.com/nickg/xcowsay
+	https://www.doof.me.uk/xcowsay/
+"
+SRC_URI="https://github.com/nickg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus fortune nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	virtual/awk
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	dbus? (	dev-libs/dbus-glib )
+	fortune? ( games-misc/fortune-mod )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	if ! use fortune; then
+		sed -e 's/xcowfortune//g' -i src/Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-rpath
+		$(use_enable dbus)
+		$(use_enable nls)
+	)
+
+	econf ${myeconfargs[@]}
+}