summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2020-01-25 14:05:57 +0000
committerJames Le Cuirot <chewi@gentoo.org>2020-01-25 14:05:57 +0000
commit00ddbd2134a56fd5b11bda2cb88b74d7fcc8ad6e (patch)
treedefe22bc294b39f7d0f8042733fc6b188c5d3074 /games-strategy
parentgames-emulation/ppsspp: tweak for gcc-10 (diff)
downloadgentoo-00ddbd2134a56fd5b11bda2cb88b74d7fcc8ad6e.tar.gz
gentoo-00ddbd2134a56fd5b11bda2cb88b74d7fcc8ad6e.tar.bz2
gentoo-00ddbd2134a56fd5b11bda2cb88b74d7fcc8ad6e.zip
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@gentoo.org>
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/ufoai/Manifest1
-rw-r--r--games-strategy/ufoai/metadata.xml1
-rw-r--r--games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild (renamed from games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild)42
3 files changed, 5 insertions, 39 deletions
diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest
index 2ee133e7a40b..7a4adf1687b1 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 916e44355c73..278d047b1ab2 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
index 2ce3bcbcdbe8..81b78a01e04d 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
}