[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Julian Ospald]

commit:     e8c8e1b2849945ba1ef3f660e1acaa41a0fe3e55
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 22:10:06 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 22:30:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c8e1b2

games-strategy/0ad: add missing dependency on dev-libs/nspr

We need this dep, because we don't use the system spidermonkey
anymore.

Reported-by: Toralf Förster
Gentoo-Bug: 558276

 .../0ad/{0ad-0.0.18_alpha.ebuild => 0ad-0.0.18_alpha-r1.ebuild}          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-strategy/0ad/0ad-0.0.18_alpha.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
similarity index 99%
rename from games-strategy/0ad/0ad-0.0.18_alpha.ebuild
rename to games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
index 258645d..06c8f8a 100644
--- a/games-strategy/0ad/0ad-0.0.18_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	dev-libs/boost
 	dev-libs/icu:=
 	dev-libs/libxml2
+	dev-libs/nspr
 	~games-strategy/0ad-data-${PV}
 	media-libs/libpng:0
 	media-libs/libsdl2[X,opengl,video]

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Julian Ospald]

commit:     cf0f6da43b1e12cdf6aa6c92c761b757f00e8832
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 23:55:18 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 23:55:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf0f6da4

games-strategy/0ad: revbump to fix missing python DEPEND

Gentoo-Bug: 560542

 ...{0ad-0.0.18_alpha-r1.ebuild => 0ad-0.0.18_alpha-r2.ebuild} | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
similarity index 94%
rename from games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
rename to games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
index 06c8f8a..e9c57bd 100644
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
@@ -6,7 +6,10 @@ EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit eutils wxwidgets toolchain-funcs gnome2-utils games
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
 
 MY_P=0ad-${PV/_/-}
 DESCRIPTION="A free, real-time strategy game"
@@ -41,11 +44,17 @@ RDEPEND="
 	sound? ( media-libs/libvorbis
 		media-libs/openal )"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	games_pkg_setup
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 }

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Julian Ospald]

commit:     a36823d5f86a959f46ff6d01b05e2de1bf4ee12e
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 17:31:40 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:32:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36823d5

games-strategy/0ad: use x11-libs/wxGTK:3.0

Gentoo-Bug: 563328

 games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild | 154 ++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild
