version bump

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/games-fps/darkplaces/ChangeLog b/games-fps/darkplaces/ChangeLog
index 484c72f8ebdc877a98f98da22620629b91ef950b..37e3e929d7374b6dc715a21ae7d7fe1954b950f2 100644 (file)
--- a/games-fps/darkplaces/ChangeLog
+++ b/games-fps/darkplaces/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/darkplaces
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.5 2009/07/21 04:13:54 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.6 2010/03/17 20:17:20 mr_bones_ Exp $
+
+*darkplaces-20100221_beta1 (17 Mar 2010)
+
+  17 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  -darkplaces-20060616_beta1.ebuild, -darkplaces-20090709.ebuild,
+  +darkplaces-20100221_beta1.ebuild:
+  version bump
 
 *darkplaces-20090709 (21 Jul 2009)
 

diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index b97c867729e62e5c07734ce6693a293e8eee302e..f05571fe06ab00bd403cb78653100418f8ff4292 100644 (file)
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -1,9 +1,6 @@
-DIST darkplacesengine20060616beta1.zip 8337337 RMD160 5b88e0f18726afb999b84bcc62684aa46dd3a29f SHA1 0491b6375fedcf595c2ecc114791f9f5ca84000c SHA256 4813e2324cbae0f96f1812939115ecd268c85db0ea72e259d8b842737437bd56
-DIST darkplacesengine20090709.zip 13468363 RMD160 bcea05859617f338590948d16aa8f58143e02530 SHA1 a81a8914659c492fb3244bbbf985db672e3a3bd2 SHA256 6cd1e71d09bae850dcd6fb691a35723969b29567163e783f5d8c0e8504e7c8f1
-DIST darkplacesmod20060606.zip 5021820 RMD160 8517b739f471dc6a074e967b9082a234bfb45aa2 SHA1 43292a5916d33f058ad4beece5606fd8341df596 SHA256 6821132e551fcde45771677b65d230c5b00fd3c5aee6d685063d4aa380e1e94b
+DIST darkplacesengine20100221beta1.zip 16945797 RMD160 009619b8b36015afce9ffffee56163dd538b04ee SHA1 01ca5b781ffbc1a078e2a01d224cf768146ba6b2 SHA256 245f14452897912c9e982fef4e2ecdaf9573fb66b1caae463b21f8a5c5453969
 DIST fuhquake-lits.rar 8388829 RMD160 574937680f7354362088f2ec63d8941f0f4b0981 SHA1 1e9199c8ac7c9162e43c621487b712551711a45e SHA256 066fd58e2a6d157a1aa7925334d7e3e6cffa7f5c556e707bc31da8bfecea873c
 DIST id1.pk3 350470 RMD160 ac1633c56ca27ae3175e15305ce5d0e829daa43c SHA1 f83c25b74f666665369783b0f08949d480b382a8 SHA256 f1ee6e144d1942ebf91a8c71d0333eac94c73efae35377fbe7ae43e0e4ab37dc
-EBUILD darkplaces-20060616_beta1.ebuild 5795 RMD160 224970c12fecfa87f8530e03745878470f879156 SHA1 8aea544bb52b06a7561c799ff00358d231819861 SHA256 672c40061eb35da1349d1970dc5cd68185bf0b22104b217bfec2d86681ccf78d
-EBUILD darkplaces-20090709.ebuild 4768 RMD160 f220024d06c9157af909416e109ac9cec1f4988f SHA1 86bed0382f4edddd121687a874ae8e40ff57af56 SHA256 db3f3e7a7de76e430e4c64718143677f5bd063aec18438685a6a8039b0aac198
-MISC ChangeLog 1135 RMD160 eb39dcb57a3b70498f8ded2f4362ba12877dfd15 SHA1 c52571164aed50baa4f78b6e11b92736e7703192 SHA256 8f5da89a20f2432a8649757bc6e257da1e40f5d7d8e4c196ad845794ef29d839
+EBUILD darkplaces-20100221_beta1.ebuild 4936 RMD160 878fa122fbbae6b972ff7c164668a40cd278b814 SHA1 459f3b6f00cb43d0c7e4d7b38d6071f8aefd93fa SHA256 105117c4b5217c517bffd3712c4c747939bc75d0d8ec85cada18a2630c31cdeb
+MISC ChangeLog 1351 RMD160 7b7432ee33be42fb2e8198613c1fa39ea6ad1c3c SHA1 99aefa186291e5bae6ac1deadc4963c53661bc67 SHA256 3012fc93a3fbb20151032289a59f1cf0ff6f29ed16003573ae45526c477ab3d3
 MISC metadata.xml 538 RMD160 cbb93c1a27e24bc19e70bd393952541ecc401603 SHA1 48da7aadd0c3025f9ecde7e7a08693dc3f3bd9a7 SHA256 109e025896cb87b71061d4e9e95a3154b4ca86a3124d44ea12fce6851b3fab48

