Version bump thanks to Luke-Jr <luke-jr+gentoobugs@utopios.org> in bug 102615

Package-Manager: portage-2.1_pre10

5 files changed, 281 insertions, 10 deletions

diff --git a/games-action/armagetronad/ChangeLog b/games-action/armagetronad/ChangeLog
index eae6ea580ed7..fd41a987a39c 100644
--- a/games-action/armagetronad/ChangeLog
+++ b/games-action/armagetronad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/armagetronad
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.5 2006/02/10 16:35:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.6 2006/04/30 19:51:11 genstef Exp $
+
+*armagetronad-0.2.8.1 (30 Apr 2006)
+
+  30 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/0280_fix-sysinstall.patch, +armagetronad-0.2.8.1.ebuild:
+  Version bump thanks to Luke-Jr <luke-jr+gentoobugs@utopios.org> in bug 102615
 
   10 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   armagetronad-0.2.7.1.ebuild:
diff --git a/games-action/armagetronad/Manifest b/games-action/armagetronad/Manifest
index 3134d2b12be0..778b9ee9848b 100644
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@@ -1,18 +1,49 @@
-MD5 ae23c7b32f2c3e6d686c3b0c02809a29 ChangeLog 1063
-RMD160 b7a0542ecab17fa8dc4a9aad00ced19af38cb95d ChangeLog 1063
-SHA256 58fb3b33fd0b3487845118685537184319535bd0155384d5a1ca632534b080be ChangeLog 1063
-MD5 7cf5f4a1d194616d98e9a1e272f901fc armagetronad-0.2.7.1.ebuild 2041
-RMD160 755c03bf0793bd5fca41f9dee589e9b835eef8fe armagetronad-0.2.7.1.ebuild 2041
-SHA256 3f9ab00924ed7c9b567b5532003535bf8c94004fda12e82b2fa24ce53c80bc32 armagetronad-0.2.7.1.ebuild 2041
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0280_fix-sysinstall.patch 2072 RMD160 d3e67fcd3a88a1fa16f1e27e23cf239edde2a84a SHA1 e8c9483b6f93bd1bfba124ced9853a47b263015c SHA256 077ef38aca1f74c1c84bde11654180673a2596ffd2d15d939e8ad1dd0f08d8ba size 2072
+MD5 8e0ee678028d0d9ef52677d738c76856 files/0280_fix-sysinstall.patch 2072
+RMD160 d3e67fcd3a88a1fa16f1e27e23cf239edde2a84a files/0280_fix-sysinstall.patch 2072
+SHA256 077ef38aca1f74c1c84bde11654180673a2596ffd2d15d939e8ad1dd0f08d8ba files/0280_fix-sysinstall.patch 2072
+AUX armagetronad 1102 RMD160 e9a7852c6b03010e03d93f1c849e4c582338745b SHA1 bd4feaba945fe12dc47bfae4e8fe18992e4546cd SHA256 b267de50ee8b41028b2fe3e441dd4049d3fd689cb3fa7788427ade03e7851579 size 1102
 MD5 617e831d7f4c02cd72d67800bcf0144f files/armagetronad 1102
 RMD160 e9a7852c6b03010e03d93f1c849e4c582338745b files/armagetronad 1102
 SHA256 b267de50ee8b41028b2fe3e441dd4049d3fd689cb3fa7788427ade03e7851579 files/armagetronad 1102
+AUX armagetronad-ded 1340 RMD160 508417bcacbf0583513c5407517e79bd15ce06af SHA1 254cb6460fb43a35f8cc8ccf8e6bc51d7312f350 SHA256 24935ddbb1e82b5a0695e03bd5e7f23f3ecae503b61459c6168cb7ae0d62080a size 1340
 MD5 37312a765833708af1d1712bc4fad0ac files/armagetronad-ded 1340
 RMD160 508417bcacbf0583513c5407517e79bd15ce06af files/armagetronad-ded 1340
 SHA256 24935ddbb1e82b5a0695e03bd5e7f23f3ecae503b61459c6168cb7ae0d62080a files/armagetronad-ded 1340
-MD5 6a1cb0c3d1b6316c534867da55cd7049 files/digest-armagetronad-0.2.7.1 196
-RMD160 86c5960e6352dbf0b62fda4daa401226294d451f files/digest-armagetronad-0.2.7.1 196
-SHA256 eb2d6d187d6fa52f198821a28d56e1d5ccd81529b6e6beecd063266580c2417a files/digest-armagetronad-0.2.7.1 196
+DIST armagetronad-0.2.7.1.tar.bz2 1243746 size 1243746
+DIST armagetronad-0.2.8.1.src.tar.bz2 1441730 RMD160 151681f84cd4694dc79c1653bc6960eef8f63d37 SHA256 f887e00342dc17ee6f85a5b534a7ddb5fc95dc7028c6fab92bde647918ce2a04 size 1441730
+DIST moviepack.zip 352253 size 352253
+DIST moviesounds_fq.zip 2182021 size 2182021
+DIST spanishvoices.zip 1146 RMD160 06690a3abf204a4bdf9fcb9334aeef0c28efa9d7 SHA256 88bfd555c46bdeecfe88e51909a32b322beca8dc77134a3396a949a67e4c0046 size 1146
+EBUILD armagetronad-0.2.7.1.ebuild 2041 RMD160 755c03bf0793bd5fca41f9dee589e9b835eef8fe SHA1 9e77bf079cc2280151f3fd6fffbccba14225c71e SHA256 3f9ab00924ed7c9b567b5532003535bf8c94004fda12e82b2fa24ce53c80bc32 size 2041
+MD5 7cf5f4a1d194616d98e9a1e272f901fc armagetronad-0.2.7.1.ebuild 2041
+RMD160 755c03bf0793bd5fca41f9dee589e9b835eef8fe armagetronad-0.2.7.1.ebuild 2041
+SHA256 3f9ab00924ed7c9b567b5532003535bf8c94004fda12e82b2fa24ce53c80bc32 armagetronad-0.2.7.1.ebuild 2041
+EBUILD armagetronad-0.2.8.1.ebuild 5926 RMD160 97b6fa91720865d946f5d02ed182245b166a5442 SHA1 143c4dc62d5c4812b09250efdd9c979f52b4db04 SHA256 2fefcbf6b949aaa25d79473d6e06dfbce8e454489a533074b2710c4e40adfec5 size 5926
+MD5 14fb01955e82961eb9afd8312cd6042a armagetronad-0.2.8.1.ebuild 5926
+RMD160 97b6fa91720865d946f5d02ed182245b166a5442 armagetronad-0.2.8.1.ebuild 5926
+SHA256 2fefcbf6b949aaa25d79473d6e06dfbce8e454489a533074b2710c4e40adfec5 armagetronad-0.2.8.1.ebuild 5926
+MISC ChangeLog 1299 RMD160 9619e66ef17ca95f6adfdd351777ae8b0669dab7 SHA1 b8b5963d8a73db8afdaf6eb1eb2b07a8e37b97a4 SHA256 eb2ded61e8c6fb4c82cb58b164d7f711a0904c201846f557f6d66c39d00e0991 size 1299
+MD5 b85890372597a396cabe99d2df1f41ef ChangeLog 1299
+RMD160 9619e66ef17ca95f6adfdd351777ae8b0669dab7 ChangeLog 1299
+SHA256 eb2ded61e8c6fb4c82cb58b164d7f711a0904c201846f557f6d66c39d00e0991 ChangeLog 1299
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 6a1cb0c3d1b6316c534867da55cd7049 files/digest-armagetronad-0.2.7.1 196
+RMD160 86c5960e6352dbf0b62fda4daa401226294d451f files/digest-armagetronad-0.2.7.1 196
+SHA256 eb2d6d187d6fa52f198821a28d56e1d5ccd81529b6e6beecd063266580c2417a files/digest-armagetronad-0.2.7.1 196
+MD5 2fa12a5deb55a19ac0a123d40bb98560 files/digest-armagetronad-0.2.8.1 628
+RMD160 a38f6c97e3a8ad28a8a98a3ec06b1e2b1aea8445 files/digest-armagetronad-0.2.8.1 628
+SHA256 bde4258f0704bd5438afa17522d959c4ecfb11ea73f22ae387d1aaf70fdb9e44 files/digest-armagetronad-0.2.8.1 628
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEVRU7NJowsmZ/PzARAqynAKDP1pbrdbVsM2fR9o+JB7113zutCgCfYcXl
+mX9klkRSqNcaF+FVOSks8Es=
+=WHV2
+-----END PGP SIGNATURE-----
diff --git a/games-action/armagetronad/armagetronad-0.2.8.1.ebuild b/games-action/armagetronad/armagetronad-0.2.8.1.ebuild
new file mode 100644
index 000000000000..a3e8d0d7c750
--- /dev/null
+++ b/games-action/armagetronad/armagetronad-0.2.8.1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.8.1.ebuild,v 1.1 2006/04/30 19:51:11 genstef Exp $
+
+inherit flag-o-matic eutils games
+
+DESCRIPTION="\"A Tron clone in 3D\""
+HOMEPAGE="http://armagetronad.net/"
+SRC_URI="mirror://sourceforge/armagetronad/${P}.src.tar.bz2
+	moviesounds? (
+		http://armagetron.sourceforge.net/addons/moviesounds_fq.zip
+		linguas_es? ( !linguas_en? (
+			http://usuario.tiscalinet.es/hgctiscali/naflat/downloads/spanishvoices.zip
+		) )
+	)
+	moviepack? (
+		http://armagetron.sourceforge.net/addons/moviepack.zip
+	)
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug dedicated krawall opengl moviepack moviesounds"
+
+GLDEPS="
+		|| (
+			virtual/x11
+			x11-libs/libX11
+		)
+		virtual/glu
+		virtual/opengl
+		media-libs/libsdl
+		media-libs/sdl-image
+		media-libs/jpeg
+		media-libs/libpng
+	"
+RDEPEND="
+		>=dev-libs/libxml2-2.6.12
+		sys-libs/zlib
+		opengl? ( ${GLDEPS} )
+		!dedicated? ( ${GLDEPS} )
+	"
+DEPEND="${RDEPEND}
+	moviepack? ( app-arch/unzip )
+	moviesounds? ( app-arch/unzip )
+	linguas_es? ( !linguas_en? ( app-arch/unzip ) )
+	"
+
+pkg_setup() {
+	if use debug; then
+		ewarn
+		ewarn 'The "debug" USE flag will enable debugging code. This will cause AI'
+		ewarn ' players to chat debugging information, debugging lines to be drawn'
+		ewarn ' on the grid and at wall angles, and probably most relevant to your'
+		ewarn ' decision to keep the USE flag:'
+		ewarn '         FULL SCREEN MODE AND SOUND WILL BE DISABLED'
+		ewarn
+		ewarn "If you don't like this, add this line to /etc/portage/package.use:"
+		ewarn '	games-action/armagetronad -debug'
+		ewarn
+		ewarn 'If you ignore this warning and complain about any of the above'
+		ewarn ' effects, the Armagetron Advanced team will either ignore you or'
+		ewarn ' delete your complaint.'
+		ewarn
+		ebeep 5
+	fi
+	# Assume client if they don't want a server
+	use opengl || ! use dedicated && build_client=true || build_client=false
+	use dedicated && build_server=true || build_server=false
+
+	MyEMAKE="armabindir=${GAMES_BINDIR}"	# we have a broken build system, I guess
+	# Note: Music isn't there yet
+	COMMON_CONFIG="--disable-master --enable-main --disable-memmanager --disable-music $(use_enable krawall) --enable-sysinstall --disable-useradd --enable-etc --disable-restoreold --disable-games"
+	if [ "$SLOT" == "0" ]; then
+		COMMON_CONFIG="${COMMON_CONFIG} --disable-multiver"
+		GameSLOT=""
+	else
+		COMMON_CONFIG="${COMMON_CONFIG}  --enable-multiver=${SLOT}"
+		GameSLOT="-${SLOT}"
+	fi
+	UNINSTALL_CONFIG=--enable-uninstall="emerge --clean =${CATEGORY}/${PF}"
+	if use debug; then
+		DEBUGLEVEL=3
+	else
+		DEBUGLEVEL=0
+	fi
+	CODELEVEL=0
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/batch"
+	epatch "${FILESDIR}/0280_fix-sysinstall.patch"
+}
+
+aabuild() {
+	MyBUILDDIR="${WORKDIR}/build-$1"
+	mkdir -p "${MyBUILDDIR}" || die "error creating build directory($1)"	# -p to allow EEXIST scenario
+	cd "${MyBUILDDIR}"
+	cat >configure <<EOF
+#!/bin/sh
+"${S}/configure" "\$@"
+EOF
+	chmod +x configure
+	export DEBUGLEVEL CODELEVEL
+	egamesconf ${COMMON_CONFIG} "${UNINSTALL_CONFIG}" "${@:2}" || die "egamesconf($1) failed"
+	if [ "$1" == "server" ]; then
+		ded='-dedicated'
+	else
+		ded=''
+	fi
+	cat >>"config.h" <<EOF
+#undef ENABLE_BINRELOC
+#define DATA_DIR "${GAMES_DATADIR}/${PN}${ded}${GameSLOT}"
+#define CONFIG_DIR "${GAMES_SYSCONFDIR}/${PN}${ded}${GameSLOT}"
+#define RESOURCE_DIR "${GAMES_DATADIR}/${PN}${ded}${GameSLOT}/resource"
+#define USER_DATA_DIR "~/.${PN}"
+#define AUTORESOURCE_DIR "~/.${PN}/resource/automatic"
+#define INCLUDEDRESOURCE_DIR "${GAMES_DATADIR}/${PN}${ded}${GameSLOT}/resource/included"
+EOF
+	emake ${MyEMAKE} || die "emake($1) failed"
+}
+
+src_compile() {
+	filter-flags -fno-exceptions
+	if ${build_client}; then
+		einfo "Building game client"
+		aabuild client  --enable-glout --disable-initscripts  --enable-desktop
+	fi
+	if ${build_server}; then
+		einfo "Building dedicated server"
+		aabuild server --disable-glout  --enable-initscripts --disable-desktop
+	fi
+}
+
+src_install() {
+	if ${build_client} && ${build_server}; then
+		# Setup symlink so both client and server share their common data
+		mkdir -p "${D}${GAMES_DATADIR}"
+		dosym "${PN}${GameSLOT}" "${GAMES_DATADIR}/${PN}-dedicated${GameSLOT}"
+	fi
+	if ${build_client}; then
+		einfo "Installing game client"
+		cd "${WORKDIR}/build-client"
+		emake install DESTDIR="${D}" ${MyEMAKE} || die "emake(client) install failed"
+		# copy moviepacks/sounds
+		cd "${WORKDIR}"
+		insinto "${GAMES_DATADIR}/${PN}${GameSLOT}"
+		if use moviepack; then
+			einfo 'Installing moviepack'
+			doins -r moviepack || die "copying moviepack"
+		fi
+		if use moviesounds; then
+			einfo 'Installing moviesounds'
+			doins -r moviesounds || die "copying moviesounds"
+			if use linguas_es && ! use linguas_en; then
+				einfo 'Installing Spanish moviesounds'
+				doins -r ArmageTRON/moviesounds || die "copying spanish moviesounds"
+			fi
+		fi
+	fi
+	if ${build_server}; then
+		einfo "Installing dedicated server"
+		cd "${WORKDIR}/build-server"
+		emake install DESTDIR="${D}" ${MyEMAKE} || die "emake(server) install failed"
+		einfo 'Adjusting dedicated server configuration'
+		sed -i "s,\(^user=\).*$,\1${GAMES_USER_DED},; s,^#VARDIR=\$HOME/./armagetronad-dedicated$,\\0\\nVARDIR=${GAMES_STATEDIR}/${PN}-dedicated${GameSLOT}," "${D}${GAMES_SYSCONFDIR}/${PN}-dedicated${GameSLOT}/rc.config"
+		DedHOME="$(eval echo ~${GAMES_USER_DED})"
+		mkdir -p "${D}${DedHOME}"
+		dosym "${GAMES_STATEDIR}/${PN}-dedicated${GameSLOT}" "${DedHOME}/.${PN}"
+	fi
+	# Ok, so we screwed up on doc installation... so for now, the ebuild does this manually
+	dohtml -r "${D}${GAMES_PREFIX}/share/doc/${PN}${ded}${GameSLOT}/html/"*
+	dodoc "${D}${GAMES_PREFIX}/share/doc/${PN}${ded}${GameSLOT}/html/"*.txt
+	rm -r "${D}${GAMES_PREFIX}/share/doc"
+	rmdir "${D}${GAMES_PREFIX}/share" || true	# Supress potential error
+	prepgamesdirs
+}
diff --git a/games-action/armagetronad/files/0280_fix-sysinstall.patch b/games-action/armagetronad/files/0280_fix-sysinstall.patch
new file mode 100644
index 000000000000..abc58d59b8f1
--- /dev/null
+++ b/games-action/armagetronad/files/0280_fix-sysinstall.patch
@@ -0,0 +1,47 @@
+--- sysinstall.in	2006-03-16 07:35:26.000000000 +0000
++++ sysinstall.in.fixed	2006-03-18 02:31:02.000000000 +0000
+@@ -103,26 +103,26 @@
+     DESTDIR=`echo $SOURCE | sed -e "s,${prefix},,"`
+     BINDIR=${SOURCE}/bin
+ else
+-    SCRIPTDIR=${DESTDIR}`echo @armascriptdir@ | sed -e "s,@prefix@,${PREFIX},"`
++    SCRIPTDIR=`echo @armascriptdir@ | sed -e "s,@prefix@,${PREFIX},"`
+     #@datasuffix@@scriptsuffix@
+-    BINDIR=${DESTDIR}`echo @bindir@ | sed -e "s,@prefix@,${PREFIX},"`
++    BINDIR=`echo @bindir@ | sed -e "s,@prefix@,${PREFIX},"`
+ fi
+ 
+ # determine data locations
+-EXECUTABLE=${BINDIR}/@progname@@executable_suffix@
+-CONFIGDIR=${SOURCE}`echo @configdir@ | sed -e "s,@prefix@,,"`
+-VARDIR=${SOURCE}`echo @vardir@ | sed -e "s,@prefix@,,"`
++EXECUTABLE=${DESTDIR}${BINDIR}/@progname@@executable_suffix@
++CONFIGDIR=`echo @configdir@ | sed -e "s,@prefix@,${PREFIX},"`
++VARDIR=`echo @vardir@ | sed -e "s,@prefix@,${PREFIX},"`
+ 
+ # determine location of scripts
+ 
+-test -d $SCRIPTDIR || { echo "Script directory not found."; exit -1; }
++test -d $DESTDIR$SCRIPTDIR || { echo "Script directory not found."; exit -1; }
+ 
+ # transscribe true location into scripts
+ if test $MODE = install; then
+     echo "Transscribing scripts..."
+-    for script in $SCRIPTDIR/*; do
+-        if test $script != $SCRIPTDIR/sysinstall; then
+-            sed -e "s,@configdir_reloc\@,$CONFIGDIR,g" -e "s,@prefix_reloc\@,$SOURCE,g" \
++    for script in $DESTDIR$SCRIPTDIR/*; do
++        if test $script != $DESTDIR$SCRIPTDIR/sysinstall; then
++            sed -e "s,@configdir_reloc\@,$CONFIGDIR,g" -e "s,@prefix_reloc\@,$PREFIX,g" \
+                 -e "s,@scriptdir_reloc\@,$SCRIPTDIR,g" -e "s,@localstatedir_reloc\@,$VARDIR,g"\
+                 < $script > $script.trans || exit -1
+             mv $script.trans $script
+@@ -150,7 +150,7 @@
+ fi
+ 
+ # link executable files
+-pushd ${BINDIR} > /dev/null || exit -1
++pushd ${DESTDIR}${BINDIR} > /dev/null || exit -1
+ install_link @progname@-@version@ @progname@
+ install_link @prognamebase@-master-@version@ @prognamebase@-master
+ popd > /dev/null 
diff --git a/games-action/armagetronad/files/digest-armagetronad-0.2.8.1 b/games-action/armagetronad/files/digest-armagetronad-0.2.8.1
new file mode 100644
index 000000000000..83ac31065f98
--- /dev/null
+++ b/games-action/armagetronad/files/digest-armagetronad-0.2.8.1
@@ -0,0 +1,8 @@
+MD5 28fa1f66dd09cf96deeb0c78161b1b5c armagetronad-0.2.8.1.src.tar.bz2 1441730
+RMD160 151681f84cd4694dc79c1653bc6960eef8f63d37 armagetronad-0.2.8.1.src.tar.bz2 1441730
+SHA256 f887e00342dc17ee6f85a5b534a7ddb5fc95dc7028c6fab92bde647918ce2a04 armagetronad-0.2.8.1.src.tar.bz2 1441730
+MD5 e2d40309dde7e1339ca6aff7599cdfa3 moviepack.zip 352253
+MD5 3c5d04af52eb296cdeb2fba5ecbd8899 moviesounds_fq.zip 2182021
+MD5 6fc9487c23d350997fff141e9e40e7e5 spanishvoices.zip 1146
+RMD160 06690a3abf204a4bdf9fcb9334aeef0c28efa9d7 spanishvoices.zip 1146
+SHA256 88bfd555c46bdeecfe88e51909a32b322beca8dc77134a3396a949a67e4c0046 spanishvoices.zip 1146