version bump (#104980), thanks to Andrew & gtk, sdl and Xaw3d support (#78781), thanks to Gustavo Ribeiro Alves

(Portage version: 2.1_pre5-r1)

5 files changed, 179 insertions, 4 deletions

diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog
index 760d67d1cca2..b246a1084684 100644
--- a/games-roguelike/tome/ChangeLog
+++ b/games-roguelike/tome/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-roguelike/tome
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.21 2006/02/27 23:34:27 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.22 2006/02/28 20:10:10 tupone Exp $
+
+*tome-2.3.3 (28 Feb 2006)
+
+  28 Feb 2006; <Tupone@gentoo.org> +files/2.3.3-gentoo-paths.patch,
+  +tome-2.3.3.ebuild:
+  version bump (bug #104980). Thanks Andrew.
+  gtk, sdl and Xaw3d support added (bug #78781). Thanks Gustavo Ribeiro Alves.
+  ppc-macos support dropped, until media-libs/sdl-ttf & media-libs/sdl-image
+  are supported there
 
   27 Feb 2006; <Tupone@gentoo.org> -files/2.2.6-gentoo-paths.patch,
   -files/2.2.5-gentoo-paths.patch, tome-2.2.7-r1.ebuild, tome-2.3.0.ebuild,
diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest
index 06133fbaa8a4..5659c6a253c4 100644
--- a/games-roguelike/tome/Manifest
+++ b/games-roguelike/tome/Manifest
@@ -1,6 +1,6 @@
-MD5 df0058ae4d764248b10e0efe441a0bc0 ChangeLog 4103
-RMD160 e9e0dd530adfde5ac58494d6386b4295055eaeb3 ChangeLog 4103
-SHA256 8def62ff87afb7a79577ca44db016bc684ac7d086db13c8ce5a5313acaf3ae1a ChangeLog 4103
+MD5 1979dd0806345ecd5ea2f4d799abdd86 ChangeLog 4444
+RMD160 bf912f756d9e75670be9e2d0e827d6920a4c4463 ChangeLog 4444
+SHA256 6cada7bb4052ee34bc713f4d15c5823fb676c44e587a27e82d2fbed226e9a7bc ChangeLog 4444
 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.7-gentoo-paths.patch 1172
 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 files/2.2.7-gentoo-paths.patch 1172
 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.2.7-gentoo-paths.patch 1172
@@ -10,6 +10,9 @@ SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.
 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.1-gentoo-paths.patch 1172
 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 files/2.3.1-gentoo-paths.patch 1172
 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.3.1-gentoo-paths.patch 1172
+MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.3-gentoo-paths.patch 1172
+RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 files/2.3.3-gentoo-paths.patch 1172
+SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.3.3-gentoo-paths.patch 1172
 MD5 2b7fa16de09206112d60ee628383f526 files/digest-tome-2.2.7-r1 244
 RMD160 7170d6df363869a41d89c0fba227e4657642a508 files/digest-tome-2.2.7-r1 244
 SHA256 88de2724caf495d98751495e00246e82984a0f5185c7734745774883b4b4befd files/digest-tome-2.2.7-r1 244
@@ -19,6 +22,9 @@ SHA256 1e9989e4ee5165eddde03d5ab911ace98e0c761e4499be436f90aa3fc4eb669d files/di
 MD5 be0eb8fb39ae1e3aa45a89acf5e01518 files/digest-tome-2.3.1 244
 RMD160 2db5af0397ef157a988936c800d52094b3fc4a5c files/digest-tome-2.3.1 244
 SHA256 efacb79f05ec2662bdbce251ea95ca42148f3201ba71874199866296c87468e2 files/digest-tome-2.3.1 244
+MD5 431dea3eb67e375073976220f6f968d3 files/digest-tome-2.3.3 244
+RMD160 c6c54aa02f66a011fdd6a1b8ea8efbccda7af3aa files/digest-tome-2.3.3 244
+SHA256 5b525bbceb08351853df881ea9482ca77827edc4a9979284dfd348518e25722e files/digest-tome-2.3.3 244
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
@@ -31,3 +37,6 @@ SHA256 9ce9516732448776b487cab1a4601741735827f7da490bc40d840ef7d8e92e45 tome-2.3
 MD5 11700d82746873465da2ae1725abff8d tome-2.3.1.ebuild 2082
 RMD160 869ad5506fec7e5d49cd773fae79c4896f71d1c0 tome-2.3.1.ebuild 2082
 SHA256 077360e62a2905f915a5c888e94633fd26f7d5bc54cbcc52bc62bdbc5ae0c575 tome-2.3.1.ebuild 2082
+MD5 46abd6337f18a725856ba8c81c41a354 tome-2.3.3.ebuild 3644
+RMD160 7a4a4e77c290fd40346138e8ed55d16aceb4b562 tome-2.3.3.ebuild 3644
+SHA256 c36134b187af31c1c0aa785d53f50e17b1719adc76c59eea0d38a12c8cee42c2 tome-2.3.3.ebuild 3644
diff --git a/games-roguelike/tome/files/2.3.3-gentoo-paths.patch b/games-roguelike/tome/files/2.3.3-gentoo-paths.patch
new file mode 100644
index 000000000000..d171a1cf540f
--- /dev/null
+++ b/games-roguelike/tome/files/2.3.3-gentoo-paths.patch
@@ -0,0 +1,31 @@
+diff -rU 1 tome-225-src.orig/src/files.c tome-225-src/src/files.c
+--- tome-225-src.orig/src/files.c	2004-01-14 11:17:02.423263360 -0500
++++ tome-225-src/src/files.c	2004-01-14 11:17:50.074019344 -0500
+@@ -5670,3 +5670,3 @@
+ 	/* Build the filename */
+-	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
++	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
+ 
+@@ -5748,3 +5748,3 @@
+ 	/* Build the filename */
+-	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
++	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
+ 
+@@ -5846,3 +5846,3 @@
+ 	/* Build the filename */
+-	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
++	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
+ 
+@@ -6296,3 +6296,3 @@
+ 	/* Build the filename */
+-	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
++	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
+ 
+diff -rU 1 tome-225-src.orig/src/init2.c tome-225-src/src/init2.c
+--- tome-225-src.orig/src/init2.c	2004-01-14 11:17:02.473255760 -0500
++++ tome-225-src/src/init2.c	2004-01-14 11:17:58.286770816 -0500
+@@ -6686,3 +6686,3 @@
+ 	/* Build the filename */
+-	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
++	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
+ 
diff --git a/games-roguelike/tome/files/digest-tome-2.3.3 b/games-roguelike/tome/files/digest-tome-2.3.3
new file mode 100644
index 000000000000..66b3afd6615a
--- /dev/null
+++ b/games-roguelike/tome/files/digest-tome-2.3.3
@@ -0,0 +1,3 @@
+MD5 d6df22607dd1009ab96bd3e6d6acf729 tome-233-src.tar.bz2 2865537
+RMD160 5f7006182be65e1fd49a9f3be1ef1f25e00fd0d3 tome-233-src.tar.bz2 2865537
+SHA256 2220419d69533ac8c3cc5687c1f9f6e5c9eadacf9643900ba50dce3696a9d721 tome-233-src.tar.bz2 2865537
diff --git a/games-roguelike/tome/tome-2.3.3.ebuild b/games-roguelike/tome/tome-2.3.3.ebuild
new file mode 100644
index 000000000000..1862755dec42
--- /dev/null
+++ b/games-roguelike/tome/tome-2.3.3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.3.ebuild,v 1.1 2006/02/28 20:10:10 tupone Exp $
+
+inherit eutils flag-o-matic games
+
+MY_PV=${PV//./}
+DESCRIPTION="save the world from Morgoth and battle evil (or become evil ;])"
+HOMEPAGE="http://t-o-m-e.net/"
+SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.bz2"
+
+LICENSE="Moria"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X Xaw3d gtk sdl"
+
+RDEPEND=">=sys-libs/ncurses-5
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )
+	Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
+	sdl? (
+		media-libs/sdl-ttf
+		media-libs/sdl-image
+		media-libs/libsdl
+	)
+	gtk? ( !amd64? ( =x11-libs/gtk+-1.2* ) )"
+DEPEND="${REDEPEND}
+	|| ( x11-misc/makedepend virtual/x11 )"
+
+S="${WORKDIR}/tome-${MY_PV}-src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/src"
+	mv makefile.std makefile
+	epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
+	sed -i \
+		-e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c \
+		|| die "sed failed"
+
+	find "${S}" -name .cvsignore -exec rm -f \{\} \;
+	find "${S}/lib/edit" -type f -exec chmod a-x \{\} \;
+}
+
+src_compile() {
+	local GENTOO_INCLUDES="" GENTOO_DEFINES="-DUSE_GCU " GENTOO_LIBS="-lncurses"
+	if use sdl || use X || use gtk || use Xaw3d; then
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY \
+			-DSUPPORT_GAMMA"
+	fi
+	if use sdl || use X || use Xaw3d; then
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK "
+	fi
+	if use sdl; then
+		GENTOO_INCLUDES="${GENTOO_INCLUDES} $(sdl-config --cflags)"
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_SDL "
+		GENTOO_LIBS="${GENTOO_LIBS} $(sdl-config --libs) -lSDL_image -lSDL_ttf"
+	fi
+	if use X; then
+		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_X11 "
+		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lX11 "
+	fi
+	if use Xaw3d; then
+		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
+		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_XAW "
+		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 "
+	fi
+	if use gtk; then
+		if use amd64; then
+			einfo "gtk support will not be built for amd64"
+		else
+			GENTOO_INCLUDES="${GENTOO_INCLUDES} $(gtk-config --cflags)"
+			GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_GTK "
+			GENTOO_LIBS="${GENTOO_LIBS} $(gtk-config --libs) "
+		fi
+	fi
+	GENTOO_INCLUDES="${GENTOO_INCLUDES} -Ilua -I."
+	GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_LUA"
+	append-ldflags -Wl,-z,now
+	cd src
+	make \
+		INCLUDES="${GENTOO_INCLUDES}" \
+		DEFINES="${GENTOO_DEFINES}" \
+		depend || die "make depend failed"
+	emake ./tolua || die "emake ./tolua failed"
+	emake \
+		COPTS="${CFLAGS}" \
+		INCLUDES="${GENTOO_INCLUDES}" \
+		DEFINES="${GENTOO_DEFINES}" \
+		LIBS="${GENTOO_LIBS}" \
+		BINDIR="${GAMES_BINDIR}" \
+		LIBDIR="${GAMES_DATADIR}/${PN}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	cd src
+	make \
+		DESTDIR="${D}" \
+		OWNER="${GAMES_USER}" \
+		BINDIR="${GAMES_BINDIR}" \
+		LIBDIR="${GAMES_DATADIR}/${PN}" install \
+		|| die "make install failed"
+	cd "${S}"
+	dodoc *.txt
+
+	dodir "${GAMES_STATEDIR}"
+	touch "${D}/${GAMES_STATEDIR}/${PN}-scores.raw"
+	prepgamesdirs
+	fperms g+w "${GAMES_STATEDIR}/${PN}-scores.raw"
+	#FIXME: something has to be done about this.
+	fperms g+w "${GAMES_DATADIR}/${PN}/data"
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	ewarn "ToME ${PV} is not save-game compatible with 2.3.0 and previous versions."
+	echo
+	einfo "If you have older save files and you wish to continue those games,"
+	einfo "you'll need to remerge the version of ToME with which you started"
+	einfo "those save-games."
+}