gentoo resync : 09.06.2018

6 files changed, 53 insertions, 2 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index f21112b7a4c9..2e5a734fea4c 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/freedink-data/Manifest b/games-rpg/freedink-data/Manifest
index a279ea8c6424..5b2e93b46124 100644
--- a/games-rpg/freedink-data/Manifest
+++ b/games-rpg/freedink-data/Manifest
@@ -1,3 +1,5 @@
 DIST freedink-data-1.08.20140901.tar.gz 51303165 BLAKE2B 28c225cf12b2bdcf0cf4cccb773e39055c756f0d031d851e697b2a47b8d82781b43ac31ae88245e67582be74fed8a67b20498d8e61231bb4106cc1a679b9ac18 SHA512 cdaa50610ed7e365967f6a84f6d540295ccc85bf4d11b882b49c6b97abe2b375be9880afc1e8ea31cdf22a24365d09861b9f4d1d522cc1ae685f7a8b6b4cad82
+DIST freedink-data-1.08.20170409.tar.gz 53030350 BLAKE2B cf7eb210ed908aed185b2c3d450492ef4265600ee8a058a4d13396de21ec543b619bca4d1a684edec69c913459489db2f1fe868b51306e52ffdf081d7245cd7d SHA512 8ce6bd0de33da0edd42722c2a7d02aae54a3e8e81fc8e0a4c97d9b2b696e58eb41e05e12b3fc1cd4be72be7bcf799988d50affb3689f3fec8e2e78c878cd4afc
 EBUILD freedink-data-1.08.20140901-r1.ebuild 480 BLAKE2B af2dd511e91fc3befa1e7ca9d5af8906e751610c7f7418dbc1f5e579a928c16e53b20728289e76ed0dd9c352e279e3018310bb20d1576ff9585c8eaec361089e SHA512 0d1b688d5c8cab12bd4c3123583f8d20686a65f275b510b97664935b452ba5b76604639e51d9307edf2f5101e4dbdba4c049793936ff1a154a3dbcdbe0f869c9
+EBUILD freedink-data-1.08.20170409.ebuild 472 BLAKE2B 3cf16f3b121aefee27b7d147d7596aa3c4aa545a42d67f6d5fc3a5293798a5576d8c42c6a145da14f376c3a7569a21ebb74e63700ea33773decde06f967a6f0f SHA512 13c954cb0697375126de07de9851f6175705e18d85ed649ac841889af2df779de148cf54aaa20dbc7af2adc4a58f51dc5428f8702f4d527a73b93b8fcbf2fcab
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
new file mode 100644
index 000000000000..61874259e09a
--- /dev/null
+++ b/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Freedink game data"
+HOMEPAGE="http://www.freedink.org/"
+SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
+
+LICENSE="ZLIB
+	CC-BY-SA-3.0
+	CC-BY-3.0
+	FreeArt
+	GPL-2
+	GPL-3
+	WTFPL-2
+	OAL-1.0.1
+	public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_install() {
+	emake DESTDIR="${D}" DATADIR="/usr/share" install
+	dodoc README.txt README-REPLACEMENTS.txt
+}
diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest
index 5834dc97f384..8e9f5064bd39 100644
--- a/games-rpg/freedink/Manifest
+++ b/games-rpg/freedink/Manifest
@@ -1,3 +1,4 @@
+AUX freedink-108.4-no-windres.patch 733 BLAKE2B 165eb162877e49b4d2785ca394da2eb092171ae02f46da822d39405a037f40d28553fb46f5900b4b50f84a3e1abe499ae65198e4b21e7d2bb8771e6ce97cfd67 SHA512 f771f54e93d0ce4233d8f895dba91cfe637abae47d1fccefeb5fea615845c107710b1f7c7ccf30dc2a1ef6bc4ec7ee73ff7bc7914387ca5e97de229457c18802
 DIST freedink-108.4.tar.gz 1897701 BLAKE2B b26129f3e5d17895a08cac9564973e31d6e8e2458ac9a2ed4b00f53cd1b8004073022a8e3f4cf8ded2e44cc4bb73909f021a7c960d219e78aec47b4c4ce7c18e SHA512 1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61
-EBUILD freedink-108.4-r1.ebuild 1023 BLAKE2B 9cee4fec543e4d3c406fc076ee6a00f660592f40443f56ff78fe1ba926213b7db486c540d10ff06cf7b75a6744f3af9832810defd0b915eed956e780706dbac6 SHA512 d23fbb32c63d88e023200449c3cacdfcaee5c9872d83d111b668573eb4f5d4ff547460187ed58e911e7064a67c0cac4777a791ede4f7a255575a4fb81d7d597f
+EBUILD freedink-108.4-r1.ebuild 1064 BLAKE2B 51675813c9d58c44da48884bd47b6f51373a7f9d05f8118e7ff35ccd582c87cc3326baf3329668b30ab98dfa80f3b746ef66913f45a1e47b88d406ae08123891 SHA512 29b4f5d78125577e2790e6a46b922b2fcf13099c275898f8ee685be2adda84e6d125daafc650f5dd04473e09d3fe744cc332a058664fe21a705a3dd1efbe4a11
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/freedink/files/freedink-108.4-no-windres.patch b/games-rpg/freedink/files/freedink-108.4-no-windres.patch
new file mode 100644
index 000000000000..81c72e00dae0
--- /dev/null
+++ b/games-rpg/freedink/files/freedink-108.4-no-windres.patch
@@ -0,0 +1,20 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -226,7 +226,7 @@
+ 	update_frame.h
+ am_freedink_OBJECTS = $(am__objects_3) freedink.$(OBJEXT) \
+ 	update_frame.$(OBJEXT)
+-@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT)
++#@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT)
+ nodist_freedink_OBJECTS = $(am__objects_4)
+ freedink_OBJECTS = $(am_freedink_OBJECTS) $(nodist_freedink_OBJECTS)
+ freedink_LDADD = $(LDADD)
+@@ -1143,7 +1143,7 @@
+ @HAVE_WINDRES_FALSE@WOERES = 
+ 
+ # How do we handle resources embedded in the executable binary?
+-@HAVE_WINDRES_TRUE@WOERES = woeres.rc
++#@HAVE_WINDRES_TRUE@WOERES = woeres.rc
+ 
+ # Other projects that use Autotools and support MinGW
+ # http://sourceforge.net/projects/chocolate-doom (Doom port)
diff --git a/games-rpg/freedink/freedink-108.4-r1.ebuild b/games-rpg/freedink/freedink-108.4-r1.ebuild
index a40e9cd65da7..743ce07e7546 100644
--- a/games-rpg/freedink/freedink-108.4-r1.ebuild
+++ b/games-rpg/freedink/freedink-108.4-r1.ebuild
@@ -22,13 +22,16 @@ DEPEND="
 	>=media-libs/sdl-ttf-2.0.9
 "
 RDEPEND="${DEPEND}
-	~games-rpg/freedink-data-1.08.20140901
+	games-rpg/freedink-data
 "
 DEPEND="${DEPEND}
 	dev-libs/check
 	virtual/pkgconfig
 	sys-devel/gettext
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-108.4-no-windres.patch
+)
 
 src_prepare() {
 	default