commit: 16e78f6d6c609944edb91a530a38dcd8909f7a6f Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Sat Jul 15 19:29:07 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Aug 11 06:11:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e78f6d
games-engines/fheroes2: drop 1.0.5 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/31900 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> games-engines/fheroes2/Manifest | 1 - games-engines/fheroes2/fheroes2-1.0.5.ebuild | 79 ---------------------- .../fheroes2/files/fheroes2-1.0.5-gettext.patch | 15 ---- 3 files changed, 95 deletions(-) diff --git a/games-engines/fheroes2/Manifest b/games-engines/fheroes2/Manifest index 11680cb1af94..22395c6b601f 100644 --- a/games-engines/fheroes2/Manifest +++ b/games-engines/fheroes2/Manifest @@ -1,2 +1 @@ -DIST fheroes2-1.0.5.tar.gz 11570167 BLAKE2B 7294ae4a816ce0a42c035262cbc8d44fc53cfdaa1333934ac316607f7d086a44358fc13931e5dbce9b17ff65e58016efc57cd123747af30277bcf4c1bc195e1e SHA512 13f058319540fa9fa04955ff8a5f16a0113e791307d58c32025361c773757769306f632d2c6472ee6d0b704dc4c260a9c64954c19ba2e58ab21dc6744c3cdd3e DIST fheroes2-1.0.6.tar.gz 11611881 BLAKE2B b7219a1a843f4a08cfc9ade161e38b19dcb343fa6dc700568d2e38b984d2cd26c78d02b9792f7d893b0babcca7bf71a01d349bc3806136736d46768b048a8db2 SHA512 c42b2ded44b7d6e112de3e919044b6b7d69161cc8cf08198df88da42c7f77b2dcf9df9ea7b453def66902e85f42047c0375b093c8d2d91517acb42d1804e621b diff --git a/games-engines/fheroes2/fheroes2-1.0.5.ebuild b/games-engines/fheroes2/fheroes2-1.0.5.ebuild deleted file mode 100644 index 3aeb794a8d78..000000000000 --- a/games-engines/fheroes2/fheroes2-1.0.5.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake python-single-r1 xdg - -DESCRIPTION="Recreation of HoMM2 game engine" -HOMEPAGE="https://ihhub.github.io/fheroes2/"; -SRC_URI="https://github.com/ihhub/fheroes2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="tools" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - media-libs/libpng:= - media-libs/libsdl2[video] - media-libs/sdl2-image - media-libs/sdl2-mixer - sys-libs/zlib -" -RDEPEND=" - ${COMMON_DEPEND} - ${PYTHON_DEPS} - app-arch/libarchive - dev-lang/python - virtual/libintl -" -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/fheroes2-1.0.4-scripts.patch" - "${FILESDIR}/fheroes2-1.0.5-gettext.patch" -) - -src_configure() { - # Not using dev-games/libsmacker because the game crashes with it - local mycmakeargs=( - -DENABLE_IMAGE=ON - -DENABLE_TOOLS=$(usex tools) - -DUSE_SYSTEM_LIBSMACKER=NO - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - emake -C files/lang -} - -src_install() { - cmake_src_install - - if use tools; then - for file in 82m2wav bin2txt extractor h2dmgr icn2img pal2img til2img xmi2midi; do - newbin "${BUILD_DIR}/${file}" "fheroes2-${file}" - done - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "You need original HoMM2 data files to play fheroes2." - elog "If you have an installer (.exe) from GOG, install:" - elog " games-strategy/homm2-gold-gog" - elog "If you have the original game installed somewhere already, run:" - elog " ${EPREFIX}/usr/share/fheroes2/extract_homm2_resources.sh" - elog "Also you can automatically get a demo version for free by installing:" - elog " games-strategy/homm2-demo" -} diff --git a/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch b/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch deleted file mode 100644 index 20118037b779..000000000000 --- a/games-engines/fheroes2/files/fheroes2-1.0.5-gettext.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/ihhub/fheroes2/commit/e55c33c1bc7ac1b8c2ffc6e4ca61ab47921ec1b1 -https://bugs.gentoo.org/908863 - ---- a/files/lang/Makefile -+++ b/files/lang/Makefile -@@ -19,7 +19,8 @@ - ########################################################################### - - ICONV = iconv --MSGFMT = sed -e '1,20 s/UTF-8/$(1)/' $< | $(ICONV) -f utf-8 -t $(1) | msgfmt - -o $@ -+# TODO: consider converting game fonts and texts to UTF-8 in the engine instead -+MSGFMT = sed -e '1,20 s/UTF-8/$(1)/' $< | $(ICONV) -f utf-8 -t $(1) | if msgfmt --help | grep -q no-convert >/dev/null 2>/dev/null; then msgfmt - -o $@ --no-convert; else msgfmt - -o $@; fi - - .PHONY: all clean merge -
