diff options
Diffstat (limited to 'games-strategy/warzone2100')
| -rw-r--r-- | games-strategy/warzone2100/Manifest | 5 | ||||
| -rw-r--r-- | games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch | 60 | ||||
| -rw-r--r-- | games-strategy/warzone2100/warzone2100-4.1.2-r3.ebuild (renamed from games-strategy/warzone2100/warzone2100-4.1.2-r1.ebuild) | 5 | ||||
| -rw-r--r-- | games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild (renamed from games-strategy/warzone2100/warzone2100-4.1.3-r2.ebuild) | 13 |
4 files changed, 70 insertions, 13 deletions
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest index e21ce24bf1b0..800ed0ccf31c 100644 --- a/games-strategy/warzone2100/Manifest +++ b/games-strategy/warzone2100/Manifest @@ -1,6 +1,7 @@ +AUX warzone2100-4.1.3-no-compress-manpages.patch 2317 BLAKE2B 00d67b7df0898b1a6343b38ffb7e1655d3f16a94bffe94894f3cff5e25f1e7f426046beda9983eea963bac5fb2a7e49aca473b8b78d141ac00baa250710093c1 SHA512 48b8c3f651bf7d504da88a6351799cc9cd19bf84191f52e9ca5b0c5c60b52a81587c8a03fde5e3d8d19e7770dc7b17dd60b59d8441b47221a7cda5a8008f9558 DIST warzone2100-4.1.2.tar.xz 337480924 BLAKE2B 2042aedd43a3515bf6ccfc210dd02502bc20d487ff96ce763f573f0dd92ef08577ee21fd54237b4cf4f99c31ed33197febc70edd25d0e0a515e286167d815f9d SHA512 7218f98757e421d8ccf6c36de5e310060b52506d4e10c3cba6e32d1917da30b9deb52b8081026d8efc84ef44842a7db8604d4a86157409281a30bbcc52b556f6 DIST warzone2100-4.1.3.tar.xz 337479212 BLAKE2B 07d1788fc2f8e5073a15231d5bf0c8c50dc0413522ea1589b064190144906fb58008faab66a295cec7759a1036f4d007ef8a42cffd9ef588fde1116b6cd7a38b SHA512 64126a1a5aab8b766cdfc70b8d96465ad451bd6a31e33be963eb89664b062dfe58e195ac3cbc087a9c008519c0e13003d9750bcb428b0e0ff12c82bf9940be3f DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6 -EBUILD warzone2100-4.1.2-r1.ebuild 2527 BLAKE2B 5b30a48f1bfa0fa022120923698dac9054bd77b598d3d12015be911ee1fea198c28d46e4c9d0bc9a6438845dfd237b8e2f54d37089bb37f890edb9fbd279d841 SHA512 d251b0cdc1500dbb9befe2925a4c796d893d4659a5bd932ab45955a5ecce2772154937e1dd13f488891f011c161d35a47c78b6d14e956c89425f0c956224000b -EBUILD warzone2100-4.1.3-r2.ebuild 2765 BLAKE2B b23e35e0912b3fe841aeecada4770d698e897f8e2de01d4f549d8d8ea9a6d491d5173bac4e3cfcce7cccb345d5e620c27e0b13f5c1e0ebd04f1746a57190f2a8 SHA512 4f16ef347548f8c88c1a9da413053da897530443fbc39e2c15561d5419e3fce342d3499ef146f8f86d1b3bce1c494db3241e4236a86e3ec8cbdfaa0cda755edc +EBUILD warzone2100-4.1.2-r3.ebuild 2402 BLAKE2B 30851896517d6df07fa994ba6125af0e4d8ead4e0179158bbcb280b084f629675128117ab29927dc48fb22740921566d2dddb966a94ab649da7991907708ce25 SHA512 94ffadb25e4048d8c8a9b12e4f50cfea5884201d233033861b5a1c31029fe43222e36a0724bcd4b7bad3356a3555d86d59b76d7e2c3eef11573e1e43bb26a2d7 +EBUILD warzone2100-4.1.3-r4.ebuild 2686 BLAKE2B c66c3402d285cccfd2d33780605a22acf294564671e52ad6630d892d67e2d7d42f1b2ab7b3f84f735340892e78c38263186a0b9034f48fc44911b175b1255347 SHA512 5a2146eb1f1f201d830a40cc843df461cf16ac489d2b792d9977478db6a1d60a37af42d618c16be58fe0f556548986a8a8535b07808af2284165db5c40f06bd7 MISC metadata.xml 811 BLAKE2B 3b34613b3eeec7f6f428f9e2c48561df6fecc03566d7b9b10618aba37fd53e2f1bd1d09e46804f2c87f2504e4d91d1a289a2a22afea8c7eac01820b779a77cf3 SHA512 af44da84a5578f11e6f01e0310a7aefedf29582c90d257eaa51e64a59fd85a5e60c2f56ca401c58fb40c079c556abc400586aa74dc49d1b5b9073bf750ce1845 diff --git a/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch b/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch new file mode 100644 index 000000000000..b90ad05bc754 --- /dev/null +++ b/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch @@ -0,0 +1,60 @@ +https://bugs.gentoo.org/808120 + +From e65b71cec99b2c3a4d0ed6aa448e7a2dc28fabac Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 17 Aug 2021 22:22:40 +0100 +Subject: [PATCH] Don't compress manpages + +--- + doc/CMakeLists.txt | 34 ++++++---------------------------- + 1 file changed, 6 insertions(+), 28 deletions(-) + +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 3d27a1a..f3c702b 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -236,35 +236,13 @@ install(FILES ${wz2100_doc_FILES} DESTINATION "${CMAKE_INSTALL_DOCDIR}${WZ_OUTPU + if(UNIX) + # Man-page gzip and installation + +- find_program(GZIP_BIN NAMES gzip PATHS /bin /usr/bin /usr/local/bin) +- if (GZIP_BIN) +- set(_warzone2100_6_uncompressed_orig "${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6") +- set(_warzone2100_6_uncompressed "${CMAKE_CURRENT_BINARY_DIR}/warzone2100${WZ_OUTPUT_NAME_SUFFIX}.6") +- set(_warzone2100_6_compressed "${_warzone2100_6_uncompressed}.gz") +- +- add_custom_target(wz2100_manpages ALL) +- set_property(TARGET wz2100_manpages PROPERTY FOLDER "doc") +- add_dependencies(wz2100_manpages wz2100_doc) +- +- if (NOT "${_warzone2100_6_uncompressed_orig}" STREQUAL "${_warzone2100_6_uncompressed}") +- add_custom_command( +- TARGET wz2100_manpages +- COMMAND ${CMAKE_COMMAND} -E copy "${_warzone2100_6_uncompressed_orig}" "${_warzone2100_6_uncompressed}" +- COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed} +- VERBATIM +- ) +- else() +- add_custom_command( +- TARGET wz2100_manpages +- COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed} +- VERBATIM +- ) +- endif() ++ set(_warzone2100_6 "${CMAKE_CURRENT_BINARY_DIR}/warzone2100${WZ_OUTPUT_NAME_SUFFIX}.6") + +- install(FILES "${_warzone2100_6_compressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages) +- else() +- message( WARNING "Unable to find gzip tool; skipping Unix man page generation" ) +- endif() ++ add_custom_target(wz2100_manpages ALL) ++ set_property(TARGET wz2100_manpages PROPERTY FOLDER "doc") ++ add_dependencies(wz2100_manpages wz2100_doc) ++ ++ install(FILES "${_warzone2100_6}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages) + endif() + + set(wz2100_doc_IMAGES_FILES ${wz2100_doc_IMAGES_FILES} PARENT_SCOPE) +-- +2.33.0 + diff --git a/games-strategy/warzone2100/warzone2100-4.1.2-r1.ebuild b/games-strategy/warzone2100/warzone2100-4.1.2-r3.ebuild index 78e0c7a03746..db26399fb3a0 100644 --- a/games-strategy/warzone2100/warzone2100-4.1.2-r1.ebuild +++ b/games-strategy/warzone2100/warzone2100-4.1.2-r3.ebuild @@ -21,14 +21,10 @@ KEYWORDS="~amd64 ~x86" # upstream requested debug support IUSE="debug discord nls videos vulkan" -# TODO: unbundle miniupnpc and quesoglc -# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828 CDEPEND=" >=dev-games/physfs-2[zip] >=dev-libs/libsodium-1.0.14:= - dev-libs/openssl:0= media-libs/freetype:2 - media-libs/glew:= media-libs/harfbuzz:= media-libs/libogg media-libs/libpng:= @@ -36,6 +32,7 @@ CDEPEND=" media-libs/libtheora media-libs/libvorbis media-libs/openal + net-libs/miniupnpc:= sys-libs/zlib virtual/glu virtual/opengl diff --git a/games-strategy/warzone2100/warzone2100-4.1.3-r2.ebuild b/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild index 3e39b944a707..1259fe012c7e 100644 --- a/games-strategy/warzone2100/warzone2100-4.1.3-r2.ebuild +++ b/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild @@ -21,15 +21,11 @@ KEYWORDS="~amd64 ~x86" # Upstream requested debug support IUSE="debug discord nls videos vulkan" -# TODO: unbundle miniupnpc and quesoglc, bug #477610 -# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828 CDEPEND=" >=dev-games/physfs-2[zip] - dev-db/sqlite + dev-db/sqlite:3 >=dev-libs/libsodium-1.0.14:= - dev-libs/openssl:0= media-libs/freetype:2 - media-libs/glew:= media-libs/harfbuzz:= media-libs/libogg media-libs/libpng:= @@ -37,6 +33,7 @@ CDEPEND=" media-libs/libtheora media-libs/libvorbis media-libs/openal + net-libs/miniupnpc:= net-misc/curl sys-libs/zlib nls? ( virtual/libintl ) @@ -61,13 +58,15 @@ BDEPEND=" HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm ) DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md ) +PATCHES=( + "${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch +) + src_unpack() { unpack ${P}.tar.xz } src_prepare() { - default - sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die # Delete translations we're not using |