From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- games-strategy/Manifest.gz | Bin 8394 -> 8229 bytes games-strategy/endless-sky/Manifest | 3 - .../endless-sky/endless-sky-0.9.6.ebuild | 55 ---------- games-strategy/endless-sky/metadata.xml | 14 --- games-strategy/freeciv/Manifest | 2 +- games-strategy/freeciv/freeciv-2.6.2.ebuild | 5 +- games-strategy/freeorion/Manifest | 6 +- .../freeorion/freeorion-0.4.10.1-r1.ebuild | 77 ++++++++++++++ .../freeorion/freeorion-0.4.9_p20200409-r1.ebuild | 77 -------------- games-strategy/freeorion/freeorion-9999.ebuild | 12 +-- games-strategy/glob2/Manifest | 8 -- .../glob2/files/glob2-0.9.4.4-gcc44.patch | 12 --- .../glob2/files/glob2-0.9.4.4-gcc49.patch | 35 ------- .../glob2/files/glob2-0.9.4.4-gcc6.patch | 49 --------- .../glob2/files/glob2-0.9.4.4-scons-blows.patch | 26 ----- .../glob2/files/glob2-0.9.4.4-underlinking.patch | 19 ---- games-strategy/glob2/glob2-0.9.4.4-r2.ebuild | 64 ------------ games-strategy/glob2/metadata.xml | 15 --- games-strategy/liquidwar/Manifest | 10 +- .../files/liquidwar-5.6.4-exec-stack.patch | 27 ----- .../liquidwar/files/liquidwar-5.6.4-ovflfix.patch | 18 ---- .../files/liquidwar-5.6.4-underlink.patch | 11 -- .../files/liquidwar-5.6.5-exec-stack.patch | 27 +++++ .../liquidwar/files/liquidwar-5.6.5-gcc10.patch | 30 ++++++ .../liquidwar/files/liquidwar-5.6.5-makefile.patch | 93 +++++++++++++++++ games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild | 64 ------------ games-strategy/liquidwar/liquidwar-5.6.5.ebuild | 51 ++++++++++ games-strategy/megaglest/Manifest | 3 +- ...megaglest-3.11.1-miniupnpc-api-version-16.patch | 17 ++++ .../megaglest/megaglest-3.11.1-r1.ebuild | 7 +- games-strategy/seven-kingdoms/Manifest | 7 +- .../files/seven-kingdoms-2.15.2-fortify.patch | 26 ----- .../seven-kingdoms/seven-kingdoms-2.14.7.ebuild | 8 +- .../seven-kingdoms/seven-kingdoms-2.15.2.ebuild | 39 -------- .../seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild | 42 ++++++++ games-strategy/war1gus/Manifest | 3 + games-strategy/war1gus/metadata.xml | 11 ++ games-strategy/war1gus/war1gus-2.4.3.ebuild | 60 +++++++++++ games-strategy/wargus/Manifest | 4 +- games-strategy/wargus/metadata.xml | 7 +- games-strategy/wargus/wargus-2.4.3.ebuild | 71 +++++++++++++ games-strategy/wesnoth/Manifest | 7 +- .../wesnoth/files/wesnoth-1.14.14-ar.patch | 14 +++ games-strategy/wesnoth/wesnoth-1.14.13.ebuild | 111 --------------------- games-strategy/wesnoth/wesnoth-1.14.14.ebuild | 7 +- games-strategy/wesnoth/wesnoth-1.15.4.ebuild | 7 +- 46 files changed, 548 insertions(+), 713 deletions(-) delete mode 100644 games-strategy/endless-sky/Manifest delete mode 100644 games-strategy/endless-sky/endless-sky-0.9.6.ebuild delete mode 100644 games-strategy/endless-sky/metadata.xml create mode 100644 games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild delete mode 100644 games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild delete mode 100644 games-strategy/glob2/Manifest delete mode 100644 games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch delete mode 100644 games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch delete mode 100644 games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch delete mode 100644 games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch delete mode 100644 games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch delete mode 100644 games-strategy/glob2/glob2-0.9.4.4-r2.ebuild delete mode 100644 games-strategy/glob2/metadata.xml delete mode 100644 games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch delete mode 100644 games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch delete mode 100644 games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch create mode 100644 games-strategy/liquidwar/files/liquidwar-5.6.5-exec-stack.patch create mode 100644 games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch create mode 100644 games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch delete mode 100644 games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild create mode 100644 games-strategy/liquidwar/liquidwar-5.6.5.ebuild create mode 100644 games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch delete mode 100644 games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch delete mode 100644 games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild create mode 100644 games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild create mode 100644 games-strategy/war1gus/Manifest create mode 100644 games-strategy/war1gus/metadata.xml create mode 100644 games-strategy/war1gus/war1gus-2.4.3.ebuild create mode 100644 games-strategy/wargus/wargus-2.4.3.ebuild create mode 100644 games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch delete mode 100644 games-strategy/wesnoth/wesnoth-1.14.13.ebuild (limited to 'games-strategy') diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz index b1158fe09ea4..33ca82847628 100644 Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest deleted file mode 100644 index faeaa83d39e0..000000000000 --- a/games-strategy/endless-sky/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST endless-sky-0.9.6.tar.gz 71119557 BLAKE2B cf4fa6575a701396083815abd55071563f85973dc354b52509dc2fb0f7c803d7c6b44e6ace881bb6103063273f358b525c958e10a3c4ca3ceb3d6f849dd745f9 SHA512 e8dbae856153246f68a3c7ba68fd33a15cf60908f65003f614269df6909ed8d7ad848b4add4ee071b295f58be92c532e6579982d3c20b83d9203b74077f90bae -EBUILD endless-sky-0.9.6.ebuild 1309 BLAKE2B fbc02bb94f10c278c2fedef310782c70490fe6b5d88da554e7cec5b2fb275ecd34b47738e00325db48ee3ea05df564a087a17b17e7b4b1b883d1ca255b221c6b SHA512 4f3f4763d0c9160043f04a9486c921d9c7eada3258a4da07a61445bcb8c171ce746f9c03881149236e70e66aa96f10f113e1b884a34ae230f75cbf896c1e4e12 -MISC metadata.xml 737 BLAKE2B 0936e186a61932b265cd78766420c6affa33c70415d3a0f5e5089d4813e09b652dbfa5e31fab57e0f44deb04590a7667fa4909b194e389facc9e13f51da0b3ff SHA512 498915ae234ea096b061b14057c2103b6cff7b1fbf0ee1d5076c7b2657a1289fd0d9ab5514e5d459b14dfb23ba967c07a4c052c9854b748fcb45ed6e1c1143c3 diff --git a/games-strategy/endless-sky/endless-sky-0.9.6.ebuild b/games-strategy/endless-sky/endless-sky-0.9.6.ebuild deleted file mode 100644 index e01d717396f9..000000000000 --- a/games-strategy/endless-sky/endless-sky-0.9.6.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils gnome2-utils scons-utils - -DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity" -HOMEPAGE="https://endless-sky.github.io" -SRC_URI="https://github.com/endless-sky/endless-sky/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="media-libs/glew:0 - media-libs/libsdl2 - media-libs/libjpeg-turbo - media-libs/libpng:= - media-libs/openal - virtual/opengl" -DEPEND="${RDEPEND}" - -src_prepare() { - sed -i 's/\(.*flags += \["\)-O3\("\]\)/\1\2/g' SConstruct || die - sed -i 's#env.Install("$DESTDIR$PREFIX/games", sky)#env.Install("$DESTDIR$PREFIX/bin", sky)#g' SConstruct || die - eapply_user -} - -src_compile() { - escons -} - -src_install() { - escons PREFIX="${D}/usr/" install -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} - -pkg_postinst() { - einfo "Endless Sky provides high-res sprites for high-dpi screens." - einfo "If you want to use them, download" - einfo - einfo " https://github.com/endless-sky/endless-sky-high-dpi/releases" - einfo - einfo "and extract it to ~/.local/share/endless-sky/plugins/." - einfo - einfo " Enjoy." -} diff --git a/games-strategy/endless-sky/metadata.xml b/games-strategy/endless-sky/metadata.xml deleted file mode 100644 index 5754bfb7b195..000000000000 --- a/games-strategy/endless-sky/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games - - - Explore other star systems. Earn money by trading, carrying passengers, or completing missions. Use your earnings to buy a better ship or to upgrade the weapons and engines on your current one. Blow up pirates. Take sides in a civil war. Or leave human space behind and hope to find some friendly aliens whose culture is more civilized than your own... - - - endless-sky/endless-sky - - diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index 552bfe694959..0900d499c74d 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -2,5 +2,5 @@ AUX freeciv-2.6.2-qt515.patch 1069 BLAKE2B 36d66375826386961ef393385f987b146d812 DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665 SHA512 bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302 SHA512 b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3 EBUILD freeciv-2.5.12.ebuild 4536 BLAKE2B 2673bcafd06b9c720d3aa62c57f281028ee5b796fa63535bf1ccfd90acaac744fd74c3cd14ce470f8b18f9920a09a7d33b54eb194a41e90af611d7ff3ba39712 SHA512 a6fdaa207990d2fd5521d627a54d24fd2fa62fbe42578e8176f35c598fb2a4149b8ab728f6ac516a63ce3b4923912a54096c87c65f5035a6b1e221e579a8e600 -EBUILD freeciv-2.6.2.ebuild 4796 BLAKE2B 17e1a8e02ec8605652c624a70c35f3aec2091cbb6d22021527797ec68f6d963178e39eada22e654ef27a943cb53b83abd90fc67bd0f01612dc52119c8a37f76a SHA512 466fe54dcee64f844b234b3cb22fd59d09037b855c285fb84e5c06c1c84ef14f787da4ec2020bd3e2fafb245b0884270a75a3e61d579b3d609a65d4bb5e54733 +EBUILD freeciv-2.6.2.ebuild 4857 BLAKE2B f441ef92692f71d6a67ffcca49405f19f517c42b57b40ac6bd338c7c57ee09ef0b58363559085d6eca72934802bb7b28db496cc00507fad6c132b009d2235ca2 SHA512 3e7dd216d356063662e16916d66bf2580bfcd2d860293e759f5c6160b1c900c6134ac2c621b1bb853cfc52154ededda67b7bd8cccf7ec3c2c880f65c4832dc67 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201 diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild b/games-strategy/freeciv/freeciv-2.6.2.ebuild index 2b5d791692c3..e361752c4a59 100644 --- a/games-strategy/freeciv/freeciv-2.6.2.ebuild +++ b/games-strategy/freeciv/freeciv-2.6.2.ebuild @@ -6,14 +6,14 @@ EAPI=7 MY_PV="${PV/_beta/-beta}" MY_PV="${MY_PV/_rc/-RC}" MY_P="${PN}-${MY_PV}" -inherit desktop flag-o-matic xdg +inherit desktop flag-o-matic qmake-utils 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" + KEYWORDS="~amd64 ~ppc64 ~x86" fi LICENSE="GPL-2+" @@ -129,6 +129,7 @@ src_configure() { use sdl && myclient+=( sdl2 ) use gtk && myclient+=( gtk2 ) if use qt5 ; then + local -x MOCCMD=$(qt5_get_bindir)/moc myclient+=( qt ) append-cxxflags -std=c++11 fi diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest index 25c3a867cf4f..af9179cc00ed 100644 --- a/games-strategy/freeorion/Manifest +++ b/games-strategy/freeorion/Manifest @@ -1,5 +1,5 @@ AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b -DIST freeorion-0.4.9_p20200409.tar.gz 124663848 BLAKE2B 7468a386829498c9ca971e686bda216002b6f263fbc0f3784e7898854ad91278441579c1a3e0d1ef2d92b46747d14a17463e46d7ba16f06633e9a5d474ce3b9c SHA512 09fe8db818c3f22bac94577461d9ada082a2c8365cb524948bf13650ea368fcc55043f4df2f9701075011c890a08197e7f7bb13d8884cb41cc8e1346b8538345 -EBUILD freeorion-0.4.9_p20200409-r1.ebuild 1663 BLAKE2B fb14a6e5665df5714126609d25c91d4caf34e5f6b602472b72a070c58f548a4d64c1876b7e9060edce0df5f2fcd7c4fdd2a0b915a6830e9de628f0a5e45b4091 SHA512 c8db259b18db09ae42b4fe2f2b2f2eb6ed08a219563d8a2fa03c5516c4762f16ea6b9e9c8805ca7df7c9767642e759adc484785db6a18cd01c1f5a1069f6fc7b -EBUILD freeorion-9999.ebuild 1659 BLAKE2B 4ac8aaffea568c30bd0bb3dcf8e664f72e7baa9de32b4ee7958635eb3d1b410a1a679aea9d9df514fcea098130212f0a1c985469ef82cb26c51f199757149c1c SHA512 c3f055bc27735e31a9fb1f54b2abcb85505cd6fbb683cff70716256cede43cc408e70b13ef21eafacd833fa57c8a2d0fb16c9cd17fe9c7f76fb8262cbea6a6ac +DIST freeorion-0.4.10.1.tar.gz 124693099 BLAKE2B d24c481e7be6f718897bb095209673f24cb7d43842f148cf1e8665254970d22449bf7a4ee4ba7a8cb3b5b515d6bed38a24e2862810959a63b29ba9d3c054e6c4 SHA512 b28a8bdc2428778480ff8404ad7d84153939f4f8b4a75f51775354e3e563f7f309d479e499ea1be8b57822d725cc57ece8dd14f2e40360ab6c07d70c917bc256 +EBUILD freeorion-0.4.10.1-r1.ebuild 1599 BLAKE2B 50615aba70661a4be2b8592696aba2ae7e1cfd46f1ab622a0b1cf5f4dd00b853d94426a5bc141b44ff3adb8c5a25f54ac8edf0dbee2191a2c91ad45dd47ddad2 SHA512 0e3adb70e8c3aeeb948891755bb4fb9863103203b4037b9962a0b674aef799d8142bece2d8acf5d45262c009e85db551d6a930bb9d28a88123a722f3fc93adb6 +EBUILD freeorion-9999.ebuild 1599 BLAKE2B 4700fa07d7be8e63657cc413a378bfa9e4e94fa8d148b7e3130041426cec47b294107f8574377074b8092ceeeb9494e31afa200cc3afadda6cac9da5e07e9c8a SHA512 1338d150dc86e5c23bd5e508435ee7cdeee576f4a6da097499763c60e67992d9126ea5088a2c9cd991b07fa06fe6896ca14d9bb29ff65bd0b496de71246262b5 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1 diff --git a/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild new file mode 100644 index 000000000000..9cfb07f7b4e2 --- /dev/null +++ b/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +inherit cmake python-single-r1 xdg + +DESCRIPTION="A free turn-based space empire and galactic conquest game" +HOMEPAGE="https://www.freeorion.org" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/freeorion/freeorion.git" +else + KEYWORDS="~amd64" + if [[ ${PV} = *_p* ]]; then + COMMIT="" + SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${PV/_/-}" + fi +fi + +LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" +SLOT="0" +IUSE="dedicated" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + $(python_gen_cond_dep ' + >=dev-libs/boost-1.58:=[nls,python,threads,${PYTHON_MULTI_USEDEP}] + ') + !dedicated? ( + media-libs/freealut + >=media-libs/freetype-2.5.5 + media-libs/glew:= + >=media-libs/libogg-1.1.3 + media-libs/libpng:0= + media-libs/libsdl2[X,opengl,video] + >=media-libs/libvorbis-1.1.2 + media-libs/openal + sci-physics/bullet + virtual/opengl + ) + sys-libs/zlib + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e "s/-O3//" -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_SKIP_RPATH=ON + -DBUILD_HEADLESS="$(usex dedicated)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newenvd "${FILESDIR}/${PN}.envd" 99${PN} +} diff --git a/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild deleted file mode 100644 index c1efcaa3e7c0..000000000000 --- a/games-strategy/freeorion/freeorion-0.4.9_p20200409-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) -inherit cmake-utils python-single-r1 xdg - -DESCRIPTION="A free turn-based space empire and galactic conquest game" -HOMEPAGE="https://www.freeorion.org" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/freeorion/freeorion.git" -else - KEYWORDS="~amd64" - if [[ ${PV} = *_p* ]]; then - COMMIT="1570afb475763b13f5d2f434037ec907da812bb4" - SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${PV/_/-}" - fi -fi - -LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" -SLOT="0" -IUSE="dedicated" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - $(python_gen_cond_dep ' - >=dev-libs/boost-1.67:=[nls,python,threads,${PYTHON_MULTI_USEDEP}] - ') - !dedicated? ( - media-libs/freealut - >=media-libs/freetype-2.5.5 - media-libs/glew:= - >=media-libs/libogg-1.1.3 - media-libs/libpng:0= - media-libs/libsdl2[X,opengl,video] - >=media-libs/libvorbis-1.1.2 - media-libs/openal - sci-physics/bullet - virtual/opengl - ) - sys-libs/zlib - ${PYTHON_DEPS} -" -DEPEND="${RDEPEND}" - -src_prepare() { - sed -e "s/-O3//" -i CMakeLists.txt || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_SKIP_RPATH=ON - -DBUILD_HEADLESS="$(usex dedicated)" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - newenvd "${FILESDIR}/${PN}.envd" 99${PN} -} diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild index 048d1b8bf695..0b5fba26ee50 100644 --- a/games-strategy/freeorion/freeorion-9999.ebuild +++ b/games-strategy/freeorion/freeorion-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7,3_8} ) -inherit cmake-utils python-single-r1 xdg +inherit cmake python-single-r1 xdg DESCRIPTION="A free turn-based space empire and galactic conquest game" HOMEPAGE="https://www.freeorion.org" @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then else KEYWORDS="~amd64" if [[ ${PV} = *_p* ]]; then - COMMIT="1570afb475763b13f5d2f434037ec907da812bb4" + COMMIT="" SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" else @@ -35,7 +35,7 @@ BDEPEND=" " RDEPEND=" $(python_gen_cond_dep ' - >=dev-libs/boost-1.67:=[python,threads,${PYTHON_MULTI_USEDEP}] + >=dev-libs/boost-1.60:=[nls,python,threads,${PYTHON_MULTI_USEDEP}] ') !dedicated? ( media-libs/freealut @@ -57,7 +57,7 @@ DEPEND="${RDEPEND}" src_prepare() { sed -e "s/-O3//" -i CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -67,11 +67,11 @@ src_configure() { -DBUILD_HEADLESS="$(usex dedicated)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install newenvd "${FILESDIR}/${PN}.envd" 99${PN} } diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest deleted file mode 100644 index 8cfd63e1a78b..000000000000 --- a/games-strategy/glob2/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX glob2-0.9.4.4-gcc44.patch 188 BLAKE2B bd6fc1a3ad79eb29e070d53099079c403553add1e8fcf513d8c5cf58902120ff0735ad0cc78d396329ababf64d94355c21b9e2269046467b8a68069cee0afdc4 SHA512 c341e484311fa508f9a034d216729fa7a8251e6fb710fe6417bd0a000b89a870cf5a24850e6126a704f160fee064fa7211973da8f3720dbd9a96df86adcd67fd -AUX glob2-0.9.4.4-gcc49.patch 907 BLAKE2B f7ad515c19660af0713ca8c79c40a4c225372da85d17dfa58bc4a31e65bdced9a24ae9ff3f8f57f623da0011b24d841618bfc8fe09000703db94bc9e89a66971 SHA512 7a1f19fe40effa577b2eb03ec4f2ddd7df78bff1c3df25c8b15df37d9feb03e4583e1776e4c2240130f318f9fa643d2d662492c9c5be46ed659bd587f88eafac -AUX glob2-0.9.4.4-gcc6.patch 1767 BLAKE2B 41716842d1d0552e4ea05e4ae189b92ea600ca5e31604bf19e5659ca6690c7e394d25f11baf3fee07b9bdfcba6a748586b152a0141312daad89ab76946ea4d82 SHA512 d2eddfe657f81a1ec085298f09aafb904d22a80d601aca6405d92d6f17b28d0f3f3b5b445a9423988b7bc8869ca41698783e4139928f9f2ba33093ded6a3cb02 -AUX glob2-0.9.4.4-scons-blows.patch 908 BLAKE2B 6d677c0588dbad9f44307579549946c8979b956331be3ef667fb4bbcd6fdf3e9889b22cd4c9458a76f487b12bc73ae73dfba03e0c1f86fb228e1934b1d4e67cc SHA512 0d805014200c76ca571ecc97c284b9168f280df0e88060c880b284b8e3d5490c1512708857bb22a0b2a4e4b78716d98ae26ae552531f661bb38f6dd75af474d3 -AUX glob2-0.9.4.4-underlinking.patch 672 BLAKE2B 59fbd0afacd468cc6a2e6e18336c524653697f42404124d9b2347246130ba390a202cb2b88fa223bd80063e6555211a5065cbf08dd4d113b7dadd2e0ad9a3f41 SHA512 24551c73af34badaa4a464da30c771c95082f0bfe83f351b264abddc578d5486a71f1a79b02d13ff48753e67059f8350752e77eb89397029833647bb74d79d21 -DIST glob2-0.9.4.4.tar.gz 11338986 BLAKE2B 047f27385c9b819c6ca2614406d340ff2cb7dcc26c8a20a205b11dce234af4ea52cb4eb04b7ed5b695382b17b34b5dd50387d61cfecaced16ee61b3c69c2921f SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca -EBUILD glob2-0.9.4.4-r2.ebuild 1251 BLAKE2B 41c2a82cecb07b7e544d457519af07829702584b083990933ac2f2a64024cc10e3a5bd9546dcf9712fa762560efbae6bf3ffdd3d53d45ffc3259d3d145947f39 SHA512 aff57e535f19cae25e86dd0f85edbcccec499951d5e12c2c718bc83f70f061de9b6b5f705a4da86e0d2dee51f815383e73f6495e0644a9eb5fed9c4396876e36 -MISC metadata.xml 637 BLAKE2B 405198c067618ace05cf22e6b790a356eb643cddf921f07a37516cc661f37706adab72edde18639abaa5b23ebfe771877ced14f1eacb3d9da83ed5c9e32213f5 SHA512 af021418808275511478f34bcbd4a3fadd193a583c7e94c676e94d39d10fb23c8d2de7b3ef5c8da81f2f6291a3bf9d0cc09448aea1b16959e7c811ba38d64e66 diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch deleted file mode 100644 index 8d2da78cee23..000000000000 --- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/libgag/include/StreamBackend.h.old -+++ b/libgag/include/StreamBackend.h -@@ -28,6 +28,9 @@ - #ifdef putc - #undef putc - #endif -+#ifdef getc -+#undef getc -+#endif - - namespace GAGCore - { diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch deleted file mode 100644 index fca1efb5891a..000000000000 --- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch +++ /dev/null @@ -1,35 +0,0 @@ -From https://bugs.gentoo.org/show_bug.cgi?id=538580 - -Works around this build failure: - -In file included from src/AICastor.cpp:26:0: -src/Game.h: In member function 'void AICastor::computeBuildingNeighbourMap(int, int)': -src/Game.h:152:9: error: 'struct Game::BuildProject' is private - struct BuildProject - ^ -src/AICastor.cpp:2296:23: error: within this context - for (std::list::iterator bpi=game->buildProjects.begin(); bpi!=game->buildProjects.end(); bpi++) - ^ -scons: *** [src/AICastor.o] Error 1 -scons: building terminated because of errors. - -patch submitted by zimous - ---- glob2-0.9.4.4.orig/src/Game.h -+++ glob2-0.9.4.4/src/Game.h -@@ -149,6 +149,7 @@ - BOTTOM_TO_TOP - }; - -+public: - struct BuildProject - { - int posX; -@@ -159,6 +160,7 @@ - int unitWorkingFuture; - }; - -+private: - ///Initiates Game - void init(GameGUI *gui, MapEdit* edit); - diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch deleted file mode 100644 index f1152c3ba1cc..000000000000 --- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch +++ /dev/null @@ -1,49 +0,0 @@ -Bug: https://bugs.gentoo.org/610382 -Upstream commit: https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a - -# HG changeset patch -# User Jonathan Wakely -# Date 1485875296 0 -# Node ID c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a -# Parent c4da01699846179d8bf21e8dae2b973158ec0775 -Fix last argument to ChooseMapScreen constructor - -Since C++14 'false' is not a valid null pointer constant, so cannot be passed -to functions expecting pointer arguments. - -diff --git a/src/EditorMainMenu.cpp b/src/EditorMainMenu.cpp ---- a/src/EditorMainMenu.cpp -+++ b/src/EditorMainMenu.cpp -@@ -90,7 +90,7 @@ - } - else if (par1==LOADMAP) - { -- ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", false); -+ ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", NULL); - int rc=chooseMapScreen.execute(globalContainer->gfx, 40); - if (rc==ChooseMapScreen::OK) - { -diff --git a/src/LANMenuScreen.cpp b/src/LANMenuScreen.cpp ---- a/src/LANMenuScreen.cpp -+++ b/src/LANMenuScreen.cpp -@@ -62,7 +62,7 @@ - } - else if(par1 == HOST) - { -- ChooseMapScreen cms("maps", "map", false, "games", "game", false); -+ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL); - int rc = cms.execute(globalContainer->gfx, 40); - if(rc == ChooseMapScreen::OK) - { -diff --git a/src/YOGClientLobbyScreen.cpp b/src/YOGClientLobbyScreen.cpp ---- a/src/YOGClientLobbyScreen.cpp -+++ b/src/YOGClientLobbyScreen.cpp -@@ -326,7 +326,7 @@ - - void YOGClientLobbyScreen::hostGame() - { -- ChooseMapScreen cms("maps", "map", false, "games", "game", false); -+ ChooseMapScreen cms("maps", "map", false, "games", "game", NULL); - int rc = cms.execute(globalContainer->gfx, 40); - if(rc == ChooseMapScreen::OK) - { diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch deleted file mode 100644 index b3e6e86eb485..000000000000 --- a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/SConstruct.orig -+++ b/SConstruct -@@ -1,6 +1,7 @@ - EnsureSConsVersion(0, 96, 92) - import sys - import os -+import SCons.Util - import glob - sys.path.append( os.path.abspath("scons") ) - import bundle -@@ -268,6 +269,15 @@ - env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz" - env["TARFLAGS"] = "-c -z" - env.Alias("dist", env["TARFILE"]) -+ # Using suggestions for https://dev.gentoo.org/~vapier/scons-blows.txt -+ if os.environ.has_key('CC'): -+ env['CC'] = os.environ['CC'] -+ if os.environ.has_key('CXX'): -+ env['CXX'] = os.environ['CXX'] -+ if os.environ.has_key('CXXFLAGS'): -+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) -+ if os.environ.has_key('LDFLAGS'): -+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) - - def PackTar(target, source): - if "dist" in COMMAND_LINE_TARGETS: diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch deleted file mode 100644 index 65eba48717db..000000000000 --- a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- glob2-0.9.4.4.orig/SConstruct -+++ glob2-0.9.4.4/SConstruct -@@ -110,6 +110,16 @@ - print "Could not find libz or zlib1.dll" - missing.append("zlib") - -+ boost_system = '' -+ if conf.CheckLib("boost_system"): -+ boost_system="boost_system" -+ elif conf.CheckLib("boost_system-mt"): -+ boost_system="boost_system-mt" -+ else: -+ print "Could not find libboost_system or libboost_system-mt" -+ missing.append("libboost_system") -+ env.Append(LIBS=[boost_system]) -+ - boost_thread = '' - if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"): - boost_thread="boost_thread" diff --git a/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild deleted file mode 100644 index fe7cdc7b1729..000000000000 --- a/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop gnome2-utils scons-utils - -DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs" -HOMEPAGE="http://globulation2.org/" -SRC_URI="mirror://nongnu/glob2/${PV:0:5}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-libs/boost-1.34[threads] - dev-libs/fribidi - media-libs/libsdl[opengl] - media-libs/libvorbis - media-libs/sdl-image[png] - media-libs/sdl-net - media-libs/sdl-ttf - media-libs/speex - virtual/glu - virtual/opengl -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch ) - -src_configure() { - myesconsargs=( - INSTALLDIR=/usr/share/${PN} - DATADIR=/usr/share/${PN} - ) - escons data -} - -src_compile() { - escons -} - -src_install() { - dobin src/${PN} - insinto /usr/share/${PN} - doins -r campaigns data maps scripts - find "${ED}"/usr/share/${PN} -name SConscript -exec rm -f '{}' + - newicon -s 48 data/icons/glob2-icon-48x48.png ${PN}.png - make_desktop_entry glob2 "Globulation 2" - einstalldocs -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-strategy/glob2/metadata.xml b/games-strategy/glob2/metadata.xml deleted file mode 100644 index 181fc4eec533..000000000000 --- a/games-strategy/glob2/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - -Globulation2 is an innovative high quality Real-Time Strategy [RTS], -which minimizes micro-management by automatically assigning tasks to -the units. The player has to choose the number of units he wants for -the different tasks, and the units will do their best to satisfy the -requests. This allows to manage more units and to focus on strategies. - - diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest index 9ac03e77fc48..c93473a9a0c6 100644 --- a/games-strategy/liquidwar/Manifest +++ b/games-strategy/liquidwar/Manifest @@ -1,6 +1,6 @@ -AUX liquidwar-5.6.4-exec-stack.patch 442 BLAKE2B 21e0cdd8bb36ff7ce4bacb9bf9c5bd046803c953818eb73e58f372eb431a368dfd97530b22d3352eceecbb503975ccf3fa041d2776a48f63c15dcb4ef809a6fd SHA512 9759a6ae5805871ccbe2161e295449efc268403094d96360596e6043c1583e9ee18d2fdefbbf6bc695dadfe5f57170a5badf930a0fe8aa637b10215014c9561a -AUX liquidwar-5.6.4-ovflfix.patch 700 BLAKE2B d0a46b244008d78eaa67cba8f8a39a710c8b75d64876a9e7eae86b168c94f8111326739795b061a2209c70fbb05399291cfdfa6f580c3439e7a68768e9049def SHA512 0d242ff7ba17af4b5d61e040b37fbf363d5c4bec615af21e2b2ea77f7cef4633f66a870196e40b590c6609ed15c90208172154b4e613b6ea0d4fe0f2189bb294 -AUX liquidwar-5.6.4-underlink.patch 442 BLAKE2B bfd7beea85546fca013de4229bbd0b1a658f87a608d1340e2463304c72b1d6e82917a95052488f53be40e3bfcafcf23b13007d8f86d541c8236e6dbaeec1c948 SHA512 3835cad62e8141774c5675d1dbc22103cb41a6af0d4a0a70b23e96d88fe72f49b872823bfb9f35294b8d1bec5d6e89942b37928ee92bb53ecb177a560fe8559d -DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7 -EBUILD liquidwar-5.6.4-r2.ebuild 1650 BLAKE2B 92597eae770aa2a1063101a383eb406922c969b9adf8187b812fa98ae04d6135b29dcb90440190c0a02d2637d3f06752894c7a122aac3c88a62a3a67fa08558f SHA512 4adc6c05c0f9c319ba75c3720679040bdf5e2b2e269ed1208cf155a44b26b14d015943b5520233adcb86156f007b16840f8696d1d150933b1e8cc1b89f5c86c9 +AUX liquidwar-5.6.5-exec-stack.patch 442 BLAKE2B 21e0cdd8bb36ff7ce4bacb9bf9c5bd046803c953818eb73e58f372eb431a368dfd97530b22d3352eceecbb503975ccf3fa041d2776a48f63c15dcb4ef809a6fd SHA512 9759a6ae5805871ccbe2161e295449efc268403094d96360596e6043c1583e9ee18d2fdefbbf6bc695dadfe5f57170a5badf930a0fe8aa637b10215014c9561a +AUX liquidwar-5.6.5-gcc10.patch 1084 BLAKE2B 9d22731a10775c42009ab97c1cc1c7ddd92f32373e148af0a6fc2753486c88c95518c6e657038c2fa444fdf4f149b18bacf9ad8138f9e37b8fd09e519206d56c SHA512 e2880aa19c869ccc7774f7a8f5f22e82be0235f41a9fc3aa39bf287a577ee1765b75259b6d804dce5d2c8a7c9dbc02421561aa6273e498b1981df67b2d8c5b53 +AUX liquidwar-5.6.5-makefile.patch 4909 BLAKE2B 3154d05b02ed7d38150f4456299abcbb5b383837f43f5b6bfb27c64c3f1a2b496eafe6f4fc448a8480a1d6b3180a4fff23e3b556da5d1561d565c177094ae1d9 SHA512 b61c7728543939d98c303af912162c3a433374c4e19d19eac7784b2cc05f7c0f03e18e8736063faa932eac254d980b7a3767cecd9af6254b29d36e503be9fa85 +DIST liquidwar-5.6.5.tar.gz 6508987 BLAKE2B 26411f3c79a407a467f14a0c18b4ff320ab522ed96e43d00fdf4ccc8feab72e786361ac367349336e0478b6cbd187d9ce7c12e28be7896476557beb7b2f65327 SHA512 15dc2cacd1f3b00f8dcac4318cbaf5c713f2d0e111392d14dd56eec7ae97a64af1487a11038dc108743baf3c995e9136100d56331fadc4cf19dc5702d5051a25 +EBUILD liquidwar-5.6.5.ebuild 1039 BLAKE2B fecb93b52cad359ee53b1796533ae9633ae42b1e717bfc3c21f30a56252be4f3120d67078f09db6bf25b6dea91f3ce8b2b96219de0c4d934467ded50791f97cc SHA512 18818b92a64733411efbd4b57b27eeb8a08330b7252927ce38d7fafaffb322d9fbdf112181b1fdd3dd32dd3b8199ed4f3dfc11aadf46b69b39abbbb68269bcd5 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch deleted file mode 100644 index a1e93c9b738c..000000000000 --- a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/src/glouglou.s -+++ b/src/glouglou.s -@@ -240,3 +240,6 @@ - - ret - -+#ifdef __ELF__ -+.section .note.GNU-stack,"",%progbits -+#endif ---- a/src/monster.s -+++ b/src/monster.s -@@ -972,3 +972,6 @@ - ret # retour au c - - -+#ifdef __ELF__ -+.section .note.GNU-stack,"",%progbits -+#endif ---- a/src/spread.s -+++ b/src/spread.s -@@ -957,3 +957,6 @@ - - - -+#ifdef __ELF__ -+.section .note.GNU-stack,"",%progbits -+#endif diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch deleted file mode 100644 index c092f02beabe..000000000000 --- a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200 -+++ b/src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200 -@@ -100,12 +100,12 @@ - - data->privacy = privacy; - data->log = log; -- strncpy (data->metaserver, metaserver, URL_SIZE); -+ strncpy (data->metaserver, metaserver, sizeof(data->metaserver)); - data->port = port; - data->busy_players = busy_players; - data->max_players = max_players; -- strncpy (data->password, password, URL_SIZE); -- strncpy (data->comment, comment, URL_SIZE); -+ strncpy (data->password, password, sizeof(data->password)); -+ strncpy (data->comment, comment, sizeof(data->comment)); - } - - /*------------------------------------------------------------------*/ diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch deleted file mode 100644 index d80e349bf1b1..000000000000 --- a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200 -+++ b/src/Makefile.in 2011-06-22 07:46:00.681613957 +0200 -@@ -223,7 +223,7 @@ - EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) - else - LINK_OPTIONS = -- EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -+ EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm - endif - - CONFIG_OPTIONS = \ diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.5-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-exec-stack.patch new file mode 100644 index 000000000000..a1e93c9b738c --- /dev/null +++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-exec-stack.patch @@ -0,0 +1,27 @@ +--- a/src/glouglou.s ++++ b/src/glouglou.s +@@ -240,3 +240,6 @@ + + ret + ++#ifdef __ELF__ ++.section .note.GNU-stack,"",%progbits ++#endif +--- a/src/monster.s ++++ b/src/monster.s +@@ -972,3 +972,6 @@ + ret # retour au c + + ++#ifdef __ELF__ ++.section .note.GNU-stack,"",%progbits ++#endif +--- a/src/spread.s ++++ b/src/spread.s +@@ -957,3 +957,6 @@ + + + ++#ifdef __ELF__ ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch new file mode 100644 index 000000000000..7d69c705e0c8 --- /dev/null +++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-gcc10.patch @@ -0,0 +1,30 @@ +Author: Reiner Herrmann +Description: Fix FTBFS with GCC 10 +Bug-Debian: https://bugs.debian.org/957493 + +--- a/src/fighter.h ++++ b/src/fighter.h +@@ -59,8 +59,8 @@ + /* variables globales */ + /*==================================================================*/ + +-int FIGHTER_MOVE_X[2][NB_DIRS][5]; +-int FIGHTER_MOVE_Y[2][NB_DIRS][5]; ++extern int FIGHTER_MOVE_X[2][NB_DIRS][5]; ++extern int FIGHTER_MOVE_Y[2][NB_DIRS][5]; + + /*==================================================================*/ + /* fonctions globales */ +--- a/src/random.h ++++ b/src/random.h +@@ -66,8 +66,8 @@ + /* variables globales */ + /*==================================================================*/ + +-void *LW_RANDOM_RAW_MAP; +-int LW_RANDOM_ON; ++extern void *LW_RANDOM_RAW_MAP; ++extern int LW_RANDOM_ON; + + /*==================================================================*/ + /* fonctions globales */ diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch b/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch new file mode 100644 index 000000000000..b034a2947265 --- /dev/null +++ b/games-strategy/liquidwar/files/liquidwar-5.6.5-makefile.patch @@ -0,0 +1,93 @@ +Fix paths. Don't install COPYING and obsolete .desktop + +diff --git a/Makefile.in b/Makefile.in +index 45f13ec..d27dddc 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,21 +27,19 @@ mandir = @mandir@ + infodir = @infodir@ + + BINDIR = $(bindir) +-GAMEDIR = $(exec_prefix)/games +-DATADIR = $(datadir)/games/liquidwar ++GAMEDIR = $(bindir) ++DATADIR = $(datadir)/liquidwar + PIXDIR = $(datadir)/pixmaps + DOCDIR = $(datadir)/doc/liquidwar + DESKTOPDIR = $(datadir)/applications + # We don't use the autoconf default mandir=$(prefix)/man man + # directory since the FHS (File Hierarchy Standard recommends + # to place man pages in $(datadir)/man (ie /usr/share/man). +-# MANDIR = $(mandir)/man6 +-MANDIR = $(datadir)/man/man6 ++MANDIR = $(mandir)/man6 + # We don't use the autoconf default infodir=$(prefix)/info info + # directory since the FHS (File Hierarchy Standard recommends + # to place info pages in $(datadir)/info (ie /usr/share/info). +-# INFODDIR = $(infodir) +-INFODIR = $(datadir)/info ++INFODDIR = $(infodir) + INFODIRDIR = $(infodir) + + HOST = @host@ +@@ -123,7 +121,7 @@ build_doc: + + install: install_link install_nolink + +-# the install_nolink is for distribs where $(prefix)/games is in the PATH, ++# the install_nolink is for distribs where $(prefix) is in the PATH, + # for instance Debian, where a link in $(prefix)/bin is pretty much useless + install_nolink: install_bin install_data install_custom_map install_custom_texture install_custom_music install_icon install_doc install_gpl install_desktop install_readme + @echo +@@ -136,9 +134,9 @@ install_nolink: install_bin install_data install_custom_map install_custom_textu + install_bin: src/liquidwar src/liquidwar-server src/liquidwar-mapgen + @echo "Installing liquidwar binaries in $(GAMEDIR)." + @install -d $(DESTDIR)$(GAMEDIR) +- @install -c -s src/liquidwar $(DESTDIR)$(GAMEDIR) +- @install -c -s src/liquidwar-server $(DESTDIR)$(GAMEDIR) +- @install -c -s src/liquidwar-mapgen $(DESTDIR)$(GAMEDIR) ++ @install -c src/liquidwar $(DESTDIR)$(GAMEDIR) ++ @install -c src/liquidwar-server $(DESTDIR)$(GAMEDIR) ++ @install -c src/liquidwar-mapgen $(DESTDIR)$(GAMEDIR) + + install_link: + @echo "Installing link in $(BINDIR)." +@@ -174,7 +172,7 @@ install_custom_music: + @install -c -m 0644 custom/music/*.* $(DESTDIR)$(DATADIR)/music + + install_doc: +- @if [ -f $(MAKE_DOC_DIR)/txt/rules.txt ]; then echo "Installing liquidwar plain text doc in $(DOCDIR)/txt."; install -d $(DESTDIR)$(DOCDIR)/txt; install -c -m 0644 $(MAKE_DOC_DIR)/txt/*.txt $(DESTDIR)$(DOCDIR)/txt; fi ++ @if [ -f $(MAKE_DOC_DIR)/txt/rules.txt ]; then echo "Installing liquidwar plain text doc in $(DOCDIR)."; install -d $(DESTDIR)$(DOCDIR); install -c -m 0644 $(MAKE_DOC_DIR)/txt/*.txt $(DESTDIR)$(DOCDIR); fi + @if [ -f $(MAKE_DOC_DIR)/html/rules.html ]; then echo "Installing liquidwar HTML doc in $(DOCDIR)/html."; install -d $(DESTDIR)$(DOCDIR)/html; install -c -m 0644 $(MAKE_DOC_DIR)/html/*.html $(DESTDIR)$(DOCDIR)/html; fi + @if [ -f $(MAKE_DOC_DIR)/man/liquidwar.6.gz ]; then echo "Installing liquidwar man page in $(MANDIR)."; install -d $(DESTDIR)$(MANDIR); install -c -m 0644 $(MAKE_DOC_DIR)/man/liquidwar.6.gz $(DESTDIR)$(MANDIR); ln -s -f liquidwar.6.gz $(DESTDIR)$(MANDIR)/liquidwar-server.6.gz; ln -s -f liquidwar.6.gz $(DESTDIR)$(MANDIR)/liquidwar-mapgen.6.gz; fi + @if [ -f $(MAKE_DOC_DIR)/info/liquidwar.info.gz ]; then echo "Installing info page $(INFODIR)/liquidwar.info.gz."; install -d $(DESTDIR)$(INFODIR); install -c -m 644 $(MAKE_DOC_DIR)/info/liquidwar.info* $(DESTDIR)$(INFODIR); if which install-info; then if test -d $(DESTDIR)$(INFODIRDIR); then if test -f $(DESTDIR)$(INFODIRDIR)/dir; then echo "Installing liquidwar info entry."; install-info --info-dir=$(DESTDIR)$(INFODIRDIR) $(MAKE_DOC_DIR)/info/liquidwar.info.gz; fi; fi; fi; fi +@@ -189,12 +187,12 @@ install_icon: + install_desktop: + @echo "Installing desktop file in $(DESKTOPDIR)." + @install -d $(DESTDIR)$(DESKTOPDIR) +- @install -c -m 0644 misc/liquidwar.desktop $(DESTDIR)$(DESKTOPDIR) ++ #@install -c -m 0644 misc/liquidwar.desktop $(DESTDIR)$(DESKTOPDIR) + + install_gpl: + @echo "Installing GPL in $(DOCDIR)." + @install -d $(DESTDIR)$(DOCDIR) +- @install -c -m 0644 COPYING $(DESTDIR)$(DOCDIR) ++ #@install -c -m 0644 COPYING $(DESTDIR)$(DOCDIR) + + install_readme: + @echo "Installing README in $(DOCDIR)." +diff --git a/src/Makefile.in b/src/Makefile.in +index f9a471a..deb6692 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -4,8 +4,8 @@ exec_prefix = @exec_prefix@ + datarootdir = @datarootdir@ + datadir = @datadir@ + +-DATADIR = $(datadir)/games/liquidwar +-GAMEDIR = $(exec_prefix)/games ++DATADIR = $(datadir)/liquidwar ++GAMEDIR = @bindir@ + + HOST_OPT = @HOST_OPT@ + STATIC = @STATIC@ diff --git a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild deleted file mode 100644 index 8899b512aa19..000000000000 --- a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop - -DESCRIPTION="Unique multiplayer wargame" -HOMEPAGE="http://www.ufoot.org/liquidwar/" -SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" -RESTRICT="test" - -RDEPEND=">=media-libs/allegro-4.2:0[X]" -DEPEND="${RDEPEND}" - -src_prepare() { - default - - eapply "${FILESDIR}"/${P}-exec-stack.patch \ - "${FILESDIR}"/${P}-ovflfix.patch - sed -i \ - -e 's:/games::' \ - -e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \ - -e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \ - -e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \ - -e '/^INFODIR/ s/=.*/= $(infodir)/' \ - -e '/^GAMEDIR/ s/exec_prefix/bindir/' \ - -e '/install/s:-s ::' \ - -e 's:$(DOCDIR)/txt:$(DOCDIR):g' \ - -e 's:$(GMAKE):$(MAKE):' \ - -e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \ - || die 'sed Makefile.in failed' - sed -i \ - -e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \ - -e 's:/games::' src/Makefile.in \ - || die "sed src/Makefile.in failed" - eapply "${FILESDIR}"/${P}-underlink.patch -} - -src_configure() { - econf \ - --disable-doc-ps \ - --disable-doc-pdf \ - --disable-target-opt \ - $(use_enable x86 asm) -} - -src_compile() { - # skip build_doc target wrt bug 460344 - emake build_bin build_data -} - -src_install() { - emake DESTDIR="${D}" install_nolink - einstalldocs - rm -f "${ED}"/usr/share/doc/${PF}/COPYING - # Provided desktop file is completely obsolete - rm -f "${ED}"/usr/share/applications/liquidwar.desktop - make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm -} diff --git a/games-strategy/liquidwar/liquidwar-5.6.5.ebuild b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild new file mode 100644 index 000000000000..47a0e6ddf7a1 --- /dev/null +++ b/games-strategy/liquidwar/liquidwar-5.6.5.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs + +DESCRIPTION="Unique multiplayer wargame" +HOMEPAGE="https://ufoot.org/liquidwar/" +SRC_URI="https://ufoot.org/download/liquidwar/v5/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +RDEPEND=">=media-libs/allegro-4.2:0[X]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-exec-stack.patch + "${FILESDIR}"/${P}-gcc10.patch + "${FILESDIR}"/${P}-makefile.patch +) + +src_prepare() { + default + + sed -i \ + -e 's:$(GMAKE):$(MAKE):' \ + -e "/^DOCDIR/ s:=.*:= ${EPREFIX}/usr/share/doc/\$(PF):" Makefile.in \ + || die 'sed Makefile.in failed' +} + +src_configure() { + tc-export CC + econf \ + --disable-doc-ps \ + --disable-doc-pdf \ + $(use_enable x86 asm) +} + +src_compile() { + # skip build_doc target wrt bug 460344 + emake build_bin build_data +} + +src_install() { + emake DESTDIR="${D}" install_nolink + einstalldocs + make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm +} diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest index feaa0431b45a..199806ef108f 100644 --- a/games-strategy/megaglest/Manifest +++ b/games-strategy/megaglest/Manifest @@ -1,6 +1,7 @@ AUX megaglest-3.11.1-cmake.patch 897 BLAKE2B 3076a11cbb18263aabfabdaadb4e201d26b7db6e55e32278c0f37ebd938ae8a41cccb906bcf30ff99a32f6ecb35d77512fd3904610443847d1e3bb3212122902 SHA512 f49580a2b87fbc1e9aa3bec7313bdff36f78404aa97ac9f0cef790202c7d92439ad3fd8a9bdc991540048adb771e22f36c946f44a967cacae5157ef98b41c6cc +AUX megaglest-3.11.1-miniupnpc-api-version-16.patch 1334 BLAKE2B ae9ad1641d8624c59bd69046b00be6bbb8395baee2c72e9929ecc070d6b550cbe311cd071ad0d16539175df263da08900e5668787a4ae9232202de6e8b81da43 SHA512 a91a551da9cf67c5984ac359e6f56d97e873b52de02ff1dfc73ac516f34f9f9704e3958ad3371e6609f048ff198e9b3dfbde0a3c97e1b0253748fd41d39b0443 AUX megaglest-3.11.1-miniupnpc.patch 1299 BLAKE2B e56123ca017cf7b244c449e7b77385d9adc5066873e2ff220eed0344752405019abb13a7dfd0ade027dedd7064e65cf4d6e0509b44986aa5692d7af73b701f7f SHA512 62bf0ff8fa167cecae9f7bf65e5295d609afcdb9fdcb3bf502366eb775fa8d3d39c12001d320a9dc42e12075004c86b7d118eb517d6a57473e03aa26944f8bd4 AUX megaglest-3.11.1-static-build.patch 1939 BLAKE2B 6d71cdc521f3bcf519a3f98bee00bf45951c26f895c3fe74cd03f3ea74c7a28f370726e82385ce6e6af46a81fa77999b28ae266bdbb8b34cf9d1a5e66abb8bef SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5 DIST megaglest-source-3.11.1.tar.xz 2863180 BLAKE2B 01923ad4b29cc7042f0a26ba44a6a023020cbe2071b26b40c3332d763430dd559eb9eb7041182e154a0f1832866c759e08f21a677fcb5f2dba134127b0624b30 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225 -EBUILD megaglest-3.11.1-r1.ebuild 4505 BLAKE2B 4740e92ac4cc3159ee3e52500a089cad5ebfa530196989737711bdd0fbd86a6fcede17a59190f02450a3b834f502f8b3f263af0325c1ad0d47c091a2dce7735e SHA512 7df2fe631b17a88fead0cd758bcbd8cc7b4f94bf5f5cd4bc541ab527d204c3e769929e573c4ee586a614ff4ccc90ca99cf1bccc73a7b512c7fe119ee93455a87 +EBUILD megaglest-3.11.1-r1.ebuild 4599 BLAKE2B 3e2c93a8883e370b796e90f5eab608551bcd4862013535c65c9b253ba5598153df9edfdd74abbf3483b4db38a2bf12239525c18b1e5f7fb61d01a0dbb5435b2d SHA512 e4adcc2397228c260b196a6b97fb85e552236521272e2a3c40c0d92bf56266f6d5c3f29ca624ba1737f66c29b8549ad1d53e4345aca2a23fb6cc1f998abe0459 MISC metadata.xml 1621 BLAKE2B c8cbe108c70355825dfc84d74a64380ca7fd84b335abee058738e2139f00a25c3e79f6a7a3faa0da5cd06051809315ef482cf661ab29bac7f1254f41abdab8fc SHA512 b2bb0fc5043314a798b697ca6e337b7b4896475502c14c0e31ebf8b9d56e6629ef8c4dded03338b1ec7669db5a3ab84021177893dae2e0fae9d661d1f27216d1 diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch new file mode 100644 index 000000000000..a793c122b210 --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch @@ -0,0 +1,17 @@ +https://github.com/MegaGlest/megaglest-source/commit/a85d12aed1983eb69d630b431b81ae656d83b3ac + +--- /source/shared_lib/sources/platform/posix/socket.cpp ++++ /source/shared_lib/sources/platform/posix/socket.cpp +@@ -2610,8 +2610,10 @@ + if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP device found: %s %s\n", dev->descURL, dev->st); + + //printf("UPnP device found: [%s] [%s] lanaddr [%s]\n", dev->descURL, dev->st,lanaddr); +-#if (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 9) || (!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6)) +- char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])),0); ++#if (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 16) ++ char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])), 0, NULL); ++#elif (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 9) || (!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6)) ++ char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])), 0); + #else + char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0]))); + #endif diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild index ef99043c0a34..ca99c5450f14 100644 --- a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild +++ b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 2010-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # google-breakpad @@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="manual" inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games DESCRIPTION="Cross-platform 3D realtime strategy game" -HOMEPAGE="http://www.megaglest.org/" +HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source" SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz" LICENSE="GPL-3 BitstreamVera" @@ -71,7 +71,8 @@ src_prepare() { epatch "${FILESDIR}"/${P}-static-build.patch \ "${FILESDIR}"/${P}-cmake.patch \ - "${FILESDIR}"/${P}-miniupnpc.patch + "${FILESDIR}"/${P}-miniupnpc.patch \ + "${FILESDIR}"/${P}-miniupnpc-api-version-16.patch } src_configure() { diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest index 2dfc71862b1e..8c266c69ac2c 100644 --- a/games-strategy/seven-kingdoms/Manifest +++ b/games-strategy/seven-kingdoms/Manifest @@ -1,7 +1,6 @@ -AUX seven-kingdoms-2.15.2-fortify.patch 756 BLAKE2B 9a37b62281f0feee39a9dd0bce917be83c59280e0fd37522a01d1859fb3ac9e2c49dc342ef58e22fb8392e3c50eb02e311648bd7df9c6b83b8c1744fbe23ca90 SHA512 c4dda156ef2e745d6e3e37d3dd8f64fdf61717b4c65b6713fa4c0888fb6477f8630da4269d6710349db299fa9c7e0115be5f4408ffec3df8e4c57969aeffb337 DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93 SHA512 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1 -DIST 7kaa-2.15.2.tar.xz 46821276 BLAKE2B f5297ebed906937389c86bc4f7ac80a022172ec2c7157d52086ba2742fd2a3231cbb1ee1b8bb8a1c2beba27eb8cee006ce1cce70ea12ef01ede3b1ef4f989a0e SHA512 df053b9934fa3fc32a9a0a239fdafdfb7e441b7e98e280d1c74622f867919be48335ddbc54abb06b12b11e4a84b7a20ebb244fac9e4d7aebb8ad3cbe3192c29a +DIST 7kaa-2.15.4p1.tar.xz 46927880 BLAKE2B b32b819bef5918f2de378893224dcb7a27af6afe4e09791d59a2208f92aa8b82f3d9936553734a8b1cdfec93a8cc5562c65a78a15734fa1457dc94a64a49ed93 SHA512 eac0ca91755f828cfc8b0ea07ad1d0c08030c60ac236473992cc7887f8da43a3246a1f375f569e4fc71afaf7c5797ae6911b8b617217077429e5f5c51af4f4b6 DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6 -EBUILD seven-kingdoms-2.14.7.ebuild 783 BLAKE2B 88eb5caf7fad23b0924878a177f4dc4c7da78e928752ff6082350bc44635ab8b2e0c5286d14d5e36562eb23c6bff40e6e52d2b3d6b7bcbb298cf3df578f1ccf7 SHA512 f360b0580feefb5e53f0639e56aa206af62ac20932c0e624bff9865e449c31fe72d735cc7b204eb073252c6509872f2ce487a5ff00164ce4a79910d3bf3fefcc -EBUILD seven-kingdoms-2.15.2.ebuild 836 BLAKE2B fe8171eaba25e8cc31333fbbdbdd48ede4c2d8fce284b95a6786686f5264088cd97edad2de6a1172004da85e2eb0957fa3eb62f3eb7a2be84b8202e352d09154 SHA512 e806c3a2348e2e04b3a75c73dead52b45c7ac8952c8703d252aa8cb61042c2107c8818f2e0d8330a2b5bc8a03ac7db0a55de280a7dd2930008385e34c6f36535 +EBUILD seven-kingdoms-2.14.7.ebuild 839 BLAKE2B e611c29456970a60ecf4235f03ce74f108655df2e9a67661b149fe0398d8824c22ea108e3eccedf259bf0e9c6c0b590e15dceb70f21147d3d3425db022ca5d9d SHA512 c6ed2f3bf01c2eee117eebb427f7583225050fd05a9fcd3a552be53164c84be96b47208e2f80ec666714db8b9dd24800c20c17fa93996943edeaf28a2ae6a150 +EBUILD seven-kingdoms-2.15.4_p1.ebuild 879 BLAKE2B 3c598c3f546cbb2709b2246a6a601c79a9ba72a9351c94b18aabe4027f6bee3571271142b75ee69d1ee851b5dd0fc0a6f6ab49629edf0395f2d5e5f62bdb2671 SHA512 eb3b16362ceb60ba01335932087d19947f215b84656fce61abeec1833185ccafe68e3c5c0fe1df74717e83376f9b40b0254ef4a2fad3096fea2ccf7ae94d1589 MISC metadata.xml 379 BLAKE2B e307acc5095abbee8bc3bdab262c6f85dbf01638364fdc3ff6a1ea4d6ca0409f9e3197bb06fc3724327081fa4316811aecd594c4ecfc2288b978ca09831cfe96 SHA512 74215810c5079763bd386dd78cd2edcdefbac5350226beb275d0229247f733c9f09268893b3a9581e5924bd3651b54203b8acd3691ee86a32c52f382d5e22477 diff --git a/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch b/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch deleted file mode 100644 index 9377287a6089..000000000000 --- a/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 5f765d8f0ef76c227277c3f9e3162f9deac654db -Author: Jesse Allen -Date: Wed Jun 26 18:11:30 2019 -0700 - - LocaleRes: Don't use database field to enable transliteration. - -diff --git a/src/LocaleRes.cpp b/src/LocaleRes.cpp -index 5b4300a..88d975f 100644 ---- a/src/LocaleRes.cpp -+++ b/src/LocaleRes.cpp -@@ -107,10 +107,13 @@ void LocaleRes::init(const char *locale) - strcpy(lang, "??"); - strcpy(codeset, "ISO-8859-1"); - } -- strcat(codeset, "//TRANSLIT"); - -- cd = iconv_open(codeset, ""); -+ String tocode(codeset); -+ tocode += "//TRANSLIT"; -+ cd = iconv_open(tocode, ""); -+ - cd_latin = iconv_open("ISO-8859-1", ""); -+ - in_buf = mem_add(INIT_BUF_SIZE+1); - in_buf_size = INIT_BUF_SIZE; - out_buf = mem_add(INIT_BUF_SIZE+1); diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild index 33a7974f04b1..e76f54f62801 100644 --- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild +++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils +inherit eutils toolchain-funcs MY_PN="7kaa" MY_P="${MY_PN}-${PV}" @@ -29,6 +29,10 @@ src_unpack() { unpack ${MY_P}.tar.xz } +src_compile() { + emake AR="$(tc-getAR)" +} + src_install() { default diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild deleted file mode 100644 index f8f2227e3f71..000000000000 --- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop - -MY_PN="7kaa" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Seven Kingdoms: Ancient Adversaries" -HOMEPAGE="https://7kfans.com/" -SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -DEPEND="net-libs/enet:1.3= - media-libs/libsdl2[X,video] - media-libs/openal - net-misc/curl" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-fortify.patch" ) - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${MY_P}.tar.xz -} - -src_install() { - default - - doicon "${DISTDIR}/${MY_PN}.png" - make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" "${MY_PN}" "Game;StrategyGame" -} diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild new file mode 100644 index 000000000000..a23677ae1b8b --- /dev/null +++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs + +MY_PN="7kaa" +MY_PV="$(ver_rs 3- '')" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Seven Kingdoms: Ancient Adversaries" +HOMEPAGE="https://7kfans.com/" +SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +DEPEND="net-libs/enet:1.3= + media-libs/libsdl2[X,video] + media-libs/openal + net-misc/curl" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${MY_P}.tar.xz +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + + doicon "${DISTDIR}/${MY_PN}.png" + make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" "${MY_PN}" "Game;StrategyGame" +} diff --git a/games-strategy/war1gus/Manifest b/games-strategy/war1gus/Manifest new file mode 100644 index 000000000000..4190fd44ebfd --- /dev/null +++ b/games-strategy/war1gus/Manifest @@ -0,0 +1,3 @@ +DIST war1gus-2.4.3.tar.gz 436938 BLAKE2B 662c3e2d16d4ca3225a50ec28ff6ae11f9c309a02c1b71e26a28155012395091dec7833a4f32a0ee6c19119a9c0aa2aa96cb465b06937da8efdd54b040189778 SHA512 909dc3375a00a4ff05eb287e6a1e3414b084f51cda37fe73ab4d728eb2d13e3e0e8612700a90e000d67a9ddffb115fe41554a4ad9db9f68e0b62cdbc0d025ae0 +EBUILD war1gus-2.4.3.ebuild 1496 BLAKE2B 88682061cccc413ed62d0916738dd40eb53f2635e58bddc11b40fdc621598a40017e64e17106a48b2188076009f57db216dbfec47c85f299568906890376503f SHA512 b7126069f9e42f13618552546d5bc9c6a407acef835271d9c3bc6842670b9ef856e87b9a2988f3aa9c0d8184a336773c1adcc097d9f3c3ffc31787cd628b9419 +MISC metadata.xml 326 BLAKE2B ee56deed66d8e6505929adafa4fd6d41ec36f71f6289134bac4c7e9efdfefd4dd8243a793ee16bbceda788759cad4827f6fcb7428b80cc93838a9b5d2a063395 SHA512 f3097f181d9ffd627b29eb7fb6df021323067955dd0610d4497bf23e49812322339a0379424bc257caddeb86b13f98d9cd52ab09c36987070006892b36aa8567 diff --git a/games-strategy/war1gus/metadata.xml b/games-strategy/war1gus/metadata.xml new file mode 100644 index 000000000000..98971eeec5c4 --- /dev/null +++ b/games-strategy/war1gus/metadata.xml @@ -0,0 +1,11 @@ + + + + + mgorny@gentoo.org + Michał Górny + + + Wargus/war1gus + + diff --git a/games-strategy/war1gus/war1gus-2.4.3.ebuild b/games-strategy/war1gus/war1gus-2.4.3.ebuild new file mode 100644 index 000000000000..7871af95da19 --- /dev/null +++ b/games-strategy/war1gus/war1gus-2.4.3.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg-utils + +DESCRIPTION="Warcraft: Orcs & Humans for the Stratagus game engine" +HOMEPAGE="https://wargus.github.io/war1gus.html + https://github.com/Wargus/war1gus" +SRC_URI="https://github.com/Wargus/war1gus/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + =games-engines/stratagus-${PV}*[theora] + media-libs/libpng:0= + sys-libs/zlib:= + x11-libs/gtk+:2 + x11-libs/libX11" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DGAMEDIR="${EPREFIX}/usr/bin" + -DBINDIR="${EPREFIX}/usr/bin" + -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus" + -DSHAREDIR="${EPREFIX}/usr/share/stratagus/war1gus" + -DICONDIR=/usr/share/icons/hicolor/64x64/apps + ) + cmake_src_configure +} + +pkg_postinst() { + elog "War1gus requires the data from the original game to run. The game" + elog "will ask you for the location of the game data and extract/convert" + elog "it automatically on the first run." + + if ! has_version media-video/ffmpeg || + ! has_version media-sound/timidity++ + then + elog + elog "If you did not convert the game data yet, you may want to install" + elog "the following optional dependencies:" + elog + elog "media-video/ffmpeg -- to convert game videos" + elog "media-sound/timidity++ -- to convert game music" + fi + + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest index a543cdcaff82..6ad26d8d499b 100644 --- a/games-strategy/wargus/Manifest +++ b/games-strategy/wargus/Manifest @@ -1,3 +1,5 @@ DIST wargus-2.4.1.tar.gz 45981981 BLAKE2B 8d80e5d781a1be1edf602f13d77b84e85fe2592fb0a784f1b25b5c9656eaf10a11c3241dfa71388c9a01a9e8fad15b1805a67ddb3157c2a0e86d967f3852869a SHA512 d468d9ad08907fbbfd02af0bca069d6a95d5303cd4f3d838c12bbfe6af0d48f695f9f49d446dbddeae2a91deb1eaa17875954eefdfbe5e25cd840c4454dc6ea0 +DIST wargus-2.4.3.tar.gz 46635465 BLAKE2B be559e6efdba7542e9ed65f4ece5419b781b61d7d6d43b40418ca8dffc446fa7478f608d7f24696281c7acbda4dc5bf8d808feeb3376ae3e8a04b3372d18ace1 SHA512 0c9eca898146c44e211e0da7061cb605eb04ab113fd9ad0c51f9b92df8724a5b28aea9b7cf9bfadd44f0183f8b5c519d7da0050b260624f4f7da4b9f8aee458c EBUILD wargus-2.4.1.ebuild 1015 BLAKE2B 2ec460a15d26df522ead61b9863618d24057da3b48e73eedb8888017369b94458e87e4792f05d6eb965412c3fee8b21a8fbaf8868065d46948e1e8acfdc0f793 SHA512 4b5b967cfbd52156e3fbe32eb75829ef627ef69534fb5994ad3d0a76ad4280cb89026eed1a5eef643c198865781a32eccb3d9308b356b3b00ae936fe736fd9f8 -MISC metadata.xml 378 BLAKE2B ea732d1cff85972c33a4fef5281b71f5e3bcf7663e864b00891802ee353fab9b33bd93fc6e76ff8123ba4dd8e77dc4889f3a8d044d7c664782c07629b2f942e6 SHA512 ccc5c5ce04783ccd03e482797fd8941fae5c1ba32936641b762595a03606996157637f5155a80eb7284fa2f290b8883b12a1b9b9ba83cf2693876f3cd269617f +EBUILD wargus-2.4.3.ebuild 1933 BLAKE2B 1570688d37ca291df56f903b130957f8e898b8b3c618863743bdf24f3c8a4ea2ce6d3850bd3d746947efcef7f0bead9849a23f72124b87d12e323ecd4bad0e7c SHA512 eda886eae8fdd69c877d3b2f9c175eedb899a2d79b0d67c3006b69f15800679297c0397a861a86749187cd62f4423f4cffa1969ff7c10ae4583ca7ad2a800a1c +MISC metadata.xml 439 BLAKE2B eebdbfe89e7dde448e4828a3d6d9aab70fa1269da5069cf14560edb1dab234cd90f510251af7cbed27440c7712b6ec17273ec2f22a1c8082bd70a8ef13e32094 SHA512 047eacf4d2169f8446f04312c14ea7f9693d631da3eef54c2c5ec696d6b721905dbcf88b196942b796e373ae125b7b2a62301766927a82c18385cac8d1b93ff7 diff --git a/games-strategy/wargus/metadata.xml b/games-strategy/wargus/metadata.xml index 734f09c524c3..4dbdbbfd0323 100644 --- a/games-strategy/wargus/metadata.xml +++ b/games-strategy/wargus/metadata.xml @@ -1,12 +1,15 @@ + + mgorny@gentoo.org + Michał Górny + games@gentoo.org Gentoo Games Project - wargus - wargus + Wargus/wargus diff --git a/games-strategy/wargus/wargus-2.4.3.ebuild b/games-strategy/wargus/wargus-2.4.3.ebuild new file mode 100644 index 000000000000..23954b3347a3 --- /dev/null +++ b/games-strategy/wargus/wargus-2.4.3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg-utils + +DESCRIPTION="Warcraft II for the Stratagus game engine" +HOMEPAGE="https://wargus.github.io/ + https://github.com/Wargus/wargus" +SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + =games-engines/stratagus-${PV}*[theora] + media-libs/libpng:0= + sys-libs/zlib:= + x11-libs/gtk+:2 + x11-libs/libX11 + !games-strategy/wargus-data" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig" + +pkg_pretend() { + if has_version games-strategy/wargus-data; then + ewarn "The system-wide install of game data via games-strategy/wargus-data" + ewarn "no longer works. The old data will be uninstalled after merging" + ewarn "this version of Wargus. If you would like to preserve it, please" + ewarn "abort the process and back /usr/share/stratagus/wargus up." + fi +} + +src_configure() { + local mycmakeargs=( + -DGAMEDIR="${EPREFIX}/usr/bin" + -DBINDIR="${EPREFIX}/usr/bin" + -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus" + -DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus" + -DICONDIR=/usr/share/icons/hicolor/64x64/apps + ) + cmake_src_configure +} + +pkg_postinst() { + elog "Wargus requires the data from the original game to run. The game" + elog "will ask you for the location of the game data and extract/convert" + elog "it automatically on the first run. Only the DOS version is supported" + elog "at the moment." + + if ! has_version media-video/ffmpeg || + ! has_version media-sound/cdparanoia + then + elog + elog "If you did not convert the game data yet, you may want to install" + elog "the following optional dependencies:" + elog + elog "media-video/ffmpeg -- to convert game videos" + elog "media-sound/cdparanoia -- to rip game music from the CD" + fi + + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index 5639050a7b5b..f390a0efab42 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,8 +1,7 @@ +AUX wesnoth-1.14.14-ar.patch 576 BLAKE2B 5cc3995992f9e92f1179e502d8cb3981191953d2ef438d68e8b6a0666fec1485152200861b4b4e32e05875a8d7115d050cc9e9030b97e8ce5a183b0f5d7aa9b8 SHA512 8e612f56a292fe3e155ab072204938888a2fda2e73559029145cdda3b4d201437e616525596610bfd7022a85ec59d761c9711732f227a335ff56040b57e94b75 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab -DIST wesnoth-1.14.13.tar.gz 502959933 BLAKE2B 48f2e4340e9ae015c2e45f75f419ddfbb95a436a4ffbebbe417fdcf322e162ed0ad799680757adb88e19cba717cc48ec0e3d83c4c170e3502fea7be73a39a0c7 SHA512 ee1b7a93e2ae49698ec185cf6385cd93a49116315ebdec474bd5d5b73ab6af59db92ee5621fab68581edd81c74d8584237d5068fd30362054377d84a3dcb5ea0 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4 DIST wesnoth-1.15.4.tar.gz 500087559 BLAKE2B bb46766369cfcb1432b5b5e8df62636e2a45ff45bf3ec4381aa9e73b20a4a5a6e196f0355b10d2b86ffad608cfdd24f8d2fad21061db9b18f1a2decf11b0e466 SHA512 b209e584a187934b0ca3808cb870f4703b49edd5de357b6a6b01bdad2c71b8d755b81d3628c5281cd19f82ee8d030716d6bf64a806e6636426949b0a3d85ee9d -EBUILD wesnoth-1.14.13.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d -EBUILD wesnoth-1.14.14.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d -EBUILD wesnoth-1.15.4.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d +EBUILD wesnoth-1.14.14.ebuild 2570 BLAKE2B 0ba8ec3c027da454e679f166b7f35ee2faae15c60da9739c2eba13aad850aa7989d0e47e9f120ffd0f3c7c08b7c735ad45733e63ede211adaea7dc49a7a2f69f SHA512 2b32bf85157098d8c49644f8629a07248998e7075e0d83cb1b9606f1b082c94bbaf7b488a994a58f65d482d1af00c667fa3dd4a21a61f310ed153d2a77a1ef0d +EBUILD wesnoth-1.15.4.ebuild 2570 BLAKE2B 0ba8ec3c027da454e679f166b7f35ee2faae15c60da9739c2eba13aad850aa7989d0e47e9f120ffd0f3c7c08b7c735ad45733e63ede211adaea7dc49a7a2f69f SHA512 2b32bf85157098d8c49644f8629a07248998e7075e0d83cb1b9606f1b082c94bbaf7b488a994a58f65d482d1af00c667fa3dd4a21a61f310ed153d2a77a1ef0d MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3 diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch new file mode 100644 index 000000000000..4a7c8cf41e72 --- /dev/null +++ b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch @@ -0,0 +1,14 @@ +Leave default AR as is, https://bugs.gentoo.org/732096 + +diff -r 419bf3de54e5 CMakeLists.txt +--- a/CMakeLists.txt Sat Oct 24 19:50:25 2020 +0000 ++++ b/CMakeLists.txt Sat Oct 24 19:50:53 2020 +0000 +@@ -390,8 +390,6 @@ + MESSAGE("Using ar, ranlib, and default linker") + find_program(NON_LTO_AR NAMES ar) + find_program(NON_LTO_RANLIB NAMES ranlib) +- set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE) +- set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support LTO" FORCE) + endif() + MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB) + diff --git a/games-strategy/wesnoth/wesnoth-1.14.13.ebuild b/games-strategy/wesnoth/wesnoth-1.14.13.ebuild deleted file mode 100644 index 407e3840468a..000000000000 --- a/games-strategy/wesnoth/wesnoth-1.14.13.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic toolchain-funcs xdg - -DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" -HOMEPAGE="http://www.wesnoth.org - https://github.com/wesnoth/wesnoth" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -# uneven minor versions are development versions -if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then - KEYWORDS="~amd64 ~x86" -fi -IUSE="dbus dedicated doc fribidi libressl nls server" - -RDEPEND=" - acct-group/wesnoth - acct-user/wesnoth - >=dev-libs/boost-1.50:=[nls,threads,icu] - >=media-libs/libsdl2-2.0.4:0[joystick,video,X] - !dedicated? ( - dev-libs/glib:2 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=media-libs/fontconfig-2.4.1 - >=media-libs/sdl2-image-2.0.0[jpeg,png] - >=media-libs/sdl2-mixer-2.0.0[vorbis] - >=media-libs/sdl2-ttf-2.0.12 - media-libs/libvorbis - >=x11-libs/pango-1.22.0 - >=x11-libs/cairo-1.10.0 - sys-libs/readline:0= - dbus? ( sys-apps/dbus ) - fribidi? ( dev-libs/fribidi ) - )" -DEPEND="${RDEPEND} - x11-libs/libX11 -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - cmake_src_prepare - - if ! use doc ; then - sed -i \ - -e '/manual/d' \ - doc/CMakeLists.txt || die - fi - - # respect LINGUAS (bug #483316) - if [[ ${LINGUAS+set} ]] ; then - local lang 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="ON" - -DENABLE_SERVER="ON" - -DSERVER_UID="${PN}" - -DSERVER_GID="${PN}" - -DFIFO_DIR="/run/wesnothd" - ) - else - mycmakeargs=( - -DENABLE_CAMPAIGN_SERVER="OFF" - -DENABLE_SERVER="OFF" - ) - fi - mycmakeargs+=( - -Wno-dev - -DENABLE_GAME="$(usex !dedicated)" - -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)" - -DENABLE_NLS="$(usex nls)" - -DENABLE_NOTIFICATIONS="$(usex dbus)" - -DENABLE_FRIBIDI="$(usex fribidi)" - -DENABLE_STRICT_COMPILATION="OFF" - ) - cmake_src_configure -} - -src_install() { - local DOCS=( README.md changelog.md ) - cmake_src_install - if use dedicated || use server; then - rmdir "${ED}/run/wesnothd" || die - newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd - fi -} diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild index 407e3840468a..4d50bca27254 100644 --- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild @@ -46,6 +46,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/wesnoth-1.14.14-ar.patch" +) + src_prepare() { cmake_src_prepare @@ -72,9 +76,6 @@ src_configure() { append-flags -fno-stack-protector fi - # Work around eclass - append-flags -UNDEBUG - if use dedicated || use server ; then mycmakeargs=( -DENABLE_CAMPAIGN_SERVER="ON" diff --git a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild index 407e3840468a..4d50bca27254 100644 --- a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild @@ -46,6 +46,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/wesnoth-1.14.14-ar.patch" +) + src_prepare() { cmake_src_prepare @@ -72,9 +76,6 @@ src_configure() { append-flags -fno-stack-protector fi - # Work around eclass - append-flags -UNDEBUG - if use dedicated || use server ; then mycmakeargs=( -DENABLE_CAMPAIGN_SERVER="ON" -- cgit v1.2.3