diff options
| -rw-r--r-- | games-strategy/warzone2100/Manifest | 2 | ||||
| -rw-r--r-- | games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch | 36 | ||||
| -rw-r--r-- | games-strategy/warzone2100/warzone2100-3.3.0.ebuild (renamed from games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild) | 12 |
3 files changed, 5 insertions, 45 deletions
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest index 426b447104e7..a237586ef418 100644 --- a/games-strategy/warzone2100/Manifest +++ b/games-strategy/warzone2100/Manifest @@ -1,4 +1,4 @@ DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc55bf031579c8e9cb0b1b159e4fb1f9e8aa63bfcc6985e91cb2667149e7cc4b354bf96726fc6b8f8a8f519375e0a88c4be21dcb69 SHA512 766698c25c02b4254424efdafb8aa7b37360c3c05d3cd2d6c7f9127cbdd6a25840f98e8e3aadd5d6af494b4632584e564214c1f20c0bd74eb637da305552e067 DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746 -DIST warzone2100-3.3.0_beta1.tar.xz 85916776 BLAKE2B ec94e6fafff103e014e063f554b6a40411577d9c415733eb7857c4cd470195f1ab9878c2d5afd6c154e1f058c2f2a645a46738518d307da42ae97e0898fdf75a SHA512 17e9d81e7eadc71ad285147ff76517a92e8ea8747a05a6a08373d994725efa6bae11f87cd6bc9068cbfd78aa24d26fea95929c65a0906d03605b96469d972f4a +DIST warzone2100-3.3.0_src.tar.xz 86605304 BLAKE2B 70bad66966e31009de7f16a039525b2bc3e84a9991e7d95227f8789ceca7313a219044f41c0ceec0ce357e8368a30833d7dc1cc35e9575d9b56efa20b9e35c03 SHA512 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6 diff --git a/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch b/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch deleted file mode 100644 index 2d4b6c50a485..000000000000 --- a/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5539b080824bd4bcd0f212829012993ef193dc41 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Thu, 1 Aug 2019 04:53:14 +0200 -Subject: [PATCH] configure.ac: Raise AM_GNU_GETTEXT_VERSION to 0.17 - -the shipped copy of po/Makefile.in.in comes from gettext-0.17 and since -m4/po.m4 has been changed to use AC_PROG_MKDIR_P (Trac ticket #4701) -autopoint from gettext would produce a broken po/Makefile.in.in which has -no MKDIR_P definition. This again would result in "make install" throwing -the following error when invoking install-data-yes target in /po/ dir: - - make[1]: execvp: /usr/share: Permission denied - -Raising AM_GNU_GETTEXT_VERSION fixes the described issue. - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7e9c31433..30a732447 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,7 +71,7 @@ AC_CHECK_HEADERS(alloca.h sys/ucontext.h) - - # Check for gettext - AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION([0.15]) -+AM_GNU_GETTEXT_VERSION([0.17]) - - # Check for pkg-config - PKG_PROG_PKG_CONFIG --- -2.22.0 - diff --git a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild index d8ab1ae7bb7d..fe91974e0f39 100644 --- a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild +++ b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild @@ -4,17 +4,17 @@ EAPI=7 inherit autotools toolchain-funcs xdg -MY_PV=$(ver_cut 1-2) +MY_PV="$(ver_cut 1-2)" VIDEOS_PV=2.2 -VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz +VIDEOS_P="${PN}-videos-${VIDEOS_PV}.wz" DESCRIPTION="3D real-time strategy game" HOMEPAGE="http://wz2100.net/" -SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz +SRC_URI="mirror://sourceforge/warzone2100/${P}_src.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )" LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain" SLOT="0" -#[[ "${PV}" == *_beta* ]] || \ +[[ "${PV}" == *_beta* ]] || \ KEYWORDS="~amd64 ~x86" # upstream requested debug support IUSE="debug nls videos" @@ -64,10 +64,6 @@ BDEPEND=" S="${WORKDIR}/${PN}" -PATCHES=( - "${FILESDIR}"/${PN}-3.3.0_beta1-gettext_version.patch -) - src_prepare() { default |