version bump - ebuild submitted by Simon in bug #338055

Package-Manager: portage-2.1.9.24/cvs/Linux i686

6 files changed, 154 insertions, 3 deletions

diff --git a/games-rpg/daimonin-client/ChangeLog b/games-rpg/daimonin-client/ChangeLog
index 0e5c25c8e354..775ad2c48726 100644
--- a/games-rpg/daimonin-client/ChangeLog
+++ b/games-rpg/daimonin-client/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-rpg/daimonin-client
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/ChangeLog,v 1.26 2010/10/15 12:46:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/ChangeLog,v 1.27 2010/12/01 20:26:27 mr_bones_ Exp $
+
+*daimonin-client-0.10.5 (01 Dec 2010)
+
+  01 Dec 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +daimonin-client-0.10.5.ebuild,
+  +files/daimonin-client-0.10.5-datadir.patch,
+  +files/daimonin-client-0.10.5-nozlib.patch, metadata.xml:
+  version bump - ebuild submitted by Simon in bug #338055
 
   15 Oct 2010; Brent Baude <ranger@gentoo.org>
   daimonin-client-0.9.7.1-r1.ebuild:
diff --git a/games-rpg/daimonin-client/Manifest b/games-rpg/daimonin-client/Manifest
index 02ba658cfd90..3f12bdb5e085 100644
--- a/games-rpg/daimonin-client/Manifest
+++ b/games-rpg/daimonin-client/Manifest
@@ -1,7 +1,12 @@
+AUX daimonin-client-0.10.5-datadir.patch 983 RMD160 3bcf6bbcfadf3ea4441b4598d79989162766dd09 SHA1 8249a523e458ebfccfd6baf19af69686a72483c7 SHA256 5970d6918827f19111b8eb15cc371cbcb7ea80d7207d561f9304ee1095c68eff
+AUX daimonin-client-0.10.5-nozlib.patch 1094 RMD160 4f322e850e03348abc9474ca77eba7b32ec9a811 SHA1 5f564210231ae8ee1259e55d11c13843ff60346b SHA256 d4879387daedf093203abed70b7ac4ad3a286d06e9aed52e8d392a35fd89ece8
 AUX daimonin-client-0.9.7.1-nozlib.patch 1043 RMD160 64c0360830b41f9e3ca5223d1503b198e42312e9 SHA1 7d621d9717de51d406d5125a2537b5f5fac0a189 SHA256 27f4ade5317f9ee7c05f2f080e750b08610982148cbc3b8acbc9036dc76b0fbc
 DIST AllMusic.zip 86844919 RMD160 06a0d24356624d1059126376a22659ec0b3c9e4c SHA1 d6ec3e717f940af0655bfc1059d0f120ed7f69a3 SHA256 0732fde7f39b34057d72ab65b00ddefc1c84fcf8ef8fdf00d72fb67f2144d867
+DIST daimonin-client-0.10.5.tar.gz 15554328 RMD160 a695eb41c78890dd3cd879ec284659555be1e9b4 SHA1 dda18d20336735b4caa4eb3d9f45add817df7855 SHA256 07bc94207dc77e0cae2bc949fd9df92da853f70343927d39f31e439d2d7ea3c9
+DIST daimonin-client-AllMusic-20100827.zip 86844919 RMD160 06a0d24356624d1059126376a22659ec0b3c9e4c SHA1 d6ec3e717f940af0655bfc1059d0f120ed7f69a3 SHA256 0732fde7f39b34057d72ab65b00ddefc1c84fcf8ef8fdf00d72fb67f2144d867
 DIST daimonin_client-0.9.7.1.zip 30086700 RMD160 a698f524aa1ed22421c3e9a507f99d6197659522 SHA1 61a8a353e1a0ff6858b0726a0627100b2328f5e1 SHA256 6cafeab3fab06647daa5730e1d36608e5affd17d4d60fa94ac0d008ab47e2d4c
+EBUILD daimonin-client-0.10.5.ebuild 1695 RMD160 a6547805a089a6cbf3a65391e1e2e5c5f8e6f504 SHA1 f58aa3b9e453bc6a2ef15eeafb359168a3e8f1bd SHA256 ecb7ecc55f4395e64f180e5c5cff503a6549f3cba3051f5c092978024286e270
 EBUILD daimonin-client-0.9.7.1-r1.ebuild 1394 RMD160 338207d7c26c7623ebecc62df40adf1c00fb7142 SHA1 7e3442c63f2cb8503ff95ab5fbb11ada5d638568 SHA256 ac36a8c69dc708b55ff1eaa81131719d2893bbb9461fd8a5ef651610e55f29ed
 EBUILD daimonin-client-0.9.7.1.ebuild 1312 RMD160 0a9e5d29b50f800272f1c87a04d7892e9257091b SHA1 28fc83f3aa42636630853e5c1eaf3541a88c5502 SHA256 4fc2591b57afb1bf9ff26031f7b573a6af29dfffe53859d8facb0b25a2f4b4e8
