gentoo resync : 18.11.2017

3 files changed, 138 insertions, 0 deletions

diff --git a/games-rpg/daimonin-client/Manifest b/games-rpg/daimonin-client/Manifest
index f5418d500e84..a98a5d9e716a 100644
--- a/games-rpg/daimonin-client/Manifest
+++ b/games-rpg/daimonin-client/Manifest
@@ -1,9 +1,13 @@
 AUX daimonin-client-0.10.5-datadir.patch 983 SHA256 69f925f6fe46e7129a2b2af3988f6a5b6cc06b670ec1a97a7765e4a655d0c7cc SHA512 eb4748894c0722ee112efc3953a14784eb13237919813c057afddc09104f250f346c29a1a224bd3ce8a44b22af4fa2b59f826aa5eb96fb45a51f276f743fa3fa WHIRLPOOL f68dfaca458d7d4a5f0f4c464d6483e684f0812a414bbceed42c404715dd493a8a816156ec34bde39ffd11d1448324ad2d3a0c019617c884abc8ab736d2e7671
 AUX daimonin-client-0.10.5-nozlib.patch 1094 SHA256 f5fe6c24c907bf991bb8e853ab5afa2fc4df26e12ce66395b92fc981f5f15bcd SHA512 31ef58b81c669f7a8c685355dfb37d85383891db4534c3b62b0d9f5beaed6cb6d4be34657acd109287dc85d83a6c81950322667729b36552394c17a9b0bfc989 WHIRLPOOL 4a172e40362abd7d3e3937e0df18536d73f95784a5207b1e292d5eeb36b90e1d0c5fb2c1e862252176f21fea584e20e0fab95f0e00650f13255d244cc063ef7a
+AUX daimonin-client-0.10.8-fix-build-system.patch 2538 SHA256 1c7e0b39075b478220febee348a53c9188e86b64026d64e76dd91bc0415a26fe SHA512 baf333aad05a662bf38e6579cb6f8bfcb0b1fbf2a48191df28a96fe3d20585f7a2ad211d96107a3f99245bc99b877ca140b450111e7466d866e07d32199c737d WHIRLPOOL 89c5cc332c0661a91696b21a5f6c8aec2fe822218ffd125ac38ebd989069ccb708491664033f6ebd5b304638a666c981cf2c578fac6cdc44936b4a18b9950947
 DIST daimonin-client-0.10.5.tar.gz 15554328 SHA256 07bc94207dc77e0cae2bc949fd9df92da853f70343927d39f31e439d2d7ea3c9 SHA512 7f961105f368d7b4279c03e90028581a0efe998311f334f87d4ca6ff22df1a62f9b5911adf20822a282d7ed3796d8cb0643ab458cc51fb46cf3b90815164ac04 WHIRLPOOL e5141b02cb581f391609031b18626cd37eb2ed69dcfc7dc2e53d7b019747a5e63bf9f2cbcb7751b936c8c9e7f1637fe92151ac0370fb6dab3511fca0e8ea2dc4
+DIST daimonin-client-0.10.8.zip 51894462 SHA256 f2757b082aa16fe4b9241f5c0d5609c63fd793c2f1099aa5869709f2983f3009 SHA512 f4f5891697f96a60a8ee79973b0172b544cbae25b2d8787e0a4e9113d95be3b41b8c29c80ba5cbaf7548055e4c847456fa364346489f4d6ad165b984cfd64531 WHIRLPOOL 9fb55a307e519e6badb029a0cacd04c1180447be0756159e047d51a56957a5dbf4b6718bcdb7becab513526c98dba7be372215c1afec9896f099e95e76030d7d
 DIST daimonin-client-AllMusic-20100827.zip 86844919 SHA256 0732fde7f39b34057d72ab65b00ddefc1c84fcf8ef8fdf00d72fb67f2144d867 SHA512 50ec9524bd934a715271ddef1ea2cec855e93607e5befd1b18b74493400c9e1b2e6e5d829f3b21088b28c67635c0d1479eec53e1626c680f1d34081292607c9f WHIRLPOOL 91d485e1b816c6ee06cca9c18185b2a58f1da1f4231139dbb183a14a2ce3a12bab1891a9506bfe7ee2d9ff91d63801b160a4b67a52be8d2f2c4615d2568edd93
+DIST daimoninMusicLQ20100827.zip 24293301 SHA256 44d77d419ee58d340bb10d5fcea5df7b491f4c49b5b06cc37c8ed8ae9f1eb1a4 SHA512 f24bba24c0e9a79469511315c608c464568f3ee0dc05b3d83c791512fa51eae07669dc175e7672cc8b31764a7bdff5c975ac2b13e2d7b0e5287717e188f1d439 WHIRLPOOL 19bd35bedf9a4c173314242a481393e36b1c09915b12e8cfc6e78c16df435174e153ae9ed808b1e7e9c74f59474ad7d303f6c7ca9645e7c313461aa021f58460
 EBUILD daimonin-client-0.10.5-r1.ebuild 1533 SHA256 fb74ee3679374c3a10783344ae136d951721b2090146ef9d790f41272f0e4808 SHA512 e94ae5bd39900bcb50d31a64f395b96087911ce824a0502fd386a8f25fd3acdcbd80908baed1d8a8ec73febe635052964ffbfae5804c2f8ee679666c7ccb68a3 WHIRLPOOL 41186f88b049a21313e5666145b01cf32238b80cfa103d4578a7817286286fd51fee45ed2051ec9bb69bb9c5c9e0cb8b5e16a4f15b683c0a06146bef236cc7d5
 EBUILD daimonin-client-0.10.5.ebuild 1446 SHA256 0bac292ec850fe052a5a9f4d1afe47d5e6debffef5e29f3737a4488019f3c2c1 SHA512 ce7e1af44dba8de7022d8e7cb2b55981ffa169d3f0b3a63b2474efbf3f2fadd86dafa95ec03bf73585ccf62f7756f78069475aebc7f8ebdca6e03982cf463a78 WHIRLPOOL fd588ee77f724b29ba00cd0de569887abd18e7f5f834a75a720f1b472adba2d75502f4708cd0159fdbd6453becc3a254734b4c9883701884d62eabb0711e2fb3
+EBUILD daimonin-client-0.10.8.ebuild 1504 SHA256 b0e9e391f40e43338f19794d032b4e4cfd8a7afcf6c55c3906d7d2e1b153ee67 SHA512 c44d9c662487d153678b215c99654da3907cf5a2b51de3d61fd7b18ba4697f27bf1719f58f3f8e84047365cbecbde724963d8e1b8c2844a1f3609f8af4a3b6cb WHIRLPOOL 3cf9da4f6a93d2d1fd43f4535e4234a788e015ac8885de331379b95dc3a6958d0126fc204f421db9a675c2bb9186490b6559126d9a608bbe1328fb38e9477d31
 MISC ChangeLog 2908 SHA256 78eaf599c4c881246a680b45136bc43c823a6e8c6e847278487311cabfa83b40 SHA512 52d59681a7d1f59f84051212722557033975b7e80ba7ec727a6dfef84a1f270ffb2e73f88a8135d561664caecba58563cbbb797a474cc3a6c2cf180dfa60ddcc WHIRLPOOL 9a1db530f059514d4bda1bd38e21548058a02351dfb4f1f94560f45596f62739300bf821bccaa342a55b5c78df5fa0cb6b405e29f3cd10a62af595b69755708f
 MISC ChangeLog-2015 5418 SHA256 817b643734fbd26b098fc4bd48cf100d78450e6a431a231489cd7da76879f7df SHA512 09db4ad04c1d46edf00792a552813ebb16213ee33afa7b5ab32294f01f7698dcb26736c38cfe6c15cfbcf7305606af7aa14054e2e124b4cd3bd92bd27fadf176 WHIRLPOOL 9a61289b9ba35d116f10aa1c5464037805caac9d567f90dd6a293352ec04134f39ad1994fd9608c60f15285bf32ade5813a6b33a87f9f54e9ef1711e00d80467
 MISC metadata.xml 408 SHA256 f8bde5afc39419a3b24fd0c99e19cec9e2d50601759dac0062875a89ea06d5fa SHA512 039f6849c28f9c21b7e2854314fcd0ff9b356b3983e68c0a4a2eb8e96893475e4333f7408c233f8f9651c4613a2683a63a4f5da58d11555d34712f9ebe0a2f6b WHIRLPOOL c3bcc6aab04716086320e35e6f147f2a969b1bc54520566e82bfaa1c4549c96c825ab3c7800023185ec569bc375ac1afe6c69a8baa2c7b2cc20c76686c8f7b94
