Install ut2004-ded wrapper when USE=dedicated for "ucc-bin server"; allow installation of server only (with no client deps)

(Portage version: 2.2_rc45/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 42 insertions, 180 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index e985af31c317..3744368e8e6a 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/ut2004
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.65 2009/09/03 13:35:31 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.66 2009/10/12 00:54:03 nyhm Exp $
+
+*ut2004-3369.3-r1 (12 Oct 2009)
+
+  12 Oct 2009; Tristan Heaven <nyhm@gentoo.org> -files/ut2004.xml,
+  -ut2004-3369-r4.ebuild, -ut2004-3369.3.ebuild, +ut2004-3369.3-r1.ebuild:
+  Install ut2004-ded wrapper when USE=dedicated for "ucc-bin server"; allow
+  installation of server only (with no client deps)
 
 *ut2004-3369.3 (03 Sep 2009)
 
diff --git a/games-fps/ut2004/files/ut2004.xml b/games-fps/ut2004/files/ut2004.xml
deleted file mode 100644
index f87f48c78ff4..000000000000
--- a/games-fps/ut2004/files/ut2004.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<product name="ut2004" desc="Unreal Tournament 2004" xmlversion="1.6" root="GAMES_PREFIX_OPT/ut2004" update_url="http://unreal.epicgames.com/updates/ut2004/updates.txt">
-  <component name="__CDKEY__" version="3369" default="yes">
-    <option name="English"></option>
-    <option name="__CDKEY__" tag="__CDKEY__"></option>
-  </component>
-</product>
diff --git a/games-fps/ut2004/ut2004-3369-r4.ebuild b/games-fps/ut2004/ut2004-3369-r4.ebuild
deleted file mode 100644
index 2e46bd8bc261..000000000000
--- a/games-fps/ut2004/ut2004-3369-r4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v 1.20 2009/04/14 07:30:05 mr_bones_ Exp $
-
-# To use system libraries, uncomment the following line and comment the one
-# below it.
-inherit eutils multilib games
-
-MY_P="${PN}-lnxpatch${PV}-2.tar.bz2"
-DESCRIPTION="Editor's Choice Edition plus Mega Pack for the critically-acclaimed first-person shooter"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="mirror://3dgamers/unrealtourn2k4/${MY_P}
-	http://speculum.twistedgamer.com/pub/0day.icculus.org/${PN}/${MY_P}
-	http://treefort.icculus.org/${PN}/${MY_P}
-	http://sonic-lux.net/data/mirror/ut2004/${MY_P}"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# The executable pages are required.
-QA_EXECSTACK_x86="${GAMES_PREFIX_OPT:1}/ut2004/System/ut2004-bin
-	${GAMES_PREFIX_OPT:1}/ut2004/System/ucc-bin"
-QA_EXECSTACK_amd64="${GAMES_PREFIX_OPT:1}/ut2004/System/ut2004-bin
-	${GAMES_PREFIX_OPT:1}/ut2004/System/ucc-bin"
-RESTRICT="mirror strip"
-PROPERTIES="interactive"
-IUSE="dedicated opengl"
-
-RDEPEND=">=games-fps/ut2004-data-3186-r2
-	>=games-fps/ut2004-bonuspack-ece-1-r1
-	>=games-fps/ut2004-bonuspack-mega-1-r1
-	opengl? (
-		virtual/opengl )
-	=virtual/libstdc++-3.3
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	>=media-libs/libsdl-1.2
-	media-libs/openal"
-
-S=${WORKDIR}/UT2004-Patch
-
-GAMES_CHECK_LICENSE="yes"
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-src_install() {
-	# These files are owned by ut2004-bonuspack-mega
-	rm "${S}"/System/{Manifest.in{i,t},Packages.md5}
-
-	# Installing patch files
-	for p in {Animations,Help,Speech,System,Textures,Web}
-	do
-		dodir "${dir}/${p}"
-		cp -r "${S}/${p}"/* "${Ddir}/${p}" \
-			|| die "copying ${p} from patch"
-	done
-
-	dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so || die
-	dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0 \
-		|| die
-
-	use amd64 && rm "${Ddir}"/System/u{cc,t2004}-bin \
-		&& mv "${Ddir}"/System/ucc-bin-linux-amd64 "${Ddir}"/System/ucc-bin \
-		&& mv "${Ddir}"/System/ut2004-bin-linux-amd64 \
-		"${Ddir}"/System/ut2004-bin \
-		&& chmod ug+x "${Ddir}"/System/ucc-bin "${Ddir}"/System/ut2004-bin
-	use x86 && rm "${Ddir}"/System/ucc-bin-linux-amd64 \
-		"${Ddir}"/System/ut2004-bin-linux-amd64
-
-	# Creating .manifest files
-	sed -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" "${FILESDIR}"/${PN}.xml > \
-		"${T}"/${PN}.xml || die "sed failed"
-	insinto "${dir}"/.manifest
-	doins "${T}"/${PN}.xml
-
-	# Creating .loki/installed links
-	mkdir -p "${D}"/root/.loki/installed
-	dosym "${dir}"/.manifest/${PN}.xml /root/.loki/installed/${PN}.xml
-
-	games_make_wrapper ut2004 ./ut2004 "${dir}" "${dir}"
-
-	prepgamesdirs
-	make_desktop_entry ut2004 "Unreal Tournament 2004" ut2004
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	# Here is where we check for the existence of a cdkey...
-	# If we don't find one, we ask the user for it
-	if [[ -f "${dir}/System/cdkey" ]]
-	then
-		einfo "A cdkey file is already present in ${dir}/System"
-	else
-		ewarn "You MUST run this before playing the game:"
-		ewarn "emerge --config =${CATEGORY}/${PF}"
-		ewarn "That way you can [re]enter your cdkey."
-	fi
-	echo
-	elog "Starting with 3369, the game supports render-to-texture.  To enable"
-	elog "it, you will need the Nvidia drivers of at least version 7676 and"
-	elog "you should edit the following:"
-	elog 'Set "UseRenderTargets=True" in the "[OpenGLDrv.OpenGLRenderDevice]"'
-	elog 'section of your UT2004.ini/Default.ini and set "bPlayerShadows=True"'
-	elog 'and "bBlobShadow=False" in the "[UnrealGame.UnrealPawn]" section of'
-	elog 'your User.ini/DefUser.ini'
-	echo
-	if use x86
-	then
-		elog "The 32-bit version of UT2004 uses Pixomatic, which means it"
-		elog "really does need an executable stack.  It is safe to ignore any"
-		elog "warnings from portage about this.  See:"
-		elog "http://bugs.gentoo.org/show_bug.cgi?id=114733"
-		elog "for more information."
-		echo
-	fi
-	elog "To play the game run:"
-	elog " ut2004"
-	echo
-}
-
-pkg_postrm() {
-	ewarn "This package leaves a cdkey file in ${dir}/System that you need"
-	ewarn "to remove to completely get rid of this game's files."
-}
-
-pkg_config() {
-	ewarn "Your CD key is NOT checked for validity here."
-	ewarn "  Make sure you type it in correctly."
-	eerror "If you CTRL+C out of this, the game will not run!"
-	echo
-	einfo "CD key format is: XXXXX-XXXXX-XXXXX-XXXXX"
-	while true
-	do
-		einfo "Please enter your CD key:"
-		read CDKEY1
-		einfo "Please re-enter your CD key:"
-		read CDKEY2
-		if [[ "$CDKEY1" == "" ]]
-		then
-			echo "You entered a blank CD key.  Try again."
-		else
-			if [[ "$CDKEY1" == "$CDKEY2" ]]
-			then
-				echo "$CDKEY1" | tr a-z A-Z > "${dir}"/System/cdkey
-				einfo "Thank you!"
-				break
-			else
-				eerror "Your CD key entries do not match.  Try again."
-			fi
-		fi
-	done
-}
diff --git a/games-fps/ut2004/ut2004-3369.3.ebuild b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
index 3a97ea9ea3ff..2c992c4a0e11 100644
--- a/games-fps/ut2004/ut2004-3369.3.ebuild
+++ b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369.3.ebuild,v 1.1 2009/09/03 13:35:31 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369.3-r1.ebuild,v 1.1 2009/10/12 00:54:03 nyhm Exp $
 
+EAPI=2
 inherit eutils multilib games
 
 MY_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
@@ -15,35 +16,38 @@ SRC_URI="mirror://3dgamers/unrealtourn2k4/${MY_P}
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dedicated opengl"
 RESTRICT="mirror strip"
 PROPERTIES="interactive"
 
-RDEPEND=">=games-fps/ut2004-data-3186-r2
-	>=games-fps/ut2004-bonuspack-ece-1-r1
-	>=games-fps/ut2004-bonuspack-mega-1-r1
-	=virtual/libstdc++-3.3
+UIDEPEND="=virtual/libstdc++-3.3
+	virtual/opengl
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	media-libs/libsdl
-	media-libs/openal
-	opengl? ( virtual/opengl )"
+	media-libs/openal"
+RDEPEND="sys-libs/glibc
+	games-fps/ut2004-data
+	games-fps/ut2004-bonuspack-ece
+	games-fps/ut2004-bonuspack-mega
+	dedicated? ( !games-server/ut2004-ded )
+	opengl? ( ${UIDEPEND} )
+	!dedicated? ( !opengl? ( ${UIDEPEND} ) )"
 DEPEND="app-arch/p7zip"
 
 S=${WORKDIR}/UT2004-Patch
+dir=${GAMES_PREFIX_OPT}/${PN}
 
 GAMES_CHECK_LICENSE="yes"
-dir=${GAMES_PREFIX_OPT}/${PN}
 
 # The executable pages are required #114733
 QA_EXECSTACK_x86="${dir:1}/System/ut2004-bin
 	${dir:1}/System/ucc-bin"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	cd "${S}"/System
 
 	# These files are owned by ut2004-bonuspack-mega
@@ -63,19 +67,32 @@ src_unpack() {
 	else
 		mv -f ucc-bin "${S}"/System/ || die
 	fi
+
+	if use dedicated && ! use opengl ; then
+		rm -f "${S}"/System/ut2004-bin
+	fi
 }
 
 src_install() {
 	insinto "${dir}"
 	doins -r * || die "doins failed"
-	fperms +x "${dir}"/System/{ucc-bin,ut2004-bin} || die
+	fperms +x "${dir}"/System/ucc-bin || die "fperms ucc-bin failed"
 
-	dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so || die
-	dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0 \
-		|| die
+	if use opengl || ! use dedicated ; then
+		fperms +x "${dir}"/System/ut2004-bin || die "fperms ut2004-bin failed"
 
-	games_make_wrapper ut2004 ./ut2004 "${dir}" "${dir}"
-	make_desktop_entry ut2004 "Unreal Tournament 2004"
+		dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so \
+			|| die "dosym openal failed"
+		dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0 \
+			|| die "dosym sdl failed"
+
+		games_make_wrapper ut2004 ./ut2004 "${dir}" "${dir}"
+		make_desktop_entry ut2004 "Unreal Tournament 2004"
+	fi
+
+	if use dedicated ; then
+		games_make_wrapper ut2004-ded "./ucc-bin server" "${dir}"/System
+	fi
 
 	prepgamesdirs
 }