-MISC ChangeLog 4494 RMD160 6f2b46a9b2533fa45715ad0eb593d817d450381b SHA1 587ed479d32c00922e4a0a1dc499a764882756a8 SHA256 601c84c10851c6a58ec100911fcca628173d1396708ca1af32d4cebef99698e3
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+MISC ChangeLog 4791 RMD160 07b8b8ebfaadcb3455f610985a237324ace962e3 SHA1 6e973e8964f63519b8e312ce05ba5149586b94f8 SHA256 96c34f1fdb0b22aa6558e0fa94d6880a0d13e9da3ec64e4c1110c2f8e838c5ef
+MISC metadata.xml 225 RMD160 2efeab1dc15d1bfc881c934839efa29771cc496f SHA1 7721667c93f491ff5ca17a13f92020145ffb60c1 SHA256 e5bc22abe6c3805ab223e29bc0b96c57b731e2d90271d94fd664b7440c392502
diff --git a/games-rpg/daimonin-client/daimonin-client-0.10.5.ebuild b/games-rpg/daimonin-client/daimonin-client-0.10.5.ebuild
new file mode 100644
index 000000000000..a37eb104f802
--- /dev/null
+++ b/games-rpg/daimonin-client/daimonin-client-0.10.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/daimonin-client-0.10.5.ebuild,v 1.1 2010/12/01 20:26:27 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils autotools games
+
+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="music debug"
+
+RDEPEND="media-libs/libsdl[audio,video]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-image[png]
+	dev-games/physfs
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	music? ( app-arch/unzip )"
+
+S=${WORKDIR}/client/make/linux
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	if use music ; then
+		cd client/media
+		rm -f *
+		unpack ${PN}-AllMusic-20100827.zip
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nozlib.patch
+	rm ../../src/include/z{lib,conf}.h
+	sed -i \
+		-e 's:$(d_datadir):$(DESTDIR)$(d_datadir):' \
+		-e '/PROGRAMS/s:daimonin-updater::' \
+		Makefile.am \
+		|| die "sed failed"
+	eautoreconf
+	cd ../../src
+	epatch "${FILESDIR}"/${P}-datadir.patch
+}
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--disable-simplelayout \
+		$(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	cd ../..
+	dodoc README*
+	newicon bitmaps/pentagram.png ${PN}.png || die "newicon failed"
+	make_desktop_entry daimonin Daimonin
+	prepgamesdirs
+}
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
new file mode 100644
index 000000000000..ea79f7595910
--- /dev/null
+++ b/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch
@@ -0,0 +1,28 @@
+--- main.c.old	2010-08-24 19:32:55.000000000 +0200
++++ main.c	2010-09-19 18:49:54.000000000 +0200
+@@ -2386,7 +2386,7 @@
+ 
+     /* Add the base dir to the search path. The base dir is where all the
+      * defaults are (or should be). */
+-    if (!PHYSFS_addToSearchPath(PHYSFS_getBaseDir(), 1))
++    if (!PHYSFS_addToSearchPath(SYSPATH, 1))
+     {
+         LOG(LOG_MSG, "%s\n", PHYSFS_getLastError());
+     }
+@@ -2545,13 +2545,13 @@
+ 
+     /* Prepend the user dir to the search path. This means files are read from
+      * this location in preference to the defaults. */
+-    if (strcmp(PHYSFS_getBaseDir(), home))
+-    {
++    /*if (strcmp(PHYSFS_getBaseDir(), home))
++    {*/
+         if (!PHYSFS_addToSearchPath(home, 0))
+         {
+             LOG(LOG_ERROR, "%s\n", PHYSFS_getLastError());
+         }
+-    }
++    //}
+ 
+     /* Prepend any add-on packs to the search path. This means files are read
+      * from these locations in preference to the defaults and the user dir. */
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
new file mode 100644
index 000000000000..c342cc3c3850
--- /dev/null
+++ b/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch
@@ -0,0 +1,40 @@
+--- Makefile.am.old	2010-12-01 14:39:11.605648458 -0500
++++ Makefile.am	2010-12-01 14:41:59.875915880 -0500
+@@ -2,23 +2,18 @@
+ daimonin_PROGRAMS = daimonin daimonin-updater
+ 
+ daimonin_SOURCES =  \
+-	../../src/adler32.c \
+ 	../../src/anim.c \
+ 	../../src/book.c \
+ 	../../src/buddy.c \
+ 	../../src/chatfilter.c \
+ 	../../src/client.c \
+ 	../../src/commands.c \
+-	../../src/crc32.c \
+ 	../../src/dialog.c \
+ 	../../src/event.c \
+ 	../../src/filewrap.c \
+ 	../../src/font.c \
+ 	../../src/group.c \
+ 	../../src/ignore.c \
+-	../../src/inffast.c \
+-	../../src/inflate.c \
+-	../../src/inftrees.c \
+ 	../../src/interface.c \
+ 	../../src/inventory.c \
+ 	../../src/item.c \
+@@ -35,11 +30,9 @@
+ 	../../src/sprite.c \
+ 	../../src/textwin.c \
+ 	../../src/tile_stretcher.c \
+-	../../src/uncompr.c \
+ 	../../src/wrapper.c \
+-	../../src/widget.c \
+-	../../src/zutil.c
+-daimonin_LDADD = -lSDL_mixer -lSDL_image @SDL_LIBS@ @EXTRA_LIBS@ @PHYSFS_LIBS@
++	../../src/widget.c
++daimonin_LDADD = -lSDL_mixer -lSDL_image @SDL_LIBS@ @EXTRA_LIBS@ @PHYSFS_LIBS@ -lz
+ daimonin_OBJDIR = objs
+ 
+ daimonin_updater_SOURCES = \
diff --git a/games-rpg/daimonin-client/metadata.xml b/games-rpg/daimonin-client/metadata.xml
index d3c2cc926f0b..768443e782d2 100644
--- a/games-rpg/daimonin-client/metadata.xml
+++ b/games-rpg/daimonin-client/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
+  <use>
+    <flag name="music">Install extra music</flag>
+  </use>
 </pkgmetadata>