diff --git a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
new file mode 100644
index 000000000000..e1dc786d730d
--- /dev/null
+++ b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="A graphical 2D tile-based MMORPG"
+HOMEPAGE="http://daimonin.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.zip
+	music? ( mirror://sourceforge/daimonin/daimoninMusicLQ20100827.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug music"
+REQUIRED_USE="music"
+
+RDEPEND="
+	dev-games/physfs
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	net-misc/curl
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/daimonin-code-8183-trunk/client/make/linux
+
+src_unpack() {
+	unpack ${P}.zip
+	if use music; then
+		rm -f daimonin-code-8183-trunk/client/media/* || die
+		cd daimonin-code-8183-trunk/client || die
+		unpack daimoninMusicLQ20100827.zip
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.10.5-nozlib.patch
+	eapply "${FILESDIR}"/${PN}-0.10.8-fix-build-system.patch
+
+	pushd ../../src >/dev/null || die
+		eapply "${FILESDIR}"/${PN}-0.10.5-datadir.patch
+	popd >/dev/null || die
+
+	eapply_user
+
+	# remove bundled zlib
+	rm ../../src/include/z{lib,conf}.h || die
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-simplelayout \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	cd ../.. || die
+	dodoc README*
+	newicon bitmaps/pentagram.png "daimonin.png"
+	make_desktop_entry "daimonin" "Daimonin" "daimonin" "Game;Amusement"
+}
diff --git a/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fix-build-system.patch b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fix-build-system.patch
new file mode 100644
index 000000000000..a6171896bfac
--- /dev/null
+++ b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fix-build-system.patch
@@ -0,0 +1,64 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,5 @@
+ daimonindir=$(d_bindir)
+-daimonin_PROGRAMS = daimonin daimonin-updater
++daimonin_PROGRAMS = daimonin
+ 
+ daimonin_SOURCES =  \
+ 	../../src/adler32.c \
+@@ -72,30 +72,30 @@
+ #		echo '***'; \
+ #		exit 42; \
+ #	fi;
+-	$(MKDIR) -p $(d_datadir)/sfx
+-	$(MKDIR) -p $(d_datadir)/man
+-	$(MKDIR) -p $(d_datadir)/media
+-	$(MKDIR) -p $(d_datadir)/cache
+-	$(MKDIR) -p $(d_datadir)/logs
+-	$(MKDIR) -p $(d_datadir)/gfx_user
+-	$(MKDIR) -p $(d_datadir)/srv_files
+-	$(MKDIR) -p $(d_datadir)/bitmaps
+-	$(MKDIR) -p $(d_datadir)/icons
+-	$(MKDIR) -p $(d_datadir)/settings
+-	$(MKDIR) -p $(d_datadir)/update
+-	$(CP) ../../sfx/*.* $(d_datadir)/sfx
+-	$(CP) -R ../../man/* $(d_datadir)/man
+-	$(CP) ../../media/*.* $(d_datadir)/media
+-	$(CP) ../../cache/*.* $(d_datadir)/cache
+-	$(CP) ../../bitmaps/* $(d_datadir)/bitmaps
+-	$(CP) ../../icons/* $(d_datadir)/icons
+-	$(CP) -R ../../settings/*.* $(d_datadir)/settings
+-	$(CP) ../../srv_files/*.* $(d_datadir)/srv_files
+-	$(CP) ../../update/version $(d_datadir)/update
+-	$(CP) ../../gfx_user/*.* $(d_datadir)/gfx_user
+-	$(CP) ../../daimonin.p0 $(d_datadir)
+-	$(CP) ../../License $(d_datadir)
+-	$(CP) ../../archdef.dat $(d_datadir)
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/sfx
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/man
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/media
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/cache
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/logs
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/gfx_user
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/srv_files
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/bitmaps
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/icons
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/settings
++	$(MKDIR) -p $(DESTDIR)$(d_datadir)/update
++	$(CP) ../../sfx/*.* $(DESTDIR)$(d_datadir)/sfx
++	$(CP) -R ../../man/* $(DESTDIR)$(d_datadir)/man
++	$(CP) ../../media/*.* $(DESTDIR)$(d_datadir)/media
++	$(CP) ../../cache/*.* $(DESTDIR)$(d_datadir)/cache
++	$(CP) ../../bitmaps/* $(DESTDIR)$(d_datadir)/bitmaps
++	$(CP) ../../icons/* $(DESTDIR)$(d_datadir)/icons
++	$(CP) -R ../../settings/*.* $(DESTDIR)$(d_datadir)/settings
++	$(CP) ../../srv_files/*.* $(DESTDIR)$(d_datadir)/srv_files
++	$(CP) ../../update/version $(DESTDIR)$(d_datadir)/update
++	$(CP) ../../gfx_user/*.* $(DESTDIR)$(d_datadir)/gfx_user
++	$(CP) ../../daimonin.p0 $(DESTDIR)$(d_datadir)
++	$(CP) ../../License $(DESTDIR)$(d_datadir)
++	$(CP) ../../archdef.dat $(DESTDIR)$(d_datadir)
+ 	@echo "*** Daimonin client successful installed in $(daimonindir)!"
+ 	@echo "*** Enter your install folder and type ./daimonin"
+ 	@echo "*** to start the game!"