new file mode 100644
index 0000000..8052103
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/"
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/nspr
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:62
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( net-libs/gloox )
+	nvtt? ( media-gfx/nvidia-texture-tools )
+	sound? ( media-libs/libvorbis
+		media-libs/openal )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	games_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-miniupnpc14.patch
+}
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--minimal-flags
+		--sdl2
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex sound "" "--without-audio")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="${GAMES_BINDIR}"
+		--libdir="$(games_get_libdir)"/${PN}
+		--datadir="${GAMES_DATADIR}"/${PN}
+		)
+
+	# stock premake4 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake4 || die
+	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake4/bin/release/premake4 \
+		--file="premake4.lua" \
+		--outpath="../workspaces/gcc/" \
+		--platform=$(usex amd64 "x64" "x32") \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build bundled and patched spidermonkey
+	cd libraries/source/spidermonkey || die
+	JOBS="${MAKEOPTS}" ./build.sh || die
+	cd "${S}" || die
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newgamesbin binaries/system/pyrogenesis 0ad
+	use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe binaries/system/libCollada.so
+	doexe libraries/source/spidermonkey/lib/*.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Julian Ospald]

commit:     84e3985f307d91f4ad57ba3d5ec4e7076e763b09
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 17:59:12 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 18:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e3985f

games-strategy/0ad: fix virtual/jpeg SLOT

 games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild | 154 ++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
new file mode 100644
index 0000000..5bd3321
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/"
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/nspr
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( net-libs/gloox )
+	nvtt? ( media-gfx/nvidia-texture-tools )
+	sound? ( media-libs/libvorbis
+		media-libs/openal )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	games_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-miniupnpc14.patch
+}
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--minimal-flags
+		--sdl2
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex sound "" "--without-audio")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="${GAMES_BINDIR}"
+		--libdir="$(games_get_libdir)"/${PN}
+		--datadir="${GAMES_DATADIR}"/${PN}
+		)
+
+	# stock premake4 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake4 || die
+	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake4/bin/release/premake4 \
+		--file="premake4.lua" \
+		--outpath="../workspaces/gcc/" \
+		--platform=$(usex amd64 "x64" "x32") \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build bundled and patched spidermonkey
+	cd libraries/source/spidermonkey || die
+	JOBS="${MAKEOPTS}" ./build.sh || die
+	cd "${S}" || die
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newgamesbin binaries/system/pyrogenesis 0ad
+	use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe binaries/system/libCollada.so
+	doexe libraries/source/spidermonkey/lib/*.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Julian Ospald]

commit:     a51e027ecd9511fdc2249c9d689b4097c4d0a4bf
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 17:59:42 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 18:00:14 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51e027e

games-strategy/0ad: rm old

 games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild | 154 --------------------------
 games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild | 154 --------------------------
 2 files changed, 308 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
deleted file mode 100644
index 654bb3d..0000000
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/"
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch sound test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/icu:=
-	dev-libs/libxml2
-	dev-libs/nspr
-	~games-strategy/0ad-data-${PV}
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:62
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( net-libs/gloox )
-	nvtt? ( media-gfx/nvidia-texture-tools )
-	sound? ( media-libs/libvorbis
-		media-libs/openal )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	games_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-miniupnpc14.patch
-}
-
-src_configure() {
-	local myconf=(
-		--with-system-nvtt
-		--with-system-miniupnpc
-		--minimal-flags
-		--sdl2
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex sound "" "--without-audio")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--collada
-		--bindir="${GAMES_BINDIR}"
-		--libdir="$(games_get_libdir)"/${PN}
-		--datadir="${GAMES_DATADIR}"/${PN}
-		)
-
-	# stock premake4 does not work, use the shipped one
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake4 || die
-	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
-	# rebuild premake again... this is the most stupid build system
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake4/bin/release/premake4 \
-		--file="premake4.lua" \
-		--outpath="../workspaces/gcc/" \
-		--platform=$(usex amd64 "x64" "x32") \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake || die "Premake failed"
-}
-
-src_compile() {
-	tc-export AR
-
-	# build bundled and patched spidermonkey
-	cd libraries/source/spidermonkey || die
-	JOBS="${MAKEOPTS}" ./build.sh || die
-	cd "${S}" || die
-
-	# build 3rd party fcollada
-	emake -C libraries/source/fcollada/src
-
-	# build 0ad
-	emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-	newgamesbin binaries/system/pyrogenesis 0ad
-	use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r binaries/data/l10n
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe binaries/system/libCollada.so
-	doexe libraries/source/spidermonkey/lib/*.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild
deleted file mode 100644
index 8052103..0000000
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/"
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch sound test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/icu:=
-	dev-libs/libxml2
-	dev-libs/nspr
-	~games-strategy/0ad-data-${PV}
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:62
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( net-libs/gloox )
-	nvtt? ( media-gfx/nvidia-texture-tools )
-	sound? ( media-libs/libvorbis
-		media-libs/openal )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	games_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-miniupnpc14.patch
-}
-
-src_configure() {
-	local myconf=(
-		--with-system-nvtt
-		--with-system-miniupnpc
-		--minimal-flags
-		--sdl2
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex sound "" "--without-audio")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--collada
-		--bindir="${GAMES_BINDIR}"
-		--libdir="$(games_get_libdir)"/${PN}
-		--datadir="${GAMES_DATADIR}"/${PN}
-		)
-
-	# stock premake4 does not work, use the shipped one
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake4 || die
-	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
-	# rebuild premake again... this is the most stupid build system
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake4/bin/release/premake4 \
-		--file="premake4.lua" \
-		--outpath="../workspaces/gcc/" \
-		--platform=$(usex amd64 "x64" "x32") \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake || die "Premake failed"
-}
-
-src_compile() {
-	tc-export AR
-
-	# build bundled and patched spidermonkey
-	cd libraries/source/spidermonkey || die
-	JOBS="${MAKEOPTS}" ./build.sh || die
-	cd "${S}" || die
-
-	# build 3rd party fcollada
-	emake -C libraries/source/fcollada/src
-
-	# build 0ad
-	emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-	newgamesbin binaries/system/pyrogenesis 0ad
-	use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r binaries/data/l10n
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe binaries/system/libCollada.so
-	doexe libraries/source/spidermonkey/lib/*.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Lars Wendler]

commit:     7a5d3469dfbf86c6c3b157d8a3a40bc1225b27f6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 05:38:49 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 05:40:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5d3469

games-strategy/0ad: Added sub-slot dependency for dev-libs/boost.

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.20_alpha.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
index 56370a9..1a7b692 100644
--- a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
@@ -23,7 +23,7 @@ IUSE="editor +lobby nvtt pch sound test"
 RESTRICT="test"
 
 RDEPEND="
-	dev-libs/boost
+	dev-libs/boost:=
 	dev-libs/icu:=
 	dev-libs/libxml2
 	dev-libs/nspr

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Michael Palimaka]

commit:     991a88d0ef10942b2202c132d1c4105895090c9b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 08:09:32 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 08:09:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991a88d0

games-strategy/0ad: use HTTPS

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/0ad/0ad-0.0.20_alpha.ebuild | 4 ++--
 games-strategy/0ad/0ad-0.0.21_alpha.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
index 14f1d2a1cab..5ccfab2942c 100644
--- a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
 
 MY_P=0ad-${PV/_/-}
 DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/"
+HOMEPAGE="https://play0ad.com/"
 SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"

diff --git a/games-strategy/0ad/0ad-0.0.21_alpha.ebuild b/games-strategy/0ad/0ad-0.0.21_alpha.ebuild
index ab8f438e264..89de55c9db8 100644
--- a/games-strategy/0ad/0ad-0.0.21_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.21_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
 
 MY_P=0ad-${PV/_/-}
 DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/"
+HOMEPAGE="https://play0ad.com/"
 SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Lars Wendler]

commit:     644a4c60652a4da408daa1ba1df32ae5aee0c750
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 13:36:50 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 13:38:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=644a4c60

games-strategy/0ad: Bump to version 0.0.22_alpha

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 games-strategy/0ad/0ad-0.0.22_alpha.ebuild | 146 +++++++++++++++++++++++++++++
 games-strategy/0ad/Manifest                |   1 +
 2 files changed, 147 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
new file mode 100644
index 00000000000..0eac8acb767
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/nspr
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( net-libs/gloox )
+	nvtt? ( media-gfx/nvidia-texture-tools )
+	sound? ( media-libs/libvorbis
+		media-libs/openal )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex sound "" "--without-audio")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+		)
+
+	# stock premake4 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake4 || die
+	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake4/bin/release/premake4 \
+		--file="premake4.lua" \
+		--outpath="../workspaces/gcc/" \
+		--platform=$(usex amd64 "x64" "x32") \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build bundled and patched spidermonkey
+	cd libraries/source/spidermonkey || die
+	JOBS="${MAKEOPTS}" ./build.sh || die
+	cd "${S}" || die
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto /usr/share/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/libCollada.so
+	doexe libraries/source/spidermonkey/lib/*.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index d7fbed78d56..616caf97e65 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,2 +1,3 @@
 DIST 0ad-0.0.20-alpha-unix-build.tar.xz 25610932 SHA256 a396d5cb37057ddd3cd523434f70c56be21588a2228443e7508d2b2d610fc68e SHA512 786f92b74c2e0c64c07ef2f5578dcb5c753fb4fed7238d385bca23549805fcfaeecb9bfbfae809a2ac09a7dfc804455237346588099db347c28a3ff0ae284c43 WHIRLPOOL 2d4b4e96dcb80e265cbbbddfe3b52e72110a419713f6644a68d2a9d499ffc57f03d5b68e612d00ccd889ec9a19609b968af450b228ef586d9567bd16cbc76fcb
 DIST 0ad-0.0.21-alpha-unix-build.tar.xz 29196476 SHA256 96be23e4284a3931ef9536f988f2517040bde1f8700ee048bff18c932d8683cf SHA512 68f3586375f7dcbf3dfb6476040b8b43da8e2ea1e74947223ff5c9936b54a93caef919d8982d78c6f4ad01ee8f707b38a2c37cdab88ea5c5408544364cff4c37 WHIRLPOOL 8e72c2c3311169eabab5a8a028ffc90b8d6838f72d23ebbac3e5331a7f9434bbe7cae8cf0f5a97bf30b913f7f7f737d264aaf86298f8f65c81a270b0c4e5f871
+DIST 0ad-0.0.22-alpha-unix-build.tar.xz 29199308 SHA256 fddd36df4fd32b5b31fd8871bc5ed3ec71a921de79517fb6199ba7571ec9f5b1 SHA512 3f917e77c6cc1d3fb585c98950db6eab3f5895ba3db41a8737f8172c769b5582689b436cab31eeafecce0e9639ee456afc7b78ebb03435b06512eb9fe7393771 WHIRLPOOL ae33f4f77cb981a0e8f00969c6b1ee05a2f06bacb70f79bfac74fda383bffedd4c6027370d5003e3d7815d5c68e13308b3553d8810bc69eebee143231968e95c

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Lars Wendler]

commit:     23eaef86b34331c8601cdd6b7aaf545588f54138
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  4 08:43:49 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Aug  4 08:44:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23eaef86

games-strategy/0ad: Adjust gloox dependency (bug #626976)

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 games-strategy/0ad/0ad-0.0.22_alpha.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
index 0eac8acb767..2bc96642ea2 100644
--- a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXcursor
 	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( net-libs/gloox )
+	lobby? ( >=net-libs/gloox-1.0.20 )
 	nvtt? ( media-gfx/nvidia-texture-tools )
 	sound? ( media-libs/libvorbis
 		media-libs/openal )"

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Lars Wendler]

commit:     63ef41c718a62fa23050d4f8abc9086b0e02feea
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 07:13:55 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 07:14:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ef41c7

games-strategy/0ad: Removed "sound" USE flag.

A game without sound does not really provide optimal game experience.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 games-strategy/0ad/0ad-0.0.22_alpha.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
index 2bc96642ea2..73de7d6ddbe 100644
--- a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
 LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch sound test"
+IUSE="editor +lobby nvtt pch test"
 RESTRICT="test"
 
 RDEPEND="
@@ -29,6 +29,8 @@ RDEPEND="
 	~games-strategy/0ad-data-${PV}
 	media-libs/libpng:0
 	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
 	net-libs/enet:1.3
 	net-libs/miniupnpc:=
 	net-misc/curl
@@ -39,9 +41,7 @@ RDEPEND="
 	x11-libs/libXcursor
 	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 	lobby? ( >=net-libs/gloox-1.0.20 )
-	nvtt? ( media-gfx/nvidia-texture-tools )
-	sound? ( media-libs/libvorbis
-		media-libs/openal )"
+	nvtt? ( media-gfx/nvidia-texture-tools )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig
@@ -65,7 +65,6 @@ src_configure() {
 		$(usex nvtt "" "--without-nvtt")
 		$(usex pch "" "--without-pch")
 		$(usex test "" "--without-tests")
-		$(usex sound "" "--without-audio")
 		$(usex editor "--atlas" "")
 		$(usex lobby "" "--without-lobby")
 		--collada

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Lars Wendler]

commit:     183cd703980c2e0b36654ee4137d78b669e0253d
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sat Dec 30 16:55:48 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 13:01:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183cd703

games-strategy/0ad: add missing setup-wxwidgets()

Closes: https://bugs.gentoo.org/642748
Closes: https://github.com/gentoo/gentoo/pull/6691

 games-strategy/0ad/0ad-0.0.22_alpha.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
index 73de7d6ddbe..1cb088436b4 100644
--- a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
@@ -51,6 +51,7 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	python-any-r1_pkg_setup
+	use editor && setup-wxwidgets
 }
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Lars Wendler]

commit:     b0b035efd9097d0900d3318557cff31f7cc18769
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 14:38:40 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 24 14:39:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b035ef

games-strategy/0ad: Bump to version 0.0.23_alpha

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 games-strategy/0ad/0ad-0.0.23_alpha.ebuild | 146 +++++++++++++++++++++++++++++
 games-strategy/0ad/Manifest                |   1 +
 2 files changed, 147 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
new file mode 100644
index 00000000000..281d8103dfe
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/nspr
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( >=net-libs/gloox-1.0.20 )
+	nvtt? ( media-gfx/nvidia-texture-tools )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use editor && setup-wxwidgets
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+		)
+
+	# stock premake4 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake4 || die
+	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake4/bin/release/premake4 \
+		--file="premake4.lua" \
+		--outpath="../workspaces/gcc/" \
+		--platform=$(usex amd64 "x64" "x32") \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build bundled and patched spidermonkey
+	cd libraries/source/spidermonkey || die
+	JOBS="${MAKEOPTS}" ./build.sh || die
+	cd "${S}" || die
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto /usr/share/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/libCollada.so
+	doexe libraries/source/spidermonkey/lib/*.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index d1c420b3d27..a8e495c7706 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1 +1,2 @@
 DIST 0ad-0.0.22-alpha-unix-build.tar.xz 29199308 BLAKE2B a9204949e4dd669228b2a0e2c2dc5d2ccd4f18767e32c4f772714c61314ca0fb283d41201cb9f0547588a6dbdc20fd9d7d14ff153bc3087003c27f4ec2f6fef9 SHA512 3f917e77c6cc1d3fb585c98950db6eab3f5895ba3db41a8737f8172c769b5582689b436cab31eeafecce0e9639ee456afc7b78ebb03435b06512eb9fe7393771
+DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Maciej Mrozowski]

commit:     db6824809134c8a3327f7fdba293d8fcb6b06e97
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 21:18:57 2018 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu May 24 21:19:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db682480

games-strategy/0ad: Add dev-libs/libsodium dependency, fixes 656454

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-strategy/0ad/0ad-0.0.23_alpha.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
index 281d8103dfe..0e44c4e36fb 100644
--- a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
@@ -24,6 +24,7 @@ RESTRICT="test"
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/icu:=
+	dev-libs/libsodium
 	dev-libs/libxml2
 	dev-libs/nspr
 	~games-strategy/0ad-data-${PV}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Lars Wendler]

commit:     44d0bfd3972a9aa9114d162e3bc8a27cb4ca4303
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 31 08:13:03 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Oct 31 08:13:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d0bfd3

games-strategy/0ad: Removed old.

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 games-strategy/0ad/0ad-0.0.22_alpha.ebuild | 146 -----------------------------
 games-strategy/0ad/Manifest                |   1 -
 2 files changed, 147 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
deleted file mode 100644
index 1cb088436b4..00000000000
--- a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libxml2
-	dev-libs/nspr
-	~games-strategy/0ad-data-${PV}
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( >=net-libs/gloox-1.0.20 )
-	nvtt? ( media-gfx/nvidia-texture-tools )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use editor && setup-wxwidgets
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
-)
-
-src_configure() {
-	local myconf=(
-		--with-system-nvtt
-		--with-system-miniupnpc
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--collada
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-		)
-
-	# stock premake4 does not work, use the shipped one
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake4 || die
-	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
-	# rebuild premake again... this is the most stupid build system
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake4/bin/release/premake4 \
-		--file="premake4.lua" \
-		--outpath="../workspaces/gcc/" \
-		--platform=$(usex amd64 "x64" "x32") \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake || die "Premake failed"
-}
-
-src_compile() {
-	tc-export AR
-
-	# build bundled and patched spidermonkey
-	cd libraries/source/spidermonkey || die
-	JOBS="${MAKEOPTS}" ./build.sh || die
-	cd "${S}" || die
-
-	# build 3rd party fcollada
-	emake -C libraries/source/fcollada/src
-
-	# build 0ad
-	emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	insinto /usr/share/${PN}
-	doins -r binaries/data/l10n
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/libCollada.so
-	doexe libraries/source/spidermonkey/lib/*.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index a8e495c7706..30284e61a66 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,2 +1 @@
-DIST 0ad-0.0.22-alpha-unix-build.tar.xz 29199308 BLAKE2B a9204949e4dd669228b2a0e2c2dc5d2ccd4f18767e32c4f772714c61314ca0fb283d41201cb9f0547588a6dbdc20fd9d7d14ff153bc3087003c27f4ec2f6fef9 SHA512 3f917e77c6cc1d3fb585c98950db6eab3f5895ba3db41a8737f8172c769b5582689b436cab31eeafecce0e9639ee456afc7b78ebb03435b06512eb9fe7393771
 DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Lars Wendler]

commit:     e49344e875574eadef38acc4efacd3b99f3c79f7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 23:39:43 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 23:39:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e49344e8

games-strategy/0ad: Bump to version 0.0.23b_alpha

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.23b_alpha.ebuild | 147 ++++++++++++++++++++++++++++
 games-strategy/0ad/Manifest                 |   1 +
 2 files changed, 148 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
new file mode 100644
index 00000000000..632db834446
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libsodium
+	dev-libs/libxml2
+	dev-libs/nspr
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( >=net-libs/gloox-1.0.20 )
+	nvtt? ( media-gfx/nvidia-texture-tools )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use editor && setup-wxwidgets
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+		)
+
+	# stock premake4 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake4 || die
+	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake4/bin/release/premake4 \
+		--file="premake4.lua" \
+		--outpath="../workspaces/gcc/" \
+		--platform=$(usex amd64 "x64" "x32") \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build bundled and patched spidermonkey
+	cd libraries/source/spidermonkey || die
+	JOBS="${MAKEOPTS}" ./build.sh || die
+	cd "${S}" || die
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto /usr/share/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/libCollada.so
+	doexe libraries/source/spidermonkey/lib/*.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 30284e61a66..2edf2ff884b 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1 +1,2 @@
 DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
+DIST 0ad-0.0.23b-alpha-unix-build.tar.xz 31922812 BLAKE2B db7d6bf1a2bb084870b914cf974bfdb19812ff6f9391e5bc5213ae215fc670b77bd4508a5432aa3e47bf327bd37d4bb14961ab3332b165b53327c3f01a935ac1 SHA512 82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     ccf88971df129944101991c1a8b78cb3e74203d6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 00:32:33 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 00:32:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf88971

games-strategy/0ad: arm64 keyworded (bug #730888)

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.23b_alpha.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
index b059293c8f0..174ce6ff0cd 100644
--- a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="editor +lobby nvtt pch test"
 RESTRICT="test"
 

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     58b4677f8fed20a5996c79496f93f992665e385a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 01:12:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 01:17:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58b4677f

games-strategy/0ad: misc fixups

* Tighten nvtt dep
* Use xdg-utils -> xdg

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild   | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
index efaa4577774..aff130d91e0 100644
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
@@ -1,10 +1,10 @@
 # Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-WX_GTK_VER="3.0-gtk3"
+EAPI=7
 
-inherit desktop toolchain-funcs wxwidgets xdg-utils
+WX_GTK_VER="3.0-gtk3"
+inherit desktop toolchain-funcs wxwidgets xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -54,7 +54,8 @@ DEPEND="
 	x11-libs/libX11
 	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 	lobby? ( >=net-libs/gloox-1.0.20 )
-	nvtt? ( media-gfx/nvidia-texture-tools )"
+	nvtt? ( >=media-gfx/nvidia-texture-tools-2.1.0 )"
+
 RDEPEND="${DEPEND}"
 PDEPEND="~games-strategy/0ad-data-${PV}"
 
@@ -94,7 +95,9 @@ src_configure() {
 		--bindir="/usr/bin"
 		--libdir="/usr/$(get_libdir)"/${PN}
 		--datadir="/usr/share/${PN}"
-		)
+	)
+
+	tc-export CC CXX
 
 	# stock premake5 does not work, use the shipped one
 	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
@@ -147,11 +150,3 @@ src_install() {
 	doicon -s 128 build/resources/${PN}.png
 	make_desktop_entry ${PN}
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     815ab784f5f549e0f4cb803bbd813199d2c94c90
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 20:18:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 20:18:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=815ab784

games-strategy/0ad: revert to bundled libraries

* SpiderMonkey changes the consumed interfaces
  even within minor versions, so using
  the system version is a no go.

* nvtt is abandoned upstream and using the
  system version results in segfaults.

  Use 0ad's version which has fixes instead.

Bug: https://bugs.gentoo.org/735352
Bug: https://bugs.gentoo.org/689124
Closes: https://bugs.gentoo.org/768840
Closes: https://bugs.gentoo.org/759934
Closes: https://bugs.gentoo.org/768930
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...> 0ad-0.0.24_alpha_pre20210116040036-r1.ebuild} | 28 ++++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild
similarity index 81%
rename from games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
rename to games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild
index aff130d91e0..a138651fac2 100644
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild
@@ -36,7 +36,6 @@ RESTRICT="test"
 BDEPEND="virtual/pkgconfig
 	test? ( dev-lang/perl )"
 DEPEND="
-	>=dev-lang/spidermonkey-78.6:78
 	dev-libs/boost:=
 	dev-libs/icu:=
 	dev-libs/libfmt:0=
@@ -78,14 +77,11 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# Delete check for minor version of dev-lang/spidermonkey.
-	sed -e "/^#if MOZJS_MINOR_VERSION != [[:digit:]]\+$/,/^#endif$/d" -i source/scriptinterface/ScriptTypes.h || die
+	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
 }
 
 src_configure() {
 	local myconf=(
-		--with-system-mozjs
-		--with-system-nvtt
 		--minimal-flags
 		$(usex nvtt "" "--without-nvtt")
 		$(usex pch "" "--without-pch")
@@ -124,9 +120,31 @@ src_compile() {
 	tc-export AR
 
 	# build 3rd party fcollada
+	einfo "Building bundled fcollada"
 	emake -C libraries/source/fcollada/src
 
+	# build bundled nvtt
+	# nvtt is abandoned upstream and 0ad have forked it
+	# and added fixes. Use their copy.
+	# bug #768930
+	if use nvtt ; then
+		cd libraries/source/nvtt || die
+		elog "Building bundled nvtt (bug #768930)"
+		./build.sh || die "Failed to build bundled nvtt"
+		cd "${S}" || die
+	fi
+
+	# build bundled spidermonkey
+	# We genuinely can't use the system SpiderMonkey right now.
+	# Breakages occur even on minor bumps in upstream SM,
+	# e.g. bug #768840.
+	cd libraries/source/spidermonkey || die
+	elog "Building bundled SpiderMonkey (bug #768840)"
+	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh || die "Failed to build bundled SpiderMonkey"
+	cd "${S}" || die
+
 	# build 0ad
+	elog "Building 0ad"
 	emake -C build/workspaces/gcc verbose=1
 }
 

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     a18c2bdc043ce8926cf9f247189c8d42f32d0efe
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 22:27:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18c2bdc

games-strategy/0ad: remove old broken versions

Keep 0.0.24_alpha_pre20210116040036-r2 temporarily just
in case.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.23_alpha.ebuild         | 147 ------------------
 games-strategy/0ad/0ad-0.0.23b_alpha.ebuild        | 148 ------------------
 .../0ad-0.0.24_alpha_pre20210116040036-r1.ebuild   | 170 ---------------------
 games-strategy/0ad/Manifest                        |   4 +-
 4 files changed, 2 insertions(+), 467 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
deleted file mode 100644
index 0e44c4e36fb..00000000000
--- a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libsodium
-	dev-libs/libxml2
-	dev-libs/nspr
-	~games-strategy/0ad-data-${PV}
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( >=net-libs/gloox-1.0.20 )
-	nvtt? ( media-gfx/nvidia-texture-tools )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use editor && setup-wxwidgets
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
-)
-
-src_configure() {
-	local myconf=(
-		--with-system-nvtt
-		--with-system-miniupnpc
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--collada
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-		)
-
-	# stock premake4 does not work, use the shipped one
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake4 || die
-	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
-	# rebuild premake again... this is the most stupid build system
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake4/bin/release/premake4 \
-		--file="premake4.lua" \
-		--outpath="../workspaces/gcc/" \
-		--platform=$(usex amd64 "x64" "x32") \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake || die "Premake failed"
-}
-
-src_compile() {
-	tc-export AR
-
-	# build bundled and patched spidermonkey
-	cd libraries/source/spidermonkey || die
-	JOBS="${MAKEOPTS}" ./build.sh || die
-	cd "${S}" || die
-
-	# build 3rd party fcollada
-	emake -C libraries/source/fcollada/src
-
-	# build 0ad
-	emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	insinto /usr/share/${PN}
-	doins -r binaries/data/l10n
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/libCollada.so
-	doexe libraries/source/spidermonkey/lib/*.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
deleted file mode 100644
index 174ce6ff0cd..00000000000
--- a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libsodium
-	dev-libs/libxml2
-	dev-libs/nspr
-	~games-strategy/0ad-data-${PV}
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( >=net-libs/gloox-1.0.20 )
-	nvtt? ( media-gfx/nvidia-texture-tools )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use editor && setup-wxwidgets
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
-	"${FILESDIR}"/${PN}-0.0.23b-header_includes_fix.patch
-)
-
-src_configure() {
-	local myconf=(
-		--with-system-nvtt
-		--with-system-miniupnpc
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--collada
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-		)
-
-	# stock premake4 does not work, use the shipped one
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake4 || die
-	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
-	# rebuild premake again... this is the most stupid build system
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake4/bin/release/premake4 \
-		--file="premake4.lua" \
-		--outpath="../workspaces/gcc/" \
-		--platform=$(usex amd64 "x64" "x32") \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake || die "Premake failed"
-}
-
-src_compile() {
-	tc-export AR
-
-	# build bundled and patched spidermonkey
-	cd libraries/source/spidermonkey || die
-	JOBS="${MAKEOPTS}" ./build.sh || die
-	cd "${S}" || die
-
-	# build 3rd party fcollada
-	emake -C libraries/source/fcollada/src
-
-	# build 0ad
-	emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	insinto /usr/share/${PN}
-	doins -r binaries/data/l10n
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/libCollada.so
-	doexe libraries/source/spidermonkey/lib/*.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild
deleted file mode 100644
index a138651fac2..00000000000
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit desktop toolchain-funcs wxwidgets xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/0ad/0ad"
-	ZEROAD_GIT_REVISION=""
-elif [[ ${PV} == *_pre* ]]; then
-	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-else
-	MY_P="0ad-${PV/_/-}"
-fi
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-elif [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
-fi
-
-LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-BDEPEND="virtual/pkgconfig
-	test? ( dev-lang/perl )"
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libfmt:0=
-	dev-libs/libsodium
-	dev-libs/libxml2
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( >=net-libs/gloox-1.0.20 )
-	nvtt? ( >=media-gfx/nvidia-texture-tools-2.1.0 )"
-
-RDEPEND="${DEPEND}"
-PDEPEND="~games-strategy/0ad-data-${PV}"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
-	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
-)
-
-pkg_setup() {
-	use editor && setup-wxwidgets
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
-}
-
-src_configure() {
-	local myconf=(
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-	)
-
-	tc-export CC CXX
-
-	# stock premake5 does not work, use the shipped one
-	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
-	# regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake5 || die
-	"${S}"/build/premake/premake5/bin/release/premake5 embed || die
-
-	# rebuild premake again... this is the most stupid build system
-	emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
-	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
-	# run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake5/bin/release/premake5 \
-		--file="premake5.lua" \
-		--outpath="../workspaces/gcc/" \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake2 || die "Premake failed"
-}
-
-src_compile() {
-	tc-export AR
-
-	# build 3rd party fcollada
-	einfo "Building bundled fcollada"
-	emake -C libraries/source/fcollada/src
-
-	# build bundled nvtt
-	# nvtt is abandoned upstream and 0ad have forked it
-	# and added fixes. Use their copy.
-	# bug #768930
-	if use nvtt ; then
-		cd libraries/source/nvtt || die
-		elog "Building bundled nvtt (bug #768930)"
-		./build.sh || die "Failed to build bundled nvtt"
-		cd "${S}" || die
-	fi
-
-	# build bundled spidermonkey
-	# We genuinely can't use the system SpiderMonkey right now.
-	# Breakages occur even on minor bumps in upstream SM,
-	# e.g. bug #768840.
-	cd libraries/source/spidermonkey || die
-	elog "Building bundled SpiderMonkey (bug #768840)"
-	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh || die "Failed to build bundled SpiderMonkey"
-	cd "${S}" || die
-
-	# build 0ad
-	elog "Building 0ad"
-	emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	insinto /usr/share/${PN}
-	doins -r binaries/data/l10n
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/libCollada.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-}

diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index de55f565987..5d2ea27d724 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,3 +1,3 @@
-DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
-DIST 0ad-0.0.23b-alpha-unix-build.tar.xz 31922812 BLAKE2B db7d6bf1a2bb084870b914cf974bfdb19812ff6f9391e5bc5213ae215fc670b77bd4508a5432aa3e47bf327bd37d4bb14961ab3332b165b53327c3f01a935ac1 SHA512 82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135
 DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510
+DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea
+DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     750a1ce1cc28dc679c08b1456a83c4c8542bb526
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 22:27:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=750a1ce1

games-strategy/0ad: bump to 0.0.24b_alpha

Huge thanks to everybody mentioned in this commit
(and likely others too, sorry if I forgot you!)

This started with Arfrever giving an initial bump,
then several revisions later, we seem to be in a position
where it's fully working!

Most of the issues came from (de)bundling SpiderMonkey
and NVTT:

* New SpiderMonkey releases regularly break the APIs
  which 0ad uses, so we're reverting to the bundled
  copy per upstream advice;

* NVTT has been abandoned upstream (as an independent project)
  so the 0ad developers have taken it over and applied significant
  patches. We use the bundled copy now to take advantage of these
  fixes.

We also abandon 0ad-data for now. We're now using the released
asset files for 0.0.24b_alpha but the 0ad ebuild itself, thanks to
Wolf-Dieter, can now generate these assets rather than relying
on a separate ebuild like 0ad-data. This simplifies matters.

Closes: https://bugs.gentoo.org/735352
Thanks-to: Stanislas Dolcini <stan at wildfiregames dot com>
Thanks-to: Wolf-Dieter Rieck <wesen42 <AT> web.de>
Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com>
Thanks-to: Quentin Retornaz <gentoo <AT> retornaz.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 226 ++++++++++++++++++++++++++++
 1 file changed, 226 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
new file mode 100644
index 00000000000..436db366fb5
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -0,0 +1,226 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit desktop toolchain-funcs wxwidgets xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/0ad/0ad"
+	ZEROAD_GIT_REVISION=""
+elif [[ ${PV} == *_pre* ]]; then
+	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+else
+	MY_P="0ad-${PV/_/-}"
+fi
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+elif [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+	SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
+fi
+
+# merged with 0ad-data
+# addresses comment #3
+# bug #771147
+LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+# remove dependency on nvtt
+# as we use the bundled one
+# bug #768930
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libfmt:0=
+	dev-libs/libsodium
+	dev-libs/libxml2
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( >=net-libs/gloox-1.0.20 )"
+
+# add block on 0ad-data, as it is no longer needed.
+# addresses comment #3
+# bug #771147
+RDEPEND="${DEPEND}
+	!games-strategy/0ad-data"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
+)
+
+pkg_setup() {
+	use editor && setup-wxwidgets
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
+
+	# merged from 0ad-data
+	# addresses comment #3
+	# bug #771147
+	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
+}
+
+src_configure() {
+	local myconf=(
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+	)
+
+	tc-export CC CXX
+
+	# stock premake5 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake5 || die
+	"${S}"/build/premake/premake5/bin/release/premake5 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
+	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake5/bin/release/premake5 \
+		--file="premake5.lua" \
+		--outpath="../workspaces/gcc/" \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake2 || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build 3rd party fcollada
+	einfo "Building bundled fcollada"
+	emake -C libraries/source/fcollada/src
+
+	# build bundled nvtt
+	# nvtt is abandoned upstream and 0ad have forked it
+	# and added fixes. Use their copy.
+	# bug #768930
+	if use nvtt ; then
+		cd libraries/source/nvtt || die
+		elog "Building bundled nvtt (bug #768930)"
+		./build.sh JOBS="-j3" || die "Failed to build bundled nvtt"
+		cd "${S}" || die
+	fi
+
+	# build bundled spidermonkey
+	# We genuinely can't use the system SpiderMonkey right now.
+	# Breakages occur even on minor bumps in upstream SM,
+	# e.g. bug #768840.
+	cd libraries/source/spidermonkey || die
+	elog "Building bundled SpiderMonkey (bug #768840)"
+	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j3" || die "Failed to build bundled SpiderMonkey"
+	cd "${S}" || die
+
+	# build 0ad
+	elog "Building 0ad"
+	emake -C build/workspaces/gcc verbose=1 JOBS="-j3"
+
+	# merged from 0ad-data
+	# addresses comment #3
+	# bug #771147
+	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
+		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
+		addpredict /proc/self/task
+
+		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
+		local archivebuild_input archivebuild_output mod_name
+		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
+			mod_name="${archivebuild_input##*/}"
+			archivebuild_output="archives/${mod_name}"
+
+			mkdir -p "${archivebuild_output}"
+
+			einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
+			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" || die
+
+			if [[ -f "${archivebuild_input}/mod.json" ]]; then
+				cp "${archivebuild_input}/mod.json" "${archivebuild_output}"
+			fi
+
+			rm -r "${archivebuild_input}" || die
+			mv "${archivebuild_output}" "${archivebuild_input}" || die
+		done
+
+		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
+		rm binaries/data/config/dev.cfg || die
+		rm -r binaries/data/mods/_test.* || die
+	fi
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	# merged with 0ad-data
+	# addresses comment #3
+	# bug #771147
+	insinto /usr/share/${PN}
+	doins -r binaries/data/{l10n,config,mods,tools}
+
+	# merged with 0ad-data
+	# addresses comment #3
+	# bug #771147
+	# install bundled SpiderMonkey and nvtt
+	# fixes comment #1
+	# bug #771147
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/{libCollada,libmozjs78-ps-release,libnvtt,libnvcore,libnvimage,libnvmath}.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     be214f59a2387da65ae4665cbe1639a9c3e6bb42
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 22:32:40 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be214f59

