From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- games-strategy/Manifest.gz | Bin 8885 -> 8883 bytes games-strategy/colobot-data/Manifest | 6 +- .../colobot-data/colobot-data-0.1.11.ebuild | 53 ------ games-strategy/colobot-data/metadata.xml | 2 - games-strategy/colobot/Manifest | 2 - games-strategy/colobot/colobot-0.1.11.ebuild | 59 ------- games-strategy/dunelegacy/Manifest | 9 +- games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild | 57 ------- games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild | 39 +++++ .../dunelegacy/files/dunelegacy-0.96.3-build.patch | 60 ------- .../files/dunelegacy-0.96.4-init-mid.patch | 50 ++++++ games-strategy/dunelegacy/metadata.xml | 1 - games-strategy/freeciv/Manifest | 4 + games-strategy/freeciv/freeciv-2.5.12.ebuild | 179 ++++++++++++++++++++ games-strategy/freeciv/freeciv-2.6.1.ebuild | 184 +++++++++++++++++++++ games-strategy/hedgewars/Manifest | 2 +- games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild | 6 +- games-strategy/openra/Manifest | 2 +- games-strategy/openra/openra-20190314.ebuild | 2 +- games-strategy/ufoai/Manifest | 3 +- .../ufoai/files/ufoai-2.5.0_p20180603-mxml3.patch | 29 ++++ games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild | 22 ++- games-strategy/wesnoth/Manifest | 6 +- games-strategy/wesnoth/wesnoth-1.14.7.ebuild | 10 +- games-strategy/wesnoth/wesnoth-1.14.9.ebuild | 9 +- games-strategy/wesnoth/wesnoth-1.15.2.ebuild | 9 +- games-strategy/widelands/Manifest | 4 +- games-strategy/widelands/widelands-0.20.ebuild | 8 +- games-strategy/widelands/widelands-0.20_rc1.ebuild | 8 +- 29 files changed, 537 insertions(+), 288 deletions(-) delete mode 100644 games-strategy/colobot-data/colobot-data-0.1.11.ebuild delete mode 100644 games-strategy/colobot/colobot-0.1.11.ebuild delete mode 100644 games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild create mode 100644 games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild delete mode 100644 games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch create mode 100644 games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch create mode 100644 games-strategy/freeciv/freeciv-2.5.12.ebuild create mode 100644 games-strategy/freeciv/freeciv-2.6.1.ebuild create mode 100644 games-strategy/ufoai/files/ufoai-2.5.0_p20180603-mxml3.patch (limited to 'games-strategy') diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz index 5350c1dbce5e..1ec58e30568c 100644 Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ diff --git a/games-strategy/colobot-data/Manifest b/games-strategy/colobot-data/Manifest index 297b6a61a5b4..232ae33c2a3c 100644 --- a/games-strategy/colobot-data/Manifest +++ b/games-strategy/colobot-data/Manifest @@ -1,8 +1,4 @@ -DIST colobot-data-0.1.11-music-flac.tar.gz 298829480 BLAKE2B 2a041df82b295433257dd0358b6f83d585cae086a7c1f7e891964a4ffca2e1ca71bb68f7f01160c8dddaeb3b553fcc0082ab746177836d8b9494376a9a9b4451 SHA512 0ab613ea8ca59771b5d93b9c8d96ad88a0fe27f6171be0cb1d6d2eb60b820fdcad83f8fdc5d2f968e8091a6f3e727eb202c4dd09f86afb3eb2e325756eb40873 -DIST colobot-data-0.1.11-music-ogg.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764 -DIST colobot-data-0.1.11.tar.gz 54014394 BLAKE2B 16464ca663a9e470db4f9af052d313240f38cf651edd738412eb2dd7aed187432de859304a0f2625ed9a4d2c73abe00606670754a59404ac4651fa31ce8e688f SHA512 0f79d403e378b098bbc09fb766c34a09bbe1d4fe17e9070a983808477cb7bf3a101a7c156a0148f7b5b5164de481e45c8f83cf25c829e5e20c2aec3f58d59c9a DIST colobot-gold-0.1.12-alpha.data.tar.gz 54732267 BLAKE2B 8cf36911764beb921e2b1009fd8550a1a146f594033cfc4de2d8587866780e22f060949735b03c2e355fab412c70c8557587f859edb86ca815ef249edc348926 SHA512 599cc72e1383826b5c840446f52f53b0f325b1de2ce08826bbd6b04072a51f1c4007b5683f2608dd7be67ab358ef2856e790bbbe5c73d8514141e3284be47508 DIST colobot-music_ogg_0.1.12-alpha.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764 -EBUILD colobot-data-0.1.11.ebuild 1410 BLAKE2B 05f62120e6f26e41748a66236751ed597ad36f0d284c5933e222d72adc6df8a208555c348f84ea56f8b0565604d701241777ff8b68c1bd55bdca14defd550c72 SHA512 fabbb3117169c0ed607a7221572ae30ae7bb70dd6d6c646563062019c2195d58822f1496157d0ceff53cfa0835b09b895d8e036253af028b7e0a470ddc1212f1 EBUILD colobot-data-0.1.12.ebuild 989 BLAKE2B 5613847baa1e09fae7fe2a2b59bb44bdf3ec1e3a430371b1a6a2bb78d637a44b06f6ef05d94526e5a7f55fd3daf17da81de456a743b0333cba34eca2d9702937 SHA512 1b6607b8e168696fc396ba41ae58fad02de70a6b2d952fe638a2a46bd1bbbc9aa96f5382d473579cac6454236c600c1eb07dbe720dd4ee337a9be22178cb41b3 -MISC metadata.xml 524 BLAKE2B b9c8ac4a161d7966a294c6dc8b7c5799cb6d5b7fce77c44897d0b5ac4a62a77fdd4ac9c5fdcecd4d5ec8e93ec9ef5377b9931674c29a9c89a877ae25862d3cb6 SHA512 72d249ccfa5e7962c95f4d2731e075fe23b00f69bacf6df290a246e0bd5c8e4208b72b9eca12fcb4bcf42782fc2810c50338a3febc0762818003a8858de6fbdf +MISC metadata.xml 396 BLAKE2B d99c9c0508c946e227c6fd3802a8c93594c1807b6b911aa77f2b19968a98fb2d1cefc81f332a260e52b16aa54e568368a88c7a5bb1b0097c8b3a43e6cd94498b SHA512 e7a8f625253c57cdd9a02b68a191adf58f28744a34049794d26a0fe217c1adf77a5260245ea11b1f96be358a74b01604cfe09f78e4ba3b2681f7427d9acb7ad2 diff --git a/games-strategy/colobot-data/colobot-data-0.1.11.ebuild b/games-strategy/colobot-data/colobot-data-0.1.11.ebuild deleted file mode 100644 index 552ae2376a42..000000000000 --- a/games-strategy/colobot-data/colobot-data-0.1.11.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Data package for colobot (Colonize with Bots)" -HOMEPAGE="https://colobot.info/" -SRC_URI=" - https://github.com/colobot/colobot-data/archive/colobot-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz - music-ogg? ( https://colobot.info/files/music/colobot-music_ogg_${PV}-alpha.tar.gz -> ${P}-music-ogg.tar.gz ) - music-flac-convert? ( https://colobot.info/files/music/colobot-music_flac_${PV}-alpha.tar.gz -> ${P}-music-flac.tar.gz )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+music music-flac-convert +music-ogg" -REQUIRED_USE=" - music? ( ^^ ( music-flac-convert music-ogg ) ) - music-flac-convert? ( music ) - music-ogg? ( music )" - -DEPEND=" - music-flac-convert? ( media-sound/vorbis-tools )" - -S="${WORKDIR}/${PN}-colobot-gold-${PV}-alpha" - -src_unpack() { - unpack "${P}.tar.gz" - - cd "${S}" || die - if use music; then - tar xf "${DISTDIR}/${P}"-music-*.tar.gz -C "${S}/music" || die "Failed to unpack music" - fi -} - -src_prepare() { - cmake-utils_src_prepare - - if use music; then - sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DMUSIC=$(usex music) - -DMUSIC_FLAC=$(usex music-flac-convert) - -DMUSIC_QUALITY="${COLOBOT_DATA_MUSIC_QUALITY:-4}" - ) - cmake-utils_src_configure -} diff --git a/games-strategy/colobot-data/metadata.xml b/games-strategy/colobot-data/metadata.xml index 666782d07980..3f6e4b49600d 100644 --- a/games-strategy/colobot-data/metadata.xml +++ b/games-strategy/colobot-data/metadata.xml @@ -10,7 +10,5 @@ Enable music support - Fetch flac music and convert it to ogg - Fetch ogg music diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest index cfef8b6cda00..8587ed056b4b 100644 --- a/games-strategy/colobot/Manifest +++ b/games-strategy/colobot/Manifest @@ -1,6 +1,4 @@ -DIST colobot-0.1.11.tar.gz 1430595 BLAKE2B 6e4a23f17631031a6f502b045637949d99bfcf8aa723f11c406c8cdb9b201b9a2771de8b8c92829bc890848a19eb182bc30a45a51e6d281ce64370f6c7a0d8a5 SHA512 fe32bc56b6fae9435c74a73b694b7d2b93667e5d15b1c57a7558e492613f0a5d4cab72ff341ab4c921150137282cc71292a1e31eb1ed06c752de33c50120f20e DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe -EBUILD colobot-0.1.11.ebuild 1396 BLAKE2B add1b2c941611d1211eb5bca0c66a6590165fc6a142da9643b54dbc4a11166921878c8496d40cf2a68d377adef02ab9b3deb41854f43cd90d3af8e6f63ba84c1 SHA512 defd48a69a000859dd2999e8d1e9c167c66d54beb118a4bf75b64de20bcaceab79b489073f08a7ad280ef700d12c3110a2207500ea5622208137bd2f8079da1f EBUILD colobot-0.1.12.ebuild 1478 BLAKE2B a66d5c4aa584706868cfa8f76a368f6c614f48767a086946eafad83a44ae44d3c24a70650f4aa88971998495b70ff1122d02fded40193eda6f8fe07fb7de4080 SHA512 fcb8e33bccbf67cb835732630f1b84009202cce3a02dd7a497050f8fd91c3cb4ae54f62e3b24c62e1aa2687a4067aeced47cea1c7f5fe15a7707c451478bda83 EBUILD colobot-9999.ebuild 1422 BLAKE2B 3c0d22a6df76aa3303567bff0b42c0e52aa765b0ec7e1dc6822125a949fcf94b89bc5957778e3aa2553a36c316105d96edcd9351629bb809b2a6187967ef1391 SHA512 791b6935cedfd32412d2fabf75cc388d7cc21bdd17262b713efbce5c1627e72fa78e152d305cc4b7aa59cdbed5b94f124b4a0e6cc7df6aa9081f3c2c9fa645de MISC metadata.xml 418 BLAKE2B b30194895d7f35dc6b2bf5ed2d6153ab03832eff44536e837058b4c5641760c55ea846a3ffe91027d8892ab7ccd4a36be688b89a5909c57ca57a18f8a610f022 SHA512 6ffc5220d200c722b0e7da2ee8734282ea0fabd7d319f8a21cd88da6743312c869f44bd3b14af7031ce970feb9b6c4349236db2a7aee69ea8041e3b000812e3c diff --git a/games-strategy/colobot/colobot-0.1.11.ebuild b/games-strategy/colobot/colobot-0.1.11.ebuild deleted file mode 100644 index f1765e2658c2..000000000000 --- a/games-strategy/colobot/colobot-0.1.11.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils desktop - -DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics" -HOMEPAGE="https://colobot.info/" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/colobot/colobot" - EGIT_SUBMODULES=() - inherit git-r3 -else - SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="devbuild test tools doc +openal" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-games/physfs - dev-libs/boost:= - media-libs/glew:0 - media-libs/libogg - media-libs/libpng:0= - media-libs/libsdl2:= - media-libs/libsndfile:= - media-libs/libvorbis:= - media-libs/sdl2-image - media-libs/sdl2-ttf - media-sound/vorbis-tools - sys-devel/gettext - openal? ( media-libs/openal )" -RDEPEND="${DEPEND} - games-strategy/colobot-data" - -src_configure() { - local mycmakeargs=( - -DDEV_BUILD=$(usex devbuild) - -DTESTS=$(usex test) - -DTOOLS=$(usex tools) - -DINSTALL_DOCS=$(usex doc) - -DOPENAL_SOUND=$(usex openal) - -DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin - -DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - doicon -s 256 desktop/colobot.ico -} diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest index 1f0946fbc919..e8ee3c941efa 100644 --- a/games-strategy/dunelegacy/Manifest +++ b/games-strategy/dunelegacy/Manifest @@ -1,5 +1,4 @@ -AUX dunelegacy-0.96.3-build.patch 1942 BLAKE2B 8a230ae20884b11b4608437c03466a856b66e49136574ee5c55c5e90de34efbbb0bab7ed4fe90e2653b44fa1f5adb94d002e7d51912732d22bc5e891e593515c SHA512 fa3ffaa26ba1d85bc65d646347ef9c725bfb4f8b7e78c3ca13429356def201bb255d31c6ec684ca99dd0928bf9a3b83af547a7cb865ba1c2475ce03401fa91bb -DIST dunelegacy-0.96.3-no-autoreconf.patch.xz 8908 BLAKE2B eb1c0a5a155851e199ad2c1f0cbd8f7c583ac148f92e1b2829607c0960bf09a6d8bea8e34749df726f394b3cf796f0c457086d993ace2b3336ce99ed36fb77e1 SHA512 fc17c771a19611057b2990b76eda0eea08e011dcac455bdf7e26bba1f2e2aa6cec120f2dcbce488a2318553f9e58b4a2b5ea24c7e1e27ada9ec5740f2b66ca4c -DIST dunelegacy-0.96.3-src.tar.bz2 1652302 BLAKE2B 4502300f1364027f1734a0738a648a9ac473a142e8091d08f5c44996fa41a26e91ab030f90d3f961b95b44e7e2bcb72a376915dc014aafee5e3d0dc4f6c8915b SHA512 c84281b44bdac4eec360d90e2f23aa75468cf08c6edd6a5002c539e609312fd39e3284518ef5498201f2b0433d11cf2478cd13a2159af7c6bbef326e680fa241 -EBUILD dunelegacy-0.96.3.ebuild 1392 BLAKE2B 38f15a59aa1cbded27c61a6f5250e494228c2c1591cebe3abfaab5b27ea024d92ed6d9f7b5c0f0f82e71af305a4455cb99cbf35a6b60fa8538b74f81d77e5e32 SHA512 29ec490705192497ca8e4d27a491d70afb56af253e3e73f230a37255dc0f263de3e3acf75b3836931ae96da73f0fa3e061a9d545c6fa9d6851abc0563cbfc240 -MISC metadata.xml 1103 BLAKE2B 0c07587dff0530955a552cf5dee9835ab0c8b3478e994c0b75524ceb6914a4714e02ad13ab52fba10b401a98a068aae9990ea936333014e8c7226c07aef8983c SHA512 de8920f2cb074e969cb3b8310bf2fb111c52c90a2675833fdefc895cafac79091cee0696b52a40065cd81289d80796cb0b0e40bd8db0e349ba92ec180091edcb +AUX dunelegacy-0.96.4-init-mid.patch 1926 BLAKE2B 47c2f502e9428f0534a1684db50aa1a41103464770f8da66f69b0add7687f42e07e4f5e612f3c425f3d0f932da29d7a6049342b6bbd0b0166cbec4d5076703c6 SHA512 a10fb87b3bceb367e53dd3687354871fc8bec3dff2025b37c4426994a206c7afbd416c003f2eddfe3d1cef7e845942d2a8db4529e84c38d4b29d75d016fa8729 +DIST dunelegacy-0.96.4-src.tar.bz2 2513167 BLAKE2B 119ccabc319a54fbc85906a215ccb44079dabf82568dbd446447bbc6fade873c4760da83a50351acf63aec49bf8364c50386eef2b0681bc7a895db870673340f SHA512 d6e152da4bc526ed05ac89fafc2e3467b1a95b3670987eeca262b7207e7dbe67dd228483cb5a432fe08232e34a52d4cb500b42cd186adb4bcde5da17419f7db0 +EBUILD dunelegacy-0.96.4.ebuild 806 BLAKE2B 03ba909beb05d2eae3aff020116b962189cd4ef4497154f3050100127912cdf33a33481ee09334c9564f772883ccca4c11baed1519d7d17b61458c87d2b57501 SHA512 c17ad6aa55d7698361ad6ce55906e8e97cb8e90d2b4564a8d161a21416269163ace3ddcb1851ab26b3a23678fa789400a20c1790f90999ed78c576409bcbb365 +MISC metadata.xml 989 BLAKE2B bfaf381dc676d28e93858a0322e8f5aa8453fd7aa0d8c832cc9aa4d5857dd6abfe9ba1b545f419732c0d15cca724dabe3799f45532645be08c5adcfd95b8e3dd SHA512 b0863ae1a4847b6c9b6486666328f3a97bba2a360c16bc219ca4a2099c3c6eebea64c51b9253c9fba2c3e4431b7254932ec5ba44072e6f80b52ac965729c4e79 diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild deleted file mode 100644 index ee94d40caa60..000000000000 --- a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# do not use autotools related stuff in stable ebuilds -# unless you like random breakage: 469796, 469798, 424041 - -EAPI=5 -inherit eutils gnome2-utils games # STABLE ARCH -#inherit autotools eutils gnome2-utils games # UNSTABLE ARCH - -DESCRIPTION="Updated clone of Westood Studios' Dune2" -HOMEPAGE="http://dunelegacy.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" -SRC_URI="${SRC_URI} https://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf.patch.xz" # STABLE ARCH - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+alsa pulseaudio" - -RDEPEND="media-libs/libsdl[X,alsa?,sound,pulseaudio?,video] - media-libs/sdl-mixer[midi,mp3,vorbis]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -# exits on start without libsdl[alsa] or libsdl[pulseaudio] -REQUIRED_USE="|| ( alsa pulseaudio )" - -src_prepare() { - epatch "${DISTDIR}"/${P}-no-autoreconf.patch.xz # STABLE ARCH -# epatch "${FILESDIR}"/${P}-build.patch # UNSTABLE ARCH -# eautoreconf # UNSTABLE ARCH -} - -src_install() { - default - - doicon -s scalable ${PN}.svg - doicon -s 48 ${PN}.png - make_desktop_entry ${PN} "Dune Legacy" - - 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/dunelegacy/dunelegacy-0.96.4.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild new file mode 100644 index 000000000000..5270312de457 --- /dev/null +++ b/games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop xdg + +DESCRIPTION="Updated clone of Westood Studios' Dune II" +HOMEPAGE="http://dunelegacy.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND="media-libs/libsdl2[sound,threads,video] + media-libs/sdl2-mixer[midi]" + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-init-mid.patch +) + +src_prepare() { + default + + # Prepend upstream flags. + sed -i -r 's/^(C.*FLAGS)=[^$]+$/\0" ${\1}"/' configure || die +} + +src_install() { + default + + doicon -s scalable ${PN}.svg + doicon -s 48 ${PN}.png + newicon -s 128 ${PN}-128x128.png ${PN}.png + make_desktop_entry ${PN} "Dune Legacy" +} diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch deleted file mode 100644 index 93dd907738bc..000000000000 --- a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch +++ /dev/null @@ -1,60 +0,0 @@ -Author: hasufell -Date: Thu Aug 9 18:57:40 2012 +0200 - - respect flags - use pkg-config - use LDADD instead of LDFLAGS for libs - ---- configure.ac -+++ configure.ac -@@ -16,14 +16,6 @@ - - AC_SUBST(dunelegacydatadir) - --dnl Some flags for gcc --CXXFLAGS="-O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -DNDEBUG" --dnl Additional flags: -Wconversion -Wno-sign-conversion -- --dnl Some flags for clang --dnl CXXFLAGS="-O3 -pipe -pedantic -Weverything -Wno-sign-conversion -Wno-conversion -Wno-shadow -Wno-missing-noreturn -Wno-padded -Wno-packed -Wno-weak-vtables -Wno-c++11-narrowing -Wno-cast-align -Wno-unreachable-code -Wno-missing-prototypes -Wno-float-equal -Wno-global-constructors -Wno-exit-time-destructors -Wno-format-nonliteral -Wno-unused-macros -Wextra -Wno-unused-parameter" -- -- - dnl test for -ffp-contract=off (gcc >= 4.6) and use -mno-fused-madd instead - oldCFLAGS="$CFLAGS" - CFLAGS="-ffp-contract=off" -@@ -33,34 +25,14 @@ - ) - CFLAGS="$oldCFLAGS" - --case "$target_cpu" in --i*86) CXXFLAGS="$CXXFLAGS -mfpmath=sse -msse";; --esac -- --AC_ARG_ENABLE([debug], -- [AS_HELP_STRING([--enable-debug], -- [compile with debug information @<:@default=disabled@:>@])], -- [], -- []) -- --if test "$enable_debug" = "yes" ; then -- CXXFLAGS="$CXXFLAGS -g" --fi - - dnl Check for SDL library - SDL_VERSION=1.2.0 --AM_PATH_SDL($SDL_VERSION, : , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])) -+PKG_CHECK_MODULES([SDL], [sdl >= $SDL_VERSION SDL_mixer]) - CFLAGS="$CFLAGS $SDL_CFLAGS" - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - --dnl Check for SDL_mixer library. --AC_CHECK_LIB(SDL_mixer, -- Mix_OpenAudio, -- LIBS="$LIBS -lSDL_mixer", -- AC_MSG_ERROR([*** SDL_mixer library not found!]) --) -- - dnl enet defines - AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)]) - AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)]) diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch new file mode 100644 index 000000000000..46966269dcad --- /dev/null +++ b/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch @@ -0,0 +1,50 @@ +From e227fc26ffff199a6a659dbe954ff7b764658d4d Mon Sep 17 00:00:00 2001 +From: Richard Schaller +Date: Sat, 30 Mar 2019 18:07:28 +0100 +Subject: [PATCH] Support for SDL_mixer 2.0.2 or higher: MIX_INIT_FLUIDSYNTH + was renamed to MIX_INIT_MID + +--- + src/FileClasses/music/DirectoryPlayer.cpp | 4 ++++ + src/FileClasses/music/XMIPlayer.cpp | 6 ++++++ + 2 files changed, 10 insertions(+) + +diff --git a/src/FileClasses/music/DirectoryPlayer.cpp b/src/FileClasses/music/DirectoryPlayer.cpp +index 531d971..05d800c 100644 +--- a/src/FileClasses/music/DirectoryPlayer.cpp ++++ b/src/FileClasses/music/DirectoryPlayer.cpp +@@ -59,7 +59,11 @@ DirectoryPlayer::DirectoryPlayer() : MusicPlayer(settings.audio.playMusic, setti + + music = nullptr; + ++#if SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) >= SDL_VERSIONNUM(2,0,2) ++ Mix_Init(MIX_INIT_MID | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG); ++#else + Mix_Init(MIX_INIT_FLUIDSYNTH | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG); ++#endif + } + + DirectoryPlayer::~DirectoryPlayer() { +diff --git a/src/FileClasses/music/XMIPlayer.cpp b/src/FileClasses/music/XMIPlayer.cpp +index a7e5150..0fcfa8f 100644 +--- a/src/FileClasses/music/XMIPlayer.cpp ++++ b/src/FileClasses/music/XMIPlayer.cpp +@@ -30,9 +30,15 @@ + XMIPlayer::XMIPlayer() : MusicPlayer(settings.audio.playMusic, settings.audio.musicVolume) { + music = nullptr; + ++#if SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) >= SDL_VERSIONNUM(2,0,2) ++ if((Mix_Init(MIX_INIT_MID) & MIX_INIT_MID) == 0) { ++ SDL_Log("XMIPlayer: Failed to init required midi support: %s", SDL_GetError()); ++ } ++#else + if((Mix_Init(MIX_INIT_FLUIDSYNTH) & MIX_INIT_FLUIDSYNTH) == 0) { + SDL_Log("XMIPlayer: Failed to init required midi support: %s", SDL_GetError()); + } ++#endif + } + + XMIPlayer::~XMIPlayer() { +-- +2.24.1 + diff --git a/games-strategy/dunelegacy/metadata.xml b/games-strategy/dunelegacy/metadata.xml index 4dc56b2c71f1..54f6bacf4aab 100644 --- a/games-strategy/dunelegacy/metadata.xml +++ b/games-strategy/dunelegacy/metadata.xml @@ -6,7 +6,6 @@ Gentoo Games Project - https://sourceforge.net/apps/mediawiki/dunelegacy/index.php?title=Development/Reporting_Bugs dunelegacy diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index e3db84ecd38f..ce27117a8d2b 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,6 +1,10 @@ AUX freeciv-2.5.11-freetype_pkgconfig.patch 8120 BLAKE2B cbcb39010d40abd530b8b30955c0461b7207698bb2e0701469e696d3ad3be6b3b0887d58623c7589784edd6961485517e18877dfbe9c011292e29b94dbcffb94 SHA512 525d3829fa17401cde3a0324d1342d4513decf6996864fa5d02462e2449d0895e8048fa71bd255b028b2ed084f8ca4734536cb86f85dd00d65e14d0f68b41184 DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456 +DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665 SHA512 bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d DIST freeciv-2.6.0.tar.bz2 51912466 BLAKE2B 180fa8900af6763ecae9190ce24799a77b8504d98081e48600c16c19e814b2ff1ef01ce6a41cb1a1739f848895e1551ba158f0357602f758e76b9ee6e0104a36 SHA512 658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8 +DIST freeciv-2.6.1.tar.bz2 51915573 BLAKE2B 160df7f59a5d2ab8090132df5c690ee96ce6811ad0644341ba07b10000bc2e4c30ef4e60ead57d17a7d0f722e42c204d839264830c7b423ccc393b7e7b30c30b SHA512 44145eaea96d5ab4f18e843102209d0f88a626af37365cf91b5e592bcac45f2692a7e21e9b3454a3ee4b9099212f5826a4687931bb37dabbb7dedad059df1cb4 EBUILD freeciv-2.5.11-r1.ebuild 4594 BLAKE2B 0475b6e216d21aa18180457ac7056abbd29e24394a9873a092b6f3f8c934134762d39e1171050337f80e951ba6e2f84332ab59ad593f5d4c33fe823097efce08 SHA512 0e33f76081ee36f8b93914452884da1d95abf96689d2712aab268b721187e64583a9bceb96843efef8c94a4ecbb8cc986f12277d3e18de62706ab1aa6fd78485 +EBUILD freeciv-2.5.12.ebuild 4528 BLAKE2B 5a2b4296887e1ee64f424b3c2a8ff6ee2aba09e6335c46076bb8352032f4ec0e2b3be60dafaeee8a48f93d59a407e8a115525e41610491622086dc31c367fb37 SHA512 1946c1773a02ac56550c0460575a1622f44ccb06df08c973ed1b2b5bbda1a192b1647c9c78f45f87cf06933ba7b45d5c979104aba9aa93f5831018b9ba95f1d7 EBUILD freeciv-2.6.0-r1.ebuild 4655 BLAKE2B 56b8dbca0b4e7409498fb8ca25d6b44633fb7aec98003a7343c3f91aaa349c6e92c1ffeb9913edaab6554f8a2871f1a1f1d910e033f41598dea3cbd6e5f45708 SHA512 304f1bd699e1e76e580aa46f5bdf37b7aee36d4fdef067e706c06883f7275832ff1750bed4b74bb4f9e9600a72149e5e26344441c289579957aac620f87ebc64 +EBUILD freeciv-2.6.1.ebuild 4655 BLAKE2B 56b8dbca0b4e7409498fb8ca25d6b44633fb7aec98003a7343c3f91aaa349c6e92c1ffeb9913edaab6554f8a2871f1a1f1d910e033f41598dea3cbd6e5f45708 SHA512 304f1bd699e1e76e580aa46f5bdf37b7aee36d4fdef067e706c06883f7275832ff1750bed4b74bb4f9e9600a72149e5e26344441c289579957aac620f87ebc64 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201 diff --git a/games-strategy/freeciv/freeciv-2.5.12.ebuild b/games-strategy/freeciv/freeciv-2.5.12.ebuild new file mode 100644 index 000000000000..bbb7332dc8e3 --- /dev/null +++ b/games-strategy/freeciv/freeciv-2.5.12.ebuild @@ -0,0 +1,179 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools eutils flag-o-matic gnome2-utils + +DESCRIPTION="multiplayer strategy game (Civilization Clone)" +HOMEPAGE="http://www.freeciv.org/" +SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua" + +# postgres isn't yet really supported by upstream +RDEPEND="app-arch/bzip2 + app-arch/xz-utils + net-misc/curl + sys-libs/zlib + auth? ( + mysql? ( dev-db/mysql-connector-c:0= ) + sqlite? ( dev-db/sqlite:3 ) + !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) + ) + readline? ( sys-libs/readline:0= ) + dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) + !dedicated? ( + media-libs/libpng:0 + gtk? ( x11-libs/gtk+:2 ) + mapimg? ( media-gfx/imagemagick:= ) + modpack? ( x11-libs/gtk+:2 ) + nls? ( virtual/libintl ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + sdl? ( + media-libs/libsdl[video] + media-libs/sdl-gfx + media-libs/sdl-image[png] + media-libs/sdl-ttf + ) + server? ( aimodules? ( sys-devel/libtool:2 ) ) + sound? ( + media-libs/libsdl[sound] + media-libs/sdl-mixer[vorbis] + ) + !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) + ) + system-lua? ( >=dev-lang/lua-5.2 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + !dedicated? ( + x11-base/xorg-proto + nls? ( sys-devel/gettext ) + )" + +pkg_setup() { + if use !dedicated && use !server ; then + ewarn "Disabling server USE flag will make it impossible" + ewarn "to start local games, but you will still be able to" + ewarn "join multiplayer games." + fi +} + +src_prepare() { + default + + eautoreconf + + # install the .desktop in /usr/share/applications + # install the icons in /usr/share/pixmaps + sed -i \ + -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \ + -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \ + -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \ + client/Makefile.in \ + server/Makefile.in \ + tools/Makefile.in \ + data/icons/Makefile.in || die + sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die +} + +src_configure() { + local myclient mydatabase myeconfargs + + if use auth ; then + if ! use mysql && ! use sqlite ; then + einfo "No database backend chosen, defaulting" + einfo "to mysql!" + mydatabase=mysql + else + use mysql && mydatabase+=" mysql" + use sqlite && mydatabase+=" sqlite3" + fi + else + mydatabase=no + fi + + if use dedicated ; then + myclient="no" + myeconfargs+=( --enable-server ) + else + if use !sdl && use !gtk && ! use qt5 ; then + einfo "No client backend given, defaulting to" + einfo "gtk2 client!" + myclient="gtk2" + else + use sdl && myclient+=" sdl" + use gtk && myclient+=" gtk2" + if use qt5 ; then + myclient+=" qt" + append-cxxflags -std=c++11 + fi + fi + myeconfargs+=( $(use_enable server) --without-ggz-client ) + fi + + myeconfargs+=( + --enable-aimodules="$(usex aimodules "yes" "no")" + --enable-client="${myclient}" + --enable-fcdb="${mydatabase}" + --enable-fcmp="$(usex modpack "gtk2" "no")" + # disabling shared libs will break aimodules USE flag + --enable-shared + --localedir=/usr/share/locale + $(use_enable ipv6) + $(use_enable mapimg) + $(use_enable nls) + $(use_enable sound sdl-mixer) + $(use_enable system-lua sys-lua) + $(use_with readline) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if use dedicated ; then + rm -rf "${ED%/}/usr/share/pixmaps" + rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}* + else + if use server ; then + # Create and install the html manual. It can't be done for dedicated + # servers, because the 'freeciv-manual' tool is then not built. Also + # delete freeciv-manual from the GAMES_BINDIR, because it's useless. + # Note: to have it localized, it should be ran from _postinst, or + # something like that, but then it's a PITA to avoid orphan files... + ./tools/freeciv-manual || die + docinto html + dodoc manual*.html + fi + if use sdl ; then + make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client + else + rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl* + fi + rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw* + fi + find "${ED}" -name "freeciv-manual*" -delete + + rm -f "${ED%/}/usr/$(get_libdir)"/*.a + prune_libtool_files +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-strategy/freeciv/freeciv-2.6.1.ebuild b/games-strategy/freeciv/freeciv-2.6.1.ebuild new file mode 100644 index 000000000000..764443f246c5 --- /dev/null +++ b/games-strategy/freeciv/freeciv-2.6.1.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV="${PV/_beta/-beta}" +MY_PV="${MY_PV/_rc/-RC}" +MY_P="${PN}-${MY_PV}" +inherit desktop flag-o-matic xdg + +DESCRIPTION="multiplayer strategy game (Civilization Clone)" +HOMEPAGE="http://www.freeciv.org/" + +if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then + SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua" + +# postgres isn't yet really supported by upstream +BDEPEND=" + virtual/pkgconfig + !dedicated? ( + x11-base/xorg-proto + nls? ( sys-devel/gettext ) + ) +" +DEPEND=" + app-arch/bzip2 + app-arch/xz-utils + net-misc/curl + sys-libs/zlib + auth? ( + !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) + mysql? ( dev-db/mysql-connector-c:0= ) + sqlite? ( dev-db/sqlite:3 ) + ) + dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) + !dedicated? ( + media-libs/libpng:0 + gtk? ( x11-libs/gtk+:2 ) + mapimg? ( media-gfx/imagemagick:= ) + modpack? ( x11-libs/gtk+:2 ) + nls? ( virtual/libintl ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) + sdl? ( + media-libs/libsdl2[video] + media-libs/sdl2-gfx + media-libs/sdl2-image[png] + media-libs/sdl2-ttf + ) + server? ( aimodules? ( sys-devel/libtool:2 ) ) + sound? ( + media-libs/libsdl2[sound] + media-libs/sdl2-mixer[vorbis] + ) + ) + readline? ( sys-libs/readline:0= ) + system-lua? ( >=dev-lang/lua-5.3:= ) +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use !dedicated && use !server ; then + ewarn "Disabling server USE flag will make it impossible" + ewarn "to start local games, but you will still be able to" + ewarn "join multiplayer games." + fi +} + +src_prepare() { + default + + # install the .desktop in /usr/share/applications + # install the icons in /usr/share/pixmaps + sed -i \ + -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \ + -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \ + -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \ + client/Makefile.in \ + server/Makefile.in \ + tools/Makefile.in \ + data/icons/Makefile.in || die + sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die +} + +src_configure() { + local myclient=() mydatabase=() myeconfargs=() + + if use auth ; then + if ! use mysql && ! use sqlite ; then + einfo "No database backend chosen, defaulting" + einfo "to mysql!" + mydatabase=( mysql ) + else + use mysql && mydatabase+=( mysql ) + use sqlite && mydatabase+=( sqlite3 ) + fi + else + mydatabase=( no ) + fi + + if use dedicated ; then + myclient=( no ) + myeconfargs+=( + --enable-server + --enable-freeciv-manual=html + ) + else + if use !sdl && use !gtk && ! use qt5 ; then + einfo "No client backend given, defaulting to" + einfo "gtk2 client!" + myclient=( gtk2 ) + else + use sdl && myclient+=( sdl2 ) + use gtk && myclient+=( gtk2 ) + if use qt5 ; then + myclient+=( qt ) + append-cxxflags -std=c++11 + fi + fi + myeconfargs+=( + $(use_enable server) + $(use_enable server freeciv-manual html ) + ) + fi + + myeconfargs+=( + --enable-aimodules="$(usex aimodules "yes" "no")" + --enable-client="${myclient[*]}" + --enable-fcdb="${mydatabase[*]}" + --enable-fcmp="$(usex modpack "gtk2" "no")" + # disabling shared libs will break aimodules USE flag + --enable-shared + --localedir=/usr/share/locale + $(use_enable ipv6) + $(use_enable mapimg) + $(use_enable nls) + $(use_enable sound sdl-mixer) + $(use_enable system-lua sys-lua) + $(use_with readline) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if use dedicated ; then + rm -rf "${ED}"/usr/share/pixmaps + rm -f "${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}* + else + if use server ; then + # Create and install the html manual. It can't be done for dedicated + # servers, because the 'freeciv-manual' tool is then not built. Also + # delete freeciv-manual from the GAMES_BINDIR, because it's useless. + # Note: to have it localized, it should be ran from _postinst, or + # something like that, but then it's a PITA to avoid orphan files... + ./tools/freeciv-manual || die + docinto html + dodoc classic*.html + fi + if use sdl ; then + make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client + else + rm -f "${ED}"/usr/share/man/man6/freeciv-sdl* + fi + rm -f "${ED}"/usr/share/man/man6/freeciv-xaw* + fi + find "${ED}" -name "freeciv-manual*" -delete + + rm -f "${ED}/usr/$(get_libdir)"/*.a + find "${ED}" -name "*.la" -delete || die +} diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest index 7e4deb1fff7c..1ca6d007e684 100644 --- a/games-strategy/hedgewars/Manifest +++ b/games-strategy/hedgewars/Manifest @@ -1,3 +1,3 @@ DIST hedgewars-src-1.0.0.tar.bz2 177668452 BLAKE2B cbd99a4403b911023fb4a522ed1ed04272f07705321585b0e7a8f56785ef11bf8c654df95016b0af94f603c387f73804cbd95e13a92e875990adf5fec149e334 SHA512 9aeb904550239040a878a0e7ae5006aa4d824124b61d813b9e6f6dfe1bd1c8f5fe395e0fd6e58d685ef1259abd4669e03b985be129c620be15f6e5ad82519ec2 -EBUILD hedgewars-1.0.0-r1.ebuild 2637 BLAKE2B 2cde20a1a3938c31377668f3ff92cbd66f1753b2063e22492e1c378cf353d58d1e01f0dd5c984c8b7c23ad17e4931a084b066b4294ffba1af4cb7f15efb5b038 SHA512 63a859d5a124b70afa9dc7fc45e6826ef64551226fadcc34b9e67822af3ef8b2c48334e3fcce01107261d5a71d13931bbd792ca4cd91c58d1870d2bfe06f4303 +EBUILD hedgewars-1.0.0-r1.ebuild 2619 BLAKE2B 728c1b4144d669db797756030861b34e1a7ace65a61dd9e2666120360d161c4a3553d574052c207cd608b9b8163dfcc671b420e518fdf54f9b0d977a3ad7421b SHA512 b583296e6c7e76f28b9bf09c204246bc6f21913f5169a7d288ac3b2908036fdb7f4e1a1f956f3c1a9ef495e84602b55359dda54c8dcf83009c1993682b2131c7 MISC metadata.xml 310 BLAKE2B 0893b58ddb3ed4a4d6a73bd5cc4d31558d185953ea37fd15f9e067804b8fd4aad9021666f35feabe695fc34df502f1c1c814e52b717fdb26a5f419c07e5696a0 SHA512 aab3f53bd107c152983576ef65b7021002724f73e0a8cbda391284347eff3eb8d8489cb26fae34512e3a58bc9529903c05f41c1277e25af155215308b3da462b diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild index 9e8d0f6b1289..a30e287caed4 100644 --- a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild +++ b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake-utils xdg-utils +inherit cmake xdg-utils MY_P=${PN}-src-${PV} @@ -88,11 +88,11 @@ src_configure() { # https://bugzilla.redhat.com/show_bug.cgi?id=1200193 -DCMAKE_SKIP_RPATH=ON ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install doman man/${PN}.6 } diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest index 643f0bc4282e..aa0a4b1f7679 100644 --- a/games-strategy/openra/Manifest +++ b/games-strategy/openra/Manifest @@ -11,5 +11,5 @@ DIST SharpFont-4.0.1.zip 151532 BLAKE2B 3745959e449b0745b5cd1c20a9653595ce2166f4 DIST SharpZipLib-0.86.0.zip 463599 BLAKE2B 5d6374c5daef33afc1faf814992df1ef7001b593594a022657406ac8ce67ac5e00f71cfe9365c4acab2925ef458f9add83ec62dd22e4db74e17efdd1e1091542 SHA512 70ac4a39b599a37ff45733477ba1afb4caee177262b72037998b7eb08a737177f8689bb690759b8090d25b9d408ba8c84e56bec3509997adde62724fcfcdc2b5 DIST openra-20190314.tar.gz 24551126 BLAKE2B ed6289bbfab9f55aa88ac834dab3a2bab4cea3cb5a3b6934e24feb78bea1df71d839d4434242df666cda6180027a8e6d5b7766b6155ab2e85a4ee639a7950e12 SHA512 a16884cf626a31b3cf21662c307aef505bfcf6d34330f09b10510aa6c88d9d1026f17f2037565827fc95148776b0651fe0559c65db493295957df428793b2d71 DIST rix0rrr.BeaconLib-1.0.1.zip 17989 BLAKE2B 2a65c9276b725ac6c433eb2cf6e4a13d6e5c07446dbff1e096b100a20eebb2a432c81cfbc13c11fdf672fbd37eb5985497b3fa425a317afe39049a6a967e3a7e SHA512 4fe4c6dfd7ad0f7eb5549c66fe53cd38f74026a8202d3553481bdfdab8ce0788f8b31f05092d93f9751a687badf75a1ec22da201235f2e505893192bb371367f -EBUILD openra-20190314.ebuild 4887 BLAKE2B a8550963a01d7d4b3855137a59d68488bb05cbc9236f9e8a9b0a80d6bb5fe7dbdadecc1d89049c653f1002b3f15446135ab89300181d45fae8580accfc64ab63 SHA512 c01a9fc83fe1b343ce440bfacfbb822ef7db297706e39c65e04b75422238a7b1cc58dfeac621e0fadc62d89fbcc01db2031d9d0c9e18f6fa14475ed7de237ae9 +EBUILD openra-20190314.ebuild 4892 BLAKE2B 5985d5088bcd3d4c47e558cd19cd0939a941044802d7385d8855a046622337fa5396717b28ffa2700959a7b8514aac71301a2240e35617304a34e053cba410f6 SHA512 8302a6a869ccd4d9689bb6d69cdb0d91bbbf8daa6834d657a09a3f12d9ff70dc59f544a6c51fc030b9384a17c361be5988a758eeb79673e38900c88317de90d9 MISC metadata.xml 507 BLAKE2B 41509ed4d51adffd4aaf548f986ff19ccdf2b382e6265eeca268ccf693fcbf47468fad4ba1fcafb73f2a7fd5893942944f4118ca3b388a2b9299fd9130621d5e SHA512 ffeb53c6a7368c79336656bee82ea41fcdec13ef68f22e70a2ef70b5ba644ae1ad3832406cf54c7afd888ebe3357d2530528f39b07d515b813cf090248fa5186 diff --git a/games-strategy/openra/openra-20190314.ebuild b/games-strategy/openra/openra-20190314.ebuild index 4926ae8f13bd..b35f7f76047e 100644 --- a/games-strategy/openra/openra-20190314.ebuild +++ b/games-strategy/openra/openra-20190314.ebuild @@ -38,7 +38,7 @@ LICENSE="GPL-3 Apache-2.0 BSD GPL-2 MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+debug geoip" -RESTRICT="mirror" +RESTRICT="mirror test" BDEPEND=">=dev-lang/mono-4.2" diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest index afc325d031c8..c6f1f7668e1f 100644 --- a/games-strategy/ufoai/Manifest +++ b/games-strategy/ufoai/Manifest @@ -1,6 +1,7 @@ AUX ufoai-2.5.0_p20180603-install.patch 1097 BLAKE2B b2c1f2761429dafd2ffad037e5adf981e5062eb75bffaac51c127fe056e00da59238d91a0b1916d6325ea7e643a87e0945ac3ef20d8f2b958cc88904d96ed9c3 SHA512 b8a61ca5be370bc7fec5d97317e950b2654e6ffe4ffef4473b64f1a37af5dfbfa9152ef4e5bb11e2217bdadae04e7499ef19b67bfdfb32c5ab4a200ac5798ffc +AUX ufoai-2.5.0_p20180603-mxml3.patch 913 BLAKE2B e9d731a506bfd04d1e6fcf323c9acfcf3c895cf26dc8de308dcbc2ea62b67c643f1dcf58f8ff6087919887d0c8107ffac513c49bcd72a811238dea60edaf7dc6 SHA512 4197a7d444d1180362535f69a03bac3ab28473b1349b3c1d5daf2b360d0a7c5c00b07b6996274d08d3a52f9322f709478bd2c077c786e9501b596a6471eec74d 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 +EBUILD ufoai-2.5.0_p20180603.ebuild 3901 BLAKE2B 604c11c940c4a2fda1451d0544c6601c529e07e780b58ca5a84340da4c24c7a54ecd8e4d0bcc29d4d91fbd46aab82c34d0ce9400c2ab5dd6ae1969e9e5fbe2f7 SHA512 b7c06c9bf9e7325359dcde9c29fc918370a4a87248fb0b0ec1eaaae2e129890ef4b06f55297e7007d01d047ebd9fb0a25c68aae40e652da18c7ca2c9dd5010db MISC metadata.xml 536 BLAKE2B d0037cae0706304da8c17767d8980eadd1b437bce5f75e980e3a42113b2596d6ed0017962720a9f0c1cc726ceb63028249d5b87b57cf1166dee03d4b884f5d42 SHA512 e02322e3077645800fdc90673261658fe0c33f5e20282cdf40a1867ce85e07e79967f38999031c652f259520489cc65942ae252f8a26182cbdeae6ac5024271d diff --git a/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-mxml3.patch b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-mxml3.patch new file mode 100644 index 000000000000..256b43e94b2c --- /dev/null +++ b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-mxml3.patch @@ -0,0 +1,29 @@ +From 163073ab9527cdaa33d77a713b8e46ff462a2b5c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tam=C3=A1s=20Feh=C3=A9rv=C3=A1ri?= + +Date: Sat, 3 Aug 2019 15:21:05 +0200 +Subject: [PATCH] * {{Bug|5739}} MiniXML (mxml) 3.x compatibility + +--- + src/common/xml.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/common/xml.cpp b/src/common/xml.cpp +index 7aeceb3a29..5a66ccc887 100644 +--- a/src/common/xml.cpp ++++ b/src/common/xml.cpp +@@ -509,8 +509,13 @@ static mxml_type_t mxml_ufo_type_cb (xmlNode_t* node) + /* You can lookup attributes and/or use the + * element name, hierarchy, etc... */ + const char* type = mxmlElementGetAttr(node, "type"); +- if (type == nullptr) ++ if (type == nullptr) { ++#ifdef MXML_MAJOR_VERSION ++ type = mxmlGetElement(node); ++#else + type = node->value.element.name; ++#endif ++ } + + if (Q_streq(type, "int")) + return MXML_INTEGER; diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild index 0fd98165739d..2ce3bcbcdbe8 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-2018 Gentoo Foundation +# 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}" @@ -30,6 +30,7 @@ IUSE="+client cpu_flags_x86_sse debug editor server" REQUIRED_USE="|| ( client editor server )" RDEPEND=" + dev-libs/mxml net-misc/curl sys-libs/zlib @@ -75,7 +76,11 @@ DEPEND=" " S="${WORKDIR}/${PN}-code-${COMMIT}" -PATCHES=( "${FILESDIR}"/${P}-install.patch ) + +PATCHES=( + "${FILESDIR}"/${P}-install.patch + "${FILESDIR}"/${P}-mxml3.patch +) src_unpack() { use editor && unpack ${PN}-${DIST_VERSION}-mappack.tar.bz2 @@ -89,6 +94,9 @@ src_prepare() { # Make the build system a bit happier, will be fixed upstream mkdir -p base/{maps,models} contrib/installer/mojosetup/scripts || die + + # Remove bundled mxml + rm -r src/libs/mxml/ || die } src_configure() { @@ -160,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; } diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index a945f4ccf832..816bbca77514 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -3,7 +3,7 @@ AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a SHA512 dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d SHA512 b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f DIST wesnoth-1.15.2.tar.gz 500575489 BLAKE2B c94ff72034f0253c3a2ceb29f10617227c407baa6365116a8cd23c70dd960d9898f5a6291235347769780798438380fe78ada8fb75b4dd83e2d2831f495360ae SHA512 c15bdc214147a222ceb2e6243a75e2dbe4f10eb6153a32c10f37b1ec163a7e0b8f6fb12747917602773fd149d23dc8a6b3ed0b0c017f44f713388743126d6b94 -EBUILD wesnoth-1.14.7.ebuild 2819 BLAKE2B 194395547f79c162c8ced3294df0b5b45e53dcaa86c8f7bab5a8d4f4199ecdab103992adb012ea34579591051c48fd53bf8af0589628b20685e462b29907d72d SHA512 4f9ff22b984f899a7b534eb0ac9a8ca23c8599da1503c346943741018bf1d0d0d65a65d59c4e8bf7f0ab476a0edfeb8ffa8b01d425bc5c6d0f4d42e3817d4263 -EBUILD wesnoth-1.14.9.ebuild 2638 BLAKE2B fcac93c5e7463383370c8e914347e38c40e6e5f7b1ac0050f71ffdba3984aae796d5f9cbfcb4d496385fddc84febbf8efa743a1aa1e2623765f3e55885b8c28d SHA512 3e75f3005553cbc01e465882c3c8eeaafd8158a4c2c1f25803a2a1e1b51c871c48a1306935708c6d443090361cdc3cc38edfedf9ece86fa4af720f4b5133670d -EBUILD wesnoth-1.15.2.ebuild 2638 BLAKE2B fcac93c5e7463383370c8e914347e38c40e6e5f7b1ac0050f71ffdba3984aae796d5f9cbfcb4d496385fddc84febbf8efa743a1aa1e2623765f3e55885b8c28d SHA512 3e75f3005553cbc01e465882c3c8eeaafd8158a4c2c1f25803a2a1e1b51c871c48a1306935708c6d443090361cdc3cc38edfedf9ece86fa4af720f4b5133670d +EBUILD wesnoth-1.14.7.ebuild 2754 BLAKE2B 39fefec9fdcfe08c36f8df9fc595410e86f98b917f686876d567609daca3ba81b09db55014d57eae038857f7f7f84ab85f32127c76eac1d40c5b9f9f7aadb517 SHA512 84500046c59b62d22d7c82fe771a574e708b0415d0ff5651546d99e1218702ab570513218e0ca7ab76d3d6b1c33a96a58754a0644d02c38f6cbb804fb739c8b9 +EBUILD wesnoth-1.14.9.ebuild 2572 BLAKE2B f1ff48e20beb5a93b72432e0464ba8dace18ed6ba211f7be4421531c933ecef921fc45ab5ea54eafb1d6f42823e347cbe9b753a553c207130670548f1a9f6373 SHA512 349a881e377a1a46309655d3145d05e52617f99c6fd5f5ed4b25028f2cad28d6ceba2b905568375e3a15aa94eaf33fd98f7d5c925034c97aad8cf2efbeca3d51 +EBUILD wesnoth-1.15.2.ebuild 2572 BLAKE2B f1ff48e20beb5a93b72432e0464ba8dace18ed6ba211f7be4421531c933ecef921fc45ab5ea54eafb1d6f42823e347cbe9b753a553c207130670548f1a9f6373 SHA512 349a881e377a1a46309655d3145d05e52617f99c6fd5f5ed4b25028f2cad28d6ceba2b905568375e3a15aa94eaf33fd98f7d5c925034c97aad8cf2efbeca3d51 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3 diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild index 510a59e68be9..06ff63ec4324 100644 --- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils user + +inherit cmake user DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" HOMEPAGE="http://www.wesnoth.org @@ -55,7 +56,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare if ! use doc ; then sed -i \ @@ -106,14 +107,13 @@ src_configure() { -DENABLE_FRIBIDI="$(usex fribidi)" -DENABLE_OMP="$(usex openmp)" -DENABLE_STRICT_COMPILATION="OFF" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { local DOCS=( README.md changelog.md ) - cmake-utils_src_install + cmake_src_install if use dedicated || use server; then rmdir "${ED}/run/wesnothd" || die newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd diff --git a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild index 807170165f0b..0451aedf6acf 100644 --- a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.14.9.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils user xdg +inherit cmake user xdg DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" HOMEPAGE="http://www.wesnoth.org @@ -50,7 +50,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare if ! use doc ; then sed -i \ @@ -100,14 +100,13 @@ src_configure() { -DENABLE_NOTIFICATIONS="$(usex dbus)" -DENABLE_FRIBIDI="$(usex fribidi)" -DENABLE_STRICT_COMPILATION="OFF" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { local DOCS=( README.md changelog.md ) - cmake-utils_src_install + cmake_src_install if use dedicated || use server; then rmdir "${ED}/run/wesnothd" || die newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd diff --git a/games-strategy/wesnoth/wesnoth-1.15.2.ebuild b/games-strategy/wesnoth/wesnoth-1.15.2.ebuild index 807170165f0b..0451aedf6acf 100644 --- a/games-strategy/wesnoth/wesnoth-1.15.2.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.15.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils user xdg +inherit cmake user xdg DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" HOMEPAGE="http://www.wesnoth.org @@ -50,7 +50,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare if ! use doc ; then sed -i \ @@ -100,14 +100,13 @@ src_configure() { -DENABLE_NOTIFICATIONS="$(usex dbus)" -DENABLE_FRIBIDI="$(usex fribidi)" -DENABLE_STRICT_COMPILATION="OFF" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { local DOCS=( README.md changelog.md ) - cmake-utils_src_install + cmake_src_install if use dedicated || use server; then rmdir "${ED}/run/wesnothd" || die newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest index 9d36c2954a2f..ca8962c436d5 100644 --- a/games-strategy/widelands/Manifest +++ b/games-strategy/widelands/Manifest @@ -1,6 +1,6 @@ AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3db2fc979ebfec370e3968da4f466873c92b523671b6e7193ae7bb1dc948b713901421586266e1837f34a19d50279f02224d9 SHA512 da3f5b9e5680c84d48740c202fd937aeb76465647b1a24e4eee5a6d3df44b2f4abda819606ff7294ee1d8fe27ceb3281e4a00ca7f03d944af933bcac0e490059 DIST widelands-build20-rc1.tar.bz2 232490916 BLAKE2B 7dd13c325fa0dc891a5ab3cc643ae86025c5e853909d172b39d9d1cd2a41132d099f3d03349322b03dc52353f1465391ec006a83e70eb6554be133199efd96b8 SHA512 2d713db8e4a0774e8a6615b6f0dbec4f29870d69fa9bf48db8694316f7320b58ee5afa5a7796e0886471c9c787954c21f478b1364f52ce01a23212a7512465a6 DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5 -EBUILD widelands-0.20.ebuild 1558 BLAKE2B 2482813be293046c44d0c3931ef49a37dd6d9d04a9af72057fa9b44ec685239cc8abc3fd16efed654e1946625ad7c64c6e39fc282341192771fff77cd0daf01e SHA512 d44f3f88d188bf1b6c6e585cf2806baf02b0b7bbef2dd2edb5a7a4ad17f36b6ccd28ccb2c6fc5a12266ac6d905822d6e282cb1ed38499f7f0d476ae2bef1f9f8 -EBUILD widelands-0.20_rc1.ebuild 1564 BLAKE2B 083dd593effc815f4e10aadd8d1cff0428f712237fc2899bc5576d34d56366c5e74790a1fcfabc267c1bae0db83a421e87cd94167b28933819f7993b1d96e2bf SHA512 e907d79e5ca6f87ae6b77e27caa5773d79714a398b8ce0116ebe4d07bf3e8fb6011926a53e607046e0fd636c5a9567705900f650e95ac541c212acf3228ab58b +EBUILD widelands-0.20.ebuild 1534 BLAKE2B de3b990b98ad937f5c636dc5ca92a27b84e870030085a407a8da91e4fac4cfa1aff78a6dc2620b79a1fdb710da6f69944388df9b52ecc6c21586585705bc35f4 SHA512 9de366c738a293952b2e79cdf5bf79d5d1c32106060fe9ab5bf39aff8ccc16d25254fd3e9698e167e8854e5b11ba275dc0b16fca0befe7bd16166e1e512d2bb6 +EBUILD widelands-0.20_rc1.ebuild 1540 BLAKE2B 347020070fed8f72b38901d8e580c2ffe6d0f1869a8b79d39e6788b14fe57b6a4251c9fab451fc68da578271515add391bca190b4abedfaf693e0cfb80e603fc SHA512 b2b26373b77c476bd2ca5b1aa8a089e4d882fdc5f2b12941ee844e81c0467a5cb274a904111779f9b0ecb4f4e21ef19e135b1dd924337258ee83cf4cc9616969 MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20.ebuild index b1bdd2677338..2ccf31fe16eb 100644 --- a/games-strategy/widelands/widelands-0.20.ebuild +++ b/games-strategy/widelands/widelands-0.20.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop cmake-utils +inherit desktop cmake MY_PV="build$(ver_cut 2-)" MY_P="${PN}-${MY_PV/_/-}" @@ -43,7 +43,7 @@ PATCHES=( ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die } @@ -57,11 +57,11 @@ src_configure() { # Game is NOT happy being moved from /usr/share/games -DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN} ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install # move game binary to correct location dodir /usr/bin diff --git a/games-strategy/widelands/widelands-0.20_rc1.ebuild b/games-strategy/widelands/widelands-0.20_rc1.ebuild index 9cfddcf425f9..aaff95f0bbf1 100644 --- a/games-strategy/widelands/widelands-0.20_rc1.ebuild +++ b/games-strategy/widelands/widelands-0.20_rc1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop cmake-utils +inherit desktop cmake MY_PV="build$(ver_cut 2-)" MY_P="${PN}-${MY_PV/_/-}" @@ -43,7 +43,7 @@ PATCHES=( ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed -i -e 's:__ppc__:__PPC__:' src/map_io/s2map.cc || die } @@ -57,11 +57,11 @@ src_configure() { # Game is NOT happy being moved from /usr/share/games -DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN} ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install # move game binary to correct location dodir /usr/bin -- cgit v1.2.3