diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-09 09:27:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-09 09:27:03 +0100 |
commit | cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch) | |
tree | 047fc92023c520d07f13ec5ac96e094d1b312a7a /games-strategy | |
parent | 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff) |
gentoo resync : 09.06.2018
Diffstat (limited to 'games-strategy')
-rw-r--r-- | games-strategy/Manifest.gz | bin | 9885 -> 9885 bytes | |||
-rw-r--r-- | games-strategy/ufo-ai/Manifest | 8 | ||||
-rw-r--r-- | games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch | 17 | ||||
-rw-r--r-- | games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch | 15 | ||||
-rw-r--r-- | games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch | 29 | ||||
-rw-r--r-- | games-strategy/ufo-ai/ufo-ai-2.4.ebuild | 118 | ||||
-rw-r--r-- | games-strategy/ufoai/Manifest | 6 | ||||
-rw-r--r-- | games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch | 37 | ||||
-rw-r--r-- | games-strategy/ufoai/metadata.xml (renamed from games-strategy/ufo-ai/metadata.xml) | 4 | ||||
-rw-r--r-- | games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild | 166 | ||||
-rw-r--r-- | games-strategy/wesnoth/Manifest | 5 | ||||
-rw-r--r-- | games-strategy/wesnoth/files/wesnothd.rc | 22 | ||||
-rw-r--r-- | games-strategy/wesnoth/wesnoth-1.12.6.ebuild | 119 | ||||
-rw-r--r-- | games-strategy/wesnoth/wesnoth-1.14.2.ebuild | 2 |
14 files changed, 214 insertions, 334 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz Binary files differindex 9d7b2ed1b1c9..6fcd554da617 100644 --- a/games-strategy/Manifest.gz +++ b/games-strategy/Manifest.gz diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest deleted file mode 100644 index 9ee0111adc3e..000000000000 --- a/games-strategy/ufo-ai/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX ufo-ai-2.4-anon.patch 731 BLAKE2B 7789e7ae6a748128acbdecebb44e4ac89178128926d3412f8b46889cda125fa267dbfaa44af2aa4df60ecac8ef4fe6ded67fa8e54a7c88751f38cb8b6c57f9cc SHA512 252d3cfe1ad2dc947433e316505b5cbdacd663d3465aa5ffaaeb1ba2a641b2a8a01ef91f503fa335c2642f0fc0342abf159fbc13640802d02d7aabdbbb40883c -AUX ufo-ai-2.4-locale.patch 744 BLAKE2B 428e500092f5c4c5ed32f271231af2157e989e0d5759fa546cfa3c308c605b1a578004a08836eb29c21ae8d139f95e97a73ff7e57651e260cca04fabbc1ac7ef SHA512 94ae4710bfed572abe7dd4b6238ddb4e240c55250e608d63fc1c8ccf67567927721a0f09234ae7a018fe38e4f5a0bc47745b483e5073d5a4da3816d99853746d -AUX ufo-ai-2.4-mathlib.patch 1852 BLAKE2B 793a17f18af5dbc3420e5d06b239aa5ed024470cab74c3d278f3d83720ceb6b48e589694e510dd2ce5084106b7688bd64045db3abb62da74d589213429b71ea9 SHA512 3b086458e94ea9a7f1efd4ecb7d96a5b44e326f0d59916476595bf328c1e66250241124a74921302a9e139eeb61fd7b2a860fd972bbbc5664157bf60a2196b02 -DIST 1maps.pk3 242016 BLAKE2B 8b30fd8d8bcb4f59b1626feb00e71d7a2360ab19a7aade746778f3cf668ae670cb4c61f35847f49df677ac6a8948e496c37da980db5a1c780128c6c75c0d9e15 SHA512 9615b365e590dceb82362e7cd683980e15401a3b5a2b359a33c7ed2a4c51e5328efb352618cc48f46971a2ced1717276b5270ca6bf6d2bc7fc2b2238030eb3ae -DIST ufoai-2.4-data.tar 937062400 BLAKE2B a364058fb06501a93edc23a721849005bdab996b4dab572a102900579db4cfc819d905431f85bd6a3eddc5295996cea8de42b394821f72564fe3bef72a2a4a88 SHA512 471eab2f62cad144fe9966317d48c408fba19de0c33cf7414918b502c723b722af38a025f808848698d9a06ffc10fb0faac145dd01dcd3d321547c87da1c6246 -DIST ufoai-2.4-source.tar.bz2 16875353 BLAKE2B 67da8274733810eeece2fce69d49685433dfca766e8f8e03717f9828cfdd3b0f002c4b0d0402b667b1262a9d1deaeadf4c31e47eb0fe7fab0d3b62ec6715d9d3 SHA512 3f9d0df7392f50c201464c81e42435f860df97d5d7a2ef53bb9a05d2b2fc645a1130baaf16fc34818b88bb07b8cf83283f7479d685cbd3caf80ea7522e13c56f -EBUILD ufo-ai-2.4.ebuild 2733 BLAKE2B fa9f944bb071f12c2f38d2858052c88da098b6bb6b85859413b843d518d3335cbcd07ec5113ac0103f51f108f5ba4bb25f2f8606712c817b35f0f80a2faed36f SHA512 15aef152ec1fb487ff30e93746c2cd7d5502726fc77e05e25b072825dc39d93e942552f249741b0a07656064976f3a3e6d56a1f84c475d215b02b0eeca4dd8dc -MISC metadata.xml 403 BLAKE2B cb99fbd5f7f476ce55df930f1a83ce9dd4ceb22f91d4ba3797659247a15c921fbb20342ac603719a3c57aa4bd6fe121fa0bc65fc597c60adf8e9877794e34114 SHA512 959ff148dd3c58fdc06929f0ec98e1aecdced859cd0ce4549582dde6913d7061bc7ad39522f88fd6e18cf8731c04d3c8198d5f731b1839df16a53fc554c4adf0 diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch deleted file mode 100644 index 53f07261bb7e..000000000000 --- a/games-strategy/ufo-ai/files/ufo-ai-2.4-anon.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/tools/radiant/radiant/camera/CameraSettings.h.old 2014-10-22 08:30:35.690248415 +0200 -+++ src/tools/radiant/radiant/camera/CameraSettings.h 2014-10-22 08:31:12.329900302 +0200 -@@ -16,13 +16,13 @@ - const std::string RKEY_ENABLE_FARCLIP = "user/ui/camera/enableCubicClipping"; - const std::string RKEY_DRAWMODE = "user/ui/camera/drawMode"; - const std::string RKEY_SOLID_SELECTION_BOXES = "user/ui/xyview/solidSelectionBoxes"; -+} - - enum CameraDrawMode - { - drawWire, drawSolid, drawTexture - }; - --} - /* greebo: This is the home of all the camera settings. As this class derives - * from a RegistryKeyObserver, it can be connected to the according registry keys - * and gets notified if any of the observed keys are changed.*/ diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch deleted file mode 100644 index 632e0d4fdc0d..000000000000 --- a/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urN ufoai-2.4-source.old//src/client/cl_main.c ufoai-2.4-source/src/client/cl_main.c ---- ufoai-2.4-source.old//src/client/cl_main.c 2012-05-01 10:59:51.720868619 +0200 -+++ ufoai-2.4-source/src/client/cl_main.c 2012-05-01 11:00:57.235869759 +0200 -@@ -1180,7 +1180,11 @@ - if (fs_i18ndir->string[0] != '\0') - Q_strncpyz(languagePath, fs_i18ndir->string, sizeof(languagePath)); - else -+#ifdef LOCALEDIR -+ Q_strncpyz(languagePath, LOCALEDIR, sizeof(languagePath)); -+#else - Com_sprintf(languagePath, sizeof(languagePath), "%s/"BASEDIRNAME"/i18n/", FS_GetCwd()); -+#endif - Com_DPrintf(DEBUG_CLIENT, "...using mo files from %s\n", languagePath); - bindtextdomain(TEXT_DOMAIN, languagePath); - bind_textdomain_codeset(TEXT_DOMAIN, "UTF-8"); diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch deleted file mode 100644 index 72fd81038fb6..000000000000 --- a/games-strategy/ufo-ai/files/ufo-ai-2.4-mathlib.patch +++ /dev/null @@ -1,29 +0,0 @@ -http://bugs.gentoo.org/509928 - -src/common/common.c:261: error: undefined reference to 'sincos' -src/shared/mathlib.c:476: error: undefined reference to '__acosf_finite' -[ ... snip ... ] -collect2: error: ld returned 1 exit status - ---- build/modules/ufo.mk -+++ build/modules/ufo.mk -@@ -9,7 +9,7 @@ - $(TARGET)_LINKER := $(CC) - $(TARGET)_FILE := $(TARGET)$(EXE_EXT) - $(TARGET)_CFLAGS += -DCOMPILE_UFO $(BFD_CFLAGS) $(SDL_CFLAGS) $(SDL_TTF_CFLAGS) $(SDL_MIXER_CFLAGS) $(CURL_CFLAGS) $(THEORA_CFLAGS) $(XVID_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) $(MXML_CFLAGS) --$(TARGET)_LDFLAGS += -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz -+$(TARGET)_LDFLAGS += -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz -lm - - $(TARGET)_SRCS = \ - client/cl_console.c \ ---- build/modules/testall.mk -+++ build/modules/testall.mk -@@ -9,7 +9,7 @@ - $(TARGET)_LINKER := $(CC) - $(TARGET)_FILE := $(TARGET)$(EXE_EXT) - $(TARGET)_CFLAGS += -DCOMPILE_UFO -DHARD_LINKED_GAME -DCOMPILE_UNITTESTS $(BFD_CFLAGS) $(SDL_CFLAGS) $(CURL_CFLAGS) $(OGG_CFLAGS) $(MXML_CFLAGS) --$(TARGET)_LDFLAGS += -lcunit -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz -+$(TARGET)_LDFLAGS += -lcunit -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz -lm - - $(TARGET)_SRCS = \ - tests/test_all.c \ diff --git a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild deleted file mode 100644 index 57907a66571c..000000000000 --- a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic games - -MY_P=${P/o-a/oa} - -DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game" -HOMEPAGE="http://ufoai.sourceforge.net/" -SRC_URI="mirror://sourceforge/ufoai/${MY_P}-source.tar.bz2 - mirror://sourceforge/ufoai/${MY_P}-data.tar - http://mattn.ninex.info/1maps.pk3" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug dedicated editor" - -# Dependencies and more instructions can be found here: -# http://ufoai.ninex.info/wiki/index.php/Compile_for_Linux -DEPEND="!dedicated? ( - virtual/opengl - virtual/glu - media-libs/libsdl - media-libs/sdl-image[jpeg,png] - media-libs/sdl-ttf - media-libs/sdl-mixer - virtual/jpeg - media-libs/libpng:0 - media-libs/libogg - media-libs/libvorbis - x11-proto/xf86vidmodeproto - ) - net-misc/curl - sys-devel/gettext - sys-libs/zlib - editor? ( - dev-libs/libxml2 - virtual/jpeg - media-libs/openal - x11-libs/gtkglext - x11-libs/gtksourceview:2.0 - )" - -S=${WORKDIR}/${MY_P}-source - -src_prepare() { - if has_version '>=sys-libs/zlib-1.2.5.1-r1' ; then - sed -i -e '1i#define OF(x) x' src/common/ioapi.h || die - fi - - # don't try to use the system mini-xml - sed -i -e '/mxml/d' configure || die - - epatch \ - "${FILESDIR}"/${P}-mathlib.patch \ - "${FILESDIR}"/${P}-anon.patch \ - "${FILESDIR}"/${P}-locale.patch - - cp "${DISTDIR}"/1maps.pk3 "${WORKDIR}"/base/ || die - mv "${WORKDIR}"/base/ "${S}"/ || die -} - -src_configure() { - # they are special and provide hand batched configure file - local myconf=" - --disable-dependency-tracking - $(use_enable !debug release) - $(use_enable editor ufo2map) - $(use_enable editor uforadiant) - --enable-ufoded - --bindir="${GAMES_BINDIR}" - --libdir="$(games_get_libdir)" - --datadir="${GAMES_DATADIR}/${PN/-}" - --localedir="${EPREFIX}/usr/share/locale/" - --prefix="${GAMES_PREFIX}" - " - echo "./configure ${myconf}" - ./configure ${myconf} || die -} - -src_compile() { - emake - emake lang - - if use editor; then - emake uforadiant - fi -} - -src_install() { - newicon src/ports/linux/ufo.png ${PN}.png - dobin ufoded - make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN} - if ! use dedicated; then - dobin ufo - make_desktop_entry ufo "UFO: Alien Invasion" ${PN} - fi - - if use editor; then - dobin ufo2map ufomodel - fi - - # install data - insinto "${GAMES_DATADIR}"/${PN/-} - doins -r base - rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/game.so" - dogameslib base/game.so - - # move translations where they belong - dodir "${GAMES_DATADIR_BASE}/locale" - mv "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/"* \ - "${ED}/${GAMES_DATADIR_BASE}/locale/" || die - rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/" || die - - prepgamesdirs -} diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest new file mode 100644 index 000000000000..afc325d031c8 --- /dev/null +++ b/games-strategy/ufoai/Manifest @@ -0,0 +1,6 @@ +AUX ufoai-2.5.0_p20180603-install.patch 1097 BLAKE2B b2c1f2761429dafd2ffad037e5adf981e5062eb75bffaac51c127fe056e00da59238d91a0b1916d6325ea7e643a87e0945ac3ef20d8f2b958cc88904d96ed9c3 SHA512 b8a61ca5be370bc7fec5d97317e950b2654e6ffe4ffef4473b64f1a37af5dfbfa9152ef4e5bb11e2217bdadae04e7499ef19b67bfdfb32c5ab4a200ac5798ffc +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 +EBUILD ufoai-2.5.0_p20180603.ebuild 3972 BLAKE2B dc47c6537bbf7f4f824300bb639009b64d7cb27fe0f36a334c79617fdac03ab4c4c7d2ef1068121c8730c8775bdc988828496f9366507dde30154b756ecf78f8 SHA512 65256cda61fda4e051a859836841fa8575e8dd224242781e7b444c403bc51ef71807eed6ba919194a9d31719b64c67a430df3b92959ff0f4654b04bf7a38f6e6 +MISC metadata.xml 536 BLAKE2B d0037cae0706304da8c17767d8980eadd1b437bce5f75e980e3a42113b2596d6ed0017962720a9f0c1cc726ceb63028249d5b87b57cf1166dee03d4b884f5d42 SHA512 e02322e3077645800fdc90673261658fe0c33f5e20282cdf40a1867ce85e07e79967f38999031c652f259520489cc65942ae252f8a26182cbdeae6ac5024271d diff --git a/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch new file mode 100644 index 000000000000..5c92f433e279 --- /dev/null +++ b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch @@ -0,0 +1,37 @@ +* Prevent stripping +* Prevent installation of useless wrappers +* Install binaries to the right locations + +Chewi +2018/06/05 + +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2018-06-03 21:55:40.000000000 +0100 ++++ b/Makefile 2018-06-05 22:29:08.666944853 +0100 +@@ -33,8 +33,8 @@ + CONFIGURE_PREFIX ?= + + INSTALL ?= install +-INSTALL_PROGRAM ?= $(INSTALL) -m 755 -s +-INSTALL_SCRIPT ?= $(INSTALL) -m 755 ++INSTALL_PROGRAM ?= $(INSTALL) -m 755 ++INSTALL_SCRIPT ?= true + INSTALL_DIR ?= $(INSTALL) -d + INSTALL_MAN ?= $(INSTALL) -m 444 + INSTALL_DATA ?= $(INSTALL) -m 444 +@@ -162,8 +162,13 @@ + + install-$(1): $($(1)_FILE) + @echo 'Install $$<' +- $(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGDATADIR)/$(dir $($(1)_FILE)) +- $(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGDATADIR)/$$< ++ $(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGBINDIR)/ ++ $(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGBINDIR)/ ++ ++install-game: $(game_FILE) ++ @echo 'Install $$<' ++ $(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGLIBDIR)/ ++ $(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGLIBDIR)/$(notdir $(game_FILE)) + + uninstall-$(1): + @echo 'Uninstall $($(1)_FILE)' diff --git a/games-strategy/ufo-ai/metadata.xml b/games-strategy/ufoai/metadata.xml index 21d773f531ac..916e44355c73 100644 --- a/games-strategy/ufo-ai/metadata.xml +++ b/games-strategy/ufoai/metadata.xml @@ -6,7 +6,9 @@ <name>Gentoo Games Project</name> </maintainer> <use> - <flag name="editor">Build map editor</flag> + <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> <remote-id type="sourceforge">ufoai</remote-id> diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild new file mode 100644 index 000000000000..0fd98165739d --- /dev/null +++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop flag-o-matic gnome2-utils toolchain-funcs versionator + +# 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) + +# Install game data here +DATADIR="/usr/share/${PN}" + +DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game" +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 )" + +RDEPEND=" + net-misc/curl + sys-libs/zlib + + client? ( + media-libs/libogg + media-libs/libpng:0= + media-libs/libsdl2[joystick,opengl,sound,threads,video] + media-libs/libtheora + media-libs/libvorbis + media-libs/sdl2-mixer + media-libs/sdl2-ttf + media-libs/xvid + virtual/jpeg:0 + 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] + ) +" + +DEPEND=" + ${RDEPEND} + app-arch/unzip + sys-devel/gettext + virtual/pkgconfig +" + +S="${WORKDIR}/${PN}-code-${COMMIT}" +PATCHES=( "${FILESDIR}"/${P}-install.patch ) + +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 +} + +src_prepare() { + default + + # Make the build system a bit happier, will be fixed upstream + mkdir -p base/{maps,models} contrib/installer/mojosetup/scripts || die +} + +src_configure() { + # Avoid noise, will be present in 2.6 + append-cxxflags -Wno-expansion-to-defined + + # The configure script of UFO:AI is hand crafted and a bit special + # econf does not work: "invalid option --build=x86_64-pc-linux-gnu" + local config=( + --prefix="${EPREFIX}"/usr + --datadir="${EPREFIX}${DATADIR}" + --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} + --localedir="${EPREFIX}"/usr/share/locale + --disable-dependency-tracking + --disable-paranoid + --disable-memory + --disable-testall + --disable-ufomodel + --disable-ufoslicer + $(use_enable cpu_flags_x86_sse sse) + $(use_enable !debug release) + $(use_enable server ufoded) + $(use_enable client ufo) + $(use_enable editor uforadiant) + $(use_enable editor ufo2map) + ) + + if use client || use server; then + config+=( --enable-game ) + else + config+=( --disable-game ) + fi + + echo ./configure "${config[@]}" + + CC=$(tc-getCC) CXX=$(tc-getCXX) \ + ./configure "${config[@]}" || die "configure failed" +} + +src_compile() { + emake all lang Q= +} + +src_install() { + newicon -s 32 src/ports/linux/ufo.png ${PN}.png + emake install Q= DESTDIR="${D}" + + if use client; then + doman debian/ufo.6 + make_desktop_entry ufo "UFO: Alien Invasion" ${PN} + fi + + if use server; then + 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 +} + +pkg_preinst() { gnome2_icon_savelist; } +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; } diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index 7cce06a5dc8a..733d5525023b 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,9 +1,6 @@ -AUX wesnothd.rc 502 BLAKE2B 70803edb2084abfee5382624adba4a31e0bd1d5e9e2a7d800f7732fb262bacc80eb39550f2c15d19b7be9bc626d07aa5eafca04ea07abfda92a1778681a51428 SHA512 5e0a4680a35f81e749b8e0d56e3cf372c4a13b19578deda072560d0c63460426d7bde3e0e955287c8fbc939c700dc487283373ff9bc72bbcd9cf633ddaeafc96 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab -DIST wesnoth-1.12.6.tar.bz2 387869758 BLAKE2B 53328f8ebbaaabb266064fea57c0d28779183ba1b77ae8522c4dbb01c4a9ad9068d76307b48cec6576648132bf34f9a45efdb93ad36e03d035ed06e84711c9b6 SHA512 12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079 SHA512 0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02 DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e SHA512 010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb -EBUILD wesnoth-1.12.6.ebuild 3106 BLAKE2B 20d3d1069778f17dde09d92b734ca4aa1a9f6c20cf0cf65339a418c686e83e9a7b1d40e39aa823f467b50c62cf4cc7ec71a110ce390213189008940c0cfe3ef8 SHA512 3220f1581f8f4561d2c179267d47fd8c8c1eeb0a296467e6d07311635e01f2981b64b747377e229f0e3cd575accab4b66be99be36994b81400db20f56f795f5d EBUILD wesnoth-1.14.1-r1.ebuild 2656 BLAKE2B 00da7cf0a8939393225357da39a395d0de8c6bfb37b9eb939fc4c6813357ad7ac32ccfb395dfbc6ae6cab918e87fc041b097d5125d3b564ff74f5d045c68d197 SHA512 3276ec8c8b527addd1caf2f413dd95ec219bd7cc47779bb146eeddbd6bc7dd840bb6d852f70992ffde5dca90501489484faf27f6f65053b2b0b098d1cf8f941f -EBUILD wesnoth-1.14.2.ebuild 2656 BLAKE2B 00da7cf0a8939393225357da39a395d0de8c6bfb37b9eb939fc4c6813357ad7ac32ccfb395dfbc6ae6cab918e87fc041b097d5125d3b564ff74f5d045c68d197 SHA512 3276ec8c8b527addd1caf2f413dd95ec219bd7cc47779bb146eeddbd6bc7dd840bb6d852f70992ffde5dca90501489484faf27f6f65053b2b0b098d1cf8f941f +EBUILD wesnoth-1.14.2.ebuild 2666 BLAKE2B 5cd566af18469c24be3771464dc25c72aa56a2f3cd5640df5f82d740c4dda2c3ec4743e3b2c25aa30fe10604d9ef58ad5c4f01417b2118329f3840f41879fa54 SHA512 0608ca01af7838cdeac1e979bd3d248e97951248b70379d566a2b7950f286c191024661045213871ad94677019ab594e5e1595b8114259c6431c0746bad87f30 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3 diff --git a/games-strategy/wesnoth/files/wesnothd.rc b/games-strategy/wesnoth/files/wesnothd.rc deleted file mode 100644 index f8662b0981fc..000000000000 --- a/games-strategy/wesnoth/files/wesnothd.rc +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use net -} - -start() { - ebegin "Starting wesnothd" - start-stop-daemon --start --quiet -b -m \ - --pidfile "GAMES_STATEDIR"/run/wesnothd/wesnothd.pid \ - -c GAMES_USER_DED:GAMES_GROUP \ - --exec "GAMES_BINDIR"/wesnothd - eend $? -} - -stop() { - ebegin "Stopping wesnothd" - start-stop-daemon --stop --quiet --pidfile "GAMES_STATEDIR"/run/wesnothd/wesnothd.pid - eend $? -} diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild deleted file mode 100644 index 3c5d8cf3cf08..000000000000 --- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games - -DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" -HOMEPAGE="http://www.wesnoth.org/" -SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd" -IUSE="dbus dedicated doc fribidi nls server" - -RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X] - media-libs/sdl-net - !dedicated? ( - >=media-libs/sdl-ttf-2.0.8 - >=media-libs/sdl-mixer-1.2[vorbis] - >=media-libs/sdl-image-1.2[jpeg,png] - fribidi? ( dev-libs/fribidi ) - dbus? ( sys-apps/dbus ) - sys-libs/zlib - x11-libs/pango - dev-lang/lua:0 - media-libs/fontconfig - ) - >=dev-libs/boost-1.48:=[nls,threads] - virtual/libintl" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext" - -src_prepare() { - cmake-utils_src_prepare - - if use dedicated || use server ; then - sed \ - -e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \ - -e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \ - -e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \ - -e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \ - > "${T}"/wesnothd || die - fi - if ! use doc ; then - sed -i \ - -e '/manual/d' \ - doc/CMakeLists.txt || die - fi - # bug #472994 - mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die - mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die - - # respect LINGUAS (bug #483316) - if [[ ${LINGUAS+set} ]] ; then - local langs - for lang in $(cat po/LINGUAS) - do - has $lang $LINGUAS && langs+="$lang " - done - echo "$langs" > po/LINGUAS || die - fi -} - -src_configure() { - filter-flags -ftracer -fomit-frame-pointer - if [[ $(gcc-major-version) -eq 3 ]] ; then - filter-flags -fstack-protector - append-flags -fno-stack-protector - fi - # Work around eclass - append-flags -UNDEBUG - if use dedicated || use server ; then - mycmakeargs=( - "-DENABLE_CAMPAIGN_SERVER=TRUE" - "-DENABLE_SERVER=TRUE" - "-DSERVER_UID=${GAMES_USER_DED}" - "-DSERVER_GID=${GAMES_GROUP}" - "-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd" - ) - else - mycmakeargs=( - $(cmake-utils_use_enable fribidi FRIBIDI) - "-DENABLE_CAMPAIGN_SERVER=FALSE" - "-DENABLE_SERVER=FALSE" - ) - fi - mycmakeargs+=( - $(cmake-utils_use_enable !dedicated GAME) - $(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY) - $(cmake-utils_use_enable nls NLS) - $(cmake-utils_use_enable dbus NOTIFICATIONS) - "-DCMAKE_VERBOSE_MAKEFILE=TRUE" - "-DENABLE_STRICT_COMPILATION=FALSE" - "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}" - "-DDATAROOTDIR=${GAMES_DATADIR}" - "-DBINDIR=${GAMES_BINDIR}" - "-DICONDIR=/usr/share/pixmaps" - "-DDESKTOPDIR=/usr/share/applications" - "-DLOCALEDIR=/usr/share/locale" - "-DMANDIR=/usr/share/man" - "-DDOCDIR=/usr/share/doc/${PF}" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - DOCS="README.md changelog players_changelog" cmake-utils_src_install - if use dedicated || use server; then - keepdir "${GAMES_STATEDIR}/run/wesnothd" - doinitd "${T}"/wesnothd - fi - prepgamesdirs -} diff --git a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild index 5a1f6c5af2e9..27cde05f1ad0 100644 --- a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild @@ -100,7 +100,7 @@ src_configure() { -DENABLE_FRIBIDI="$(usex fribidi)" -DENABLE_OMP="$(usex openmp)" -DENABLE_STRICT_COMPILATION="OFF" - -DCMAKE_INSTALL_PREFIX="/usr" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" ) cmake-utils_src_configure } |