[gentoo-commits] repo/gentoo:master commit in: games-rpg/daimonin-client/files/, games-rpg/daimonin-client/

2017-11-18 Thread David Seifert
commit: 4a76a27157a7138c64368d4b597faedeebdf45b8
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 18 16:35:31 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 18 16:36:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a76a271

games-rpg/daimonin-client: Version bump to 0.10.8

Closes: https://bugs.gentoo.org/612832
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 games-rpg/daimonin-client/Manifest |  2 +
 .../daimonin-client/daimonin-client-0.10.8.ebuild  | 70 ++
 .../daimonin-client-0.10.8-fix-build-system.patch  | 64 
 3 files changed, 136 insertions(+)

diff --git a/games-rpg/daimonin-client/Manifest 
b/games-rpg/daimonin-client/Manifest
index 2c3221b..cda190378b0 100644
--- a/games-rpg/daimonin-client/Manifest
+++ b/games-rpg/daimonin-client/Manifest
@@ -1,2 +1,4 @@
 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

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 000..e1dc786d730
--- /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 000..a6171896bfa
--- /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

[gentoo-commits] repo/gentoo:master commit in: games-rpg/daimonin-client/files/, games-rpg/daimonin-client/

2016-10-14 Thread Austin English
commit: cef11d7dcfb7a6034d3660c57e80cb6ca8093d73
Author: Austin English  gentoo  org>
AuthorDate: Fri Oct 14 23:15:27 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Fri Oct 14 23:41:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef11d7d

games-rpg/daimonin-client: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 .../daimonin-client-0.10.5-r1.ebuild   | 71 ++
 .../files/daimonin-client-0.10.5-datadir.patch |  4 +-
 .../files/daimonin-client-0.10.5-nozlib.patch  |  4 +-
 3 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/games-rpg/daimonin-client/daimonin-client-0.10.5-r1.ebuild 
b/games-rpg/daimonin-client/daimonin-client-0.10.5-r1.ebuild
new file mode 100644
index ..9341e42
--- /dev/null
+++ b/games-rpg/daimonin-client/daimonin-client-0.10.5-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils autotools
+
+MY_P=${PN}-${PV}
+DESCRIPTION="a graphical 2D tile-based MMORPG"
+HOMEPAGE="http://daimonin.sourceforge.net/";
+SRC_URI="http://daimonin.svn.sourceforge.net/viewvc/daimonin/main/client/?view=tar&pathrev=6021
+   -> daimonin-client-0.10.5.tar.gz
+   music? ( 
mirror://sourceforge/daimonin/Addon%20packs/Music/AllMusic.zip
+   -> daimonin-client-AllMusic-20100827.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug music"
+
+RDEPEND="
+   dev-games/physfs
+   media-libs/libsdl[sound,video]
+   media-libs/sdl-image[png]
+   media-libs/sdl-mixer[vorbis]
+   net-misc/curl"
+DEPEND="${RDEPEND}
+   music? ( app-arch/unzip )"
+
+S=${WORKDIR}/client/make/linux
+
+PATCHES=(
+   "${FILESDIR}"/${P}-nozlib.patch
+)
+
+src_unpack() {
+   unpack ${MY_P}.tar.gz
+   if use music ; then
+   cd client/media || die
+   rm -f * || die
+   unpack ${PN}-AllMusic-20100827.zip
+   fi
+}
+
+src_prepare() {
+   default
+   rm ../../src/include/z{lib,conf}.h || die
+   sed -i \
+   -e 's:$(d_datadir):$(DESTDIR)$(d_datadir):' \
+   -e '/PROGRAMS/s:daimonin-updater::' \
+   Makefile.am \
+   || die "sed failed"
+   eautoreconf
+   cd ../../src || die
+   # Not relative to $S, so can't be applied via $PATCHES[@]
+   eapply "${FILESDIR}"/${P}-datadir.patch
+}
+
+src_configure() {
+   econf \
+   --disable-simplelayout \
+   $(use_enable debug)
+}
+
+src_install() {
+   default
+   cd ../.. || die
+   dodoc README*
+   newicon bitmaps/pentagram.png ${PN}.png
+   make_desktop_entry daimonin Daimonin
+}

diff --git 
a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch 
b/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch
index ea79f75..f2fc757 100644
--- a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch
+++ b/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch
@@ -1,5 +1,5 @@
 main.c.old 2010-08-24 19:32:55.0 +0200
-+++ main.c 2010-09-19 18:49:54.0 +0200
+--- a/main.c   2010-08-24 19:32:55.0 +0200
 b/main.c   2010-09-19 18:49:54.0 +0200
 @@ -2386,7 +2386,7 @@
  
  /* Add the base dir to the search path. The base dir is where all the

diff --git 
a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch 
b/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch
index c342cc3..62a6e5f 100644
--- a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch
+++ b/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch
@@ -1,5 +1,5 @@
 Makefile.am.old2010-12-01 14:39:11.605648458 -0500
-+++ Makefile.am2010-12-01 14:41:59.875915880 -0500
+--- a/Makefile.am  2010-12-01 14:39:11.605648458 -0500
 b/Makefile.am  2010-12-01 14:41:59.875915880 -0500
 @@ -2,23 +2,18 @@
  daimonin_PROGRAMS = daimonin daimonin-updater