[gentoo-commits] proj/gamerlay:master commit in: games-fps/rtcw/

[gentoo-commits] proj/gamerlay:master commit in: games-fps/rtcw/

[Christian Schmitt]

commit:     23e47f7d7c32f8ac4a27b309c67f81891dd8d2ba
Author:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Thu Aug 27 16:16:11 2015 +0000
Commit:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Thu Aug 27 16:16:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=23e47f7d

[games-fps/rtcw-9999] Download most of the pk3 files from the last point release and install them as well (thanks again, polynomial-c)

 games-fps/rtcw/rtcw-9999.ebuild | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/games-fps/rtcw/rtcw-9999.ebuild b/games-fps/rtcw/rtcw-9999.ebuild
index e50f689..961a07a 100644
--- a/games-fps/rtcw/rtcw-9999.ebuild
+++ b/games-fps/rtcw/rtcw-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 SCM=""
 [[ "${PV}" = 9999 ]] && SCM="git-r3"
-inherit eutils games ${SCM}
+inherit eutils games unpacker ${SCM}
 unset SCM
 
 DESCRIPTION="Return to Castle Wolfenstein - IORTCW Project"
@@ -20,7 +20,11 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-2"
+WOLF_POINTRELEASE="wolf-linux-1.41b.x86.run"
+SRC_URI+=" mirror://idsoftware/wolf/linux/${WOLF_POINTRELEASE}"
+# iortcw is GPL-2 but the point release files still have the original copyrights
+# from ID-software
+LICENSE="GPL-2 RTCW"
 SLOT="0"
 IUSE="+client curl mumble openal opus server truetype voip vorbis"
 
@@ -69,6 +73,16 @@ use_switch() {
 	fi
 }
 
+src_unpack() {
+	if [[ "${PV}" = 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+
+	unpack_makeself "${DISTDIR}/${WOLF_POINTRELEASE}"
+}
+
 src_prepare(){
 	epatch "${FILESDIR}/${PN}-zlib.patch"
 	cp "${FILESDIR}/Makefile.local" "${S}/SP/"
@@ -97,7 +111,9 @@ src_prepare(){
 		done
 	done
 
-	sed "/^CFLAGS=/s@=.*\$@=${CFLAGS}@" -i SP/Makefile.local || die
+	local makefile="SP/Makefile.local"
+
+	sed "/^CFLAGS=/s@=.*\$@=${CFLAGS}@" -i ${makefile} || die
 
 	use_switch client BUILD_CLIENT
 	use_switch curl USE_CURL
@@ -109,8 +125,8 @@ src_prepare(){
 	use_switch vorbis USE_CODEC_VORBIS
 	use_switch voip USE_VOIP
 
-	use curl && echo "USE_CURL_DLOPEN=0" >> SP/Makefile.local
-	use openal && echo "USE_OPENAL_DLOPEN=0" >> SP/Makefile.local
+	use curl && echo "USE_CURL_DLOPEN=0" >> ${makefile}
+	use openal && echo "USE_OPENAL_DLOPEN=0" >> ${makefile}
 }
 
 src_compile() {
@@ -136,6 +152,10 @@ src_install() {
 	#		|| die
 	#fi
 
+	# install pk3 files from the point release
+	insinto ${dir}/main
+	doins ${WORKDIR}/main/*.pk3
+
 	doicon -s scalable misc/iortcw.svg
 	make_desktop_entry rtcwsp "Return to Castle Wolfenstein (SP)" iortcw
 	prepgamesdirs
@@ -143,8 +163,8 @@ src_install() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	elog "You need to copy pak0.pk3, mp_pak0.pk3, mp_pak1.pk3, mp_pak2.pk3,"
-	elog "sp_pak1.pk3 and sp_pak2.pk3 sp_pak3.pk3 sp_pak4.pk3 from a Window installation into ${dir}/main/"
+	elog "You need to copy pak0.pk3, mp_pak0.pk3 and sp_pak1.pk3 from a"
+	elog "Window installation or your install media into ${dir}/main/"
 	elog
 	elog "To play the game run:"
 	elog " rtcwsp (single-player)"

[gentoo-commits] proj/gamerlay:master commit in: games-fps/rtcw/

[Vadim A. Misbakh-Soloviov]

commit:     3d2ababc25d2128212c0438f29490cb1403ad621
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Thu Sep  7 15:31:14 2017 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Thu Sep  7 15:31:14 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=3d2ababc

rtcw: fixed calling ext command in global scope (fixes bgo#630174)

 games-fps/rtcw/rtcw-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-fps/rtcw/rtcw-9999.ebuild b/games-fps/rtcw/rtcw-9999.ebuild
index 961a07a..8d0b8fb 100644
--- a/games-fps/rtcw/rtcw-9999.ebuild
+++ b/games-fps/rtcw/rtcw-9999.ebuild
@@ -55,7 +55,6 @@ RDEPEND="client? ( media-libs/libsdl2
 	#voip? ( media-libs/speex )"
 
 dir=${GAMES_PREFIX_OPT}/${PN}
-ARCHITECTURE=$(uname -m)
 
 use_switch() {
 	local flag="${1}" cfg_option="${2}" cfg_val=0
@@ -127,6 +126,8 @@ src_prepare(){
 
 	use curl && echo "USE_CURL_DLOPEN=0" >> ${makefile}
 	use openal && echo "USE_OPENAL_DLOPEN=0" >> ${makefile}
+
+	export ARCHITECTURE=$(uname -m)
 }
 
 src_compile() {