From 0942c0e5cc9231dff80925dd5c876370c6a71c4c Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 11 Sep 2023 21:29:27 +0100 Subject: [PATCH 1/3] games-engines/fheroes2: add 1.0.8 Signed-off-by: Alexey Sokolov Signed-off-by: James Le Cuirot --- games-engines/fheroes2/Manifest | 1 + games-engines/fheroes2/fheroes2-1.0.8.ebuild | 76 ++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 games-engines/fheroes2/fheroes2-1.0.8.ebuild diff --git a/games-engines/fheroes2/Manifest b/games-engines/fheroes2/Manifest index 22395c6b601fd..1c86b0a01dd12 100644 --- a/games-engines/fheroes2/Manifest +++ b/games-engines/fheroes2/Manifest @@ -1 +1,2 @@ DIST fheroes2-1.0.6.tar.gz 11611881 BLAKE2B b7219a1a843f4a08cfc9ade161e38b19dcb343fa6dc700568d2e38b984d2cd26c78d02b9792f7d893b0babcca7bf71a01d349bc3806136736d46768b048a8db2 SHA512 c42b2ded44b7d6e112de3e919044b6b7d69161cc8cf08198df88da42c7f77b2dcf9df9ea7b453def66902e85f42047c0375b093c8d2d91517acb42d1804e621b +DIST fheroes2-1.0.8.tar.gz 11757081 BLAKE2B 5448ab4b8379046d632ee8ee1be3207e4b2bd7a7a8f8c2744b2c95b909128d71a1247c8c30a903cc283df7de04e1e5b3a07bac98346b4ec444dff891aa50c028 SHA512 90c198249ecd321c0c69c2e9296364c4d6d566df374198837aa2c7811c21ecf49561342006bd76f948ed14831b22d6b7d36df1c9b46d93c0aeb48052510c588e diff --git a/games-engines/fheroes2/fheroes2-1.0.8.ebuild b/games-engines/fheroes2/fheroes2-1.0.8.ebuild new file mode 100644 index 0000000000000..49baffb6ba33e --- /dev/null +++ b/games-engines/fheroes2/fheroes2-1.0.8.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..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}" + +DEPEND=" + media-libs/libpng:= + media-libs/libsdl2[video] + media-libs/sdl2-image + media-libs/sdl2-mixer + sys-libs/zlib +" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} + app-arch/libarchive + dev-lang/python + virtual/libintl +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/fheroes2-1.0.4-scripts.patch" +) + +src_configure() { + # Not using dev-games/libsmacker because the game crashes with it + local mycmakeargs=( + -DENABLE_IMAGE=ON + -DENABLE_TOOLS=$(usex tools) + ) + 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" +} From 4a156ca310556e39707f1fae9de82d7aa68e2eae Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Tue, 29 Aug 2023 01:50:31 +0100 Subject: [PATCH 2/3] games-engines/fheroes2: drop 1.0.6 Signed-off-by: Alexey Sokolov Closes: https://github.com/gentoo/gentoo/pull/32503 Signed-off-by: James Le Cuirot --- games-engines/fheroes2/Manifest | 1 - games-engines/fheroes2/fheroes2-1.0.6.ebuild | 77 -------------------- 2 files changed, 78 deletions(-) delete mode 100644 games-engines/fheroes2/fheroes2-1.0.6.ebuild diff --git a/games-engines/fheroes2/Manifest b/games-engines/fheroes2/Manifest index 1c86b0a01dd12..7af5d3cb2ddc1 100644 --- a/games-engines/fheroes2/Manifest +++ b/games-engines/fheroes2/Manifest @@ -1,2 +1 @@ -DIST fheroes2-1.0.6.tar.gz 11611881 BLAKE2B b7219a1a843f4a08cfc9ade161e38b19dcb343fa6dc700568d2e38b984d2cd26c78d02b9792f7d893b0babcca7bf71a01d349bc3806136736d46768b048a8db2 SHA512 c42b2ded44b7d6e112de3e919044b6b7d69161cc8cf08198df88da42c7f77b2dcf9df9ea7b453def66902e85f42047c0375b093c8d2d91517acb42d1804e621b DIST fheroes2-1.0.8.tar.gz 11757081 BLAKE2B 5448ab4b8379046d632ee8ee1be3207e4b2bd7a7a8f8c2744b2c95b909128d71a1247c8c30a903cc283df7de04e1e5b3a07bac98346b4ec444dff891aa50c028 SHA512 90c198249ecd321c0c69c2e9296364c4d6d566df374198837aa2c7811c21ecf49561342006bd76f948ed14831b22d6b7d36df1c9b46d93c0aeb48052510c588e diff --git a/games-engines/fheroes2/fheroes2-1.0.6.ebuild b/games-engines/fheroes2/fheroes2-1.0.6.ebuild deleted file mode 100644 index 0481e2bc397d1..0000000000000 --- a/games-engines/fheroes2/fheroes2-1.0.6.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..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}" - -DEPEND=" - media-libs/libpng:= - media-libs/libsdl2[video] - media-libs/sdl2-image - media-libs/sdl2-mixer - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - ${PYTHON_DEPS} - app-arch/libarchive - dev-lang/python - virtual/libintl -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/fheroes2-1.0.4-scripts.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" -} From 5afd6fc2d73b96515972c527df7f6b82384fe711 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 11 Sep 2023 23:37:28 +0100 Subject: [PATCH 3/3] profiles: Update standalone prefix glibc sed call nis/nss_compat moved to nss/nss_compat some years ago. Signed-off-by: James Le Cuirot --- profiles/features/prefix/standalone/profile.bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc index 8c500da855194..87a6dacd7913a 100644 --- a/profiles/features/prefix/standalone/profile.bashrc +++ b/profiles/features/prefix/standalone/profile.bashrc @@ -20,7 +20,7 @@ elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; for f in libio/iopopen.c \ shadow/lckpwdf.c resolv/{netdb,resolv}.h elf/rtld.c \ - nis/nss_compat/compat-{grp,initgroups,{,s}pwd}.c \ + n[is]s/nss_compat/compat-{grp,initgroups,{,s}pwd}.c \ nss/{bug-erange,nss_files/files-{XXX,init{,groups}}}.c \ sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c} do