diff --git a/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild b/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild
deleted file mode 100644 (file)
index 2f9fba6..0000000
--- a/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild,v 1.5 2008/02/29 19:10:55 carlo Exp $
-
-inherit eutils flag-o-matic versionator games
-
-MOD_V="20060606"
-MY_PV=$(replace_version_separator 1 '' )
-MY_ENGINE="${PN}engine${MY_PV}.zip"
-MY_MOD="${PN}mod${MOD_V}.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}
-       dpmod? ( http://icculus.org/twilight/${PN}/files/${MY_MOD} )
-       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 dedicated demo dpmod lights opengl oss sdl textures"
-
-UIDEPEND="x11-proto/xextproto
-       x11-proto/xf86dgaproto
-       x11-proto/xf86vidmodeproto
-       x11-proto/xproto"
-UIRDEPEND="alsa? ( media-libs/alsa-lib )
-       media-libs/libogg
-       media-libs/libvorbis
-       x11-libs/libX11
-       x11-libs/libXau
-       x11-libs/libXdmcp
-       x11-libs/libXext
-       x11-libs/libXxf86dga
-       x11-libs/libXxf86vm"
-COMMON="media-libs/jpeg
-       sdl? (
-               media-libs/libsdl
-               ${UIDEPEND} )
-       opengl? (
-               virtual/opengl
-               ${UIDEPEND} )
-       !dedicated? ( !sdl? ( !opengl? ( virtual/opengl ${UIDEPEND} ) ) )"
-RDEPEND="cdinstall? ( games-fps/quake1-data )
-       demo? ( games-fps/quake1-demodata )
-       textures? ( >=games-fps/quake1-textures-20050820 )
-       sdl? (
-               media-libs/libsdl
-               ${UIRDEPEND} )
-       opengl? (
-               virtual/opengl
-               ${UIRDEPEND} )
-       !dedicated? ( !sdl? ( !opengl? ( virtual/opengl ${UIRDEPEND} ) ) )"
-DEPEND="dev-util/pkgconfig
-       app-arch/unzip
-       lights? (
-               || (
-                       app-arch/unrar
-                       app-arch/rar ) )
-       sdl? (
-               media-libs/libsdl
-               ${UIDEPEND} )
-       opengl? (
-               virtual/opengl
-               ${UIDEPEND} )
-       !dedicated? (
-               !sdl? (
-                       !opengl? (
-                               virtual/opengl
-                               ${UIDEPEND} ) ) )"
-
-S=${WORKDIR}/${PN}
-dir=${GAMES_DATADIR}/quake1
-
-default_client() {
-       if use opengl || $( ! use dedicated && ! use sdl ) ; then
-               # Build default client
-               return 0
-       fi
-       return 1
-}
-
-pkg_setup() {
-       games_pkg_setup
-
-       if default_client && ! use opengl ; then
-               einfo "Defaulting to OpenGL client"
-       fi
-}
-
-src_unpack() {
-       if use lights ; then
-               unpack "${MY_LIGHTS}"
-               unzip -qo "${DISTDIR}"/id1.pk3 || die "unzip id1.pk3 failed"
-               mv *.lit maps
-               mv ReadMe.txt rtlights.txt
-       fi
-       unpack "${MY_ENGINE}"
-       if use dpmod ; then
-               unpack "${MY_MOD}"
-       fi
-
-       unpack ./${PN}*.zip
-       find "${WORKDIR}" -name CVS -type d -print0 | xargs -0 rm -r
-       rm README-SDL.txt
-       cd "${S}"
-       rm mingw_note.txt
-
-       # Make the game automatically look in the correct data directory
-       sed -i fs.c \
-               -e "s:strcpy(fs_basedir, \"\"):strcpy(fs_basedir, \"${dir}\"):" \
-               || die "sed fs.c failed"
-
-       # Only additional CFLAGS optimization is the -march flag
-       local march=$(get-flag -march)
-       sed -i makefile.inc \
-               -e '/^CC=/d' \
-               -e "s:-lasound:$(pkg-config --libs alsa):" \
-               -e "s:CPUOPTIMIZATIONS=:CPUOPTIMIZATIONS=${march}:" \
-               -e "s:strip:#strip:" \
-               || die "sed makefile.inc failed"
-
-       if ! use cdsound ; then
-               # Turn the CD accesses off
-               sed -i cd_linux.c \
-                       -e "s:/dev/cdrom:/dev/null:" \
-                       || die "sed cd_linux.c failed"
-               sed -i cd_shared.c \
-                       -e 's:COM_CheckParm("-nocdaudio"):1:' \
-                       || die "sed cd_shared.c failed"
-       fi
-
-       # Reduce SDL audio buffer, to fix latency
-       sed -i "s:requested->speed / 20.0:512:" snd_sdl.c \
-               || die "sed snd_sdl.c failed"
-
-       # Default sound is alsa.
-       if ! use alsa ; then
-               if use oss ; then
-                       sed -i "s:DEFAULT_SNDAPI=ALSA:DEFAULT_SNDAPI=OSS:" makefile \
-                               || die "sed oss failed"
-               else
-                       sed -i "s:DEFAULT_SNDAPI=ALSA:DEFAULT_SNDAPI=NULL:" makefile \
-                               || die "sed null failed"
-               fi
-       fi
-}
-
-src_compile() {
-       if default_client ; then
-               emake cl-release || die "emake cl-release failed"
-       fi
-
-       if use sdl ; then
-               emake sdl-release || die "emake sdl-release failed"
-       fi
-
-       if use dedicated ; then
-               emake sv-release || die "emake sv-release failed"
-       fi
-}
-
-src_install() {
-       if default_client || use sdl ; then
-               newicon darkplaces72x72.png ${PN}.png
-       fi
-
-       if default_client ; then
-               newgamesbin ${PN}-glx ${PN} || die "dogamesbin glx failed"
-               if use cdinstall ; then
-                       make_desktop_entry ${PN} "Dark Places" ${PN}
-               fi
-               if use dpmod ; then
-                       games_make_wrapper ${PN}-dpmod "${PN} -game dpmod"
-                       make_desktop_entry ${PN}-dpmod "Dark Places (mod)" ${PN}
-               fi
-               if use demo ; then
-                       games_make_wrapper ${PN}-demo "${PN} -game demo"
-                       make_desktop_entry ${PN}-demo "Dark Places (demo)" ${PN}
-               fi
-       fi
-
-       if use sdl ; then
-               dogamesbin ${PN}-sdl || die "dogamesbin sdl failed"
-               if use cdinstall ; then
-                       make_desktop_entry ${PN}-sdl "Dark Places (SDL)" ${PN}
-               fi
-               if use dpmod ; then
-                       games_make_wrapper ${PN}-sdl-dpmod "${PN}-sdl -game dpmod"
-                       make_desktop_entry ${PN}-sdl-dpmod "Dark Places (SDL mod)" ${PN}
-               fi
-               if use demo ; then
-                       games_make_wrapper ${PN}-sdl-demo "${PN}-sdl -game demo"
-                       make_desktop_entry ${PN}-sdl-demo "Dark Places (SDL demo)" ${PN}
-               fi
-       fi
-
-       if use dedicated ; then
-               newgamesbin ${PN}-dedicated ${PN}-ded || die "newgamesbin ded failed"
-       fi
-
-       if use dpmod ; then
-               insinto "${dir}"
-               doins -r "${WORKDIR}"/dpmod || die "doins dpmod failed"
-       fi
-
-       dodoc *.txt ChangeLog todo "${WORKDIR}"/{${PN}-cvschangelog,*.{qc,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
-}

diff --git a/games-fps/darkplaces/darkplaces-20090709.ebuild b/games-fps/darkplaces/darkplaces-20100221_beta1.ebuild
similarity index 91%
rename from games-fps/darkplaces/darkplaces-20090709.ebuild
rename to games-fps/darkplaces/darkplaces-20100221_beta1.ebuild
index d06c0f3dff4d2fba76ba0f018d3341212e472424..a369d3ec577331c0e72288fe73a59a559e333551 100644 (file)
--- a/games-fps/darkplaces/darkplaces-20090709.ebuild
+++ b/games-fps/darkplaces/darkplaces-20100221_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20090709.ebuild,v 1.1 2009/07/21 04:13:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20100221_beta1.ebuild,v 1.1 2010/03/17 20:17:20 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -85,13 +85,18 @@ src_prepare() {
        cd "${S}"
        rm mingw_note.txt
 
+       strip-flags
+
        # Only additional CFLAGS optimization is the -march flag
        local march=$(get-flag -march)
        sed -i \
-               -e '/^CC=/d' \
                -e "s:-lasound:$(pkg-config --libs alsa):" \
-               -e "s:CPUOPTIMIZATIONS=:CPUOPTIMIZATIONS=${march}:" \
-               -e "s:strip:echo:" \
+               -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
@@ -106,7 +111,7 @@ src_prepare() {
 }
 
 src_compile() {
-       local opts="DP_FS_BASEDIR=\"${dir}\""
+       local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
 
        # Preferred sound is alsa
        local sound_api="NULL"