commit: ec0510969387bcf428f02bf5bf9c4708dab8f45f
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri May 16 17:24:50 2014 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Fri May 16 17:24:50 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ec051096
[games-fps/xonotic] audio -> sound (bug #357661), cleanup.
Package-Manager: portage-2.2.8-r1
Manifest-Sign-Key: A018DE8C
---
games-fps/xonotic/xonotic-0.5.0.ebuild | 148 ---------------------------------
games-fps/xonotic/xonotic-0.7.0.ebuild | 136 ------------------------------
games-fps/xonotic/xonotic-9999.ebuild | 4 +-
3 files changed, 2 insertions(+), 286 deletions(-)
diff --git a/games-fps/xonotic/xonotic-0.5.0.ebuild
b/games-fps/xonotic/xonotic-0.5.0.ebuild
deleted file mode 100644
index a4e5397..0000000
--- a/games-fps/xonotic/xonotic-0.5.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils games toolchain-funcs check-reqs
-
-MY_PN="${PN^}"
-DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced
Quake 1 engine"
-HOMEPAGE="http://www.xonotic.org/";
-SRC_URI="http://dl.xonotic.org/${P}.zip";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa crypt debug dedicated opengl +s3tc sdl"
-
-UIRDEPEND="
- media-libs/libogg
- media-libs/libtheora
- media-libs/libvorbis
- media-libs/libmodplug
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm
- virtual/opengl
- media-libs/freetype:2
- alsa? ( media-libs/alsa-lib )
- s3tc? ( media-libs/libtxc_dxtn )
- sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video,alsa?] )
-"
-UIDEPEND="
- x11-proto/xextproto
- x11-proto/xf86dgaproto
- x11-proto/xf86vidmodeproto
- x11-proto/xproto
-"
-RDEPEND="
- sys-libs/zlib
- virtual/jpeg
- media-libs/libpng
- net-misc/curl
- ~dev-libs/d0_blind_id-0.5
- opengl? ( ${UIRDEPEND} )
- !dedicated? ( !opengl? ( ${UIRDEPEND} ) )
-"
-DEPEND="${RDEPEND}
- opengl? ( ${UIDEPEND} )
- !dedicated? ( !opengl? ( ${UIDEPEND} ) )
-"
-
-S="${WORKDIR}/${MY_PN}"
-
-pkg_setup() {
- ewarn "You need 943 MiB diskspace for distfiles."
- CHECKREQS_DISK_BUILD="1960M"
- CHECKREQS_DISK_USR="900M"
- check-reqs_pkg_setup
-}
-
-src_prepare() {
- # for darkplaces
- tc-export CC
-
- # use system libs
- rm -rf misc/buildfiles/
-
- # Engine
- pushd source/darkplaces
- sed -i \
- -e "/^EXE_/s:darkplaces:${PN}:" \
- -e "s:-O3:${CFLAGS}:" \
- -e "/-lm/s:$: ${LDFLAGS}:" \
- -e '/^STRIP/s/strip/true/' \
- makefile.inc || die "sed failed"
-
- if use !alsa; then
- sed -e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
- -i makefile || die "sed failed"
- fi
- popd
-}
-
-src_compile() {
- # Engine
- cd source/darkplaces
- if use debug; then
- ENGINEOPTS="debug"
- else
- ENGINEOPTS="release"
- fi
- ENGINEOPTS+=" DP_LINK_TO_LIBJPEG=1 DP_FS_BASEDIR=${GAMES_DATADIR}/${PN}"
-
- if use opengl || ! use dedicated; then
- emake cl-${ENGINEOPTS} || die "emake cl-${ENGINEOPTS} failed"
- if use sdl; then
- emake sdl-${ENGINEOPTS} || die "emake sdl-${ENGINEOPTS}
failed"
- fi
- fi
-
- if use dedicated; then
- emake sv-${ENGINEOPTS} || die "emake sv-${ENGINEOPTS} failed"
- fi
-}
-
-src_install() {
- # Engine & docs
- pushd source/darkplaces
- if use opengl || use !dedicated; then
- dogamesbin ${PN}-glx || die "dogamesbin glx failed"
- newicon ../../misc/logos/${PN}_icon.svg ${PN}.svg
- make_desktop_entry ${PN}-glx "${MY_PN} (GLX)"
-
- if use sdl; then
- dogamesbin ${PN}-sdl || die "dogamesbin sdl failed"
- make_desktop_entry ${PN}-sdl "${MY_PN} (SDL)"
- dosym ${PN}-sdl "${GAMES_BINDIR}"/${PN}
- else
- dosym ${PN}-glx "${GAMES_BINDIR}"/${PN}
- fi
- fi
-
- if use dedicated; then
- dogamesbin ${PN}-dedicated || die "dogamesbin dedicated failed"
- fi
- popd
-
- dodoc Docs/*.txt
- dohtml -r Docs
-
- insinto "${GAMES_DATADIR}/${PN}"
-
- # public key for d0_blind_id
- doins key_0.d0pk || die
-
- if use dedicated; then
- doins -r server || die "doins server failed"
- fi
-
- # Data
- doins -r data || die "doins data failed"
-
- prepgamesdirs
-}
diff --git a/games-fps/xonotic/xonotic-0.7.0.ebuild
b/games-fps/xonotic/xonotic-0.7.0.ebuild
deleted file mode 100644
index e94fc9d..0000000
--- a/games-fps/xonotic/xonotic-0.7.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils games toolchain-funcs flag-o-matic check-reqs
-
-MY_PN="${PN^}"
-DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced
Quake 1 engine"
-HOMEPAGE="http://www.xonotic.org/";
-SRC_URI="http://dl.xonotic.org/${P}.zip";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa ode opengl +s3tc +sdl +server"
-REQUIRED_USE="
- || ( opengl sdl server )
-"
-
-UIRDEPEND="
- media-libs/libogg
- media-libs/libtheora[encode]
- media-libs/libvorbis
- media-libs/libmodplug
- x11-libs/libX11
- virtual/opengl
- media-libs/freetype:2
- s3tc? ( media-libs/libtxc_dxtn )
-"
-RDEPEND="
- sys-libs/zlib
- virtual/jpeg
- media-libs/libpng:0=
- net-misc/curl
- >=dev-libs/d0_blind_id-0.5
- ode? ( dev-games/ode[double-precision] )
- opengl? (
- ${UIRDEPEND}
- x11-libs/libXext
- x11-libs/libXpm
- x11-libs/libXxf86vm
- alsa? ( media-libs/alsa-lib )
- )
- sdl? (
- ${UIRDEPEND}
- media-libs/libsdl[X,audio,joystick,opengl,video,alsa?]
- )
-"
-DEPEND="${RDEPEND}
- opengl? (
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- x11-proto/xproto
- )
-"
-
-S="${WORKDIR}/${MY_PN}"
-
-CHECKREQS_DISK_BUILD="2100M"
-CHECKREQS_DISK_USR="950M"
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- check-reqs_pkg_setup
- games_pkg_setup
-}
-
-src_prepare() {
- tc-export CC
- # Required for DP_PRELOAD_DEPENDENCIES=1
- append-ldflags $(no-as-needed)
-
- epatch_user
-
- sed -i \
- -e "/^EXE_/s:darkplaces:${PN}:" \
- -e "/^OPTIM_RELEASE=/s:$: ${CFLAGS}:" \
- -e "/^LDFLAGS_RELEASE=/s:$: ${LDFLAGS}:" \
- source/darkplaces/makefile.inc || die
-
- if use !alsa; then
- sed -e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
- -i source/darkplaces/makefile || die
- fi
-}
-
-src_compile() {
- local targets=""
- local i
-
- use opengl && targets+=" cl-release"
- use sdl && targets+=" sdl-release"
- use server && targets+=" sv-release"
-
- cd source/darkplaces || die
- for i in ${targets}; do
- emake STRIP=true \
- DP_FS_BASEDIR="${GAMES_DATADIR}/${PN}" \
- DP_PRELOAD_DEPENDENCIES=1 \
- ${i}
- done
-}
-
-src_install() {
- if use opengl; then
- dogamesbin source/darkplaces/${PN}-glx
- make_desktop_entry ${PN}-glx "${MY_PN} (GLX)"
- fi
- if use sdl; then
- dogamesbin source/darkplaces/${PN}-sdl
- make_desktop_entry ${PN}-sdl "${MY_PN} (SDL)"
- fi
- if use opengl || use sdl; then
- newicon misc/logos/icons_png/${PN}_512.png ${PN}.png
- fi
- use server && dogamesbin source/darkplaces/${PN}-dedicated
-
- dodoc Docs/*.txt
- dohtml -r Docs
-
- insinto "${GAMES_DATADIR}/${PN}"
-
- # public key for d0_blind_id
- doins key_0.d0pk
-
- use server && doins -r server
-
- doins -r data
-
- prepgamesdirs
-}
diff --git a/games-fps/xonotic/xonotic-9999.ebuild
b/games-fps/xonotic/xonotic-9999.ebuild
index 7f43629..8012eb0 100644
--- a/games-fps/xonotic/xonotic-9999.ebuild
+++ b/games-fps/xonotic/xonotic-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -49,7 +49,7 @@ RDEPEND="
)
sdl? (
${UIRDEPEND}
- !sdl2? ( media-libs/libsdl[X,audio,joystick,opengl,video] )
+ !sdl2? ( media-libs/libsdl[X,joystick,opengl,sound,video] )
sdl2? ( media-libs/libsdl2[X,opengl,video] )
)
"
