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 31039138010 for ; Tue, 16 Feb 2016 01:38:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7E7CE0833; Tue, 16 Feb 2016 01:38:19 +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 83555E0835 for ; Tue, 16 Feb 2016 01:38:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F516340B54 for ; Tue, 16 Feb 2016 01:38:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E052416CC for ; Tue, 16 Feb 2016 01:38:12 +0000 (UTC) From: "Michael Sterrett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Sterrett" Message-ID: <1455586666.df890970e8b419f8d39e88886fbc2158c22a37be.mr_bones_@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/darkplaces/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-fps/darkplaces/Manifest games-fps/darkplaces/darkplaces-20110628.ebuild X-VCS-Directories: games-fps/darkplaces/ X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett X-VCS-Revision: df890970e8b419f8d39e88886fbc2158c22a37be X-VCS-Branch: master Date: Tue, 16 Feb 2016 01:38:12 +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: 25a1af68-ac19-4ea3-a32c-8475b55f149a X-Archives-Hash: f359c72f6406dc62e3d88ed4bfeca4e9 commit: df890970e8b419f8d39e88886fbc2158c22a37be Author: Michael Sterrett gentoo org> AuthorDate: Tue Feb 16 01:03:25 2016 +0000 Commit: Michael Sterrett gentoo org> CommitDate: Tue Feb 16 01:37:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df890970 games-fps/darkplaces: clean old Package-Manager: portage-2.2.26 games-fps/darkplaces/Manifest | 1 - games-fps/darkplaces/darkplaces-20110628.ebuild | 188 ------------------------ 2 files changed, 189 deletions(-) diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest index 3c5e0cf..1f2c110 100644 --- a/games-fps/darkplaces/Manifest +++ b/games-fps/darkplaces/Manifest @@ -1,4 +1,3 @@ -DIST darkplacesengine20110628.zip 23377408 SHA256 d2464c681e3fdcc66cb090e79c44c0c173a43b6f181a12e500b0b1fd7d73ffce SHA512 bf44933470be2856a80ebd73a0cb531c6d22e69da5be24bc52175998ab687b4112c88423a6b42a9a4ed746e0f96c1bb39e188a037a98ea596cf7b6183e390038 WHIRLPOOL b4214be8a9c9aadf02a92c9b7e54d508df38f9e38f650f839a8ea43d9c0768641dbf59c71b210d337f591fac2d77a21a14e7900a3038d1af828f064bf3368071 DIST darkplacesengine20140513.zip 28113487 SHA256 69e5a50991884196e403bd6aab4a33bba553a934a167be366672ab4e223b06c9 SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c WHIRLPOOL 0fca6d87c9d3482112992965b70f829dfd6ecd926d940ad66f5f75aec4438c2b5b33fb6ac51f69c5199f06d53fbc16f1c8d0780db40b8cbd71c7ceb0e67a4048 DIST fuhquake-lits.rar 8388829 SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925 WHIRLPOOL d398b57c03d02c8180f8ca93f6964ac2118ef50cace3ecbc9da9113b1e91ed3a7b7e5473ebb9ad2f5198828eb8565c7c0470aea2095152b2898335562bef821d DIST id1.pk3 350470 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331 WHIRLPOOL 30fe7e6d6ac6408c54e704586d4f4e15d139c0330e4f3e758651bfc2e6582eadae08c590e87264cfb26faae56a7033b383d51f93bf54ddfce7db38e47d569280 diff --git a/games-fps/darkplaces/darkplaces-20110628.ebuild b/games-fps/darkplaces/darkplaces-20110628.ebuild deleted file mode 100644 index 5c7aa76..0000000 --- a/games-fps/darkplaces/darkplaces-20110628.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 -inherit unpacker eutils flag-o-matic games - -# Latest versions are in http://icculus.org/twilight/darkplaces/files/ -MY_PV=${PV/_beta/beta} -MY_ENGINE="${PN}engine${MY_PV}.zip" - -# Different Quake 1 engines expect the lights in different directories -# http://www.fuhquake.net/download.html and http://www.kgbsyndicate.com/romi/ -MY_LIGHTS="fuhquake-lits.rar" - -DESCRIPTION="Enhanced engine for iD Software's Quake 1" -HOMEPAGE="http://icculus.org/twilight/darkplaces/" -SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE} - lights? ( - http://www.fuhquake.net/files/extras/${MY_LIGHTS} - http://www.kgbsyndicate.com/romi/id1.pk3 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures" - -UIRDEPEND="virtual/jpeg - media-libs/libogg - media-libs/libvorbis - virtual/opengl - alsa? ( media-libs/alsa-lib ) - sdl? ( media-libs/libsdl ) - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXxf86dga - x11-libs/libXxf86vm" -UIDEPEND="x11-proto/xextproto - x11-proto/xf86dgaproto - x11-proto/xf86vidmodeproto - x11-proto/xproto" -RDEPEND="net-misc/curl - cdinstall? ( games-fps/quake1-data ) - demo? ( games-fps/quake1-demodata ) - textures? ( >=games-fps/quake1-textures-20050820 ) - opengl? ( ${UIRDEPEND} ) - !opengl? ( sdl? ( ${UIRDEPEND} ) ) - !opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )" -DEPEND="lights? ( || ( - app-arch/unrar - app-arch/rar ) ) - opengl? ( - ${UIRDEPEND} - ${UIDEPEND} ) - !opengl? ( sdl? ( - ${UIRDEPEND} - ${UIDEPEND} ) ) - !opengl? ( !sdl? ( !dedicated? ( - ${UIRDEPEND} - ${UIDEPEND} ) ) ) - virtual/pkgconfig - app-arch/unzip" - -S=${WORKDIR}/${PN} -dir=${GAMES_DATADIR}/quake1 - -opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) } - -src_unpack() { - if use lights ; then - unpack "${MY_LIGHTS}" - unpack_zip "${DISTDIR}"/id1.pk3 - mv *.lit maps/ || die - mv ReadMe.txt rtlights.txt - fi - unpack "${MY_ENGINE}" - - unpack ./${PN}*.zip -} - -src_prepare() { - rm "${WORKDIR}"/README-SDL.txt - cd "${S}" - rm mingw_note.txt - - strip-flags - - # Only additional CFLAGS optimization is the -march flag - local march=$(get-flag -march) - sed -i \ - -e "s:-lasound:$(pkg-config --libs alsa):" \ - -e "/^CPUOPTIMIZATIONS/d" \ - -e '/^OPTIM_RELEASE/s/=.*/=$(CFLAGS)/' \ - -e '/^OPTIM_DEBUG/s/=.*/=$(CFLAGS)/' \ - -e '/^LDFLAGS_DEBUG/s/$/ $(LDFLAGS)/' \ - -e '/^LDFLAGS_RELEASE/s/$/ $(LDFLAGS)/' \ - -e "s:strip:true:" \ - makefile.inc || die "sed makefile.inc failed" - - if ! use cdsound ; then - # Turn the CD accesses off - sed -i \ - -e "s:/dev/cdrom:/dev/null:" \ - cd_linux.c || die "sed cd_linux.c failed" - sed -i \ - -e 's:COM_CheckParm("-nocdaudio"):1:' \ - cd_shared.c || die "sed cd_shared.c failed" - fi -} - -src_compile() { - local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1" - - # Preferred sound is alsa - local sound_api="NULL" - use oss && sound_api="OSS" - use alsa && sound_api="ALSA" - opts="${opts} DP_SOUND_API=${sound_api}" - - local type="release" - use debug && type="debug" - - # Only compile a maximum of 1 client - if use sdl ; then - emake ${opts} "sdl-${type}" || die "emake sdl-${type} failed" - elif opengl_client ; then - emake ${opts} "cl-${type}" || die "emake cl-${type} failed" - fi - - if use dedicated ; then - emake ${opts} "sv-${type}" || die "emake sv-${type} failed" - fi -} - -src_install() { - if opengl_client || use sdl ; then - local type=glx - - use sdl && type=sdl - - # darkplaces executable is needed, even just for demo - newgamesbin "${PN}-${type}" ${PN} || die "newgamesbin client failed" - newicon darkplaces72x72.png ${PN}.png || die "newicon failed" - - if use demo ; then - # Install command-line for demo, even if not desktop entry - games_make_wrapper ${PN}-demo "${PN} -game demo" - fi - - if use demo && ! use cdinstall ; then - make_desktop_entry ${PN}-demo "Dark Places (Demo)" - else - # Full version takes precedence over demo - make_desktop_entry ${PN} "Dark Places" - fi - fi - - if use dedicated ; then - newgamesbin ${PN}-dedicated ${PN}-ded || die "newgamesbin ded failed" - fi - - dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt - - if use lights ; then - insinto "${dir}"/id1 - doins -r "${WORKDIR}"/{cubemaps,maps} || die "doins cubemaps maps failed" - if use demo ; then - # Set up symlinks, for the demo levels to include the lights - local d - for d in cubemaps maps ; do - dosym "${dir}/id1/${d}" "${dir}/demo/${d}" - done - fi - fi - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - - if ! use cdinstall && ! use demo ; then - elog "Place pak0.pak and pak1.pak in ${dir}/id1" - fi - - if use sdl ; then - ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency." - fi -}