public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic/
@ 2011-04-12  8:48 Nikoli
  0 siblings, 0 replies; 7+ messages in thread
From: Nikoli @ 2011-04-12  8:48 UTC (permalink / raw
  To: gentoo-commits

commit:     a45c33386e2792736117c1265e659d20ec610ab7
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Tue Apr 12 08:47:30 2011 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Tue Apr 12 08:47:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=a45c3338

xonotic: migrate to virtual/jpeg

(Portage version: 2.1.9.42/git/Linux x86_64, unsigned Manifest commit)

---
 games-fps/xonotic/ChangeLog                |    4 ++++
 games-fps/xonotic/xonotic-0.1.0_pre.ebuild |    2 +-
 games-fps/xonotic/xonotic-9999.ebuild      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/games-fps/xonotic/ChangeLog b/games-fps/xonotic/ChangeLog
index c4ae71e..5f04de9 100644
--- a/games-fps/xonotic/ChangeLog
+++ b/games-fps/xonotic/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Apr 2011; Nikoli <nikoli@lavabit.com> xonotic-0.1.0_pre.ebuild,
+  xonotic-9999.ebuild:
+  migrate to virtual/jpeg
+
   29 Jan 2011; Nikoli <nikoli@lavabit.com> xonotic-9999.ebuild:
   install public key for d0_blind_id, thanks ZyX-I
 

diff --git a/games-fps/xonotic/xonotic-0.1.0_pre.ebuild b/games-fps/xonotic/xonotic-0.1.0_pre.ebuild
index 79a5e85..75508ad 100644
--- a/games-fps/xonotic/xonotic-0.1.0_pre.ebuild
+++ b/games-fps/xonotic/xonotic-0.1.0_pre.ebuild
@@ -41,7 +41,7 @@ UIDEPEND="
 "
 RDEPEND="
 	sys-libs/zlib
-	media-libs/jpeg
+	virtual/jpeg
 	media-libs/libpng
 	net-misc/curl
 	~dev-libs/d0_blind_id-${PV}[crypt?]

diff --git a/games-fps/xonotic/xonotic-9999.ebuild b/games-fps/xonotic/xonotic-9999.ebuild
index 3b55ca7..407d97d 100644
--- a/games-fps/xonotic/xonotic-9999.ebuild
+++ b/games-fps/xonotic/xonotic-9999.ebuild
@@ -43,7 +43,7 @@ UIDEPEND="
 "
 RDEPEND="
 	sys-libs/zlib
-	media-libs/jpeg
+	virtual/jpeg
 	media-libs/libpng
 	net-misc/curl
 	~dev-libs/d0_blind_id-${PV}[crypt?]



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic/
@ 2011-07-05 21:45 Nikoli
  0 siblings, 0 replies; 7+ messages in thread
From: Nikoli @ 2011-07-05 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     0a46d559b562ac9f70a4afd7d8121dd87da3b066
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Tue Jul  5 21:41:58 2011 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Tue Jul  5 21:41:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=0a46d559

xonotic: migrate to git-2

(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)

---
 games-fps/xonotic/ChangeLog           |    3 +++
 games-fps/xonotic/xonotic-9999.ebuild |   10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/games-fps/xonotic/ChangeLog b/games-fps/xonotic/ChangeLog
index 5f04de9..d1fef0f 100644
--- a/games-fps/xonotic/ChangeLog
+++ b/games-fps/xonotic/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Jul 2011; Nikoli <nikoli@lavabit.com> xonotic-9999.ebuild:
+  migrate to git-2
+
   12 Apr 2011; Nikoli <nikoli@lavabit.com> xonotic-0.1.0_pre.ebuild,
   xonotic-9999.ebuild:
   migrate to virtual/jpeg

diff --git a/games-fps/xonotic/xonotic-9999.ebuild b/games-fps/xonotic/xonotic-9999.ebuild
index 407d97d..79974ad 100644
--- a/games-fps/xonotic/xonotic-9999.ebuild
+++ b/games-fps/xonotic/xonotic-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit eutils games toolchain-funcs git
+inherit eutils games toolchain-funcs git-2
 
 MY_PN="${PN^}"
 DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
@@ -58,14 +58,14 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	# root
-	git_src_unpack
+	git-2_src_unpack
 
 	# Engine
+	unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT EGIT_DIR
 	EGIT_REPO_URI="${BASE_URI}darkplaces.git" \
-	EGIT_PROJECT="darkplaces" \
-	S="${S}/darkplaces" \
+	EGIT_SOURCEDIR="${S}/darkplaces" \
 	EGIT_BRANCH="div0-stable" \
-	git_fetch
+	git-2_src_unpack
 }
 
 src_prepare() {



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic/
@ 2011-09-08 19:41 Nikoli
  0 siblings, 0 replies; 7+ messages in thread
From: Nikoli @ 2011-09-08 19:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c795ecba1200d03aa08d843dd7172b041c0b031c
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Thu Sep  8 19:41:29 2011 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Thu Sep  8 19:41:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=c795ecba

xonotic: version bump, add s3tc USE

(Portage version: 2.1.10.11/git/Linux x86_64, unsigned Manifest commit)

---
 games-fps/xonotic/ChangeLog                        |    6 +++
 games-fps/xonotic/metadata.xml                     |    3 +
 .../{xonotic-9999.ebuild => xonotic-0.5.0.ebuild}  |   44 +++++++++-----------
 games-fps/xonotic/xonotic-9999.ebuild              |    4 +-
 4 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/games-fps/xonotic/ChangeLog b/games-fps/xonotic/ChangeLog
index d1fef0f..24fc1e9 100644
--- a/games-fps/xonotic/ChangeLog
+++ b/games-fps/xonotic/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xonotic-0.5.0 (08 Sep 2011)
+
+  08 Sep 2011; Nikoli <nikoli@lavabit.com> +xonotic-0.5.0.ebuild,
+  xonotic-9999.ebuild, metadata.xml:
+  version bump, add s3tc USE
+
   05 Jul 2011; Nikoli <nikoli@lavabit.com> xonotic-9999.ebuild:
   migrate to git-2
 

diff --git a/games-fps/xonotic/metadata.xml b/games-fps/xonotic/metadata.xml
index bbbc0be..bbe9193 100644
--- a/games-fps/xonotic/metadata.xml
+++ b/games-fps/xonotic/metadata.xml
@@ -6,4 +6,7 @@
 		<email>nikoli@lavabit.com</email>
 		<name>Nikoli</name>
 	</maintainer>
+	<use>
+		<flag name='s3tc'>Install <pkg>media-libs/libtxc_dxtn</pkg> for S3TC texture (de)compression, works with mesa drivers only</flag>
+	</use>
 </pkgmetadata>

diff --git a/games-fps/xonotic/xonotic-9999.ebuild b/games-fps/xonotic/xonotic-0.5.0.ebuild
similarity index 78%
copy from games-fps/xonotic/xonotic-9999.ebuild
copy to games-fps/xonotic/xonotic-0.5.0.ebuild
index 79974ad..b0c5b79 100644
--- a/games-fps/xonotic/xonotic-9999.ebuild
+++ b/games-fps/xonotic/xonotic-0.5.0.ebuild
@@ -4,18 +4,17 @@
 
 EAPI=2
 
-inherit eutils games toolchain-funcs git-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/"
-BASE_URI="git://git.xonotic.org/${PN}/"
-EGIT_REPO_URI="${BASE_URI}${PN}.git"
+SRC_URI="http://dl.xonotic.org/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="alsa crypt debug dedicated opengl sdl"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa crypt debug dedicated opengl +s3tc sdl"
 
 UIRDEPEND="
 	media-libs/libogg
@@ -30,11 +29,10 @@ UIRDEPEND="
 	x11-libs/libXxf86vm
 	virtual/opengl
 	media-libs/freetype:2
-	~games-fps/xonotic-data-9999[client]
 	alsa? ( media-libs/alsa-lib )
+	s3tc? ( media-libs/libtxc_dxtn )
 	sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video,alsa?] )
 "
