* [gentoo-commits] repo/gentoo:master commit in: games-fps/turtlearena/
@ 2021-07-10 15:51 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-07-10 15:51 UTC (permalink / raw
To: gentoo-commits
commit: e8a879ce1f17e9f5e68ac333e52ce051d1750fac
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 10 08:30:34 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 15:49:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a879ce
games-fps/turtlearena: add github remote-id
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-fps/turtlearena/metadata.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/games-fps/turtlearena/metadata.xml b/games-fps/turtlearena/metadata.xml
index 76847d643c8..5ef91913b16 100644
--- a/games-fps/turtlearena/metadata.xml
+++ b/games-fps/turtlearena/metadata.xml
@@ -10,4 +10,7 @@
<flag name="server">Build server target</flag>
<flag name="voice">Adds VoIP support</flag>
</use>
+ <upstream>
+ <remote-id type="github">Turtle-Arena/turtle-arena-code</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/turtlearena/
@ 2021-07-10 15:51 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-07-10 15:51 UTC (permalink / raw
To: gentoo-commits
commit: ee06f01ff0006ecfbd15237b8b86473c38e137ff
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 10 09:14:20 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 15:49:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee06f01f
games-fps/turtlearena: EAPI 6->8, tidy, tc-export CC
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild | 140 ++++++++++------------
1 file changed, 66 insertions(+), 74 deletions(-)
diff --git a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
index ee3525548a7..807e9f38393 100644
--- a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
+++ b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit eutils gnome2-utils
-
-MY_P=${PN/-/}-${PV}
+inherit desktop toolchain-funcs
DESCRIPTION="A turtle featuring free and open source third-person action game (ioq3 engine)"
-HOMEPAGE="http://ztm.x10host.com/ta/index.htm"
-SRC_URI="https://turtlearena.googlecode.com/files/${MY_P}-0-src.tar.bz2
- https://turtlearena.googlecode.com/files/${MY_P}-0.zip"
+HOMEPAGE="https://clover.moe/turtlearena/"
+SRC_URI="
+ https://turtlearena.googlecode.com/files/${P}-0-src.tar.bz2
+ https://turtlearena.googlecode.com/files/${P}-0.zip"
+S+="-0-src"
LICENSE="GPL-2+ CC-BY-SA-3.0 mplus-fonts lcc"
SLOT="0"
@@ -18,11 +18,11 @@ KEYWORDS="~amd64 ~x86"
IUSE="+curl debug dedicated mumble openal server theora voice vorbis"
RDEPEND="
- sys-libs/zlib[minizip]
+ sys-libs/zlib:=[minizip]
!dedicated? (
media-libs/freetype:2
- media-libs/libsdl[X,sound,joystick,opengl,video]
- virtual/jpeg:0
+ media-libs/libsdl[X,joystick,opengl,sound,video]
+ virtual/jpeg
virtual/opengl
curl? ( net-misc/curl )
openal? ( media-libs/openal )
@@ -33,21 +33,21 @@ RDEPEND="
)
vorbis? ( media-libs/libvorbis )
)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
app-arch/unzip
virtual/pkgconfig"
-S=${WORKDIR}/${MY_P}-0-src
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+ "${FILESDIR}"/${P}-freetype.patch
+)
src_prepare() {
default
- eapply "${FILESDIR}"/${P}-build.patch
- eapply "${FILESDIR}"/${P}-freetype.patch
-
- sed -i \
- -e 's:JPEG_LIB_VERSION < 80:JPEG_LIB_VERSION < 62:' \
- engine/code/renderer/tr_image_jpg.c || die #479822
+ sed -e 's|JPEG_LIB_VERSION < 80|JPEG_LIB_VERSION < 62|' \
+ -i engine/code/renderer/tr_image_jpg.c || die #479822
rm -r engine/code/{AL,libcurl,libogg,libspeex,libtheora,libvorbis,SDL12,zlib} \
engine/code/freetype* engine/code/jpeg-* \
@@ -55,68 +55,60 @@ src_prepare() {
}
src_compile() {
- buildit() { use $1 && echo 1 || echo 0 ; }
- nobuildit() { use $1 && echo 0 || echo 1 ; }
-
- myarch=$(usex amd64 "x86_64" "x86")
- emake -C engine \
- Q="" \
- ARCH=${myarch} \
- CROSS_COMPILING=0 \
- BUILD_GAME_QVM=0 \
- BUILD_GAME_SO=0 \
- BUILD_CLIENT=$(nobuildit dedicated) \
- BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
- DEFAULT_BASEDIR="/usr/share/${PN}" \
- GENERATE_DEPENDENCIES=0 \
- OPTIMIZEVM="" \
- OPTIMIZE="" \
- DEBUG_CFLAGS="" \
- USE_MUMBLE=$(buildit mumble) \
- USE_VOIP=$(buildit voice) \
- USE_INTERNAL_SPEEX=0 \
- USE_INTERNAL_OGG=0 \
- USE_INTERNAL_ZLIB=0 \
- USE_INTERNAL_JPEG=0 \
- USE_INTERNAL_FREETYPE=0 \
- USE_CODEC_VORBIS=$(buildit vorbis) \
- USE_INTERNAL_VORBIS=0 \
- USE_CODEC_THEORA=$(buildit theora) \
- USE_OPENAL=$(buildit openal) \
- USE_OPENAL_DLOPEN=0 \
- USE_CURL=$(buildit curl) \
- USE_CURL_DLOPEN=0 \
- USE_LOCAL_HEADERS=0 \
- $(usex debug "debug" "release")
+ tc-export CC
+
+ MY_ARCH=$(usex amd64 x86_64 x86)
+ MY_RELEASE=$(usex debug debug release)
+
+ local emakeargs=(
+ ARCH=${MY_ARCH}
+ BUILD_CLIENT=$(usex dedicated 0 1)
+ BUILD_SERVER=$(usex dedicated 1 $(usex server 1 0))
+ BUILD_GAME_QVM=0
+ BUILD_GAME_SO=0
+ CROSS_COMPILING=0
+ DEBUG_CFLAGS=
+ DEFAULT_BASEDIR="${EPREFIX}"/usr/share/${PN}
+ GENERATE_DEPENDENCIES=0
+ OPTIMIZE=
+ OPTIMIZEVM=
+ Q=
+ USE_CODEC_THEORA=$(usex theora 1 0)
+ USE_CODEC_VORBIS=$(usex vorbis 1 0)
+ USE_CURL=$(usex curl 1 0)
+ USE_CURL_DLOPEN=0
+ USE_INTERNAL_FREETYPE=0
+ USE_INTERNAL_JPEG=0
+ USE_INTERNAL_OGG=0
+ USE_INTERNAL_SPEEX=0
+ USE_INTERNAL_VORBIS=0
+ USE_INTERNAL_ZLIB=0
+ USE_LOCAL_HEADERS=0
+ USE_MUMBLE=$(usex mumble 1 0)
+ USE_OPENAL=$(usex openal 1 0)
+ USE_OPENAL_DLOPEN=0
+ USE_VOIP=$(usex voice 1 0)
+ )
+
+ emake -C engine "${emakeargs[@]}" ${MY_RELEASE}
}
src_install() {
- dodoc engine/{ChangeLog,BUGS,TODO}
- use voice && dodoc engine/voip-readme.txt
+ if ! use dedicated; then
+ newbin engine/build/${MY_RELEASE}-linux-${MY_ARCH}/turtlearena.${MY_ARCH} turtlearena
- if ! use dedicated ; then
- newbin engine/build/$(usex debug "debug" "release")-linux-${myarch}/turtlearena.${myarch} turtlearena
- newicon -s scalable engine/misc/quake3-tango.svg ${PN}.svg
- newicon -s 256 engine/misc/quake3-tango.png ${PN}.png
- make_desktop_entry ${PN}
- fi
+ use voice && dodoc engine/voip-readme.txt
- if use dedicated || use server ; then
- newbin engine/build/$(usex debug "debug" "release")-linux-${myarch}/turtlearena-server.${myarch} turtlearena-server
+ newicon engine/misc/quake3-tango.svg ${PN}.svg
+ make_desktop_entry ${PN} "Turtle Arena"
fi
- insinto "/usr/share/${PN}"
- doins -r "${WORKDIR}"/${MY_P}-0/base
-}
-
-pkg_preinst() {
- use dedicated || gnome2_icon_savelist
-}
+ if use dedicated || use server; then
+ newbin engine/build/${MY_RELEASE}-linux-${MY_ARCH}/turtlearena-server.${MY_ARCH} turtlearena-server
+ fi
-pkg_postinst() {
- use dedicated || gnome2_icon_cache_update
-}
+ insinto /usr/share/${PN}
+ doins -r ../${P}-0/base
-pkg_postrm() {
- use dedicated || gnome2_icon_cache_update
+ dodoc engine/{ChangeLog,BUGS,TODO}
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-fps/turtlearena/
@ 2021-08-07 2:36 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-08-07 2:36 UTC (permalink / raw
To: gentoo-commits
commit: bbe20b134ea67338b903f603b3c6c447bb13fc6b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 7 02:30:26 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Aug 7 02:35:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe20b13
games-fps/turtlearena: fix S technical VariableScope
Overlooked that S is not guaranteed to be set in global scope per PMS.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
index 807e9f38393..98472a1a41e 100644
--- a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
+++ b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clover.moe/turtlearena/"
SRC_URI="
https://turtlearena.googlecode.com/files/${P}-0-src.tar.bz2
https://turtlearena.googlecode.com/files/${P}-0.zip"
-S+="-0-src"
+S="${WORKDIR}/${P}-0-src"
LICENSE="GPL-2+ CC-BY-SA-3.0 mplus-fonts lcc"
SLOT="0"
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-fps/turtlearena/
@ 2022-06-30 0:40 Kenton Groombridge
0 siblings, 0 replies; 4+ messages in thread
From: Kenton Groombridge @ 2022-06-30 0:40 UTC (permalink / raw
To: gentoo-commits
commit: 78cd98879d185145658c3dff61c9d8e522c7362c
Author: Kenton Groombridge <concord <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 00:37:08 2022 +0000
Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 00:37:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78cd9887
games-fps/turtlearena: update mumble depend for pkgmove
Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org>
games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
index 98472a1a41e6..11be86191560 100644
--- a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
+++ b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -29,7 +29,7 @@ RDEPEND="
theora? ( media-libs/libtheora )
voice? (
media-libs/speex
- mumble? ( media-sound/mumble )
+ mumble? ( net-voip/mumble )
)
vorbis? ( media-libs/libvorbis )
)"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-30 0:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-10 15:51 [gentoo-commits] repo/gentoo:master commit in: games-fps/turtlearena/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2021-07-10 15:51 Ionen Wolkens
2021-08-07 2:36 Ionen Wolkens
2022-06-30 0:40 Kenton Groombridge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox