* [gentoo-commits] repo/gentoo:master commit in: games-strategy/ufoai/
@ 2018-06-06 22:53 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2018-06-06 22:53 UTC (permalink / raw
To: gentoo-commits
commit: 38f91d3f50879474d9987aeb42c2b6d498f0eb97
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 22:52:24 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 22:52:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f91d3f
games-strategy/ufoai: Fetch the git snapshot from my devspace
Turns out SourceForge only keeps it for a short time before it 404s
and you have to request it from the browser again. SourceForge, why do
you suck so much!?
Package-Manager: Portage-2.3.40, Repoman-2.3.9
games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
index 4377af8d986..0fd98165739 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
@@ -17,7 +17,7 @@ DATADIR="/usr/share/${PN}"
DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game"
HOMEPAGE="https://ufoai.org/"
SRC_URI="
- https://sourceforge.net/code-snapshots/git/${PN:0:1}/${PN:0:2}/${PN}/code.git/${PN}-code-${COMMIT}.zip
+ https://dev.gentoo.org/~chewi/distfiles/${PN}-code-${COMMIT}.zip
mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-data.tar
editor? ( mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-mappack.tar.bz2 )
"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/ufoai/
@ 2019-12-27 22:47 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2019-12-27 22:47 UTC (permalink / raw
To: gentoo-commits
commit: 1aac9e3284d05747874513f4cfd49219d9d311a5
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 22:46:50 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 22:46:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aac9e32
games-strategy/ufoai: EAPI 7
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
index b3bc8e4d1ac..2ce3bcbcdbe 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
@@ -1,15 +1,15 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit desktop flag-o-matic gnome2-utils toolchain-funcs versionator
+inherit desktop flag-o-matic toolchain-funcs xdg
# 2.5.0 requires several patches
COMMIT="8b4533e85fdc0665889ff285e1521432084ee784"
# UFO:AI v2.5.0 was uploaded to SourceForge as 2.5
-DIST_VERSION=$(get_version_component_range 1-2)
+DIST_VERSION=$(ver_cut 1-2)
# Install game data here
DATADIR="/usr/share/${PN}"
@@ -168,7 +168,3 @@ src_install() {
doins -r "${WORKDIR}"/${PN}-${DIST_VERSION}-mappack/*
fi
}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/ufoai/
@ 2020-01-25 14:19 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2020-01-25 14:19 UTC (permalink / raw
To: gentoo-commits
commit: 00ddbd2134a56fd5b11bda2cb88b74d7fcc8ad6e
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 14:05:57 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 14:05:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00ddbd21
games-strategy/ufoai: Drop USE=editor to avoid dead gtkglext dependency
Now I can undo last-rites.
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-strategy/ufoai/Manifest | 1 -
games-strategy/ufoai/metadata.xml | 1 -
...0603.ebuild => ufoai-2.5.0_p20180603-r1.ebuild} | 42 +++-------------------
3 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest
index 2ee133e7a40..7a4adf1687b 100644
--- a/games-strategy/ufoai/Manifest
+++ b/games-strategy/ufoai/Manifest
@@ -1,3 +1,2 @@
DIST ufoai-2.5-data.tar 1277143040 BLAKE2B 20795ec6ebc976087f28fd0e912190bd9094494cc1b206bcc8e1956dec148cb7ab96f244db22e4836b91c0ecfae794cd206296e898015453d8ad6625d4e4ab32 SHA512 9a7be359c82cd633db657c8619cb488b5d41b9f93cd10bdeffd5896d8a1ba3bb828b5969acd14c2a69abb3f53f18113af4ca19435aea80ded94d8df68b11deec
-DIST ufoai-2.5-mappack.tar.bz2 12200150 BLAKE2B d20f96f74a4b71a4ff55e4e3f81380ee35a71c6e34d35e6300487c916f2d836e240428e8f8529cca13d46ccd5440e7f59d5bfe5f451a2cd84469f8f1e85dc796 SHA512 0f44cc3d99ceb80f91e5df0f7cbd57ce3170f5635feb082c002ab9a0f4f81216b05c346c698475c33e88f97032186f4620bad71d02bfa95ecb5c5d4f68c71994
DIST ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip 33194032 BLAKE2B caebfe5ca0eaa6376659d4aa69132c29aa4af870135a769af3541bd919164d79ab9dfe8007a40bb95507a443f6f1d968bb85b1befe8b6999f9033a0d74d7a7fb SHA512 825ca6f8ac76a3a60746ac1be4406445dd18bab80372c21c2ddfcf4d999db8549614df41386e94197013bb7b4b342ac6d9be8c969b5e1be79e8ee25cf45719c6
diff --git a/games-strategy/ufoai/metadata.xml b/games-strategy/ufoai/metadata.xml
index 916e44355c7..278d047b1ab 100644
--- a/games-strategy/ufoai/metadata.xml
+++ b/games-strategy/ufoai/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="client">Build the main game client</flag>
- <flag name="editor">Build the map editor and compiler</flag>
<flag name="server">Build the dedicated server</flag>
</use>
<upstream>
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
similarity index 73%
rename from games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
rename to games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
index 2ce3bcbcdbe..81b78a01e04 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.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=7
@@ -19,15 +19,14 @@ HOMEPAGE="https://ufoai.org/"
SRC_URI="
https://dev.gentoo.org/~chewi/distfiles/${PN}-code-${COMMIT}.zip
mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-data.tar
- editor? ( mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-mappack.tar.bz2 )
"
# https://ufoai.org/licenses/
LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+client cpu_flags_x86_sse debug editor server"
-REQUIRED_USE="|| ( client editor server )"
+IUSE="+client cpu_flags_x86_sse debug server"
+REQUIRED_USE="|| ( client server )"
RDEPEND="
dev-libs/mxml
@@ -47,22 +46,6 @@ RDEPEND="
virtual/opengl
)
- editor? (
- dev-libs/glib:2
- dev-libs/libxml2:2
- media-libs/libogg
- media-libs/libpng:0=
- media-libs/libsdl2[joystick,opengl,sound,threads,video]
- media-libs/libvorbis
- media-libs/openal
- virtual/glu
- virtual/jpeg:0
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2
- x11-libs/gtkglext
- x11-libs/gtksourceview:2.0
- )
-
server? (
media-libs/libsdl2[threads]
)
@@ -83,7 +66,6 @@ PATCHES=(
)
src_unpack() {
- use editor && unpack ${PN}-${DIST_VERSION}-mappack.tar.bz2
unpack ${PN}-code-${COMMIT}.zip
cd "${S}" || die
unpack ${PN}-${DIST_VERSION}-data.tar
@@ -120,8 +102,8 @@ src_configure() {
$(use_enable !debug release)
$(use_enable server ufoded)
$(use_enable client ufo)
- $(use_enable editor uforadiant)
- $(use_enable editor ufo2map)
+ --disable-uforadiant
+ --disable-ufo2map
)
if use client || use server; then
@@ -153,18 +135,4 @@ src_install() {
doman debian/ufoded.6
make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN} "Game;StrategyGame" "Terminal=true"
fi
-
- if use editor; then
- doman debian/ufo{2map,radiant}.6
- make_desktop_entry uforadiant "UFO: Alien Invasion Map editor" ${PN}
-
- # Install map editor data (without the binary)
- rm radiant/uforadiant || die
- insinto "${DATADIR}"
- doins -r radiant
-
- # Install map sources
- insinto "${DATADIR}"/base/maps
- doins -r "${WORKDIR}"/${PN}-${DIST_VERSION}-mappack/*
- fi
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/ufoai/
@ 2022-03-20 0:26 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-03-20 0:26 UTC (permalink / raw
To: gentoo-commits
commit: 7f112d47129b357d5165afd216c84a089f0acd10
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 00:25:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 00:25:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f112d47
games-strategy/ufoai: [QA] fix tc-get* quoting
This can cause build problems for e.g. 32-bit (gcc -m32 ...)
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
index dea50098a4cb..cd7b93cf6ac2 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -113,7 +113,7 @@ src_configure() {
echo ./configure "${config[@]}"
- CC=$(tc-getCC) CXX=$(tc-getCXX) \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
./configure "${config[@]}" || die "configure failed"
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/ufoai/
@ 2024-04-18 19:48 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2024-04-18 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 7d84fe1978e24b60085fc412724013e9d151c280
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 19:41:33 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:48:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d84fe19
games-strategy/ufoai: update deps for mxml
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...i-2.5.0_p20180603-r1.ebuild => ufoai-2.5.0_p20180603-r2.ebuild} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r2.ebuild
similarity index 98%
rename from games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
rename to games-strategy/ufoai/ufoai-2.5.0_p20180603-r2.ebuild
index cd7b93cf6ac2..93c67404831c 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,6 +20,7 @@ SRC_URI="
https://dev.gentoo.org/~chewi/distfiles/${PN}-code-${COMMIT}.zip
mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-data.tar
"
+S="${WORKDIR}/${PN}-code-${COMMIT}"
# https://ufoai.org/licenses/
LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0 MIT"
@@ -29,7 +30,7 @@ IUSE="+client cpu_flags_x86_sse debug server"
REQUIRED_USE="|| ( client server )"
RDEPEND="
- dev-libs/mxml
+ dev-libs/mxml:0
net-misc/curl
sys-libs/zlib
@@ -58,8 +59,6 @@ DEPEND="
virtual/pkgconfig
"
-S="${WORKDIR}/${PN}-code-${COMMIT}"
-
PATCHES=(
"${FILESDIR}"/${P}-install.patch
"${FILESDIR}"/${P}-mxml3.patch
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/ufoai/
@ 2024-09-28 19:04 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2024-09-28 19:04 UTC (permalink / raw
To: gentoo-commits
commit: 4951b8f659e63b6607122d3461718897dd60d075
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 19:01:05 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 19:03:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4951b8f6
games-strategy/ufoai: Fix music dependency with media-libs/sdl2-mixer[vorbis]
Closes: https://bugs.gentoo.org/831041
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-strategy/ufoai/ufoai-2.5.0_p20180603-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r3.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r3.ebuild
index 855e93fe458b..7be528256044 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r3.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r3.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
media-libs/libsdl2[joystick,opengl,sound,threads,video]
media-libs/libtheora
media-libs/libvorbis
- media-libs/sdl2-mixer
+ media-libs/sdl2-mixer[vorbis]
media-libs/sdl2-ttf
media-libs/xvid
virtual/jpeg:0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/ufoai/
@ 2024-09-28 19:04 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2024-09-28 19:04 UTC (permalink / raw
To: gentoo-commits
commit: ae722fd9674e381582f28c4d43cb54571d49a850
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 19:01:35 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 19:03:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae722fd9
games-strategy/ufoai: media-libs/libsdl2 will drop the threads USE flag
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-strategy/ufoai/ufoai-2.5.0_p20180603-r3.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r3.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r3.ebuild
index 7be528256044..152d3a479973 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603-r3.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r3.ebuild
@@ -35,20 +35,20 @@ RDEPEND="
sys-libs/zlib
client? (
+ media-libs/libglvnd[X]
+ media-libs/libjpeg-turbo:=
media-libs/libogg
media-libs/libpng:0=
- media-libs/libsdl2[joystick,opengl,sound,threads,video]
+ media-libs/libsdl2[joystick,opengl,sound,threads(+),video]
media-libs/libtheora
media-libs/libvorbis
media-libs/sdl2-mixer[vorbis]
media-libs/sdl2-ttf
media-libs/xvid
- virtual/jpeg:0
- virtual/opengl
)
server? (
- media-libs/libsdl2[threads]
+ media-libs/libsdl2[threads(+)]
)
"
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-09-28 19:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-20 0:26 [gentoo-commits] repo/gentoo:master commit in: games-strategy/ufoai/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-28 19:04 James Le Cuirot
2024-09-28 19:04 James Le Cuirot
2024-04-18 19:48 Conrad Kostecki
2020-01-25 14:19 James Le Cuirot
2019-12-27 22:47 James Le Cuirot
2018-06-06 22:53 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox