version bump (bug #74979); clean old ebuilds

10 files changed, 118 insertions, 124 deletions

diff --git a/games-rpg/daimonin-client/ChangeLog b/games-rpg/daimonin-client/ChangeLog
index 2233e9fa2bd8..e49e44bed878 100644
--- a/games-rpg/daimonin-client/ChangeLog
+++ b/games-rpg/daimonin-client/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-rpg/daimonin-client
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/ChangeLog,v 1.9 2004/11/30 07:49:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/ChangeLog,v 1.10 2004/12/30 00:30:58 mr_bones_ Exp $
+
+*daimonin-client-0.96.6_beta3 (29 Dec 2004)
+
+  29 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -daimonin-client-0.96.5_beta3-r1.ebuild,
+  -daimonin-client-0.96.5_beta3.ebuild, +daimonin-client-0.96.6_beta3.ebuild,
+  -daimonin-client-0.96_beta2.ebuild:
+  version bump (bug #74979); clean old ebuilds
 
 *daimonin-client-0.96.5_beta3-r1 (29 Nov 2004)
 
diff --git a/games-rpg/daimonin-client/Manifest b/games-rpg/daimonin-client/Manifest
index 53f63c792216..34f7b6e53e70 100644
--- a/games-rpg/daimonin-client/Manifest
+++ b/games-rpg/daimonin-client/Manifest
@@ -1,14 +1,11 @@
-MD5 dc9040ecd4ed9db3c929bbee2d864b56 ChangeLog 1574
+MD5 f04213399445567cf67ecca80fa03be3 ChangeLog 1882
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 11d73c484c3404644c5e4a3769d5f99e daimonin-client-0.95b-r2.ebuild 1169
-MD5 f2a10eea3dd01f88c2cf06645d7ed19b daimonin-client-0.96.5_beta3.ebuild 1505
-MD5 d7763f4b3e679200238510aa9846133c daimonin-client-0.96_beta2.ebuild 1548
-MD5 ecdaf8b4006075f17763a8610445424b daimonin-client-0.96.5_beta3-r1.ebuild 1510
+MD5 367562c0b436a2e6977736c210f0bee9 daimonin-client-0.96.6_beta3.ebuild 1502
 MD5 f0fea0494c9b50a88620443df60a150e files/0.95b-gcc3.patch 1664
 MD5 49fc669e5a92e2d43091dbcb3f5afec2 files/0.95b-gentoo-paths.patch 2948
 MD5 b7f58f6b5220a09dedb532eb977bd227 files/digest-daimonin-client-0.95b-r2 69
-MD5 fff92cef909650f347db6cebfd2973dd files/digest-daimonin-client-0.96_beta2 81
 MD5 8a41290909b2aa9cf1835f6aac36c738 files/0.96a_beta2-gentoo-paths.patch 3172
-MD5 1c6ea71495b869335ba165cc4600e07c files/digest-daimonin-client-0.96.5_beta3 82
+MD5 5ac5c8e1d72348115409654af5ab3584 files/digest-daimonin-client-0.96.6_beta3 77
 MD5 8a41290909b2aa9cf1835f6aac36c738 files/0.96.5_beta3-gentoo-paths.patch 3172
-MD5 d9b88e940df3215b2383727214344b04 files/digest-daimonin-client-0.96.5_beta3-r1 82
+MD5 8a41290909b2aa9cf1835f6aac36c738 files/0.96.6_beta3-gentoo-paths.patch 3172
diff --git a/games-rpg/daimonin-client/daimonin-client-0.96.5_beta3.ebuild b/games-rpg/daimonin-client/daimonin-client-0.96.5_beta3.ebuild
deleted file mode 100644
index 7796e93dee06..000000000000
--- a/games-rpg/daimonin-client/daimonin-client-0.96.5_beta3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 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.96.5_beta3.ebuild,v 1.3 2004/11/03 13:48:19 vapier Exp $
-
-inherit eutils flag-o-matic games
-
-MY_PV=${PV/_beta*}
-MY_PV=${MY_PV//.}
-DESCRIPTION="MMORPG with 2D isometric tiles grafik, true color and alpha blending effects"
-HOMEPAGE="http://daimonin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/daimonin/daimonin_client_src-BETA3-${MY_PV}a.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-image
-	virtual/x11"
-
-S="${WORKDIR}/daimonin/client"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
-	chmod a+x make/linux/configure
-}
-
-src_compile() {
-	append-flags \
-		-DGENTOO_DATADIR="'\"${GAMES_DATADIR}/${PN}\"'" \
-		-DGENTOO_STATEDIR="'\"${GAMES_STATEDIR}/${PN}\"'"
-
-	cd make/linux
-	egamesconf || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	dogamesbin src/daimonin || die "dogamesbin failed"
-	dodir "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}/${PN}"
-	cp -r bitmaps icons media sfx "${D}/${GAMES_DATADIR}/${PN}/" \
-		|| die "cp failed"
-	cp -r cache gfx_user srv_files "${D}/${GAMES_STATEDIR}/${PN}/" \
-		|| die "cp failed"
-	insinto "${GAMES_STATEDIR}/${PN}"
-	doins *.{dat,p0} || die "doins failed"
-	prepgamesdirs
-	find "${D}/${GAMES_STATEDIR}/${PN}/" -type d -print0 | xargs -0 \
-		chmod g+w
-}
diff --git a/games-rpg/daimonin-client/daimonin-client-0.96.5_beta3-r1.ebuild b/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild
index 4a3a680bf6ec..401536de4d6d 100644
--- a/games-rpg/daimonin-client/daimonin-client-0.96.5_beta3-r1.ebuild
+++ b/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.96.5_beta3-r1.ebuild,v 1.1 2004/11/30 07:49:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild,v 1.1 2004/12/30 00:30:58 mr_bones_ Exp $
 
 inherit eutils flag-o-matic games
 
@@ -8,7 +8,7 @@ MY_PV=${PV/_beta*}
 MY_PV=${MY_PV//.}
 DESCRIPTION="MMORPG with 2D isometric tiles grafik, true color and alpha blending effects"
 HOMEPAGE="http://daimonin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/daimonin/daimonin_client_src-BETA3-${MY_PV}b.tgz"
+SRC_URI="mirror://sourceforge/daimonin/daimonin_client-BETA3-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/games-rpg/daimonin-client/daimonin-client-0.96_beta2.ebuild b/games-rpg/daimonin-client/daimonin-client-0.96_beta2.ebuild
deleted file mode 100644
index 34b48dcdfcab..000000000000
--- a/games-rpg/daimonin-client/daimonin-client-0.96_beta2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 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.96_beta2.ebuild,v 1.2 2004/11/03 00:30:43 vapier Exp $
-
-inherit eutils flag-o-matic games
-
-MY_PV=${PV/_beta*}
-MY_PV=${MY_PV/.}
-DESCRIPTION="MMORPG with 2D isometric tiles grafik, true color and alpha blending effects"
-HOMEPAGE="http://daimonin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/daimonin/daimonin_client_src-BETA2-${MY_PV}a.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-image
-	virtual/x11"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/daimonin/client"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/0.96a_beta2-gentoo-paths.patch"
-	cd make/linux
-	chmod a+x ./configure
-}
-
-src_compile() {
-	append-flags \
-		-DGENTOO_DATADIR="'\"${GAMES_DATADIR}/${PN}\"'" \
-		-DGENTOO_STATEDIR="'\"${GAMES_STATEDIR}/${PN}\"'"
-
-	cd make/linux
-	egamesconf || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	dogamesbin src/daimonin || die "dogamesbin failed"
-	dodir "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}/${PN}"
-	cp -r bitmaps icons media sfx "${D}/${GAMES_DATADIR}/${PN}/" \
-		|| die "cp failed"
-	cp -r cache gfx_user srv_files "${D}/${GAMES_STATEDIR}/${PN}/" \
-		|| die "cp failed"
-	insinto "${GAMES_STATEDIR}/${PN}"
-	doins *.{dat,p0} || die "doins failed"
-	prepgamesdirs
-	find "${D}/${GAMES_STATEDIR}/${PN}/" -type d -print0 | xargs -0 \
-		chmod g+w
-}
diff --git a/games-rpg/daimonin-client/files/0.96.6_beta3-gentoo-paths.patch b/games-rpg/daimonin-client/files/0.96.6_beta3-gentoo-paths.patch
new file mode 100644
index 000000000000..94022939b3a9
--- /dev/null
+++ b/games-rpg/daimonin-client/files/0.96.6_beta3-gentoo-paths.patch
@@ -0,0 +1,102 @@
+diff -urN client/src/include/config.h client-new/src/include/config.h
+--- client/src/include/config.h	2004-05-13 19:14:52.000000000 +0100
++++ client-new/src/include/config.h	2004-06-13 13:23:55.408837640 +0100
+@@ -26,11 +26,11 @@
+ #define VERSION_CS 991016
+ #define VERSION_SC 991016
+ 
+-#define KEYBIND_FILE "./keys.dat"
+-#define OPTION_FILE  "./options.dat"
+-#define ARCHDEF_FILE "./archdef.dat"
++#define KEYBIND_FILE GENTOO_STATEDIR "/keys.dat"
++#define OPTION_FILE  GENTOO_STATEDIR "/options.dat"
++#define ARCHDEF_FILE GENTOO_STATEDIR "/archdef.dat"
+ 
+-#define LOG_FILE     "./client.log"
++#define LOG_FILE     GENTOO_STATEDIR "/client.log"
+ 
+ #define CLIENT_ICON_NAME "icon.png"
+  
+diff -urN client/src/include/main.h client-new/src/include/main.h
+--- client/src/include/main.h	2004-05-13 19:14:52.000000000 +0100
++++ client-new/src/include/main.h	2004-06-13 13:33:36.773456784 +0100
+@@ -103,16 +103,16 @@
+ 
+ extern int bmaptype_table_size;
+ 
+-#define FILE_DAIMONIN_P0 "./daimonin.p0"
+-#define FILE_BMAPS_P0 "./bmaps.p0"
+-#define FILE_BMAPS_TMP "./srv_files/bmaps.tmp"
+-#define FILE_ANIMS_TMP "./srv_files/anims.tmp"
+-
+-#define FILE_CLIENT_SPELLS "./srv_files/client_spells"
+-#define FILE_CLIENT_SKILLS "./srv_files/client_skills"
+-#define FILE_CLIENT_SETTINGS "./srv_files/client_settings"
+-#define FILE_CLIENT_BMAPS "./srv_files/client_bmap"
+-#define FILE_CLIENT_ANIMS "./srv_files/client_anims"
++#define FILE_DAIMONIN_P0 GENTOO_STATEDIR "/daimonin.p0"
++#define FILE_BMAPS_P0 GENTOO_STATEDIR "/bmaps.p0"
++#define FILE_BMAPS_TMP GENTOO_STATEDIR "/srv_files/bmaps.tmp"
++#define FILE_ANIMS_TMP GENTOO_STATEDIR "/srv_files/anims.tmp"
++
++#define FILE_CLIENT_SPELLS GENTOO_STATEDIR "/srv_files/client_spells"
++#define FILE_CLIENT_SKILLS GENTOO_STATEDIR "/srv_files/client_skills"
++#define FILE_CLIENT_SETTINGS GENTOO_STATEDIR "/srv_files/client_settings"
++#define FILE_CLIENT_BMAPS GENTOO_STATEDIR "/srv_files/client_bmap"
++#define FILE_CLIENT_ANIMS GENTOO_STATEDIR "/srv_files/client_anims"
+ 
+ enum {
+ 	SRV_CLIENT_SKILLS,
+diff -urN client/src/wrapper.c client-new/src/wrapper.c
+--- client/src/wrapper.c	2004-05-13 19:14:52.000000000 +0100
++++ client-new/src/wrapper.c	2004-06-13 13:45:34.944278224 +0100
+@@ -84,35 +84,35 @@
+ char * GetBitmapDirectory(void)
+ {
+ #if defined( __WIN_32)  || defined(__LINUX)
+-	return("./bitmaps/");
++	return(GENTOO_DATADIR "/bitmaps/");
+ #endif
+ }
+ 
+ char * GetIconDirectory(void)
+ {
+ #if defined( __WIN_32)  || defined(__LINUX)
+-    return("./icons/");
++    return(GENTOO_DATADIR "/icons/");
+ #endif
+ }
+ 
+ char * GetSfxDirectory(void)
+ {
+ #if defined( __WIN_32)  || defined(__LINUX)
+-	return("./sfx/");
++	return(GENTOO_DATADIR "/sfx/");
+ #endif
+ }
+ 
+ char * GetCacheDirectory(void)
+ {
+ #if defined( __WIN_32)  || defined(__LINUX)
+-	return("./cache/");
++	return(GENTOO_STATEDIR "/cache/");
+ #endif
+ }
+ 
+ char * GetGfxUserDirectory(void)
+ {
+ #if defined( __WIN_32)  || defined(__LINUX)
+-	return("./gfx_user/");
++	return(GENTOO_STATEDIR "/gfx_user/");
+ #endif
+ }
+ 
+@@ -120,7 +120,7 @@
+ char * GetMediaDirectory(void)
+ {
+ #if defined( __WIN_32)  || defined(__LINUX)	
+-    return("./media/");
++    return(GENTOO_DATADIR "/media/");
+ #endif
+ }
+ 
diff --git a/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.5_beta3 b/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.5_beta3
deleted file mode 100644
index 248137725686..000000000000
--- a/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.5_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7dea1391ba8771ee182e0faccc8b499 daimonin_client_src-BETA3-0965a.tgz 14444070
diff --git a/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.5_beta3-r1 b/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.5_beta3-r1
deleted file mode 100644
index a7ce4b1b10ab..000000000000
--- a/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.5_beta3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5330750ab5c5adffb6c264ff6102599d daimonin_client_src-BETA3-0965b.tgz 14452168
diff --git a/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.6_beta3 b/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.6_beta3
new file mode 100644
index 000000000000..b88d7e43f84c
--- /dev/null
+++ b/games-rpg/daimonin-client/files/digest-daimonin-client-0.96.6_beta3
@@ -0,0 +1 @@
+MD5 f15098816863537ed547b4f70d1413c2 daimonin_client-BETA3-0966.tgz 15101397
diff --git a/games-rpg/daimonin-client/files/digest-daimonin-client-0.96_beta2 b/games-rpg/daimonin-client/files/digest-daimonin-client-0.96_beta2
deleted file mode 100644
index 8ac38d806f94..000000000000
--- a/games-rpg/daimonin-client/files/digest-daimonin-client-0.96_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee0f3f4da694a2c2d980acc47c3039ad daimonin_client_src-BETA2-096a.zip 14274863