games-strategy/0ad: use multiprocessing.eclass

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 1a15d95383c..cde93c077b3 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit desktop toolchain-funcs wxwidgets xdg
+inherit desktop toolchain-funcs multiprocessing wxwidgets xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -145,7 +145,7 @@ src_compile() {
 	if use nvtt ; then
 		cd libraries/source/nvtt || die
 		elog "Building bundled nvtt (bug #768930)"
-		./build.sh JOBS="-j3" || die "Failed to build bundled nvtt"
+		./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build bundled nvtt"
 		cd "${S}" || die
 	fi
 
@@ -155,12 +155,12 @@ src_compile() {
 	# e.g. bug #768840.
 	cd libraries/source/spidermonkey || die
 	elog "Building bundled SpiderMonkey (bug #768840)"
-	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j3" || die "Failed to build bundled SpiderMonkey"
+	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j(makeopts_jobs)" || die "Failed to build bundled SpiderMonkey"
 	cd "${S}" || die
 
 	# build 0ad
 	elog "Building 0ad"
-	emake -C build/workspaces/gcc verbose=1 JOBS="-j3"
+	emake -C build/workspaces/gcc verbose=1 JOBS="-j$(makeopts_jobs)"
 
 	# Merged from 0ad-data
 	# bug #771147 (comment 3)

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     343b3abeab63a4c2f02bffe46d251a5ffcffe1ab
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 22:37:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343b3abe

games-strategy/0ad: minor style

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index d3e3cac5127..2c02a47343b 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -128,7 +128,8 @@ src_configure() {
 		--outpath="../workspaces/gcc/" \
 		--os=linux \
 		"${myconf[@]}" \
-		gmake2 || die "Premake failed"
+		gmake2 \
+	|| die "Premake failed"
 }
 
 src_compile() {
@@ -200,7 +201,7 @@ src_compile() {
 
 src_test() {
 	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
+	./test -libdir "${S}/binaries/system" || die "Failed tests"
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     7d9069c315688f51766ccd232f8a79a216d44cc5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 22:34:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9069c3

games-strategy/0ad: update formatting for asset generation

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index cde93c077b3..d3e3cac5127 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -164,6 +164,8 @@ src_compile() {
 
 	# Merged from 0ad-data
 	# bug #771147 (comment 3)
+	# We're building the assets from source if we're not using a release
+	# Warning: fragile
 	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
 		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
 		addpredict /proc/self/task
@@ -174,13 +176,16 @@ src_compile() {
 			mod_name="${archivebuild_input##*/}"
 			archivebuild_output="archives/${mod_name}"
 
-			mkdir -p "${archivebuild_output}"
+			mkdir -p "${archivebuild_output}" || die
 
 			einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
-			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" || die
+			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \
+				-archivebuild="${archivebuild_input}" \
+				-archivebuild-output="${archivebuild_output}/${mod_name}.zip" \
+			|| die "Failed to build assets"
 
 			if [[ -f "${archivebuild_input}/mod.json" ]]; then
-				cp "${archivebuild_input}/mod.json" "${archivebuild_output}"
+				cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die
 			fi
 
 			rm -r "${archivebuild_input}" || die

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     d0cdd28cee7b12f4fe2e10949af2abb94f3533c5
Author:     Wolf-Dieter Rieck <wesen42 <AT> web <DOT> de>
AuthorDate: Mon Feb 22 21:19:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0cdd28c

games-strategy/0ad: fix build and merge 0ad-data package

* Build was broken in former revision,
  as generated libs weren't in LD_LIBRARY_PATH.
  Also libs weren't correcly installed.

* 0ad-data pulled same archive as 0a package.
  Merged both ebuilds into this revision blocking the 0ad-data package.

Bug: https://bugs.gentoo.org/768930
Closes: https://bugs.gentoo.org/771147
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Wolf-Dieter Rieck <wesen42 <AT> web.de>
Closes: https://github.com/gentoo/gentoo/pull/19603
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../0ad-0.0.24_alpha_pre20210116040036-r2.ebuild   | 224 +++++++++++++++++++++
 1 file changed, 224 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
new file mode 100644
index 00000000000..7826f504366
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
@@ -0,0 +1,224 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit desktop toolchain-funcs wxwidgets xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/0ad/0ad"
+	ZEROAD_GIT_REVISION=""
+elif [[ ${PV} == *_pre* ]]; then
+	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+else
+	MY_P="0ad-${PV/_/-}"
+fi
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+elif [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+fi
+
+# merged with 0ad-data
+# addresses comment #3
+# bug #771147
+LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+# remove dependency on nvtt
+# as we use the bundled one
+# bug #768930
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libfmt:0=
+	dev-libs/libsodium
+	dev-libs/libxml2
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( >=net-libs/gloox-1.0.20 )"
+
+# add block on 0ad-data, as it is no longer needed.
+# addresses comment #3
+# bug #771147
+RDEPEND="${DEPEND}
+	!games-strategy/0ad-data"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
+)
+
+pkg_setup() {
+	use editor && setup-wxwidgets
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
+
+	# merged from 0ad-data
+	# addresses comment #3
+	# bug #771147
+	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
+}
+
+src_configure() {
+	local myconf=(
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+	)
+
+	tc-export CC CXX
+
+	# stock premake5 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake5 || die
+	"${S}"/build/premake/premake5/bin/release/premake5 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
+	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake5/bin/release/premake5 \
+		--file="premake5.lua" \
+		--outpath="../workspaces/gcc/" \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake2 || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build 3rd party fcollada
+	einfo "Building bundled fcollada"
+	emake -C libraries/source/fcollada/src
+
+	# build bundled nvtt
+	# nvtt is abandoned upstream and 0ad have forked it
+	# and added fixes. Use their copy.
+	# bug #768930
+	if use nvtt ; then
+		cd libraries/source/nvtt || die
+		elog "Building bundled nvtt (bug #768930)"
+		./build.sh || die "Failed to build bundled nvtt"
+		cd "${S}" || die
+	fi
+
+	# build bundled spidermonkey
+	# We genuinely can't use the system SpiderMonkey right now.
+	# Breakages occur even on minor bumps in upstream SM,
+	# e.g. bug #768840.
+	cd libraries/source/spidermonkey || die
+	elog "Building bundled SpiderMonkey (bug #768840)"
+	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh || die "Failed to build bundled SpiderMonkey"
+	cd "${S}" || die
+
+	# build 0ad
+	elog "Building 0ad"
+	emake -C build/workspaces/gcc verbose=1
+
+	# merged from 0ad-data
+	# addresses comment #3
+	# bug #771147
+	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
+		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
+		addpredict /proc/self/task
+
+		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
+		local archivebuild_input archivebuild_output mod_name
+		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
+			mod_name="${archivebuild_input##*/}"
+			archivebuild_output="archives/${mod_name}"
+
+			mkdir -p "${archivebuild_output}"
+
+			einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
+			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" || die
+
+			if [[ -f "${archivebuild_input}/mod.json" ]]; then
+				cp "${archivebuild_input}/mod.json" "${archivebuild_output}"
+			fi
+
+			rm -r "${archivebuild_input}" || die
+			mv "${archivebuild_output}" "${archivebuild_input}" || die
+		done
+
+		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
+		rm binaries/data/config/dev.cfg || die
+		rm -r binaries/data/mods/_test.* || die
+	fi
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	# merged with 0ad-data
+	# addresses comment #3
+	# bug #771147
+	insinto /usr/share/${PN}
+	doins -r binaries/data/{l10n,config,mods,tools}
+
+	# merged with 0ad-data
+	# addresses comment #3
+	# bug #771147
+	# install bundled SpiderMonkey and nvtt
+	# fixes comment #1
+	# bug #771147
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/{libCollada,libmozjs78-ps-release,libnvtt,libnvcore,libnvimage,libnvmath}.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     645c826c87964db5a24b3fa5dd724d7e3224cbc3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 22:31:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645c826c

games-strategy/0ad: update comments in ebuild

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 436db366fb5..1a15d95383c 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -41,8 +41,7 @@ RESTRICT="test"
 BDEPEND="virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
-# remove dependency on nvtt
-# as we use the bundled one
+# Removed dependency on nvtt as we use the bundled one
 # bug #768930
 DEPEND="
 	dev-libs/boost:=
@@ -163,9 +162,8 @@ src_compile() {
 	elog "Building 0ad"
 	emake -C build/workspaces/gcc verbose=1 JOBS="-j3"
 
-	# merged from 0ad-data
-	# addresses comment #3
-	# bug #771147
+	# Merged from 0ad-data
+	# bug #771147 (comment 3)
 	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
 		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
 		addpredict /proc/self/task
@@ -204,18 +202,13 @@ src_install() {
 	newbin binaries/system/pyrogenesis 0ad
 	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
 
-	# merged with 0ad-data
-	# addresses comment #3
-	# bug #771147
+	# Merged from 0ad-data
+	# bug #771147 (comment 3)
 	insinto /usr/share/${PN}
 	doins -r binaries/data/{l10n,config,mods,tools}
 
-	# merged with 0ad-data
-	# addresses comment #3
-	# bug #771147
-	# install bundled SpiderMonkey and nvtt
-	# fixes comment #1
-	# bug #771147
+	# Install bundled SpiderMonkey and nvtt
+	# bug #771147 (comment 1)
 	exeinto /usr/$(get_libdir)/${PN}
 	doexe binaries/system/{libCollada,libmozjs78-ps-release,libnvtt,libnvcore,libnvimage,libnvmath}.so
 	use editor && doexe binaries/system/libAtlasUI.so

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     0db072a63b8b3ad4297a2fd7ff5a44b2736ec00e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 22:41:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0db072a6

games-strategy/0ad: further formatting/style changes

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 76 +++++++++++++----------------
 1 file changed, 33 insertions(+), 43 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 2c02a47343b..49ac259e569 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -21,26 +21,26 @@ fi
 DESCRIPTION="A free, real-time strategy game"
 HOMEPAGE="https://play0ad.com/"
 if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
+	S="${WORKDIR}/${P}"
 elif [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
 else
 	SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
 	SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
+	S="${WORKDIR}/${MY_P}"
 fi
 
-# merged with 0ad-data
-# addresses comment #3
-# bug #771147
 LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="editor +lobby nvtt pch test"
 RESTRICT="test"
 
-BDEPEND="virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-lang/perl )
+"
 # Removed dependency on nvtt as we use the bundled one
 # bug #768930
 DEPEND="
@@ -60,21 +60,12 @@ DEPEND="
 	virtual/opengl
 	x11-libs/libX11
 	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( >=net-libs/gloox-1.0.20 )"
-
-# add block on 0ad-data, as it is no longer needed.
-# addresses comment #3
-# bug #771147
-RDEPEND="${DEPEND}
-	!games-strategy/0ad-data"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
-	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
+	lobby? ( >=net-libs/gloox-1.0.20 )
+"
+RDEPEND="
+	${DEPEND}
+	!games-strategy/0ad-data
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
@@ -87,11 +78,11 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# SpiderMonkey's configure no longer recognises --build for
+	# the build tuple
 	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
 
-	# merged from 0ad-data
-	# addresses comment #3
-	# bug #771147
+	# Originally from 0ad-data
 	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
 }
 
@@ -110,18 +101,18 @@ src_configure() {
 
 	tc-export CC CXX
 
-	# stock premake5 does not work, use the shipped one
+	# Stock premake5 does not work, use the shipped one
 	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
 
-	# regenerate scripts.c so our patch applies
+	# Regenerate scripts.c so our patch applies
 	cd "${S}"/build/premake/premake5 || die
 	"${S}"/build/premake/premake5/bin/release/premake5 embed || die
 
-	# rebuild premake again... this is the most stupid build system
+	# Rebuild premake again
 	emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
 	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
 
-	# run premake to create build scripts
+	# Run premake to create build scripts
 	cd "${S}"/build/premake || die
 	"${S}"/build/premake/premake5/bin/release/premake5 \
 		--file="premake5.lua" \
@@ -135,23 +126,22 @@ src_configure() {
 src_compile() {
 	tc-export AR
 
-	# build 3rd party fcollada
+	# Build 3rd party fcollada
 	einfo "Building bundled fcollada"
 	emake -C libraries/source/fcollada/src
 
-	# build bundled nvtt
-	# nvtt is abandoned upstream and 0ad have forked it
-	# and added fixes. Use their copy.
-	# bug #768930
+	# Build bundled NVTT
+	# nvtt is abandoned upstream and 0ad have forked it and added fixes.
+	# Use their copy. bug #768930
 	if use nvtt ; then
 		cd libraries/source/nvtt || die
-		elog "Building bundled nvtt (bug #768930)"
-		./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build bundled nvtt"
+		elog "Building bundled NVTT (bug #768930)"
+		./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build bundled NVTT"
 		cd "${S}" || die
 	fi
 
-	# build bundled spidermonkey
-	# We genuinely can't use the system SpiderMonkey right now.
+	# Build bundled SpiderMonkey
+	# We really can't use the system SpiderMonkey right now.
 	# Breakages occur even on minor bumps in upstream SM,
 	# e.g. bug #768840.
 	cd libraries/source/spidermonkey || die
@@ -159,14 +149,14 @@ src_compile() {
 	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j(makeopts_jobs)" || die "Failed to build bundled SpiderMonkey"
 	cd "${S}" || die
 
-	# build 0ad
+	# Build 0ad itself!
 	elog "Building 0ad"
 	emake -C build/workspaces/gcc verbose=1 JOBS="-j$(makeopts_jobs)"
 
-	# Merged from 0ad-data
-	# bug #771147 (comment 3)
-	# We're building the assets from source if we're not using a release
-	# Warning: fragile
+	# Build assets
+	# (We only do this if we're using a snapshot/non-release)
+	# See bug #771147 (comment 3) and the old 0ad-data ebuild
+	# Warning: fragile!
 	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
 		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
 		addpredict /proc/self/task

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     cb2a1da8c6bcacada604ebd45f0825ccd3c8edb3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 23:03:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:04:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2a1da8

games-strategy/0ad: add note re bundled premake

Bug: https://bugs.gentoo.org/773472
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 49ac259e569..b2d76e0fe1a 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -37,6 +37,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="editor +lobby nvtt pch test"
 RESTRICT="test"
 
+# TODO: Unbundle premake5
+# See bug #773472 which may help (bump for it)
 BDEPEND="
 	virtual/pkgconfig
 	test? ( dev-lang/perl )

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     e19e4df6bab349d7f34e622e02b10792f6186ea8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 23:17:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:17:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19e4df6

games-strategy/0ad: add github remote-id

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml
index 11542ae7c10..f28214cdf98 100644
--- a/games-strategy/0ad/metadata.xml
+++ b/games-strategy/0ad/metadata.xml
@@ -14,6 +14,7 @@
 			(might be needed for some mods)</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">0ad/0ad</remote-id>
 		<remote-id type="sourceforge">zero-ad</remote-id>
 	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     593c56113d6bb977f31c2f11ff35e0f69f68b619
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 23:20:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:20:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=593c5611

games-strategy/0ad: extra cleanup

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index b2d76e0fe1a..fd767ad8126 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -11,7 +11,6 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/0ad/0ad"
-	ZEROAD_GIT_REVISION=""
 elif [[ ${PV} == *_pre* ]]; then
 	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
 else
@@ -20,6 +19,7 @@ fi
 
 DESCRIPTION="A free, real-time strategy game"
 HOMEPAGE="https://play0ad.com/"
+
 if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}"
 elif [[ ${PV} == *_pre* ]]; then
@@ -104,6 +104,7 @@ src_configure() {
 	tc-export CC CXX
 
 	# Stock premake5 does not work, use the shipped one
+	# TODO: revisit this, see above BDEPEND note re premake5
 	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
 
 	# Regenerate scripts.c so our patch applies

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     bb706c5383db445f085b3ac628790a319ed9d309
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  1 10:16:17 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 10:16:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb706c53

games-strategy/0ad: fix USE=-nvtt installation

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index fd767ad8126..06ee07597d7 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -209,7 +209,9 @@ src_install() {
 	# Install bundled SpiderMonkey and nvtt
 	# bug #771147 (comment 1)
 	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/{libCollada,libmozjs78-ps-release,libnvtt,libnvcore,libnvimage,libnvmath}.so
+	doexe binaries/system/{libCollada,libmozjs78-ps-release}
+
+	use nvtt && doexe /binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
 	use editor && doexe binaries/system/libAtlasUI.so
 
 	dodoc binaries/system/readme.txt

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     ee5d207c95d3d2eea86f61478e7f4a277e38e63b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  1 10:20:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 10:20:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee5d207c

games-strategy/0ad: add virtual/rust BDEPEND for SpiderMonkey

Needed for bundled SpiderMonkey

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 06ee07597d7..3aa595b69b9 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -37,10 +37,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="editor +lobby nvtt pch test"
 RESTRICT="test"
 
+# virtual/rust is for bundled SpiderMonkey
 # TODO: Unbundle premake5
 # See bug #773472 which may help (bump for it)
 BDEPEND="
 	virtual/pkgconfig
+	virtual/rust
 	test? ( dev-lang/perl )
 "
 # Removed dependency on nvtt as we use the bundled one

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     691c94e28f9a4f528294c001162b419e016955f6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  1 10:21:46 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 10:56:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691c94e2

games-strategy/0ad: add python-any-r1 for SpiderMonkey

Needed at buildtime for SpiderMonkey.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 3aa595b69b9..a36405f4744 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-
-inherit desktop toolchain-funcs multiprocessing wxwidgets xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -38,9 +38,11 @@ IUSE="editor +lobby nvtt pch test"
 RESTRICT="test"
 
 # virtual/rust is for bundled SpiderMonkey
+# Build-time Python dependency is for SM too
 # TODO: Unbundle premake5
 # See bug #773472 which may help (bump for it)
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	virtual/rust
 	test? ( dev-lang/perl )

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     1a0d70cdd420a40dcbfa1d35485c76ead61ef151
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  1 13:44:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 13:44:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0d70cd

games-strategy/0ad: fix doexe typos

Fixes: bb706c5383db445f085b3ac628790a319ed9d309
Bug: https://bugs.gentoo.org/773574
Closes: https://bugs.gentoo.org/773565
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index e7596872128..5346f24636e 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -213,9 +213,9 @@ src_install() {
 	# Install bundled SpiderMonkey and nvtt
 	# bug #771147 (comment 1)
 	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/{libCollada,libmozjs78-ps-release}
+	doexe binaries/system/{libCollada,libmozjs78-ps-release}.so
 
-	use nvtt && doexe /binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
+	use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
 	use editor && doexe binaries/system/libAtlasUI.so
 
 	dodoc binaries/system/readme.txt

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     0ad51cffc272f53e4a4fef804c218eaae395cfa6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  1 19:06:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 19:06:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad51cff

games-strategy/0ad: fix makeopts_jobs typo

This is at least one issue...

Bug: https://bugs.gentoo.org/773622
Thanks-to: Emily Rowlands <emily.rowlands+gentoo <AT> mailbox.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 5346f24636e..803df28d90d 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -153,7 +153,7 @@ src_compile() {
 	# e.g. bug #768840.
 	cd libraries/source/spidermonkey || die
 	elog "Building bundled SpiderMonkey (bug #768840)"
-	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j(makeopts_jobs)" || die "Failed to build bundled SpiderMonkey"
+	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build bundled SpiderMonkey"
 	cd "${S}" || die
 
 	# Build 0ad itself!

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     8f24ae86e614567ae2ffcd316a2115da31d72214
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  1 19:44:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 19:44:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f24ae86

games-strategy/0ad: pass JOBS as env var

Closes: https://bugs.gentoo.org/773622
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 803df28d90d..a0468ee4b3e 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -143,7 +143,7 @@ src_compile() {
 	if use nvtt ; then
 		cd libraries/source/nvtt || die
 		elog "Building bundled NVTT (bug #768930)"
-		./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build bundled NVTT"
+		JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT"
 		cd "${S}" || die
 	fi
 
@@ -153,12 +153,16 @@ src_compile() {
 	# e.g. bug #768840.
 	cd libraries/source/spidermonkey || die
 	elog "Building bundled SpiderMonkey (bug #768840)"
-	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build bundled SpiderMonkey"
+	XARGS="${EPREFIX}/usr/bin/xargs" \
+		JOBS="-j$(makeopts_jobs)" \
+		./build.sh \
+	|| die "Failed to build bundled SpiderMonkey"
+
 	cd "${S}" || die
 
 	# Build 0ad itself!
 	elog "Building 0ad"
-	emake -C build/workspaces/gcc verbose=1 JOBS="-j$(makeopts_jobs)"
+	JOBS="-j$(makeopts_jobs)" emake -C build/workspaces/gcc verbose=1
 
 	# Build assets
 	# (We only do this if we're using a snapshot/non-release)

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     123947d043f4ebfcd98f0c87299067e92713e8f0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  4 05:03:46 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  4 05:03:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123947d0

games-strategy/0ad: Keyword 0.0.24b_alpha arm64, #773634

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index a0468ee4b3e..e8ce2ce4f62 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -33,7 +33,7 @@ fi
 
 LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="editor +lobby nvtt pch test"
 RESTRICT="test"
 

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     2ecc31a55cdc78c8ce60f4baed69b7229cbf77e4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 19:26:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 19:26:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ecc31a5

games-strategy/0ad: add virtual/rust dep to older version

Closes: https://bugs.gentoo.org/792681
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
index 7826f504366..849ecb4aaef 100644
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit desktop toolchain-funcs wxwidgets xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs python-any-r1 wxwidgets xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -36,9 +37,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="editor +lobby nvtt pch test"
 RESTRICT="test"
 
-BDEPEND="virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
+# virtual/rust is for bundled SpiderMonkey
+# Build-time Python dependency is for SM too
+# TODO: Unbundle premake5
+# See bug #773472 which may help (bump for it)
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	virtual/rust
+	test? ( dev-lang/perl )
+"
 # remove dependency on nvtt
 # as we use the bundled one
 # bug #768930

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     3b9c5b501e5eba7b2de982c676891504b8aeddcd
Author:     Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Thu Jun 17 20:11:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 23:23:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9c5b50

games-strategy/0ad: Remove the broken version

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/21292
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 228 ----------------------------
 1 file changed, 228 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
deleted file mode 100644
index e8ce2ce4f62..00000000000
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/0ad/0ad"
-elif [[ ${PV} == *_pre* ]]; then
-	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-else
-	MY_P="0ad-${PV/_/-}"
-fi
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
-	SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
-	SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-# virtual/rust is for bundled SpiderMonkey
-# Build-time Python dependency is for SM too
-# TODO: Unbundle premake5
-# See bug #773472 which may help (bump for it)
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	virtual/rust
-	test? ( dev-lang/perl )
-"
-# Removed dependency on nvtt as we use the bundled one
-# bug #768930
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libfmt:0=
-	dev-libs/libsodium
-	dev-libs/libxml2
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( >=net-libs/gloox-1.0.20 )
-"
-RDEPEND="
-	${DEPEND}
-	!games-strategy/0ad-data
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch
-	"${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch
-	"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
-)
-
-pkg_setup() {
-	use editor && setup-wxwidgets
-}
-
-src_prepare() {
-	default
-
-	# SpiderMonkey's configure no longer recognises --build for
-	# the build tuple
-	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
-
-	# Originally from 0ad-data
-	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_configure() {
-	local myconf=(
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-	)
-
-	tc-export AR CC CXX RANLIB
-
-	# Stock premake5 does not work, use the shipped one
-	# TODO: revisit this, see above BDEPEND note re premake5
-	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
-	# Regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake5 || die
-	"${S}"/build/premake/premake5/bin/release/premake5 embed || die
-
-	# Rebuild premake again
-	emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
-	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
-	# Run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake5/bin/release/premake5 \
-		--file="premake5.lua" \
-		--outpath="../workspaces/gcc/" \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake2 \
-	|| die "Premake failed"
-}
-
-src_compile() {
-	# Build 3rd party fcollada
-	einfo "Building bundled fcollada"
-	emake -C libraries/source/fcollada/src
-
-	# Build bundled NVTT
-	# nvtt is abandoned upstream and 0ad have forked it and added fixes.
-	# Use their copy. bug #768930
-	if use nvtt ; then
-		cd libraries/source/nvtt || die
-		elog "Building bundled NVTT (bug #768930)"
-		JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT"
-		cd "${S}" || die
-	fi
-
-	# Build bundled SpiderMonkey
-	# We really can't use the system SpiderMonkey right now.
-	# Breakages occur even on minor bumps in upstream SM,
-	# e.g. bug #768840.
-	cd libraries/source/spidermonkey || die
-	elog "Building bundled SpiderMonkey (bug #768840)"
-	XARGS="${EPREFIX}/usr/bin/xargs" \
-		JOBS="-j$(makeopts_jobs)" \
-		./build.sh \
-	|| die "Failed to build bundled SpiderMonkey"
-
-	cd "${S}" || die
-
-	# Build 0ad itself!
-	elog "Building 0ad"
-	JOBS="-j$(makeopts_jobs)" emake -C build/workspaces/gcc verbose=1
-
-	# Build assets
-	# (We only do this if we're using a snapshot/non-release)
-	# See bug #771147 (comment 3) and the old 0ad-data ebuild
-	# Warning: fragile!
-	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
-		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
-		addpredict /proc/self/task
-
-		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
-		local archivebuild_input archivebuild_output mod_name
-		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
-			mod_name="${archivebuild_input##*/}"
-			archivebuild_output="archives/${mod_name}"
-
-			mkdir -p "${archivebuild_output}" || die
-
-			einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
-			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \
-				-archivebuild="${archivebuild_input}" \
-				-archivebuild-output="${archivebuild_output}/${mod_name}.zip" \
-			|| die "Failed to build assets"
-
-			if [[ -f "${archivebuild_input}/mod.json" ]]; then
-				cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die
-			fi
-
-			rm -r "${archivebuild_input}" || die
-			mv "${archivebuild_output}" "${archivebuild_input}" || die
-		done
-
-		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
-		rm binaries/data/config/dev.cfg || die
-		rm -r binaries/data/mods/_test.* || die
-	fi
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "Failed tests"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	# Merged from 0ad-data
-	# bug #771147 (comment 3)
-	insinto /usr/share/${PN}
-	doins -r binaries/data/{l10n,config,mods,tools}
-
-	# Install bundled SpiderMonkey and nvtt
-	# bug #771147 (comment 1)
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/{libCollada,libmozjs78-ps-release}.so
-
-	use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     57cc262249976487a77241a6641f6c9437072b69
Author:     Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Thu Aug 12 07:25:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 20:56:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57cc2622

games-strategy/0ad: Bump to 0.0.25_alpha, unbundle premake

This bump unbundles premake and uses now dev-util/premake:5::gentoo.
Drop the ~arm64 keyword until premake get's ~arm64 keywords.

Upstream spidermonkey keeps changing critical stuff on minor releases, so
this bump keeps the the bundled version.

On the fly we can do some house-keeping inside the ebuild:
- add size checks as the package size got huge by the 0ad-data merge
- merge conditional blocks depending on the version into one block
  for better maintainability
- sort LICENSE alphabetically

Closes: https://bugs.gentoo.org/807337
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.25_alpha.ebuild | 221 +++++++++++++++++++++++++++++
 games-strategy/0ad/Manifest                |   2 +
 2 files changed, 223 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.25_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
new file mode 100644
index 00000000000..c4b1cf74eb7
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
@@ -0,0 +1,221 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/0ad/0ad"
+	S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+	MY_P="0ad-${PV/_/-}"
+	SRC_URI="
+		http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
+		https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
+	"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+CHECKREQS_DISK_BUILD="9000M" # 8779624 KiB (8.3 GiB)
+CHECKREQS_DISK_USR="3500M" # 3545840 KiB (3.3 GiB)
+# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
+# build and/or startup issues.
+QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
+
+# virtual/rust is for bundled SpiderMonkey
+# Build-time Python dependency is for SM, too.
+# TODO: Unbundle premake5
+# See bug #773472 which may help (bump for it)
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/premake-5.0.0_alpha12:5
+	virtual/pkgconfig
+	virtual/rust
+	test? ( dev-lang/perl )
+"
+# Removed dependency on nvtt as we use the bundled one
+# bug #768930
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libfmt:0=
+	dev-libs/libsodium
+	dev-libs/libxml2
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( net-libs/gloox )
+"
+RDEPEND="
+	${DEPEND}
+	!games-strategy/0ad-data
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
+)
+
+pkg_setup() {
+	use editor && setup-wxwidgets
+}
+
+src_prepare() {
+	default
+
+	# SpiderMonkey's configure no longer recognises --build for
+	# the build tuple
+	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
+
+	# Originally from 0ad-data
+	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
+}
+
+src_configure() {
+	# 0AD uses premake:5 to generate the Makefiles, so let's
+	# 1. configure the configure args,
+	# 2. export some toolchain args,
+	# 3. configure premake args,
+	# 4. run premake5.
+	local myconf=(
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+	)
+
+	tc-export AR CC CXX RANLIB
+
+	local mypremakeargs=(
+		--outpath="../workspace/gcc"
+		--os=linux
+		--verbose
+	)
+
+	cd "${S}/build/premake" || die "Could not enter premake directory"
+
+	/usr/bin/premake5 "${mypremakeargs[@]}" "${myconf[@]}" gmake2 \
+		|| die "Premake failed"
+}
+
+src_compile() {
+	# Build 3rd party fcollada
+	einfo "Building bundled fcollada"
+	emake -C libraries/source/fcollada/src
+
+	# Build bundled NVTT
+	# nvtt is abandoned upstream and 0ad has forked it and added fixes.
+	# Use their copy. bug #768930
+	if use nvtt ; then
+		cd libraries/source/nvtt || die
+		elog "Building bundled NVTT (bug #768930)"
+		JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT"
+		cd "${S}" || die
+	fi
+
+	# Build bundled SpiderMonkey
+	# We really can't use the system SpiderMonkey right now.
+	# Breakages occur even on minor bumps in upstream SM,
+	# e.g. bug #768840.
+	cd libraries/source/spidermonkey || die
+	elog "Building bundled SpiderMonkey (bug #768840)"
+	XARGS="${EPREFIX}/usr/bin/xargs" \
+		JOBS="-j$(makeopts_jobs)" \
+		./build.sh \
+	|| die "Failed to build bundled SpiderMonkey"
+
+	cd "${S}" || die
+
+	# Build 0ad itself!
+	elog "Building 0ad"
+	JOBS="-j$(makeopts_jobs)" emake -C build/workspace/gcc verbose=1
+
+	# Build assets
+	# (We only do this if we're using a snapshot/non-release)
+	# See bug #771147 (comment 3) and the old 0ad-data ebuild
+	# Warning: fragile!
+	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
+		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
+		addpredict /proc/self/task
+
+		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
+		local archivebuild_input archivebuild_output mod_name
+		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
+			mod_name="${archivebuild_input##*/}"
+			archivebuild_output="archives/${mod_name}"
+
+			mkdir -p "${archivebuild_output}" || die
+
+			einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
+			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \
+				-archivebuild="${archivebuild_input}" \
+				-archivebuild-output="${archivebuild_output}/${mod_name}.zip" \
+			|| die "Failed to build assets"
+
+			if [[ -f "${archivebuild_input}/mod.json" ]]; then
+				cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die
+			fi
+
+			rm -r "${archivebuild_input}" || die
+			mv "${archivebuild_output}" "${archivebuild_input}" || die
+		done
+
+		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
+		rm binaries/data/config/dev.cfg || die
+		rm -r binaries/data/mods/_test.* || die
+	fi
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "Failed tests"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	# Merged from 0ad-data
+	# bug #771147 (comment 3)
+	insinto /usr/share/${PN}
+	doins -r binaries/data/{l10n,config,mods,tools}
+
+	# Install bundled SpiderMonkey and nvtt
+	# bug #771147 (comment 1)
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/{libCollada,libmozjs78-ps-release}.so
+
+	use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}

diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 5d2ea27d724..42d9a470983 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,3 +1,5 @@
 DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510
 DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea
 DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726
+DIST 0ad-0.0.25-alpha-unix-build.tar.xz 75788348 BLAKE2B 49b8b99a8f2fd33d4a3c2c0320375cb372d23b2f2c0f4ba56438bc8d868891c8c8c624049e3165ec84f8b98bcb1e1195b672aa7ee258ff88317af9d4da883576 SHA512 a8edae7d2dd61972b947152edda8d9ca8bafd3d435623a94de2d1297ecad3bfc73d3b30eaff98e89a6bcb0291b49f1e25bae1300fde37c8989156c895cd12730
+DIST 0ad-0.0.25-alpha-unix-data.tar.xz 1272283892 BLAKE2B 7bc08e52b44129fce6a78914d36bcb0c8bb3312645982054274e230a23edc34f9aa899d7ca8f52f3044b8c7efd0aea4b5d16fcd9d6e20e274538007885cfa1c2 SHA512 92fad341ceb1156a3facea291856ca2f719691bba1cf085de0544f3ae9300f46391efdd1c88bcf1aafd9a9c938b6bef3babbd50c850dc17fb0c9609dbabe37ad

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     688ecac307728b83030e2d49f80cae7fefe62f52
Author:     Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Thu Aug 12 07:25:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 20:56:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688ecac3

games-strategy/0ad: Remove the old pre-alpha-24(!) version

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/21931
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../0ad-0.0.24_alpha_pre20210116040036-r2.ebuild   | 232 ---------------------
 games-strategy/0ad/Manifest                        |   1 -
 2 files changed, 233 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
deleted file mode 100644
index 849ecb4aaef..00000000000
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs python-any-r1 wxwidgets xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/0ad/0ad"
-	ZEROAD_GIT_REVISION=""
-elif [[ ${PV} == *_pre* ]]; then
-	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-else
-	MY_P="0ad-${PV/_/-}"
-fi
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-elif [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
-fi
-
-# merged with 0ad-data
-# addresses comment #3
-# bug #771147
-LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-# virtual/rust is for bundled SpiderMonkey
-# Build-time Python dependency is for SM too
-# TODO: Unbundle premake5
-# See bug #773472 which may help (bump for it)
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	virtual/rust
-	test? ( dev-lang/perl )
-"
-# remove dependency on nvtt
-# as we use the bundled one
-# bug #768930
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libfmt:0=
-	dev-libs/libsodium
-	dev-libs/libxml2
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( >=net-libs/gloox-1.0.20 )"
-
-# add block on 0ad-data, as it is no longer needed.
-# addresses comment #3
-# bug #771147
-RDEPEND="${DEPEND}
-	!games-strategy/0ad-data"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
-	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
-	S="${WORKDIR}/${MY_P}"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
-)
-
-pkg_setup() {
-	use editor && setup-wxwidgets
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
-
-	# merged from 0ad-data
-	# addresses comment #3
-	# bug #771147
-	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_configure() {
-	local myconf=(
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-	)
-
-	tc-export CC CXX
-
-	# stock premake5 does not work, use the shipped one
-	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
-	# regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake5 || die
-	"${S}"/build/premake/premake5/bin/release/premake5 embed || die
-
-	# rebuild premake again... this is the most stupid build system
-	emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
-	emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
-	# run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake5/bin/release/premake5 \
-		--file="premake5.lua" \
-		--outpath="../workspaces/gcc/" \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake2 || die "Premake failed"
-}
-
-src_compile() {
-	tc-export AR
-
-	# build 3rd party fcollada
-	einfo "Building bundled fcollada"
-	emake -C libraries/source/fcollada/src
-
-	# build bundled nvtt
-	# nvtt is abandoned upstream and 0ad have forked it
-	# and added fixes. Use their copy.
-	# bug #768930
-	if use nvtt ; then
-		cd libraries/source/nvtt || die
-		elog "Building bundled nvtt (bug #768930)"
-		./build.sh || die "Failed to build bundled nvtt"
-		cd "${S}" || die
-	fi
-
-	# build bundled spidermonkey
-	# We genuinely can't use the system SpiderMonkey right now.
-	# Breakages occur even on minor bumps in upstream SM,
-	# e.g. bug #768840.
-	cd libraries/source/spidermonkey || die
-	elog "Building bundled SpiderMonkey (bug #768840)"
-	XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh || die "Failed to build bundled SpiderMonkey"
-	cd "${S}" || die
-
-	# build 0ad
-	elog "Building 0ad"
-	emake -C build/workspaces/gcc verbose=1
-
-	# merged from 0ad-data
-	# addresses comment #3
-	# bug #771147
-	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
-		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
-		addpredict /proc/self/task
-
-		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
-		local archivebuild_input archivebuild_output mod_name
-		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
-			mod_name="${archivebuild_input##*/}"
-			archivebuild_output="archives/${mod_name}"
-
-			mkdir -p "${archivebuild_output}"
-
-			einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
-			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip" || die
-
-			if [[ -f "${archivebuild_input}/mod.json" ]]; then
-				cp "${archivebuild_input}/mod.json" "${archivebuild_output}"
-			fi
-
-			rm -r "${archivebuild_input}" || die
-			mv "${archivebuild_output}" "${archivebuild_input}" || die
-		done
-
-		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
-		rm binaries/data/config/dev.cfg || die
-		rm -r binaries/data/mods/_test.* || die
-	fi
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	# merged with 0ad-data
-	# addresses comment #3
-	# bug #771147
-	insinto /usr/share/${PN}
-	doins -r binaries/data/{l10n,config,mods,tools}
-
-	# merged with 0ad-data
-	# addresses comment #3
-	# bug #771147
-	# install bundled SpiderMonkey and nvtt
-	# fixes comment #1
-	# bug #771147
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/{libCollada,libmozjs78-ps-release,libnvtt,libnvcore,libnvimage,libnvmath}.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-}

diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 42d9a470983..466a2877ccf 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,4 +1,3 @@
-DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510
 DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea
 DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726
 DIST 0ad-0.0.25-alpha-unix-build.tar.xz 75788348 BLAKE2B 49b8b99a8f2fd33d4a3c2c0320375cb372d23b2f2c0f4ba56438bc8d868891c8c8c624049e3165ec84f8b98bcb1e1195b672aa7ee258ff88317af9d4da883576 SHA512 a8edae7d2dd61972b947152edda8d9ca8bafd3d435623a94de2d1297ecad3bfc73d3b30eaff98e89a6bcb0291b49f1e25bae1300fde37c8989156c895cd12730

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     0b79a1e7483b8d7b5df57942265bba7ffc76e5ae
Author:     Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Fri Aug 27 11:25:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 28 03:01:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b79a1e7

games-strategy/0ad: Bump to alpha25b and EAPI=8

Upstream bumped 0ad with some fixes, quoting upstream:

- Ranked matches did not longer grant points in the lobby.
- Mod installation no longer require restart.
- Mod installation no longer prints errors when installing mods
  by double-clicking
- Mod installation now overwrites the existing mods to allow
  for easier updates.
- Fishes are now easier to spot on lowest settings with
  the addition of seagulls.

For their full announcement see:
https://play0ad.com/re-release-of-0-a-d-alpha-25-yauna/

This bump hops to EAPI=8 as all used eclasses support it now
and the bump drops an forgotten comment about the bundled premake5.

Additionally it adds distfile signature verification using
the verify-sig eclass calling app-crypt/minisign manually.

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.25b_alpha.ebuild | 259 ++++++++++++++++++++++++++++
 games-strategy/0ad/Manifest                 |   4 +
 2 files changed, 263 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
new file mode 100644
index 00000000000..e7258e9b6f8
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
@@ -0,0 +1,259 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs multiprocessing python-any-r1 verify-sig wxwidgets xdg
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
+# Upstream signs releases (and only them) with app-crypt/minisign.
+# The (public) key can be found on https://play0ad.com/download/source.
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/0ad/0ad"
+	S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+	inherit verify-sig
+	IUSE+="verify-sig"
+	MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT"
+	MY_P="0ad-${PV/_/-}"
+	SRC_URI="
+		http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
+		https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
+		verify-sig? (
+			http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz.minisig
+			http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz.minisig
+		)
+	"
+	S="${WORKDIR}/${MY_P}"
+fi
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+
+RESTRICT="test"
+CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25
+CHECKREQS_DISK_USR="3500M" # 3545972 KiB (3.3 GiB)
+
+# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
+# build and/or startup issues.
+QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
+
+# virtual/rust is for bundled SpiderMonkey.
+# Build-time Python dependency is for SM, too.
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/premake-5.0.0_alpha12:5
+	virtual/pkgconfig
+	virtual/rust
+	test? ( dev-lang/perl )
+"
+# Upstream uses minisign which is not supported by verify-sign, bug #783066.
+# Signatures are only provided for releases.
+if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then
+	BDEPEND+="app-crypt/minisign"
+fi
+
+# Removed dependency on nvtt as we use the bundled one.
+# bug #768930
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libfmt:0=
+	dev-libs/libsodium
+	dev-libs/libxml2
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( net-libs/gloox )
+"
+RDEPEND="
+	${DEPEND}
+	!games-strategy/0ad-data
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
+)
+
+pkg_setup() {
+	use editor && setup-wxwidgets
+}
+
+src_unpack() {
+	if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then
+		if use verify-sig; then
+			elog "Verifying both signatures using app-crypt/minisign."
+			minisign -V \
+				-P "${MINISIGN_KEY}" \
+				-x "${DISTDIR}/${MY_P}-unix-build.tar.xz.minisig" \
+				-m "${DISTDIR}/${MY_P}-unix-build.tar.xz" \
+				|| die "Failed to verify engine distfile using minisign!"
+			minisign -V \
+				-P "${MINISIGN_KEY}" \
+				-x "${DISTDIR}/${MY_P}-unix-data.tar.xz.minisig" \
+				-m "${DISTDIR}/${MY_P}-unix-data.tar.xz" \
+				|| die "Failed to verify data distfile using minisign!"
+		fi
+		# Unpack manually until an eclass supports minisign and unpacks
+		# if signatures match.
+		default
+	else
+		# Unpack distfiles without checking as this is no official release.
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# SpiderMonkey's configure no longer recognises --build for
+	# the build tuple
+	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
+
+	# Originally from 0ad-data
+	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
+}
+
+src_configure() {
+	# 0AD uses premake:5 to generate the Makefiles, so let's
+	# 1. configure the configure args,
+	# 2. export some toolchain args,
+	# 3. configure premake args,
+	# 4. run premake5.
+	local myconf=(
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+	)
+
+	tc-export AR CC CXX RANLIB
+
+	local mypremakeargs=(
+		--outpath="../workspace/gcc"
+		--os=linux
+		--verbose
+	)
+
+	cd "${S}/build/premake" || die "Could not enter premake directory"
+
+	/usr/bin/premake5 "${mypremakeargs[@]}" "${myconf[@]}" gmake2 \
+		|| die "Premake failed"
+}
+
+src_compile() {
+	# Build 3rd party fcollada
+	einfo "Building bundled fcollada"
+	emake -C libraries/source/fcollada/src
+
+	# Build bundled NVTT
+	# nvtt is abandoned upstream and 0ad has forked it and added fixes.
+	# Use their copy. bug #768930
+	if use nvtt ; then
+		cd libraries/source/nvtt || die
+		elog "Building bundled NVTT (bug #768930)"
+		JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT"
+		cd "${S}" || die
+	fi
+
+	# Build bundled SpiderMonkey
+	# We really can't use the system SpiderMonkey right now.
+	# Breakages occur even on minor bumps in upstream SM,
+	# e.g. bug #768840.
+	cd libraries/source/spidermonkey || die
+	elog "Building bundled SpiderMonkey (bug #768840)"
+	XARGS="${EPREFIX}/usr/bin/xargs" \
+		JOBS="-j$(makeopts_jobs)" \
+		./build.sh \
+	|| die "Failed to build bundled SpiderMonkey"
+
+	cd "${S}" || die
+
+	# Build 0ad itself!
+	elog "Building 0ad"
+	JOBS="-j$(makeopts_jobs)" emake -C build/workspace/gcc verbose=1
+
+	# Build assets
+	# (We only do this if we're using a snapshot/non-release)
+	# See bug #771147 (comment 3) and the old 0ad-data ebuild
+	# Warning: fragile!
+	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
+		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
+		addpredict /proc/self/task
+
+		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
+		local archivebuild_input archivebuild_output mod_name
+		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
+			mod_name="${archivebuild_input##*/}"
+			archivebuild_output="archives/${mod_name}"
+
+			mkdir -p "${archivebuild_output}" || die
+
+			einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
+			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \
+				-archivebuild="${archivebuild_input}" \
+				-archivebuild-output="${archivebuild_output}/${mod_name}.zip" \
+			|| die "Failed to build assets"
+
+			if [[ -f "${archivebuild_input}/mod.json" ]]; then
+				cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die
+			fi
+
+			rm -r "${archivebuild_input}" || die
+			mv "${archivebuild_output}" "${archivebuild_input}" || die
+		done
+
+		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
+		rm binaries/data/config/dev.cfg || die
+		rm -r binaries/data/mods/_test.* || die
+	fi
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "Failed tests"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	# Merged from 0ad-data
+	# bug #771147 (comment 3)
+	insinto /usr/share/${PN}
+	doins -r binaries/data/{l10n,config,mods,tools}
+
+	# Install bundled SpiderMonkey and nvtt
+	# bug #771147 (comment 1)
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/{libCollada,libmozjs78-ps-release}.so
+
+	use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}

diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 466a2877ccf..3adb1e76c5e 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -2,3 +2,7 @@ DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b58067058
 DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726
 DIST 0ad-0.0.25-alpha-unix-build.tar.xz 75788348 BLAKE2B 49b8b99a8f2fd33d4a3c2c0320375cb372d23b2f2c0f4ba56438bc8d868891c8c8c624049e3165ec84f8b98bcb1e1195b672aa7ee258ff88317af9d4da883576 SHA512 a8edae7d2dd61972b947152edda8d9ca8bafd3d435623a94de2d1297ecad3bfc73d3b30eaff98e89a6bcb0291b49f1e25bae1300fde37c8989156c895cd12730
 DIST 0ad-0.0.25-alpha-unix-data.tar.xz 1272283892 BLAKE2B 7bc08e52b44129fce6a78914d36bcb0c8bb3312645982054274e230a23edc34f9aa899d7ca8f52f3044b8c7efd0aea4b5d16fcd9d6e20e274538007885cfa1c2 SHA512 92fad341ceb1156a3facea291856ca2f719691bba1cf085de0544f3ae9300f46391efdd1c88bcf1aafd9a9c938b6bef3babbd50c850dc17fb0c9609dbabe37ad
+DIST 0ad-0.0.25b-alpha-unix-build.tar.xz 75579956 BLAKE2B 674d69d625137709a186f9273607dc353fc99aea68ef3f2ea5031dbe2f684176910d757c3f03c7fbdac475d30708be448b71f5020d27a65c346bf147223bcb9d SHA512 e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4
+DIST 0ad-0.0.25b-alpha-unix-build.tar.xz.minisig 327 BLAKE2B 547a7a1c8a83167fa40976efb2efaf691fc5434eb1be227b481a70d308381b20dcdc90bb4652e190f8e329fb33cc19ebbaab43977329f8971e49436f7f1ce636 SHA512 9d6a235ea50183e1db16f4bf2dc59af9042a52e4e18ccd0c34c481a7e9021f19e2bc370e594aa97911bb7ca33bcc5ebe23a4b206cd74357060371ca06b6010d2
+DIST 0ad-0.0.25b-alpha-unix-data.tar.xz 1249684600 BLAKE2B d77546ba9d21b512f106645c07fa92ecc343e0a01d9a70a83f2a2b3ade912e72d095982f7d4c4cd64e18fb71a67a01c419763744dd4cad1e8c081e5f77ec17c9 SHA512 d6bbe484acb7fbd507d303f5c75f8a2ccbaf8fe9dd30ff408b082f170bfd96eb9235db1b710c15656ef465b44fa5597679a694515e0c153a35fe24c0915f29f1
+DIST 0ad-0.0.25b-alpha-unix-data.tar.xz.minisig 326 BLAKE2B 41975d4c4369780bd36edef448ab928c91ece0d60ddad04fbccd1da0ed5068b56c86fd57708c6158277c5db9faadc768f5e455d97fe5ae3c30a7522005c374e6 SHA512 ad3ef78b785db9eb37d547a86d2bf274e0b6635118a9c512d013adc45e4a0f071b86f0fb5bf696631596e0713b2de153b0ad245cbba86beb3ea153036178b07e

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     315628cd3c82148476c56fde9c7bbb762c568f4d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 28 03:03:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 28 03:08:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315628cd

games-strategy/0ad: drop unnecessary verify-sig inherit

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.25b_alpha.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
index e7258e9b6f8..94301481dc8 100644
--- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 verify-sig wxwidgets xdg
+inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
 
 DESCRIPTION="A free, real-time strategy game"
 HOMEPAGE="https://play0ad.com/"
@@ -21,8 +21,8 @@ elif [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
 else
-	inherit verify-sig
-	IUSE+="verify-sig"
+	# Trailing whitespace for IUSE append below
+	IUSE="verify-sig "
 	MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT"
 	MY_P="0ad-${PV/_/-}"
 	SRC_URI="
@@ -37,7 +37,7 @@ else
 fi
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
+IUSE+="editor +lobby nvtt pch test"
 
 RESTRICT="test"
 CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25
@@ -59,7 +59,7 @@ BDEPEND="
 # Upstream uses minisign which is not supported by verify-sign, bug #783066.
 # Signatures are only provided for releases.
 if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then
-	BDEPEND+="app-crypt/minisign"
+	BDEPEND+=" app-crypt/minisign"
 fi
 
 # Removed dependency on nvtt as we use the bundled one.

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     c9c5aaef64de02961e7a71f74e012f5e3a4273d3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 28 03:39:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 28 03:39:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c5aaef

games-strategy/0ad: add missing python-any-r1_pkg_setup call

Closes: https://bugs.gentoo.org/773568
Closes: https://bugs.gentoo.org/802072
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild | 2 ++
 games-strategy/0ad/0ad-0.0.25b_alpha.ebuild    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
index 94bf17e4928..6307e21c5b2 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
@@ -82,6 +82,8 @@ PATCHES=(
 
 pkg_setup() {
 	use editor && setup-wxwidgets
+
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {

diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
index 94301481dc8..567e01b8b03 100644
--- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
@@ -94,6 +94,8 @@ PATCHES=(
 
 pkg_setup() {
 	use editor && setup-wxwidgets
+
+	python-any-r1_pkg_setup
 }
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     022cb8098bf4a77a24c5014805b45712a67825fa
Author:     Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Fri Aug 27 11:25:02 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 28 03:01:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022cb809

games-strategy/0ad: Remove a25 (superceded by a25b)

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22118
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.25_alpha.ebuild | 221 -----------------------------
 games-strategy/0ad/Manifest                |   2 -
 2 files changed, 223 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.25_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
deleted file mode 100644
index c4b1cf74eb7..00000000000
--- a/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/0ad/0ad"
-	S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
-	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
-	MY_P="0ad-${PV/_/-}"
-	SRC_URI="
-		http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
-		https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
-	"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-CHECKREQS_DISK_BUILD="9000M" # 8779624 KiB (8.3 GiB)
-CHECKREQS_DISK_USR="3500M" # 3545840 KiB (3.3 GiB)
-# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
-# build and/or startup issues.
-QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
-
-# virtual/rust is for bundled SpiderMonkey
-# Build-time Python dependency is for SM, too.
-# TODO: Unbundle premake5
-# See bug #773472 which may help (bump for it)
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/premake-5.0.0_alpha12:5
-	virtual/pkgconfig
-	virtual/rust
-	test? ( dev-lang/perl )
-"
-# Removed dependency on nvtt as we use the bundled one
-# bug #768930
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libfmt:0=
-	dev-libs/libsodium
-	dev-libs/libxml2
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( net-libs/gloox )
-"
-RDEPEND="
-	${DEPEND}
-	!games-strategy/0ad-data
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
-)
-
-pkg_setup() {
-	use editor && setup-wxwidgets
-}
-
-src_prepare() {
-	default
-
-	# SpiderMonkey's configure no longer recognises --build for
-	# the build tuple
-	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
-
-	# Originally from 0ad-data
-	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_configure() {
-	# 0AD uses premake:5 to generate the Makefiles, so let's
-	# 1. configure the configure args,
-	# 2. export some toolchain args,
-	# 3. configure premake args,
-	# 4. run premake5.
-	local myconf=(
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-	)
-
-	tc-export AR CC CXX RANLIB
-
-	local mypremakeargs=(
-		--outpath="../workspace/gcc"
-		--os=linux
-		--verbose
-	)
-
-	cd "${S}/build/premake" || die "Could not enter premake directory"
-
-	/usr/bin/premake5 "${mypremakeargs[@]}" "${myconf[@]}" gmake2 \
-		|| die "Premake failed"
-}
-
-src_compile() {
-	# Build 3rd party fcollada
-	einfo "Building bundled fcollada"
-	emake -C libraries/source/fcollada/src
-
-	# Build bundled NVTT
-	# nvtt is abandoned upstream and 0ad has forked it and added fixes.
-	# Use their copy. bug #768930
-	if use nvtt ; then
-		cd libraries/source/nvtt || die
-		elog "Building bundled NVTT (bug #768930)"
-		JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT"
-		cd "${S}" || die
-	fi
-
-	# Build bundled SpiderMonkey
-	# We really can't use the system SpiderMonkey right now.
-	# Breakages occur even on minor bumps in upstream SM,
-	# e.g. bug #768840.
-	cd libraries/source/spidermonkey || die
-	elog "Building bundled SpiderMonkey (bug #768840)"
-	XARGS="${EPREFIX}/usr/bin/xargs" \
-		JOBS="-j$(makeopts_jobs)" \
-		./build.sh \
-	|| die "Failed to build bundled SpiderMonkey"
-
-	cd "${S}" || die
-
-	# Build 0ad itself!
-	elog "Building 0ad"
-	JOBS="-j$(makeopts_jobs)" emake -C build/workspace/gcc verbose=1
-
-	# Build assets
-	# (We only do this if we're using a snapshot/non-release)
-	# See bug #771147 (comment 3) and the old 0ad-data ebuild
-	# Warning: fragile!
-	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
-		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
-		addpredict /proc/self/task
-
-		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
-		local archivebuild_input archivebuild_output mod_name
-		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
-			mod_name="${archivebuild_input##*/}"
-			archivebuild_output="archives/${mod_name}"
-
-			mkdir -p "${archivebuild_output}" || die
-
-			einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
-			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \
-				-archivebuild="${archivebuild_input}" \
-				-archivebuild-output="${archivebuild_output}/${mod_name}.zip" \
-			|| die "Failed to build assets"
-
-			if [[ -f "${archivebuild_input}/mod.json" ]]; then
-				cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die
-			fi
-
-			rm -r "${archivebuild_input}" || die
-			mv "${archivebuild_output}" "${archivebuild_input}" || die
-		done
-
-		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
-		rm binaries/data/config/dev.cfg || die
-		rm -r binaries/data/mods/_test.* || die
-	fi
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "Failed tests"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	# Merged from 0ad-data
-	# bug #771147 (comment 3)
-	insinto /usr/share/${PN}
-	doins -r binaries/data/{l10n,config,mods,tools}
-
-	# Install bundled SpiderMonkey and nvtt
-	# bug #771147 (comment 1)
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/{libCollada,libmozjs78-ps-release}.so
-
-	use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-}

diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 3adb1e76c5e..923eae80585 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,7 +1,5 @@
 DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea
 DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726
-DIST 0ad-0.0.25-alpha-unix-build.tar.xz 75788348 BLAKE2B 49b8b99a8f2fd33d4a3c2c0320375cb372d23b2f2c0f4ba56438bc8d868891c8c8c624049e3165ec84f8b98bcb1e1195b672aa7ee258ff88317af9d4da883576 SHA512 a8edae7d2dd61972b947152edda8d9ca8bafd3d435623a94de2d1297ecad3bfc73d3b30eaff98e89a6bcb0291b49f1e25bae1300fde37c8989156c895cd12730
-DIST 0ad-0.0.25-alpha-unix-data.tar.xz 1272283892 BLAKE2B 7bc08e52b44129fce6a78914d36bcb0c8bb3312645982054274e230a23edc34f9aa899d7ca8f52f3044b8c7efd0aea4b5d16fcd9d6e20e274538007885cfa1c2 SHA512 92fad341ceb1156a3facea291856ca2f719691bba1cf085de0544f3ae9300f46391efdd1c88bcf1aafd9a9c938b6bef3babbd50c850dc17fb0c9609dbabe37ad
 DIST 0ad-0.0.25b-alpha-unix-build.tar.xz 75579956 BLAKE2B 674d69d625137709a186f9273607dc353fc99aea68ef3f2ea5031dbe2f684176910d757c3f03c7fbdac475d30708be448b71f5020d27a65c346bf147223bcb9d SHA512 e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4
 DIST 0ad-0.0.25b-alpha-unix-build.tar.xz.minisig 327 BLAKE2B 547a7a1c8a83167fa40976efb2efaf691fc5434eb1be227b481a70d308381b20dcdc90bb4652e190f8e329fb33cc19ebbaab43977329f8971e49436f7f1ce636 SHA512 9d6a235ea50183e1db16f4bf2dc59af9042a52e4e18ccd0c34c481a7e9021f19e2bc370e594aa97911bb7ca33bcc5ebe23a4b206cd74357060371ca06b6010d2
 DIST 0ad-0.0.25b-alpha-unix-data.tar.xz 1249684600 BLAKE2B d77546ba9d21b512f106645c07fa92ecc343e0a01d9a70a83f2a2b3ade912e72d095982f7d4c4cd64e18fb71a67a01c419763744dd4cad1e8c081e5f77ec17c9 SHA512 d6bbe484acb7fbd507d303f5c75f8a2ccbaf8fe9dd30ff408b082f170bfd96eb9235db1b710c15656ef465b44fa5597679a694515e0c153a35fe24c0915f29f1

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     1946b915fada8c6d9f16f9fb282697f3cdbe136f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 14 09:04:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 14 09:04:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1946b915

games-strategy/0ad: Keyword 0.0.25b_alpha arm64, #812830

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.25b_alpha.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
index 567e01b8b03c..e01f6242d2cd 100644
--- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
@@ -36,7 +36,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE+="editor +lobby nvtt pch test"
 
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     de194ece58a1c37c542ee04378732d59e963f099
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 08:36:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 08:36:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de194ece

games-strategy/0ad: update nvtt description

uses bundled copy (fork)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/0ad/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml
index bc03cc2afd55..c47c262ab260 100644
--- a/games-strategy/0ad/metadata.xml
+++ b/games-strategy/0ad/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="lobby">Enable the use of <pkg>net-libs/gloox</pkg>
 			and the multiplayer lobby</flag>
 		<flag name="nvtt">Support for some uncompressed data formats
-			via <pkg>media-gfx/nvidia-texture-tools</pkg>
 			(might be needed for some mods)</flag>
 	</use>
 	<upstream>

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Ionen Wolkens]

commit:     7003d14a3e29e2202d885ebb0633fac7bc69bdda
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 06:18:34 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 07:37:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7003d14a

games-strategy/0ad: drop 0.0.25b_alpha-r0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.25b_alpha.ebuild | 262 ----------------------------
 1 file changed, 262 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
deleted file mode 100644
index d7b282a68f35..000000000000
--- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
-# Upstream signs releases (and only them) with app-crypt/minisign.
-# The (public) key can be found on https://play0ad.com/download/source.
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/0ad/0ad"
-	S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
-	ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-	SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
-	# Trailing whitespace for IUSE append below
-	IUSE="verify-sig "
-	MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT"
-	MY_P="0ad-${PV/_/-}"
-	SRC_URI="
-		http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
-		https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
-		verify-sig? (
-			http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz.minisig
-			http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz.minisig
-		)
-	"
-	S="${WORKDIR}/${MY_P}"
-fi
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE+="editor +lobby nvtt pch test"
-
-RESTRICT="test"
-CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25
-CHECKREQS_DISK_USR="3500M" # 3545972 KiB (3.3 GiB)
-
-# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
-# build and/or startup issues.
-QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
-
-# virtual/rust is for bundled SpiderMonkey.
-# Build-time Python dependency is for SM, too.
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/premake-5.0.0_alpha12:5
-	virtual/pkgconfig
-	virtual/rust
-	test? ( dev-lang/perl )
-"
-# Upstream uses minisign which is not supported by verify-sign, bug #783066.
-# Signatures are only provided for releases.
-if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then
-	BDEPEND+=" app-crypt/minisign"
-fi
-
-# Removed dependency on nvtt as we use the bundled one.
-# bug #768930
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libfmt:0=
-	dev-libs/libsodium
-	dev-libs/libxml2
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( net-libs/gloox )
-"
-RDEPEND="
-	${DEPEND}
-	!games-strategy/0ad-data
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
-	"${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch
-)
-
-pkg_setup() {
-	use editor && setup-wxwidgets
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ( ${PV} != *9999 ) && ( ${PV} != *_p* ) ]]; then
-		if use verify-sig; then
-			elog "Verifying both signatures using app-crypt/minisign."
-			minisign -V \
-				-P "${MINISIGN_KEY}" \
-				-x "${DISTDIR}/${MY_P}-unix-build.tar.xz.minisig" \
-				-m "${DISTDIR}/${MY_P}-unix-build.tar.xz" \
-				|| die "Failed to verify engine distfile using minisign!"
-			minisign -V \
-				-P "${MINISIGN_KEY}" \
-				-x "${DISTDIR}/${MY_P}-unix-data.tar.xz.minisig" \
-				-m "${DISTDIR}/${MY_P}-unix-data.tar.xz" \
-				|| die "Failed to verify data distfile using minisign!"
-		fi
-		# Unpack manually until an eclass supports minisign and unpacks
-		# if signatures match.
-		default
-	else
-		# Unpack distfiles without checking as this is no official release.
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# SpiderMonkey's configure no longer recognises --build for
-	# the build tuple
-	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
-
-	# Originally from 0ad-data
-	rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_configure() {
-	# 0AD uses premake:5 to generate the Makefiles, so let's
-	# 1. configure the configure args,
-	# 2. export some toolchain args,
-	# 3. configure premake args,
-	# 4. run premake5.
-	local myconf=(
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-	)
-
-	tc-export AR CC CXX RANLIB
-
-	local mypremakeargs=(
-		--outpath="../workspace/gcc"
-		--os=linux
-		--verbose
-	)
-
-	cd "${S}/build/premake" || die "Could not enter premake directory"
-
-	/usr/bin/premake5 "${mypremakeargs[@]}" "${myconf[@]}" gmake2 \
-		|| die "Premake failed"
-}
-
-src_compile() {
-	# Build 3rd party fcollada
-	einfo "Building bundled fcollada"
-	emake -C libraries/source/fcollada/src
-
-	# Build bundled NVTT
-	# nvtt is abandoned upstream and 0ad has forked it and added fixes.
-	# Use their copy. bug #768930
-	if use nvtt ; then
-		cd libraries/source/nvtt || die
-		elog "Building bundled NVTT (bug #768930)"
-		JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build bundled NVTT"
-		cd "${S}" || die
-	fi
-
-	# Build bundled SpiderMonkey
-	# We really can't use the system SpiderMonkey right now.
-	# Breakages occur even on minor bumps in upstream SM,
-	# e.g. bug #768840.
-	cd libraries/source/spidermonkey || die
-	elog "Building bundled SpiderMonkey (bug #768840)"
-	XARGS="${EPREFIX}/usr/bin/xargs" \
-		JOBS="-j$(makeopts_jobs)" \
-		./build.sh \
-	|| die "Failed to build bundled SpiderMonkey"
-
-	cd "${S}" || die
-
-	# Build 0ad itself!
-	elog "Building 0ad"
-	JOBS="-j$(makeopts_jobs)" emake -C build/workspace/gcc verbose=1
-
-	# Build assets
-	# (We only do this if we're using a snapshot/non-release)
-	# See bug #771147 (comment 3) and the old 0ad-data ebuild
-	# Warning: fragile!
-	if [[ ${PV} == 9999 || ${PV} == *_pre* ]]; then
-		# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName() tries to open /proc/self/task/${TID}/comm for writing.
-		addpredict /proc/self/task
-
-		# Based on source/tools/dist/build-archives.sh used by source/tools/dist/build.sh.
-		local archivebuild_input archivebuild_output mod_name
-		for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
-			mod_name="${archivebuild_input##*/}"
-			archivebuild_output="archives/${mod_name}"
-
-			mkdir -p "${archivebuild_output}" || die
-
-			einfo pyrogenesis -archivebuild="${archivebuild_input}" -archivebuild-output="${archivebuild_output}/${mod_name}.zip"
-			LD_LIBRARY_PATH="binaries/system" binaries/system/pyrogenesis \
-				-archivebuild="${archivebuild_input}" \
-				-archivebuild-output="${archivebuild_output}/${mod_name}.zip" \
-			|| die "Failed to build assets"
-
-			if [[ -f "${archivebuild_input}/mod.json" ]]; then
-				cp "${archivebuild_input}/mod.json" "${archivebuild_output}" || die
-			fi
-
-			rm -r "${archivebuild_input}" || die
-			mv "${archivebuild_output}" "${archivebuild_input}" || die
-		done
-
-		# Based on source/tools/dist/build-unix-win32.sh used by source/tools/dist/build.sh.
-		rm binaries/data/config/dev.cfg || die
-		rm -r binaries/data/mods/_test.* || die
-	fi
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "Failed tests"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	# Merged from 0ad-data
-	# bug #771147 (comment 3)
-	insinto /usr/share/${PN}
-	doins -r binaries/data/{l10n,config,mods,tools}
-
-	# Install bundled SpiderMonkey and nvtt
-	# bug #771147 (comment 1)
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/{libCollada,libmozjs78-ps-release}.so
-
-	use nvtt && doexe binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.png
-	make_desktop_entry ${PN}
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Sam James]

commit:     9acc0180f478dee6f92338625e5930af349c3f55
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 02:58:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 03:15:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9acc0180

games-strategy/0ad: add subslot dep on libsodium

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../0ad/{0ad-0.0.26_alpha.ebuild => 0ad-0.0.26_alpha-r1.ebuild}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.26_alpha.ebuild b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
similarity index 99%
rename from games-strategy/0ad/0ad-0.0.26_alpha.ebuild
rename to games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
index 49d734e318bd..e81615d22e85 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -74,7 +74,7 @@ DEPEND="
 	dev-libs/boost:=
 	dev-libs/icu:=
 	dev-libs/libfmt:0=
-	dev-libs/libsodium
+	dev-libs/libsodium:=
 	dev-libs/libxml2
 	media-libs/libpng:0
 	media-libs/libsdl2[X,opengl,video]

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

[Andrew Ammerlaan]

commit:     b91f4b53b4c47b807bb46e0c7455dc1d861e86eb
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 14:49:11 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 15:00:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91f4b53

games-strategy/0ad: filter lto flag

Closes: https://bugs.gentoo.org/859244
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
index e81615d22e85..750458800c15 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 WX_GTK_VER="3.0-gtk3"
 # In alpha26 bundled spidermonkey-78.6.0 does not build with python 3.11.
 PYTHON_COMPAT=( python3_10 )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
+inherit desktop flag-o-matic toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
 
 DESCRIPTION="A free, real-time strategy game"
 HOMEPAGE="https://play0ad.com/"
@@ -134,6 +134,9 @@ src_unpack() {
 src_prepare() {
 	default
 
+	# https://bugs.gentoo.org/859244
+	filter-lto
+
 	# SpiderMonkey's configure no longer recognises --build for
 	# the build tuple
 	sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die