mr_bones_ 14/07/04 08:19:46 Modified: quake2-icculus-0.16.1-r1.ebuild ChangeLog Log: EAPI=5; punt svga support (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.29 games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild?r1=1.28&r2=1.29 Index: quake2-icculus-0.16.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- quake2-icculus-0.16.1-r1.ebuild 15 May 2014 16:44:49 -0000 1.28 +++ quake2-icculus-0.16.1-r1.ebuild 4 Jul 2014 08:19:46 -0000 1.29 @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.28 2014/05/15 16:44:49 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.29 2014/07/04 08:19:46 mr_bones_ Exp $ -EAPI=2 +EAPI=5 inherit eutils toolchain-funcs games MY_P="quake2-r${PV}" @@ -16,12 +16,11 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ppc sparc x86 ~x86-fbsd" -IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl svga X xatrix" +IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl X xatrix" UIDEPEND="aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl ) - svga? ( media-libs/svgalib ) sdl? ( media-libs/libsdl[sound,joystick?,video] ) X? ( x11-libs/libXxf86dga @@ -62,16 +61,12 @@ mkdir -p src/${g} pushd src/${g} local shar=../../../${g}src320.shar - sed -i \ - -e 's:^read ans:ans=yes :' ${shar} \ - || die "sed ${shar} failed" + sed -i -e 's:^read ans:ans=yes :' ${shar} || die echo ">>> Unpacking ${shar} to ${PWD}" - env PATH="${T}:${PATH}" unshar ${shar} || die "unpacking ${shar} failed" + env PATH="${T}:${PATH}" unshar ${shar} || die popd done - sed -i \ - -e 's:jpeg_mem_src:_&:' \ - src/ref_candygl/gl_image.c || die + sed -i -e 's:jpeg_mem_src:_&:' src/ref_candygl/gl_image.c || die sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile || die # -amd64.patch # make sure this is still needed in future versions @@ -116,10 +111,10 @@ [[ ${BUILD_QMAX} == "YES" ]] \ && libsuffix=-qmax \ || libsuffix= - make clean || die "cleaning failed" + emake -j1 clean emake -j1 build_release \ BUILD_SDLQUAKE2=$(yesno sdl) \ - BUILD_SVGA=$(yesno svga) \ + BUILD_SVGA=NO \ BUILD_X11=$(yesno X) \ BUILD_GLX=$(yesno opengl) \ BUILD_SDL=$(yesno sdl) \ @@ -138,8 +133,7 @@ DEFAULT_BASEDIR="${GAMES_DATADIR}/quake2" \ DEFAULT_LIBDIR="$(games_get_libdir)/${PN}${libsuffix}" \ OPT_CFLAGS="${CFLAGS}" \ - CC="$(tc-getCC)" \ - || die "make failed" + CC="$(tc-getCC)" # now we save the build dir ... except for the object files ... rm release*/*/*.o mv release* my-rel-${BUILD_QMAX} @@ -176,7 +170,7 @@ if use qmax ; then dodir "${q2maxdir}" cp -rf my-rel-YES/* "${D}/${q2maxdir}"/ || die - newgamesbin "${D}/${q2maxdir}"/quake2 quake2-qmax || die + newgamesbin "${D}/${q2maxdir}"/quake2 quake2-qmax rm "${D}/${q2maxdir}"/quake2 use dedicated \ && newgamesbin "${D}/${q2maxdir}"/q2ded q2ded-qmax \ @@ -186,7 +180,7 @@ && rm "${D}/${q2maxdir}"/sdlquake2 insinto "${q2maxdir}"/baseq2 - doins "${DISTDIR}"/maxpak.pak || die + doins "${DISTDIR}"/maxpak.pak make_desktop_entry quake2-qmax Quake2-qmax quake2 fi 1.48 games-fps/quake2-icculus/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/ChangeLog?rev=1.48&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/ChangeLog?rev=1.48&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/ChangeLog?r1=1.47&r2=1.48 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- ChangeLog 15 May 2014 16:44:49 -0000 1.47 +++ ChangeLog 4 Jul 2014 08:19:46 -0000 1.48 @@ -1,6 +1,10 @@ # ChangeLog for games-fps/quake2-icculus # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.47 2014/05/15 16:44:49 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.48 2014/07/04 08:19:46 mr_bones_ Exp $ + + 04 Jul 2014; Michael Sterrett <[email protected]> + quake2-icculus-0.16.1-r1.ebuild: + EAPI=5; punt svga support 15 May 2014; Ulrich Müller <[email protected]> quake2-icculus-0.16.1-r1.ebuild: Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
