diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-21 19:00:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-21 19:00:36 +0100 |
| commit | 491c3b190bc8dfebeb156c06938f76034140b65f (patch) | |
| tree | 84527f8c75d6aa03bf4b2ae2531ccf7f263aa8ca /games-strategy | |
| parent | 520a5b56dff7c24c9d42eafec142cb78b44f8e3e (diff) | |
gentoo resync : 21.07.2018
Diffstat (limited to 'games-strategy')
18 files changed, 609 insertions, 110 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz Binary files differindex 2c672c271129..146db2b33588 100644 --- a/games-strategy/Manifest.gz +++ b/games-strategy/Manifest.gz diff --git a/games-strategy/colobot-data/Manifest b/games-strategy/colobot-data/Manifest index 490a1cdd122b..87eab43e86d0 100644 --- a/games-strategy/colobot-data/Manifest +++ b/games-strategy/colobot-data/Manifest @@ -5,4 +5,4 @@ DIST colobot-data-9999-music-flac.tar.gz 298829480 BLAKE2B 2a041df82b295433257dd DIST colobot-data-9999-music-ogg.tar.gz 3686106 BLAKE2B c1565dbcf1aab0e29014623c924ade2ac1b5da9ae9d9231afe3299dfedab0678c3d222e58665fe3ac60291972b7c2d763437246d7816ca7c16e69766a52e9490 SHA512 2ec22944857ccc5276b93d0da4684bfd9d2a80ac712e3396cb01ccbf21a582c22d525e8af9d12828e224ee948173bffb5e31f664cc9333b79b6f3062dd2466ac EBUILD colobot-data-0.1.11.ebuild 1417 BLAKE2B e7e337a06bcc0f427ca48686a89b7153b1af7a3a50d20d2dc5c9b7a173d3efd3aa21636af625839673d884431eb8cc46b3425bda2493c2d5b73045f0601c6d52 SHA512 7533d79e52f93510df6c96ff8599d852e8c09b7e6a3f8ecc2d327817d7c3f488314ab797df770a27a558dce480f12c6ef878ade5175d02ce924de25dfbd5763f EBUILD colobot-data-9999.ebuild 1298 BLAKE2B 2a719b8b29c7d02b569d452baa874506eff9c1140ee44dd239e5777b7c2f1b240da13de87fce3f3692116d17ec84727999fba6ccd354704986e2b9a3ee6f6731 SHA512 8c580974e4bfb3d5a93540cf08b792aa966f934707edacb5825409d88b3133fa2718fac006bf577b4cceb0717e65f0369eda31e2cf4d3c6689d4ed0a29402805 -MISC metadata.xml 517 BLAKE2B 3f7a70c01e3fedb20ce8ae9ea680b5382ac852ed07684348d506c8c402d18a60ed201b314a3f923ac1974d91498543cd68e89460284148bde6876c303706b8d3 SHA512 abf5513f23d51b18ecc3f7c49148734e90eae4d9e3aaf16e35e0837c245313366ec10e2ada0bd5d5f41e4b297f3bb96d1fcf85c26dd812fd83597db1a9379427 +MISC metadata.xml 444 BLAKE2B 82c9945aa54230d7c15dcc90dceb4f7e403e2f6650c12f732271ce8e2a76ee6ed4beb418805628e90a5bd1c13ecd3f591dfe02ff0c3e0e77f1225949cc5bfca6 SHA512 1d0148632fa5d38e3a9d299cff71ea8fffe3624d26001fb7f94e509626738e2d8135af26ce692fee45885d5da44cc64ca5d4655979236f182e213c1bcd43357d diff --git a/games-strategy/colobot-data/metadata.xml b/games-strategy/colobot-data/metadata.xml index f19541007ed9..12f259a825d5 100644 --- a/games-strategy/colobot-data/metadata.xml +++ b/games-strategy/colobot-data/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>fdsfgs@krutt.org</email> - <name>soredake</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">colobot/colobot-data</remote-id> </upstream> diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest index 24574f7a7939..80e1c36cfe61 100644 --- a/games-strategy/colobot/Manifest +++ b/games-strategy/colobot/Manifest @@ -1,4 +1,4 @@ DIST colobot-0.1.11.tar.gz 1430595 BLAKE2B 6e4a23f17631031a6f502b045637949d99bfcf8aa723f11c406c8cdb9b201b9a2771de8b8c92829bc890848a19eb182bc30a45a51e6d281ce64370f6c7a0d8a5 SHA512 fe32bc56b6fae9435c74a73b694b7d2b93667e5d15b1c57a7558e492613f0a5d4cab72ff341ab4c921150137282cc71292a1e31eb1ed06c752de33c50120f20e EBUILD colobot-0.1.11.ebuild 1372 BLAKE2B b40e81306d7fc183e9d523db5d60cd19a88880e010584bc4ccb762734ad34fe7ffc1ff50660cdd80e38edca4edfb915c047d4da93caafb82d1fec0c5779879e3 SHA512 19012df06321273072c51cd9408c80f487f53e979c0eaf31edf1fab574d3a41d4a37582a05888f4486891ae057e5341905f28dd686a8e94552d9fb38062cd0cd EBUILD colobot-9999.ebuild 1372 BLAKE2B b40e81306d7fc183e9d523db5d60cd19a88880e010584bc4ccb762734ad34fe7ffc1ff50660cdd80e38edca4edfb915c047d4da93caafb82d1fec0c5779879e3 SHA512 19012df06321273072c51cd9408c80f487f53e979c0eaf31edf1fab574d3a41d4a37582a05888f4486891ae057e5341905f28dd686a8e94552d9fb38062cd0cd -MISC metadata.xml 528 BLAKE2B 55374b7caad73e5a5a2a7ecd705dd8631158642fcd6444417d422b1b433d36f92d741ae3fd097748d0cdd80651834bd63281179aece38a8ab6a92bed6fed968b SHA512 112e65009d79a3cee912908358f763c294d2662cd1c8119506c678a9763940f7c323f99bf1cdb8880aecd7fb6df81be9d1ddfb5802a1a87e4a0edc841217e98f +MISC metadata.xml 338 BLAKE2B 0db6b76296a10e4fa2333490fe61d2d33a81b417a848225f2f1f6c52b2008b5f52afe8bcf2b60d56ce7c6bc73b402604821513ca830be647a13e7d9e0ac1f926 SHA512 bc695a245c9da3a0e334e4e9a465d773098beaf2b01df5f29b9ff83c543c848c0256617d42e3e43e0f76be7204b8ac504cb5b3f34861b2dab4ed232756866c75 diff --git a/games-strategy/colobot/metadata.xml b/games-strategy/colobot/metadata.xml index 3816bd533efb..e955d3f3c923 100644 --- a/games-strategy/colobot/metadata.xml +++ b/games-strategy/colobot/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>fdsfgs@krutt.org</email> - <name>soredake</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">colobot/colobot</remote-id> </upstream> diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index 386f97068f47..1775d1784838 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,6 +1,6 @@ -AUX freeciv-2.5.11-freetype_pkgconfig.patch 7770 BLAKE2B 89ee785b4db49eebd2a17d24622728933f9a90c813ea7c5c448efc150d6c9fd1f51ade375e549a45190db08efedeca93ec3c287cff54cf3f7b842a9cd84a14ba SHA512 6aac048569b8b42768832292162dbafceb69b93f6f6419c24e6dedd3a60aee9e059624dbfbf843cea19b1a97370c7e8178ff5a10f199f94665dbabe75e3e81b1 +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.6.0-beta3.tar.bz2 51761039 BLAKE2B a01e1df80eaa7ab76416190d8c32941e443481b6f7460155f3180548919270bec5bf6efde698931c44d427e17c6347299c0674ed2fc59b5b3c6a8ee5b97c9cf0 SHA512 c8a49ab77d799a65d181632a565d92cd0f9c2cd9fbaa5ce963eddc9abca29ccb9567bc3f731ad80b3f3593dd807c3d702abbe378824e3adef655edb8100711f5 +DIST freeciv-2.6.0-RC2.tar.bz2 51828653 BLAKE2B 87e83e23cb1cec91e408415a5c0b7f4f2fc438f239ca48ba4e713b89c8624fdd58c1888ff53119196085b1f7f2c663af91df4af9c789c3238465f887758bf09f SHA512 254e492bb2ece390bcdb6c7ec9151b812811e7a1bff72eea4a9179a97c865d754436c5a02de2acb1ccf86850e1dd7db1218a84b836d18400217813d0c0ae173c EBUILD freeciv-2.5.11.ebuild 4569 BLAKE2B 06624aac60d9b6a6ce354f73d22513b429879b15f58d83990abacdb43cece5feff525cd8feaa853867bb0c8038d42b6e00c807c22d998eadd45d455344a63cec SHA512 50ea3f5c7851449554e42485e9b3e45c1483328d9b90c44ee23679a36ba10f7cd2fa84cfc041c2c4aaf9b03f66e53e53dd83d0e89719a3afbd91e221dd369ce3 -EBUILD freeciv-2.6.0_beta3.ebuild 4645 BLAKE2B c9bd80c89361bf855487e92303476fe1d450314baeb860571408a71d87e23c6fde27f6e856da8baccce2f1655007e890a69150e9bf8a227af554004660726648 SHA512 205479dc6f9cc89254e1c1bd80578549a2817d4a3b89b1139469fd5412c81468d8750ce2bd11d43d2bfdbda132d722c2dd49b4b2f2793ff2d17756c31ef2ff53 +EBUILD freeciv-2.6.0_rc2.ebuild 4730 BLAKE2B c511af4f5cfe5f89e8e764aa4e101ead2ca8847aa930f8ed3fb363cd91c0fa8e19d2d36d98ec0e908787e9725f1f812900cb4e9d80ecb2335f796e9d9840ab25 SHA512 3ab46c6adcae4fc43fe27d6202842bc404e42aa6c1716f102a559d39c9aaee0341231508b8ec99a84d054dbc4482c54e3a8948c213a2f965d160049dbb109e48 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201 diff --git a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch index b41411c8a164..d2b321dde274 100644 --- a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch +++ b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch @@ -1,4 +1,4 @@ -From fe3eaf658c256a1ee1aac645c004625e9f345421 Mon Sep 17 00:00:00 2001 +From f2eafd087a20b4236c1f2f1324e8644cb5055bf9 Mon Sep 17 00:00:00 2001 From: Lars Wendler <polynomial-c@gentoo.org> Date: Wed, 16 May 2018 20:41:22 +0200 Subject: [PATCH] Use pkg-config to find freetype @@ -6,11 +6,24 @@ Subject: [PATCH] Use pkg-config to find freetype As of freetype-2.9.1 the freetype-config script no longer gets installed by default. --- + Makefile.am | 1 - m4/freetype2.m4 | 194 ----------------------------------------------- m4/sdl-client.m4 | 2 +- - 2 files changed, 1 insertion(+), 195 deletions(-) + 3 files changed, 1 insertion(+), 196 deletions(-) delete mode 100644 m4/freetype2.m4 +diff --git a/Makefile.am b/Makefile.am +index 5d5a187d47..51791433ab 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -64,7 +64,6 @@ EXTRA_DIST = autogen.sh \ + m4/fcdb-postgres.m4 \ + m4/fcdb-sqlite3.m4 \ + m4/features.m4 \ +- m4/freetype2.m4 \ + m4/gettimeofday.m4 \ + m4/ggz.m4 \ + m4/freeciv-gettext.m4 \ diff --git a/m4/freetype2.m4 b/m4/freetype2.m4 deleted file mode 100644 index 3d0ecb3554..0000000000 @@ -225,5 +238,5 @@ index 095cd0b287..015d948d95 100644 gui_sdl_cflags="$gui_sdl_cflags $FT2_CFLAGS" gui_sdl_libs="$gui_sdl_libs $FT2_LIBS" -- -2.17.0 +2.18.0 diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild b/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild index ceb9ae038ec1..54306880240b 100644 --- a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild +++ b/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild @@ -2,11 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit flag-o-matic gnome2-utils ltprune xdg-utils +inherit flag-o-matic gnome2-utils xdg-utils + +MY_PV="${PV/_beta/-beta}" +MY_PV="${MY_PV/_rc/-RC}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="multiplayer strategy game (Civilization Clone)" HOMEPAGE="http://www.freeciv.org/" -SRC_URI="mirror://sourceforge/freeciv/${P/_/-}.tar.bz2" +SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" @@ -58,7 +62,7 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) )" -S="${WORKDIR}/${P/_/-}" +S="${WORKDIR}/${MY_P}" pkg_setup() { if use !dedicated && use !server ; then @@ -170,7 +174,7 @@ src_install() { find "${ED}" -name "freeciv-manual*" -delete rm -f "${ED%/}/usr/$(get_libdir)"/*.a - prune_libtool_files + find "${ED}" -name "*.la" -delete || die } pkg_preinst() { diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest index e57fd5ee697f..c0c01140c297 100644 --- a/games-strategy/freeorion/Manifest +++ b/games-strategy/freeorion/Manifest @@ -1,6 +1,8 @@ +AUX freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch 1030 BLAKE2B d0b4a58e85fd878fc5d332ca0f552889aff752fd8198f66d217cc54aad1ddb83cf24108d978bd0155b13a6db9d7f11f35f2b76f76456acd9ab38b1e28dbc5332 SHA512 ffd493373ccb0051aa2b41d0bd740865fa13db3ed50fbf95e83c6d97fe81e3ff04c24e865d73b011dbd0085c45a0b1a915c62eaa103ecf29a3264030d1d9ae4e AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d EBUILD freeorion-0.4.7.1-r3.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20 +EBUILD freeorion-0.4.7.1-r4.ebuild 1772 BLAKE2B 3ad940d0d84c67cdb19c1ac21a9a15e8bfd933869fdb5fb66fc55145d7dc7d1579db052020416caf565b5511968c9ff0dd377b94536ecbe9cfc4a7a0bcf6e70a SHA512 c1bea06c10cec7172b21baefcf858c4f73ce9aaccb7745d233e55a68ec862443999faf4404a945df284fb6423d265c5b0ad3acf9e725d31d6b16e89a37fa66b2 EBUILD freeorion-0.4.7.1.ebuild 1679 BLAKE2B d60e8dca3465f700cc629f8df45b4f92efbfa1814e6d4dd2c23b40c13684cc614c947c40e931810095487cf3070077dc8ba36b36a3fcf51e5b3c657f6b6f4607 SHA512 88f9d3905770f0a97a3938d58bad1c6698c5d8b651718a19cb634aaef857582023051700bc692ae59a2b8ee83b1da6841fff1a576078f7df1705e388b6faca7b EBUILD freeorion-9999.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1 diff --git a/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch b/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch new file mode 100644 index 000000000000..f7ccdba126bb --- /dev/null +++ b/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch @@ -0,0 +1,34 @@ +From 77bdc407d0760a529e40914d16248dce01fd4778 Mon Sep 17 00:00:00 2001 +From: O01eg <o01eg@yandex.ru> +Date: Wed, 8 Nov 2017 16:07:57 +0300 +Subject: [PATCH] Fix #1843 + +--- + CMakeLists.txt | 2 +- + GG/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/CMakeLists.txt 2018-06-03 11:36:04.631832409 -0400 ++++ b/CMakeLists.txt 2018-06-03 11:36:20.678821846 -0400 +@@ -484,7 +484,7 @@ + ${Boost_INCLUDE_DIRS} + ${OPENGL_INCLUDE_DIR} + ${GLEW_INCLUDE_DIRS} +- ${SDL_INCLUDE_DIRS} ++ ${SDL_INCLUDE_DIR} + ${OPENAL_INCLUDE_DIR} + ${OGG_INCLUDE_DIRS} + ${VORBIS_INCLUDE_DIRS} +diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt +index 5d3c157362..c5bf3825d8 100644 +--- a/GG/CMakeLists.txt ++++ b/GG/CMakeLists.txt +@@ -184,7 +184,7 @@ target_include_directories(GiGiSDL SYSTEM + ${Boost_INCLUDE_DIRS} + ${OPENGL_INCLUDE_DIR} + ${GLEW_INCLUDE_DIRS} +- ${SDL_INCLUDE_DIRS} ++ ${SDL_INCLUDE_DIR} + ) + + target_link_libraries(GiGiSDL diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild new file mode 100644 index 000000000000..e3471161e466 --- /dev/null +++ b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +inherit cmake-utils python-single-r1 gnome2-utils + +DESCRIPTION="A free turn-based space empire and galactic conquest game" +HOMEPAGE="http://www.freeorion.org" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/freeorion/freeorion.git" +else + MY_PV="${PV/_/-}" + SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" +SLOT="0" +IUSE="" + +RDEPEND=" + >=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}] + media-libs/freealut + media-libs/freetype + media-libs/glew:= + media-libs/libsdl2 + >=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 + sys-libs/zlib + virtual/opengl + !dev-games/gigi" + # Use bundled gigi as of freeorion-0.4.3 + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/${P}-backport-sdl2-include-dir-fix.patch" ) + +pkg_setup() { + # build system is using FindPythonLibs.cmake which needs python:2 + python-single-r1_pkg_setup +} + +src_prepare() { + sed -e "s/-O3//" -i CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_BUILD_TYPEE=Release + -DRELEASE_COMPILE_FLAGS="" + -DCMAKE_SKIP_RPATH=ON + ) + + append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + dodoc ChangeLog.md + + newenvd "${FILESDIR}/${PN}.envd" 99${PN} +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-strategy/tornado/Manifest b/games-strategy/tornado/Manifest index 830934926e91..f4205c372155 100644 --- a/games-strategy/tornado/Manifest +++ b/games-strategy/tornado/Manifest @@ -1,4 +1,4 @@ -AUX tornado-1.4-gentoo.patch 955 BLAKE2B 923f1f8aff22a9ac20e67220c249e57fd80a028ab8f2f58106c1c7300a29cd97e2bf52cb6403150f645a8a91f565b2a853631d656ddf80d909bfc35dd508537b SHA512 16499538f588370026e05518d5f437599b9f1a291e47c681cb8f7c3c7a88ba4dd1aafb8b979bc8fc35640777be8b54bf209433c88ac9f1c667f97a39500973d9 -DIST tornado-1.4.tar.gz 54591 BLAKE2B 6a734730e987c6e0516f08e6b3a594b46285e86f3e9b967bd6ff575dc3a55c053b9e4bb7795b51914eebed87979e2a1a290a0273f68a045630b6255cc9714794 SHA512 764c18b228a24cdcaf1456af79d1bdb997f200c09bc33d8f54df28f1f995db1b1a3a328550c5561bc8ebd38d4187f472aa1c892d91889e613b9ff42b86bee322 -EBUILD tornado-1.4.ebuild 867 BLAKE2B e846e4a5ee6325cf8a175f5864bd2cc128195e101fcb87252c9f9913775e812ae56578b2f18c5311f29d33420df3e3f1b46922af176efe4c06902ba815040c37 SHA512 e260752c861452a53624b62579efdd8246c2f104a404f3197844f9c233218ac867b530b2082e145dc5a86d2d39c9abd33519fa102d5fa26a54dd8d2340a8d82b +AUX tornado-1.4-r2-gentoo.patch 13288 BLAKE2B 35b3eb05fd6894ec5733e42b2423f19f3ef4ff2e71b90f6f71380fdaec0ad862caafd15a8fb7f0785927f8fee0fdead741dc4bfb34343b510fd330ac649f893e SHA512 683a5dcac5fc12b065ebb4dfc5c9972a6fe6c87ee645cdbdf038313068ae43cc1e022ad8772c6f509f7bc102862bda6cc34ce5ccf132fc06f7d1cabd2d93817a +DIST tornado-1.4.tar.gz 56341 BLAKE2B 81b99ab6484c5267c90792cfefb9dad638d8057224e4eb755dde85638e17bfb5cc17fe64bf84b0d631905493e8e1e276f0842b4f9bbe2eb40e740931a8f422a8 SHA512 32a9e078c0d0498befff78f5cafaa1e45ee2ad45d661f7d89e9038f8ca44c34b27ca846e3e4d68a15f203da20b5f6aeb41826c00159d66d9640f3b2bdd6b6e12 +EBUILD tornado-1.4-r2.ebuild 740 BLAKE2B f762b2cac420201ed1df9e77c58e19c79d9f9c113e0159f77a7d9b03c61f120ea856e7561994fe0e64db582161abed2a6288789053adb32d716e9007c1380640 SHA512 463357f175bd3707fd95f8274f248b71fd1df335bfc24e3aed9b2162a753edce7c82e23d46d9fc8e2d40f08edb93babe5a88e97f95b7ddbafef568818dda7c20 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-strategy/tornado/files/tornado-1.4-gentoo.patch b/games-strategy/tornado/files/tornado-1.4-gentoo.patch deleted file mode 100644 index fb8966841158..000000000000 --- a/games-strategy/tornado/files/tornado-1.4-gentoo.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- Makefile.old 2009-02-12 12:42:25.000000000 +0100 -+++ Makefile 2009-02-12 12:44:52.000000000 +0100 -@@ -1,10 +1,9 @@ --CC = gcc - MAKE = make --LDFLAGS = -lncurses -+LDLIBS = -lncurses - OBJFILES = main.o draw.o erwin.o network.o scores.o --PREFIX = /usr/local --LOCALEPATH = /usr/local/share/locale --CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" -+PREFIX = /usr -+LOCALEPATH = /usr/share/locale -+CFLAGS += -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" - VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //` - LOCALES = de - MAN = doc/man -@@ -25,7 +24,7 @@ - $(MAKE) -C $(MAN) all - - tornado: $(OBJFILES) -- $(CC) $(LDFLAGS) $(OBJFILES) -o tornado -+ $(CC) $(LDFLAGS) $(OBJFILES) $(LDLIBS) -o tornado - - debug: tornado.6 locales - gcc -g -ggdb -Wall -ansi -pedantic -o tornado draw.c main.c erwin.c network.c scores.c -lncurses -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" diff --git a/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch b/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch new file mode 100644 index 000000000000..72951781f3e2 --- /dev/null +++ b/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch @@ -0,0 +1,388 @@ +--- a/doc/man/de/Makefile ++++ b/doc/man/de/Makefile +@@ -9,10 +9,10 @@ + + install-man: tornado.6 + @echo "Installing german manpage ..." +- if [ ! -d "$(PREFIX)/man/de/man6" ]; then \ +- mkdir -p $(PREFIX)/man/de/man6; \ ++ if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/de/man6" ]; then \ ++ mkdir -p $(DESTDIR)/$(PREFIX)/share/man/de/man6; \ + fi +- install -m 0644 tornado.6 $(PREFIX)/man/de/man6 ++ install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/de/man6 + + clean: + rm -f tornado.6 +--- a/doc/man/fr/Makefile ++++ b/doc/man/fr/Makefile +@@ -9,10 +9,10 @@ + + install-man: tornado.6 + @echo "Installing French manpage ..." +- if [ ! -d "$(PREFIX)/man/fr/man6" ]; then \ +- mkdir -p $(PREFIX)/man/fr/man6; \ ++ if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/fr/man6" ]; then \ ++ mkdir -p $(DESTDIR)/$(PREFIX)/share/man/fr/man6; \ + fi +- install -m 0644 tornado.6 $(PREFIX)/man/fr/man6 ++ install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/fr/man6 + + clean: + rm -f tornado.6 +--- a/doc/man/it/Makefile ++++ b/doc/man/it/Makefile +@@ -9,10 +9,10 @@ + + install-man: tornado.6 + @echo "Installing Italian manpage ..." +- if [ ! -d "$(PREFIX)/man/it/man6" ]; then \ +- mkdir -p $(PREFIX)/man/it/man6; \ ++ if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/it/man6" ]; then \ ++ mkdir -p $(DESTDIR)/$(PREFIX)/share/man/it/man6; \ + fi +- install -m 0644 tornado.6 $(PREFIX)/man/it/man6 ++ install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/it/man6 + + clean: + rm -f tornado.6 +--- a/doc/man/Makefile ++++ b/doc/man/Makefile +@@ -15,10 +15,10 @@ + + install-man: tornado.6 + @echo "Installing manpage ..." +- if [ ! -d "$(PREFIX)/man/man6" ]; then \ +- mkdir -p $(PREFIX)/man/man6; \ ++ if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/man6" ]; then \ ++ mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man6; \ + fi +- install -m 0644 tornado.6 $(PREFIX)/man/man6 ++ install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/man6 + $(MAKE) -C de install-man + $(MAKE) -C fr install-man + $(MAKE) -C it install-man +--- a/doc/man/nl/Makefile ++++ b/doc/man/nl/Makefile +@@ -9,10 +9,10 @@ + + install-man: tornado.6 + @echo "Installing Dutch manpage ..." +- if [ ! -d "$(PREFIX)/man/nl/man6" ]; then \ +- mkdir -p $(PREFIX)/man/nl/man6; \ ++ if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/nl/man6" ]; then \ ++ mkdir -p $(DESTDIR)/$(PREFIX)/share/man/nl/man6; \ + fi +- install -m 0644 tornado.6 $(PREFIX)/man/nl/man6 ++ install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/nl/man6 + + clean: + rm -f tornado.6 +--- a/doc/man/no/Makefile ++++ b/doc/man/no/Makefile +@@ -9,10 +9,10 @@ + + install-man: tornado.6 + @echo "Installing Norwegian manpage ..." +- if [ ! -d "$(PREFIX)/man/no/man6" ]; then \ +- mkdir -p $(PREFIX)/man/no/man6; \ ++ if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/no/man6" ]; then \ ++ mkdir -p $(DESTDIR)/$(PREFIX)/share/man/no/man6; \ + fi +- install -m 0644 tornado.6 $(PREFIX)/man/no/man6 ++ install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/no/man6 + + clean: + rm -f tornado.6 +--- a/doc/man/ru/Makefile ++++ b/doc/man/ru/Makefile +@@ -9,10 +9,10 @@ + + install-man: tornado.6 + @echo "Installing Russian manpage ..." +- if [ ! -d "$(PREFIX)/man/ru/man6" ]; then \ +- mkdir -p $(PREFIX)/man/ru/man6; \ ++ if [ ! -d "$(DESTDIR)/$(PREFIX)/share/man/ru/man6" ]; then \ ++ mkdir -p $(DESTDIR)/$(PREFIX)/share/man/ru/man6; \ + fi +- install -m 0644 tornado.6 $(PREFIX)/man/ru/man6 ++ install -m 0644 tornado.6 $(DESTDIR)/$(PREFIX)/share/man/ru/man6 + + clean: + rm -f tornado.6 +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,9 @@ +-CC = gcc + MAKE = make +-LDFLAGS = -lncurses ++LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses) + OBJFILES = main.o draw.o erwin.o network.o scores.o +-PREFIX = /usr/local +-LOCALEPATH = /usr/local/share/locale +-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" ++PREFIX = /usr ++LOCALEPATH = /usr/share/locale ++CFLAGS += -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" + VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //` + LOCALES = de + MAN = doc/man +@@ -25,7 +24,7 @@ + $(MAKE) -C $(MAN) all + + tornado: $(OBJFILES) +- $(CC) $(LDFLAGS) $(OBJFILES) -o tornado ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJFILES) $(LDLIBS) -o tornado + + debug: tornado.6 locales + gcc -g -ggdb -Wall -ansi -pedantic -o tornado draw.c main.c erwin.c network.c scores.c -lncurses -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" +@@ -43,25 +42,24 @@ + + install: tornado tornado.6 install-locale-data + @echo "Installing tornado binary in $(PREFIX)/bin..." +- if [ ! -d "$(PREFIX)/bin" ]; then \ +- mkdir -p $(PREFIX)/bin; \ ++ if [ ! -d "$(DESTDIR)/$(PREFIX)/bin" ]; then \ ++ mkdir -p $(DESTDIR)/$(PREFIX)/bin; \ + fi +- install -s tornado $(PREFIX)/bin ++ install tornado $(DESTDIR)/$(PREFIX)/bin + + $(MAKE) -C $(MAN) install-man + ++ if [ ! -d "$(DESTDIR)/var/games" ]; then \ ++ mkdir -p $(DESTDIR)/var/games; \ ++ fi; \ + if [ -f "/var/games/tornado.scores" ]; then \ + echo "Skipping install of the highscores file. File exists."; \ + cat /var/games/tornado.scores | ./convert-highscorefile > score.tmp; \ +- mv -f score.tmp /var/games/tornado.scores; \ +- chmod a+rw-x "/var/games/tornado.scores"; \ +- else \ +- if [ ! -d "/var/games" ]; then \ +- mkdir /var/games; \ +- fi; \ +- install tornado.scores /var/games; \ +- chmod a+w-x "/var/games/tornado.scores"; \ +- fi ++ mv -f score.tmp $(DESTDIR)/var/games/tornado.scores; \ ++ else \ ++ install tornado.scores $(DESTDIR)/var/games; \ ++ fi; \ ++ chmod a+w-x "$(DESTDIR)/var/games/tornado.scores"; + + install-locale-data: + $(MAKE) -C po install-locale-data +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -1,9 +1,3 @@ +-CC = gcc +-MAKE = make +-LDFLAGS = -lncurses +-OBJFILES = main.o draw.o erwin.o network.o scores.o +-PREFIX = /usr/local +-LOCALEPATH = /usr/local/share/locale +-CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" +-LOCALES = de ++PREFIX = /usr ++LOCALEPATH = /usr/share/locale + MAN = doc/man +--- a/po/Makefile ++++ b/po/Makefile +@@ -14,38 +14,38 @@ + msgfmt no.po -o no.mo + + install-locale-data: de.mo fr.mo pt.mo es.mo it.mo ru.mo nl.mo no.po +- if [ ! -d "$(LOCALEPATH)/de/LC_MESSAGES/" ]; then \ +- mkdir -p $(LOCALEPATH)/de/LC_MESSAGES/; \ ++ if [ ! -d "$(DESTDIR)$(LOCALEPATH)/de/LC_MESSAGES/" ]; then \ ++ mkdir -p $(DESTDIR)$(LOCALEPATH)/de/LC_MESSAGES/; \ + fi +- install -m 0644 de.mo $(LOCALEPATH)/de/LC_MESSAGES/tornado.mo +- if [ ! -d "$(LOCALEPATH)/fr/LC_MESSAGES/" ]; then \ +- mkdir -p $(LOCALEPATH)/fr/LC_MESSAGES/; \ +- fi +- install -m 0644 fr.mo $(LOCALEPATH)/fr/LC_MESSAGES/tornado.mo +- if [ ! -d "$(LOCALEPATH)/pt/LC_MESSAGES/" ]; then \ +- mkdir -p $(LOCALEPATH)/pt/LC_MESSAGES/; \ +- fi +- install -m 0644 pt.mo $(LOCALEPATH)/pt/LC_MESSAGES/tornado.mo +- if [ ! -d "$(LOCALEPATH)/es/LC_MESSAGES/" ]; then \ +- mkdir -p $(LOCALEPATH)/es/LC_MESSAGES/; \ +- fi +- install -m 0644 es.mo $(LOCALEPATH)/es/LC_MESSAGES/tornado.mo +- if [ ! -d "$(LOCALEPATH)/it/LC_MESSAGES/" ]; then \ +- mkdir -p $(LOCALEPATH)/it/LC_MESSAGES/; \ +- fi +- install -m 0644 it.mo $(LOCALEPATH)/it/LC_MESSAGES/tornado.mo +- if [ ! -d "$(LOCALEPATH)/ru/LC_MESSAGES/" ]; then \ +- mkdir -p $(LOCALEPATH)/ru/LC_MESSAGES/; \ +- fi +- install -m 0644 ru.mo $(LOCALEPATH)/ru/LC_MESSAGES/tornado.mo +- if [ ! -d "$(LOCALEPATH)/nl/LC_MESSAGES/" ]; then \ +- mkdir -p $(LOCALEPATH)/nl/LC_MESSAGES/; \ +- fi +- install -m 0644 nl.mo $(LOCALEPATH)/nl/LC_MESSAGES/tornado.mo +- if [ ! -d "$(LOCALEPATH)/no/LC_MESSAGES/" ]; then \ +- mkdir -p $(LOCALEPATH)/no/LC_MESSAGES/; \ ++ install -m 0644 de.mo $(DESTDIR)$(LOCALEPATH)/de/LC_MESSAGES/tornado.mo ++ if [ ! -d "$(DESTDIR)$(LOCALEPATH)/fr/LC_MESSAGES/" ]; then \ ++ mkdir -p $(DESTDIR)$(LOCALEPATH)/fr/LC_MESSAGES/; \ ++ fi ++ install -m 0644 fr.mo $(DESTDIR)$(LOCALEPATH)/fr/LC_MESSAGES/tornado.mo ++ if [ ! -d "$(DESTDIR)$(LOCALEPATH)/pt/LC_MESSAGES/" ]; then \ ++ mkdir -p $(DESTDIR)$(LOCALEPATH)/pt/LC_MESSAGES/; \ ++ fi ++ install -m 0644 pt.mo $(DESTDIR)$(LOCALEPATH)/pt/LC_MESSAGES/tornado.mo ++ if [ ! -d "$(DESTDIR)$(LOCALEPATH)/es/LC_MESSAGES/" ]; then \ ++ mkdir -p $(DESTDIR)$(LOCALEPATH)/es/LC_MESSAGES/; \ ++ fi ++ install -m 0644 es.mo $(DESTDIR)$(LOCALEPATH)/es/LC_MESSAGES/tornado.mo ++ if [ ! -d "$(DESTDIR)$(LOCALEPATH)/it/LC_MESSAGES/" ]; then \ ++ mkdir -p $(DESTDIR)$(LOCALEPATH)/it/LC_MESSAGES/; \ ++ fi ++ install -m 0644 it.mo $(DESTDIR)$(LOCALEPATH)/it/LC_MESSAGES/tornado.mo ++ if [ ! -d "$(DESTDIR)$(LOCALEPATH)/ru/LC_MESSAGES/" ]; then \ ++ mkdir -p $(DESTDIR)$(LOCALEPATH)/ru/LC_MESSAGES/; \ ++ fi ++ install -m 0644 ru.mo $(DESTDIR)$(LOCALEPATH)/ru/LC_MESSAGES/tornado.mo ++ if [ ! -d "$(DESTDIR)$(LOCALEPATH)/nl/LC_MESSAGES/" ]; then \ ++ mkdir -p $(DESTDIR)$(LOCALEPATH)/nl/LC_MESSAGES/; \ ++ fi ++ install -m 0644 nl.mo $(DESTDIR)$(LOCALEPATH)/nl/LC_MESSAGES/tornado.mo ++ if [ ! -d "$(DESTDIR)$(LOCALEPATH)/no/LC_MESSAGES/" ]; then \ ++ mkdir -p $(DESTDIR)$(LOCALEPATH)/no/LC_MESSAGES/; \ + fi +- install -m 0644 no.mo $(LOCALEPATH)/no/LC_MESSAGES/tornado.mo ++ install -m 0644 no.mo $(DESTDIR)$(LOCALEPATH)/no/LC_MESSAGES/tornado.mo + + clean: + rm -f *.mo +--- a/doc/man/de/tornado.6.de.in ++++ b/doc/man/de/tornado.6.de.in +@@ -90,13 +90,13 @@ + .SH FILES + PREFIX/bin/tornado + .P +-PREFIX/man/man6/tornado.6 ++/usr/share/man/man6/tornado.6 + .P + /var/games/tornado.scores + .P +-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo ++/usr/share/locale/de/LC_MESSAGES/tornado.mo + .P +-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo ++/usr/share/locale/fr/LC_MESSAGES/tornado.mo + .SH NOTES + Wenn das Spiel im Netzwerkmodus läuft sollte auf beiden Seiten die selbe + Version laufen. Versionen vor 1.0pre4 funktionieren damit überhaupt nicht, +--- a/doc/man/fr/tornado.6.fr.in ++++ b/doc/man/fr/tornado.6.fr.in +@@ -72,13 +72,13 @@ + .SH FICHIERS + PREFIX/bin/tornado + .P +-PREFIX/man/man6/tornado.6 ++/usr/share/man/man6/tornado.6 + .P + /var/games/tornado.scores + .P +-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo ++/usr/share/locale/de/LC_MESSAGES/tornado.mo + .P +-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo ++/usr/share/locale/fr/LC_MESSAGES/tornado.mo + .SH NOTES + Pour jouer en mode réseau, le client et le serveur doivent avoir le même numéro de version. Les versions antérieures à la 1.0pre4 ne sont pas prévues pour jouer en réseau. Le jeu en réseau entre deux versions différentes du programme acceptera de démarrer, mais sera susceptible de crasher à tout moment. + .P +--- a/doc/man/it/tornado.6.it.in ++++ b/doc/man/it/tornado.6.it.in +@@ -74,13 +74,13 @@ + .SH FILE + PREFIX/bin/tornado + .P +-PREFIX/man/man6/tornado.6 ++/usr/share/man/man6/tornado.6 + .P + /var/games/tornado.scores + .P +-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo ++/usr/share/locale/de/LC_MESSAGES/tornado.mo + .P +-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo ++/usr/share/locale/fr/LC_MESSAGES/tornado.mo + .SH NOTE + Avviando il gioco in modalità network, dovreste avere la stessa versione del gioco dal lato server e client. Le versioni precedenti alla 1.0pre4 non funzioneranno per nulla, a causa della mancanza delle funzionalità di rete. Con versioni diverse ai due lati, il gioco si avvierà ugualmente, ma potrebbe andare in crash ad ogni momento, se c'é troppa differenza tra le due versioni. + .P +--- a/doc/man/nl/tornado.6.nl.in ++++ b/doc/man/nl/tornado.6.nl.in +@@ -71,15 +71,15 @@ + .B \-\-version, + Toont de het versienummer en beeindigt. + .SH "FILES" +-/usr/local/bin/tornado ++/usr/bin/tornado + .P +-/usr/local/man/man6/tornado.6 ++/usr/man/man6/tornado.6 + .P + /var/games/tornado.scores + .P +-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo ++/usr/share/locale/de/LC_MESSAGES/tornado.mo + .P +-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo ++/usr/share/locale/fr/LC_MESSAGES/tornado.mo + .SH "NOTES" + Als u het spel in netwerk modus draait moeten de client en de server dezelfde versie draaien. Versies voor 1.0pre4 werken helemaal niet, + omdat die geen netwerk functionaliteit hebben. Het spel zal wel starten met verschillende versies, mar het zal waarschijnlijk later crashen, als er te veel verschillen zijn. +--- a/doc/man/no/tornado.6.no.in ++++ b/doc/man/no/tornado.6.no.in +@@ -86,13 +86,13 @@ + .SH FILES + PREFIX/bin/tornado + .P +-PREFIX/man/man6/tornado.6 ++/usr/share/man/man6/tornado.6 + .P + /var/games/tornado.scores + .P +-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo ++/usr/share/locale/de/LC_MESSAGES/tornado.mo + .P +-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo ++/usr/share/locale/fr/LC_MESSAGES/tornado.mo + .SH NOTES + Når du starter spillet i nettverksmodus bør du ha samme versjon på klient + og tjener. Versjoner før 1.0pre4 vil ikke virke i det heletatt på grunn +--- a/doc/man/ru/tornado.6.ru.in ++++ b/doc/man/ru/tornado.6.ru.in +@@ -92,7 +92,7 @@ + .SH æáêìù + .nf + PREFIX/bin/tornado +-PREFIX/man/man6/tornado.6 ++/usr/share/man/man6/tornado.6 + /var/games/tornado.scores + .fi + .SH ðòéíåþáîéå +--- a/doc/man/tornado.6.in ++++ b/doc/man/tornado.6.in +@@ -88,13 +88,13 @@ + .SH FILES + PREFIX/bin/tornado + .P +-PREFIX/man/man6/tornado.6 ++/usr/share/man/man6/tornado.6 + .P + /var/games/tornado.scores + .P +-/usr/local/share/locale/de/LC_MESSAGES/tornado.mo ++/usr/share/locale/de/LC_MESSAGES/tornado.mo + .P +-/usr/local/share/locale/fr/LC_MESSAGES/tornado.mo ++/usr/share/locale/fr/LC_MESSAGES/tornado.mo + .SH NOTES + When you run the game in network mode you should have the same game versions + on client and server side. Versions prior 1.0pre4 won't work at all due to diff --git a/games-strategy/tornado/tornado-1.4-r2.ebuild b/games-strategy/tornado/tornado-1.4-r2.ebuild new file mode 100644 index 000000000000..c2a5f7c2f76c --- /dev/null +++ b/games-strategy/tornado/tornado-1.4-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs + +DESCRIPTION="Clone of a C64 game - destroy the opponent's house" +HOMEPAGE="https://github.com/kouya/tornado" +SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nls" + +DEPEND=" + nls? ( sys-devel/gettext ) +" + +RDEPEND=" + nls? ( virtual/libintl ) +" + +PATCHES=( + "${FILESDIR}"/${PF}-gentoo.patch +) + +src_configure() { + if ! use nls; then + sed -i \ + -e '/^all:/s|locales||g' \ + -e '/^install:/s|install-locale-data||g' \ + Makefile || die + fi + + tc-export CC PKG_CONFIG +} + +src_install() { + default + fperms 664 "/var/games/tornado.scores" +} diff --git a/games-strategy/tornado/tornado-1.4.ebuild b/games-strategy/tornado/tornado-1.4.ebuild deleted file mode 100644 index 0c6638176e97..000000000000 --- a/games-strategy/tornado/tornado-1.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -DESCRIPTION="Clone of a C64 game - destroy the opponent's house" -HOMEPAGE="http://kiza.kcore.de/software/tornado/" -SRC_URI="http://kiza.kcore.de/software/tornado/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" - -src_prepare() { - sed -i \ - -e "s:PREFIX/bin:${GAMES_BINDIR}:" \ - -e "s:PREFIX/man:/usr/man:" \ - -e "s:/var/games:${GAMES_STATEDIR}:" \ - -e "s:/usr/local:/usr:" \ - doc/man/tornado.6.in \ - || die "sed failed" - epatch "${FILESDIR}"/${P}-gentoo.patch -} - -src_install() { - dogamesbin tornado - doman doc/man/tornado.6 - dodoc AUTHOR CREDITS Changelog README TODO - insinto "${GAMES_STATEDIR}" - doins tornado.scores - prepgamesdirs - fperms 664 "${GAMES_STATEDIR}/tornado.scores" -} diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest index 9617b8304bd2..06e1494dfd24 100644 --- a/games-strategy/uqm/Manifest +++ b/games-strategy/uqm/Manifest @@ -1,12 +1,12 @@ AUX uqm-0.7.0-tempdir.patch 510 BLAKE2B bed2ffb2c9051accfc971268efc9c5769a43f87c22a5ac5bbeda86d171e69e9927671c0b8aaa2d16981febc15f62fb47fb80fb2e5fb4e46434ba7b97b4b0993a SHA512 07dc48c646e6e3642a1c917aa763996eaef8bae21e72470159b445e20e3e3315663009b4fd30c93a7f5b04ec78bf12de254434094f3c62ca523466148a2a9594 AUX uqm-0.7.0-warning.patch 862 BLAKE2B 8e07610eea56c3c778cff5143284551a8230b35fb20ba15c11ff8266b67cedfaaa3de3c72c3aa3bf936e4799ef62bba8524e7cbe911f81c4d183f45762a38779 SHA512 d15b09a13b82a888a5c50c5e561213e755f104cb1f7b42bf3fdc7c39350bb517111c8d212218126c89136a2a4a7c47bcc4354e7c53a9df72795ce123a619a256 +DIST uqm-0.7.0-1-source.tgz 1591613 BLAKE2B 400309aced671a23bf325b95bb471db2e5b9aa59a0c868bc1cf971e71ad22a7a555c68fc15be1c574e4b4a8f58b0c18c4a5f85c188b494e20b36bd09ba6de02b SHA512 77255e7e4cc195d4db7f02bb95e76d41c0d72cb179b30a8cd944c4c78560485d76ad89b0bbd03102e5718d66f3b16050ef73a30b6bc8d31e1c0bfa46758badaa DIST uqm-0.7.0-3domusic.uqm 18980671 BLAKE2B e86828b8a4a2ae7aee7469a9792c3ba7f472208fe33de46f2797024331a290c1092fcae4a1d599fa002d9cd9ef0248df6cb6cda673d3c0ef90c55ae4a38afd56 SHA512 e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b DIST uqm-0.7.0-content.uqm 11538533 BLAKE2B 8b654f47d8d2e66dac197b10b96fdfc62907cafc6b5b9046a84588d539349263012c5cb235a428e2cb9a8840b1ff7565035f810a8445892b3c272bb629769348 SHA512 c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2 -DIST uqm-0.7.0-source.tgz 1562003 BLAKE2B 682f87b4967b1aef298dd576dd37cef838f2eaf42f2212fc3af70bf7319e5284cc9bff616d8db3a36a7f2760d2f47f714bcaa2f4f3d35993892a78cdadc85e54 SHA512 443ac13da401d45743f913755647b3309834c57f371fb673c3ea2cacb81184bf30430db10af9001de854363520d1f792f47faffd690c8c2b2f3d12d63b217815 DIST uqm-0.7.0-voice.uqm 115143439 BLAKE2B 397bf018e128fc3ac95f40e087b809af58d935549489a1f317495d13be166317f2108eee9d1d5dc2283ef486df70d90aeb1808c29fd78d016fae504189a78625 SHA512 693a4869f8567637b112138f8a074b65919776175addbd353e3601085ee4e4bb4758daca64921c902463f5dc38baa6f7fda4ad32f3cf1786646ef48f15cdeb80 DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 02bf183aa9ef5460831d4bbcfa90ce4745814de017700d7e6dcb1a065dff2a37d47239fdacbb2ba7639a788d795ac45579952aa7f78b760aa9dc8e3aa9d2ccde SHA512 fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b DIST uqm-remix-disc2.uqm 60282662 BLAKE2B c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433 SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e DIST uqm-remix-disc3.uqm 39924875 BLAKE2B f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951 DIST uqm-remix-disc4.uqm 86545760 BLAKE2B d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7 SHA512 07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65 -EBUILD uqm-0.7.0-r4.ebuild 2887 BLAKE2B b9bcdc61a47019fefe86f46453e7413efe252a7e7169d9fed3b4d93c00b045228bd0a3956b0d8013388128eb16b30ab2aab1010b8ebce093bd29f70dbd3a9b20 SHA512 2c551fcce44049917d348d04d011c095ed0e92ba2ba7ca38f0430c2ad83e5e13c1c96951b0be0e03a23a49cb044aee4a281815d5dd9c3de7e80b9febd176f58f +EBUILD uqm-0.7.0.1.ebuild 3025 BLAKE2B 32b12b00bc7b779279d8e776035261ced811dea61e3a6b8494a5034234622060c8c23bd527dba58f9cd5af3fe761986e54716f2879153c12c4dd96125a15eef1 SHA512 269799cf4839bf20eca5ee277f26de944dcf28cd6cd37c5b2c8143db54cb3bf4e53b8e8e2a72e365cc1b2ceb4a047a4822a40c3a398d8121adc918b93af1b443 MISC metadata.xml 572 BLAKE2B 154cfbc9c11b74fb658a2e8b494e394f1924291e2273e0fef3346471c9059adf42e819dbf795aad3fdf4296a272e149cf46a8502a195b6bb97287c7b0c548409 SHA512 cd21d5260e39857374bcd1795f2cb2c158104ce865cd9c091202bab404f8133b547d0ba8e7a2580a0177ee1b97de31bdf1b0658f0b20860d70585ecb85bd49b1 diff --git a/games-strategy/uqm/uqm-0.7.0-r4.ebuild b/games-strategy/uqm/uqm-0.7.0.1.ebuild index f04136716330..562c43b26a89 100644 --- a/games-strategy/uqm/uqm-0.7.0-r4.ebuild +++ b/games-strategy/uqm/uqm-0.7.0.1.ebuild @@ -1,15 +1,20 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit desktop toolchain-funcs +MY_PV=$(ver_rs 3 '-') +MY_P="${PN}-${MY_PV}" +BASE_PV=$(ver_cut 1-3) +BASE_P="${PN}-${BASE_PV}" + DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2" HOMEPAGE="http://sc2.sourceforge.net/" -SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz - mirror://sourceforge/sc2/${P}-content.uqm - music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm ) - voice? ( mirror://sourceforge/sc2/${P}-voice.uqm ) +SRC_URI="mirror://sourceforge/sc2/${MY_P}-source.tgz + mirror://sourceforge/sc2/${BASE_P}-content.uqm + music? ( mirror://sourceforge/sc2/${BASE_P}-3domusic.uqm ) + voice? ( mirror://sourceforge/sc2/${BASE_P}-voice.uqm ) remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \ mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \ mirror://sourceforge/sc2/${PN}-remix-disc3.uqm \ @@ -34,18 +39,17 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -src_prepare() { - default +S="${WORKDIR}/${MY_P}" - local myopengl +PATCHES=( + "${FILESDIR}/${BASE_P}-tempdir.patch" + "${FILESDIR}/${BASE_P}-warning.patch" +) - use opengl \ - && myopengl=opengl \ - || myopengl=pure +src_prepare() { + default - eapply \ - "${FILESDIR}"/${P}-tempdir.patch \ - "${FILESDIR}"/${P}-warning.patch + local myopengl=$(usex opengl 'opengl' 'pure') cat <<-EOF > config.state CHOICE_debug_VALUE='nodebug' @@ -89,16 +93,16 @@ src_install() { doexe uqm insinto /usr/share/${PN}/content/packages - doins "${DISTDIR}"/${P}-content.uqm - echo ${P} > "${ED}"/usr/share/${PN}/content/version || die + doins "${DISTDIR}"/${BASE_P}-content.uqm + echo ${BASE_P} > "${ED}"/usr/share/${PN}/content/version || die insinto /usr/share/${PN}/content/addons if use music; then - doins "${DISTDIR}"/${P}-3domusic.uqm + doins "${DISTDIR}"/${BASE_P}-3domusic.uqm fi if use voice; then - doins "${DISTDIR}"/${P}-voice.uqm + doins "${DISTDIR}"/${BASE_P}-voice.uqm fi if use remix; then |