From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1BB9913989A for ; Thu, 27 Aug 2015 16:17:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0CEE14218; Thu, 27 Aug 2015 16:17:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3351A14218 for ; Thu, 27 Aug 2015 16:17:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3BB834084C for ; Thu, 27 Aug 2015 16:17:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01BC413B for ; Thu, 27 Aug 2015 16:17:39 +0000 (UTC) From: "Christian Schmitt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christian Schmitt" Message-ID: <1440692171.23e47f7d7c32f8ac4a27b309c67f81891dd8d2ba.christian@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-fps/rtcw/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-fps/rtcw/rtcw-9999.ebuild X-VCS-Directories: games-fps/rtcw/ X-VCS-Committer: christian X-VCS-Committer-Name: Christian Schmitt X-VCS-Revision: 23e47f7d7c32f8ac4a27b309c67f81891dd8d2ba X-VCS-Branch: master Date: Thu, 27 Aug 2015 16:17:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c0517762-7033-415d-8440-2fe8cdda6eb2 X-Archives-Hash: 91dbbbccd715f33deceda46fcdc8c1be commit: 23e47f7d7c32f8ac4a27b309c67f81891dd8d2ba Author: Christian Schmitt ilovelinux de> AuthorDate: Thu Aug 27 16:16:11 2015 +0000 Commit: Christian Schmitt ilovelinux 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)"