Unbundle zlib. Bug #310849

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

4 files changed, 107 insertions, 12 deletions

diff --git a/games-rpg/daimonin-client/ChangeLog b/games-rpg/daimonin-client/ChangeLog
index d5cad190fbee..c002bc75b907 100644
--- a/games-rpg/daimonin-client/ChangeLog
+++ b/games-rpg/daimonin-client/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2010/01/08 01:12:47 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/ChangeLog,v 1.23 2010/03/26 15:51:31 tupone Exp $
+
+*daimonin-client-0.9.7.1-r1 (26 Mar 2010)
+
+  26 Mar 2010; Tupone Alfredo <tupone@gentoo.org>
+  +daimonin-client-0.9.7.1-r1.ebuild,
+  +files/daimonin-client-0.9.7.1-nozlib.patch:
+  Unbundle zlib. Bug #310849 by flameeyes@gentoo.org
 
   08 Jan 2010; Joseph Jezak <josejx@gentoo.org>
   daimonin-client-0.9.7.1.ebuild:
diff --git a/games-rpg/daimonin-client/Manifest b/games-rpg/daimonin-client/Manifest
index 1c8a12e3fb1a..8824c5833d9d 100644
--- a/games-rpg/daimonin-client/Manifest
+++ b/games-rpg/daimonin-client/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+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.9.7.1.zip 30086700 RMD160 a698f524aa1ed22421c3e9a507f99d6197659522 SHA1 61a8a353e1a0ff6858b0726a0627100b2328f5e1 SHA256 6cafeab3fab06647daa5730e1d36608e5affd17d4d60fa94ac0d008ab47e2d4c
+EBUILD daimonin-client-0.9.7.1-r1.ebuild 1360 RMD160 438b39d78627db43d80fafe0ff484fb685c3c5b5 SHA1 f93aa5cdd83935d45e2eca29c393a782d1d29bfa SHA256 e03277d85863a6b66792ec0722c2025ea2533b27a75dba6e9d7f354d414b1c78
 EBUILD daimonin-client-0.9.7.1.ebuild 1312 RMD160 0a9e5d29b50f800272f1c87a04d7892e9257091b SHA1 28fc83f3aa42636630853e5c1eaf3541a88c5502 SHA256 4fc2591b57afb1bf9ff26031f7b573a6af29dfffe53859d8facb0b25a2f4b4e8
-MISC ChangeLog 3918 RMD160 9761fe97fb863a94ec328531cc05e486e8c23c1d SHA1 f07fb58d7bec084b25127ea3c61fd2986c443a43 SHA256 d0dfa79aca14b1d08c81f99f6e8cf6aa02a6daadd422bd723a6f52c0b64af309
+MISC ChangeLog 4150 RMD160 69af4e8e990f5bb45cc40387e03fd91f7cd0c913 SHA1 b16a3ce0d0c7d08a15cfcd21b06338aa28116c39 SHA256 29edc912b5b7119fca2ada815b162d0859765ebc13f735a97766ce7c8b8f7b97
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktGhigACgkQcsIHjyDViGT+QgCgtOsED+7hEvQcf/6J/U5GOir3
-a5UAnRRzE7Ua04z7sRQxTD2nXWMUFETb
-=H04e
------END PGP SIGNATURE-----
diff --git a/games-rpg/daimonin-client/daimonin-client-0.9.7.1-r1.ebuild b/games-rpg/daimonin-client/daimonin-client-0.9.7.1-r1.ebuild
new file mode 100644
index 000000000000..425bc5a58194
--- /dev/null
+++ b/games-rpg/daimonin-client/daimonin-client-0.9.7.1-r1.ebuild
@@ -0,0 +1,58 @@
+# 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.9.7.1-r1.ebuild,v 1.1 2010/03/26 15:51:31 tupone 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="mirror://sourceforge/daimonin/${MY_P}.zip
+	mirror://sourceforge/daimonin/AllMusic.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-image[png]
+	dev-games/physfs
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/daimonin/client/make/linux
+
+src_unpack() {
+	unpack ${MY_P}.zip
+	cd daimonin/client/media
+	rm -f *
+	unpack AllMusic.zip
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nozlib.patch
+	sed -i \
+		-e 's:$(d_datadir):$(DESTDIR)$(d_datadir):' \
+		-e '/PROGRAMS/s:daimonin-updater::' \
+		Makefile.am \
+		|| die "sed failed"
+	chmod +x configure
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf --disable-simplelayout
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	cd ../..
+	dodoc README*
+	newicon skins/subred/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.9.7.1-nozlib.patch b/games-rpg/daimonin-client/files/daimonin-client-0.9.7.1-nozlib.patch
new file mode 100644
index 000000000000..ed30c1977bc8
--- /dev/null
+++ b/games-rpg/daimonin-client/files/daimonin-client-0.9.7.1-nozlib.patch
@@ -0,0 +1,38 @@
+--- Makefile.am.old	2010-03-26 16:00:53.000000000 +0100
++++ Makefile.am	2010-03-26 16:01:39.000000000 +0100
+@@ -2,21 +2,16 @@
+ daimonin_PROGRAMS = daimonin daimonin-updater
+ 
+ daimonin_SOURCES =  \
+-	../../src/adler32.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/group.c \
+ 	../../src/ignore.c \
+-	../../src/inffast.c \
+-	../../src/inflate.c \
+-	../../src/inftrees.c \
+ 	../../src/interface.c \
+ 	../../src/inventory.c \
+ 	../../src/item.c \
+@@ -31,11 +26,9 @@
+ 	../../src/sound.c \
+ 	../../src/sprite.c \
+ 	../../src/textwin.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 = \