-# s3tc? ( dev-libs/libtxc_dxtn )
 UIDEPEND="
 	x11-proto/xextproto
 	x11-proto/xf86dgaproto
@@ -46,8 +44,7 @@ RDEPEND="
 	virtual/jpeg
 	media-libs/libpng
 	net-misc/curl
-	~dev-libs/d0_blind_id-${PV}[crypt?]
-	~games-fps/xonotic-data-9999
+	~dev-libs/d0_blind_id-0.3[crypt?]
 	opengl? ( ${UIRDEPEND} )
 	!dedicated? ( !opengl? ( ${UIRDEPEND} ) )
 "
@@ -56,16 +53,13 @@ DEPEND="${RDEPEND}
 	!dedicated? ( !opengl? ( ${UIDEPEND} ) )
 "
 
-src_unpack() {
-	# root
-	git-2_src_unpack
+S="${WORKDIR}/${MY_PN}"
 
-	# Engine
-	unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT EGIT_DIR
-	EGIT_REPO_URI="${BASE_URI}darkplaces.git" \
-	EGIT_SOURCEDIR="${S}/darkplaces" \
-	EGIT_BRANCH="div0-stable" \
-	git-2_src_unpack
+pkg_setup() {
+	ewarn "You need 943 MiB diskspace for distfiles."
+	CHECKREQS_DISK_BUILD="1960M"
+	CHECKREQS_DISK_USR="900M"
+	check-reqs_pkg_setup
 }
 
 src_prepare() {
@@ -76,7 +70,7 @@ src_prepare() {
 	rm -rf misc/buildfiles/
 
 	# Engine
-	pushd darkplaces
+	pushd source/darkplaces
 	sed -i \
 		-e "/^EXE_/s:darkplaces:${PN}:" \
 		-e "s:-O3:${CFLAGS}:" \
@@ -93,7 +87,7 @@ src_prepare() {
 
 src_compile() {
 	# Engine
-	pushd darkplaces
+	cd source/darkplaces
 	if use debug; then
 		ENGINEOPTS="debug"
 	else
@@ -111,15 +105,14 @@ src_compile() {
 	if use dedicated; then
 		emake sv-${ENGINEOPTS} || die "emake sv-${ENGINEOPTS} failed"
 	fi
-	popd
 }
 
 src_install() {
 	# Engine & docs
-	pushd darkplaces
+	pushd source/darkplaces
 	if use opengl || use !dedicated; then
 		dogamesbin ${PN}-glx || die "dogamesbin glx failed"
-		newicon ../misc/logos/${PN}_icon.svg ${PN}.svg
+		newicon ../../misc/logos/${PN}_icon.svg ${PN}.svg
 		make_desktop_entry ${PN}-glx "${MY_PN} (GLX)"
 
 		if use sdl; then
@@ -137,7 +130,7 @@ src_install() {
 	popd
 
 	dodoc Docs/*.txt
-	dohtml -r readme.html Docs
+	dohtml -r Docs
 
 	insinto "${GAMES_DATADIR}/${PN}"
 
@@ -148,5 +141,8 @@ src_install() {
 		doins -r server || die "doins server failed"
 	fi
 
+	# Data
+	doins -r data || die "doins data failed"
+
 	prepgamesdirs
 }

diff --git a/games-fps/xonotic/xonotic-9999.ebuild b/games-fps/xonotic/xonotic-9999.ebuild
index 79974ad..472ca23 100644
--- a/games-fps/xonotic/xonotic-9999.ebuild
+++ b/games-fps/xonotic/xonotic-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_REPO_URI="${BASE_URI}${PN}.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa crypt debug dedicated opengl sdl"
+IUSE="alsa crypt debug dedicated opengl +s3tc sdl"
 
 UIRDEPEND="
 	media-libs/libogg
@@ -32,9 +32,9 @@ UIRDEPEND="
 	media-libs/freetype:2
 	~games-fps/xonotic-data-9999[client]
 	alsa? ( media-libs/alsa-lib )
+	s3tc? ( media-libs/libtxc_dxtn )
 	sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video,alsa?] )
 "
-# s3tc? ( dev-libs/libtxc_dxtn )
 UIDEPEND="
 	x11-proto/xextproto
 	x11-proto/xf86dgaproto



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic/
@ 2013-07-19 16:43 Nikoli
  0 siblings, 0 replies; 7+ messages in thread
From: Nikoli @ 2013-07-19 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b9754ff508e4c38f93f638c3923dd2e3511b298e
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Fri Jul 19 16:24:33 2013 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Fri Jul 19 16:24:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b9754ff5

xonotic: eapi5, update, rm old

Package-Manager: portage-2.1.12.2

---
 games-fps/xonotic/metadata.xml             |   4 +
 games-fps/xonotic/xonotic-0.1.0_pre.ebuild | 147 ----------------------------
 games-fps/xonotic/xonotic-0.5.0.ebuild     |   4 +-
 games-fps/xonotic/xonotic-0.7.0.ebuild     | 136 ++++++++++++++++++++++++++
 games-fps/xonotic/xonotic-9999.ebuild      | 148 +++++++++++++----------------
 5 files changed, 207 insertions(+), 232 deletions(-)

diff --git a/games-fps/xonotic/metadata.xml b/games-fps/xonotic/metadata.xml
index da214ca..568bba7 100644
--- a/games-fps/xonotic/metadata.xml
+++ b/games-fps/xonotic/metadata.xml
@@ -6,6 +6,10 @@
 		<name>Nikoli</name>
 	</maintainer>
 	<use>
+		<flag name='experimental'>Use experimental master git branch instead of div0-stable</flag>
+		<flag name='maps'>Download and install maps</flag>
+		<flag name='ode'>Enable ODE physics engine support</flag>
 		<flag name='s3tc'>Install <pkg>media-libs/libtxc_dxtn</pkg> for S3TC texture (de)compression, works with mesa drivers only</flag>
+		<flag name="server">Enable compilation of server</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-fps/xonotic/xonotic-0.1.0_pre.ebuild b/games-fps/xonotic/xonotic-0.1.0_pre.ebuild
deleted file mode 100644
index 75508ad..0000000
--- a/games-fps/xonotic/xonotic-0.1.0_pre.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2011 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/_pre/preview}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa crypt debug dedicated opengl 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 )
-	sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video,alsa?] )
-"
-# s3tc? ( dev-libs/libtxc_dxtn )
-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-${PV}[crypt?]
-	opengl? ( ${UIRDEPEND} )
-	!dedicated? ( !opengl? ( ${UIRDEPEND} ) )
-"
-DEPEND="${RDEPEND}
-	opengl? ( ${UIDEPEND} )
-	!dedicated? ( !opengl? ( ${UIDEPEND} ) )
-"
-
-S="${WORKDIR}/${MY_PN}"
-
-pkg_setup() {
-	ewarn "You need 1,3 Gb diskspace for distfiles."
-	CHECKREQS_DISK_BUILD="2610"
-	CHECKREQS_DISK_USR="1270"
-	check_reqs
-
-	einfo "For hiding \"test build\" message add \'seta \"menu_watermark\" \"\"\' to ~/.xonotic/data/config.cfg"
-}
-
-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}"
-
-	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.5.0.ebuild b/games-fps/xonotic/xonotic-0.5.0.ebuild
index b0c5b79..a4e5397 100644
--- a/games-fps/xonotic/xonotic-0.5.0.ebuild
+++ b/games-fps/xonotic/xonotic-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -44,7 +44,7 @@ RDEPEND="
 	virtual/jpeg
 	media-libs/libpng
 	net-misc/curl
-	~dev-libs/d0_blind_id-0.3[crypt?]
+	~dev-libs/d0_blind_id-0.5
 	opengl? ( ${UIRDEPEND} )
 	!dedicated? ( !opengl? ( ${UIRDEPEND} ) )
 "

diff --git a/games-fps/xonotic/xonotic-0.7.0.ebuild b/games-fps/xonotic/xonotic-0.7.0.ebuild
new file mode 100644
index 0000000..e94fc9d
--- /dev/null
+++ b/games-fps/xonotic/xonotic-0.7.0.ebuild
@@ -0,0 +1,136 @@
+# 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 472ca23..e8c4a2f 100644
--- a/games-fps/xonotic/xonotic-9999.ebuild
+++ b/games-fps/xonotic/xonotic-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
-inherit eutils games toolchain-funcs git-2
+inherit eutils games toolchain-funcs flag-o-matic git-2
 
-MY_PN="${PN^}"
 DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
 HOMEPAGE="http://www.xonotic.org/"
 BASE_URI="git://git.xonotic.org/${PN}/"
@@ -15,138 +14,121 @@ EGIT_REPO_URI="${BASE_URI}${PN}.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa crypt debug dedicated opengl +s3tc sdl"
+IUSE="alsa experimental +maps ode opengl +s3tc +sdl +server"
+REQUIRED_USE="
+	|| ( opengl sdl server )
+"
 
 UIRDEPEND="
 	media-libs/libogg
-	media-libs/libtheora
+	media-libs/libtheora[encode]
 	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
 	~games-fps/xonotic-data-9999[client]
-	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
+	media-libs/libpng:0=
 	net-misc/curl
-	~dev-libs/d0_blind_id-${PV}[crypt?]
+	~dev-libs/d0_blind_id-${PV}
 	~games-fps/xonotic-data-9999
-	opengl? ( ${UIRDEPEND} )
-	!dedicated? ( !opengl? ( ${UIRDEPEND} ) )
+	maps? ( ~games-fps/xonotic-maps-9999 )
+	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? ( ${UIDEPEND} )
-	!dedicated? ( !opengl? ( ${UIDEPEND} ) )
+	opengl? (
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+	)
 "
 
 src_unpack() {
-	# root
 	git-2_src_unpack
 
-	# Engine
-	unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT EGIT_DIR
+	use experimental || EGIT_BRANCH="div0-stable"
 	EGIT_REPO_URI="${BASE_URI}darkplaces.git" \
 	EGIT_SOURCEDIR="${S}/darkplaces" \
-	EGIT_BRANCH="div0-stable" \
 	git-2_src_unpack
 }
 
 src_prepare() {
-	# for darkplaces
 	tc-export CC
+	# Required for DP_PRELOAD_DEPENDENCIES=1
+	append-ldflags $(no-as-needed)
+
+	epatch_user
 
-	# use system libs
-	rm -rf misc/buildfiles/
+	sed -e 's,Version=2.5,Version=1.0,' -i misc/logos/xonotic-*.desktop || die
 
-	# Engine
-	pushd 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"
+		-e "/^OPTIM_RELEASE=/s:$: ${CFLAGS}:" \
+		-e "/^LDFLAGS_RELEASE=/s:$: ${LDFLAGS}:" \
+		darkplaces/makefile.inc || die
 
 	if use !alsa; then
 		sed -e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
-			-i makefile || die "sed failed"
+			-i darkplaces/makefile || die
 	fi
-	popd
 }
 
 src_compile() {
-	# Engine
-	pushd 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
-	popd
+	local targets=""
+	local i
+
+	use opengl && targets+=" cl-release"
+	use sdl && targets+=" sdl-release"
+	use server && targets+=" sv-release"
+
+	cd darkplaces || die
+	for i in ${targets}; do
+		emake STRIP=true \
+			DP_FS_BASEDIR="${GAMES_DATADIR}/${PN}" \
+			DP_PRELOAD_DEPENDENCIES=1 \
+			${i}
+	done
 }
 
 src_install() {
-	# Engine & docs
-	pushd 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
+	if use opengl; then
+		dogamesbin darkplaces/${PN}-glx
+		domenu misc/logos/xonotic-glx.desktop
 	fi
-
-	if use dedicated; then
-		dogamesbin ${PN}-dedicated || die "dogamesbin dedicated failed"
+	if use sdl; then
+		dogamesbin darkplaces/${PN}-sdl
+		domenu misc/logos/xonotic-sdl.desktop
 	fi
-	popd
+	if use opengl || use sdl; then
+		newicon misc/logos/icons_png/${PN}_512.png ${PN}.png
+	fi
+	use server && dogamesbin darkplaces/${PN}-dedicated
 
 	dodoc Docs/*.txt
-	dohtml -r readme.html Docs
+	dohtml -r Docs
 
 	insinto "${GAMES_DATADIR}/${PN}"
 
 	# public key for d0_blind_id
-	doins key_0.d0pk || die
+	doins key_0.d0pk
 
-	if use dedicated; then
-		doins -r server || die "doins server failed"
-	fi
+	use server && doins -r server
 
 	prepgamesdirs
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic/
@ 2013-08-03 16:24 Nikoli
  0 siblings, 0 replies; 7+ messages in thread
From: Nikoli @ 2013-08-03 16:24 UTC (permalink / raw
  To: gentoo-commits

commit:     b51b15fe9eec7c98f66ea11cdaa482d37f0cb940
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Sat Aug  3 16:23:42 2013 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Sat Aug  3 16:23:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b51b15fe

xonotic: build system was updated upstream

Package-Manager: portage-2.1.12.2

---
 games-fps/xonotic/metadata.xml        |  3 ++-
 games-fps/xonotic/xonotic-9999.ebuild | 45 +++++++++++++++++++----------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/games-fps/xonotic/metadata.xml b/games-fps/xonotic/metadata.xml
index 568bba7..b99e5e4 100644
--- a/games-fps/xonotic/metadata.xml
+++ b/games-fps/xonotic/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name='maps'>Download and install maps</flag>
 		<flag name='ode'>Enable ODE physics engine support</flag>
 		<flag name='s3tc'>Install <pkg>media-libs/libtxc_dxtn</pkg> for S3TC texture (de)compression, works with mesa drivers only</flag>
-		<flag name="server">Enable compilation of server</flag>
+		<flag name='server'>Enable compilation of server</flag>
+		<flag name='videocapture'>Enable video capture feature</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-fps/xonotic/xonotic-9999.ebuild b/games-fps/xonotic/xonotic-9999.ebuild
index e8c4a2f..b94426a 100644
--- a/games-fps/xonotic/xonotic-9999.ebuild
+++ b/games-fps/xonotic/xonotic-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils games toolchain-funcs flag-o-matic git-2
+inherit eutils toolchain-funcs git-2 games
 
 DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
 HOMEPAGE="http://www.xonotic.org/"
@@ -14,16 +14,16 @@ EGIT_REPO_URI="${BASE_URI}${PN}.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa experimental +maps ode opengl +s3tc +sdl +server"
+IUSE="cdda dedicated experimental +maps +ode opengl +s3tc +sdl +server videocapture"
 REQUIRED_USE="
 	|| ( opengl sdl server )
+	dedicated? ( server !opengl !sdl )
 "
 
 UIRDEPEND="
 	media-libs/libogg
-	media-libs/libtheora[encode]
+	videocapture? ( media-libs/libtheora[encode] )
 	media-libs/libvorbis
-	media-libs/libmodplug
 	x11-libs/libX11
 	virtual/opengl
 	media-libs/freetype:2
@@ -44,11 +44,11 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXpm
 		x11-libs/libXxf86vm
-		alsa? ( media-libs/alsa-lib )
+		media-libs/alsa-lib
 	)
 	sdl? (
 		${UIRDEPEND}
-		media-libs/libsdl[X,audio,joystick,opengl,video,alsa?]
+		media-libs/libsdl[X,audio,joystick,opengl,video]
 	)
 "
 DEPEND="${RDEPEND}
@@ -56,13 +56,17 @@ DEPEND="${RDEPEND}
 		x11-proto/xextproto
 		x11-proto/xf86vidmodeproto
 		x11-proto/xproto
+		cdda? ( virtual/os-headers )
 	)
 "
 
 src_unpack() {
 	git-2_src_unpack
 
-	use experimental || EGIT_BRANCH="div0-stable"
+	if use !experimental; then
+		EGIT_BRANCH="div0-stable"
+		EGIT_COMMIT=${EGIT_BRANCH}
+	fi
 	EGIT_REPO_URI="${BASE_URI}darkplaces.git" \
 	EGIT_SOURCEDIR="${S}/darkplaces" \
 	git-2_src_unpack
@@ -70,23 +74,17 @@ src_unpack() {
 
 src_prepare() {
 	tc-export CC
-	# Required for DP_PRELOAD_DEPENDENCIES=1
-	append-ldflags $(no-as-needed)
-
-	epatch_user
 
 	sed -e 's,Version=2.5,Version=1.0,' -i misc/logos/xonotic-*.desktop || die
 
+	cd darkplaces || die
+	epatch_user
+
 	sed -i \
 		-e "/^EXE_/s:darkplaces:${PN}:" \
 		-e "/^OPTIM_RELEASE=/s:$: ${CFLAGS}:" \
-		-e "/^LDFLAGS_RELEASE=/s:$: ${LDFLAGS}:" \
-		darkplaces/makefile.inc || die
-
-	if use !alsa; then
-		sed -e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
-			-i darkplaces/makefile || die
-	fi
+		-e "/^LDFLAGS_RELEASE=/s:$: -DNO_BUILD_TIMESTAMPS ${LDFLAGS}:" \
+		makefile.inc || die
 }
 
 src_compile() {
@@ -99,9 +97,16 @@ src_compile() {
 
 	cd darkplaces || die
 	for i in ${targets}; do
-		emake STRIP=true \
+		emake \
+			STRIP=true \
 			DP_FS_BASEDIR="${GAMES_DATADIR}/${PN}" \
-			DP_PRELOAD_DEPENDENCIES=1 \
+			DP_SOUND_API="ALSA" \
+			DP_LINK_ODE="shared" \
+			DP_LINK_CRYPTO="shared" \
+			$(usex cdda "" "DP_CDDA=") \
+			$(usex ode "" "LIB_ODE=") \
+			$(usex ode "" "CFLAGS_ODE=") \
+			$(usex videocapture "" "DP_VIDEO_CAPTURE=") \
 			${i}
 	done
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic/
@ 2013-08-04  8:31 Nikoli
  0 siblings, 0 replies; 7+ messages in thread
From: Nikoli @ 2013-08-04  8:31 UTC (permalink / raw
  To: gentoo-commits

commit:     5626e7369a22436187a548c5b86967b40c003504
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Sun Aug  4 08:31:24 2013 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Sun Aug  4 08:31:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=5626e736

xonotic: support SDL2, remove obsolete workarounds, -O3 is default

Package-Manager: portage-2.1.12.2

---
 games-fps/xonotic/metadata.xml        |  1 +
 games-fps/xonotic/xonotic-9999.ebuild | 48 +++++++++++++++++------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/games-fps/xonotic/metadata.xml b/games-fps/xonotic/metadata.xml
index b99e5e4..d1c53cf 100644
--- a/games-fps/xonotic/metadata.xml
+++ b/games-fps/xonotic/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name='ode'>Enable ODE physics engine support</flag>
 		<flag name='s3tc'>Install <pkg>media-libs/libtxc_dxtn</pkg> for S3TC texture (de)compression, works with mesa drivers only</flag>
 		<flag name='server'>Enable compilation of server</flag>
+		<flag name='sdl2'>Use SDL2 instead of SDL-1.2</flag>
 		<flag name='videocapture'>Enable video capture feature</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-fps/xonotic/xonotic-9999.ebuild b/games-fps/xonotic/xonotic-9999.ebuild
index b94426a..826433a 100644
--- a/games-fps/xonotic/xonotic-9999.ebuild
+++ b/games-fps/xonotic/xonotic-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils toolchain-funcs git-2 games
+inherit eutils toolchain-funcs flag-o-matic git-2 games
 
 DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
 HOMEPAGE="http://www.xonotic.org/"
@@ -14,10 +14,11 @@ EGIT_REPO_URI="${BASE_URI}${PN}.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cdda dedicated experimental +maps +ode opengl +s3tc +sdl +server videocapture"
+IUSE="cdda custom-cflags dedicated experimental +maps +ode opengl +s3tc +sdl sdl2 +server videocapture"
 REQUIRED_USE="
 	|| ( opengl sdl server )
 	dedicated? ( server !opengl !sdl )
+	sdl2? ( sdl )
 "
 
 UIRDEPEND="
@@ -48,7 +49,8 @@ RDEPEND="
 	)
 	sdl? (
 		${UIRDEPEND}
-		media-libs/libsdl[X,audio,joystick,opengl,video]
+		!sdl2? ( media-libs/libsdl:0[X,audio,joystick,opengl,video] )
+		sdl2? ( media-libs/libsdl:2[X,opengl,video] )
 	)
 "
 DEPEND="${RDEPEND}
@@ -73,13 +75,14 @@ src_unpack() {
 }
 
 src_prepare() {
-	tc-export CC
-
 	sed -e 's,Version=2.5,Version=1.0,' -i misc/logos/xonotic-*.desktop || die
 
 	cd darkplaces || die
 	epatch_user
 
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
 	sed -i \
 		-e "/^EXE_/s:darkplaces:${PN}:" \
 		-e "/^OPTIM_RELEASE=/s:$: ${CFLAGS}:" \
@@ -88,27 +91,22 @@ src_prepare() {
 }
 
 src_compile() {
-	local targets=""
-	local i
-
-	use opengl && targets+=" cl-release"
-	use sdl && targets+=" sdl-release"
-	use server && targets+=" sv-release"
-
 	cd darkplaces || die
-	for i in ${targets}; do
-		emake \
-			STRIP=true \
-			DP_FS_BASEDIR="${GAMES_DATADIR}/${PN}" \
-			DP_SOUND_API="ALSA" \
-			DP_LINK_ODE="shared" \
-			DP_LINK_CRYPTO="shared" \
-			$(usex cdda "" "DP_CDDA=") \
-			$(usex ode "" "LIB_ODE=") \
-			$(usex ode "" "CFLAGS_ODE=") \
-			$(usex videocapture "" "DP_VIDEO_CAPTURE=") \
-			${i}
-	done
+	emake \
+		STRIP=true \
+		CC="$(tc-getCC)" \
+		DP_FS_BASEDIR="${GAMES_DATADIR}/${PN}" \
+		DP_SOUND_API="ALSA" \
+		DP_LINK_ODE="shared" \
+		DP_LINK_CRYPTO="shared" \
+		$(usex cdda "" "DP_CDDA=") \
+		$(usex ode "" "LIB_ODE=") \
+		$(usex ode "" "CFLAGS_ODE=") \
+		$(usex sdl2 "SDL_CONFIG=sdl2-config" "SDL_CONFIG=sdl-config") \
+		$(usex videocapture "" "DP_VIDEO_CAPTURE=") \
+		$(usex opengl cl-release "") \
+		$(usex sdl sdl-release "") \
+		$(usex server sv-release "")
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic/
@ 2014-05-16 17:27 Azamat H. Hackimov
  0 siblings, 0 replies; 7+ messages in thread
From: Azamat H. Hackimov @ 2014-05-16 17:27 UTC (permalink / raw
  To: gentoo-commits

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] )
 	)
 "


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-05-16 17:27 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-05 21:45 [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic/ Nikoli
  -- strict thread matches above, loose matches on Subject: below --
2014-05-16 17:27 Azamat H. Hackimov
2013-08-04  8:31 Nikoli
2013-08-03 16:24 Nikoli
2013-07-19 16:43 Nikoli
2011-09-08 19:41 Nikoli
2011-04-12  8:48 Nikoli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox