diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
tree | cf61513204d97974179580065e85df5c8009087c /games-engines/openxcom | |
parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) |
gentoo resync : 03.03.2021
Diffstat (limited to 'games-engines/openxcom')
-rw-r--r-- | games-engines/openxcom/Manifest | 5 | ||||
-rw-r--r-- | games-engines/openxcom/files/openxcom-9999-mandir.patch | 9 | ||||
-rw-r--r-- | games-engines/openxcom/openxcom-1.0.0_p20180317-r1.ebuild (renamed from games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild) | 52 | ||||
-rw-r--r-- | games-engines/openxcom/openxcom-9999.ebuild | 52 |
4 files changed, 70 insertions, 48 deletions
diff --git a/games-engines/openxcom/Manifest b/games-engines/openxcom/Manifest index 75e24124576f..160e73e57b38 100644 --- a/games-engines/openxcom/Manifest +++ b/games-engines/openxcom/Manifest @@ -1,4 +1,5 @@ +AUX openxcom-9999-mandir.patch 467 BLAKE2B 3cba7cd1a0260c1c7d2e24a94cde9818c804ab0cd9296ac2a0a979faee522a18320b0e0c832eae2663da1f365cbd7f96139108db2ec601b6ae8ffa5e2392963b SHA512 193ddf2ce37d89f09fe12e3d6ad2196e4ea661784a1e82fa29d4e0359ea238996c05d0009a93a59e679a515f58914df302f31396aaf248cc37ecbbf886d016a8 DIST openxcom-1.0.0_p20180317.tar.gz 2801430 BLAKE2B 8a3718fc99f733c145034509b596de8dd17a8bdfe1aa05b68571c66245eea45f997488e57a2811f604e0aac702e30614fcd55ecc71858f49b357afb9e8fc5de4 SHA512 57ff9a9cbbbf48b8c4f792458edf0590d7d0df9a5805eab13a4c984713311e98587afca00778e82bd66fb2f330b354ca80703b87922a92f9ae48e5bdecf68442 -EBUILD openxcom-1.0.0_p20180317.ebuild 1694 BLAKE2B f48e9dc99d832da1a0be473a17c071ee492eebb635ad56cde2bb94cdb04f9d60b043a0ca1a97c0cef8c1c42b37b5094c9b3e355257602b176a7442d924c7dc51 SHA512 b88ab84fea533615c966dcaa6eb6b58d50833b2bfdb3ab9d0cdf3afa3ea015c1ffadaf78e58ae52b84ca138c38ea52974c666ea1ccffbf1ddc75f5783185f014 -EBUILD openxcom-9999.ebuild 1572 BLAKE2B 3c949b4b4c1d130adf0a7dfcef819028d5019492243d79ad715be3f8c01f77af2405e381f8167a6ad802f3a03a5b139b23a4e808d39d04b5d2bb202a81e84ced SHA512 931ae79bc045eb233f83e521f5429958057940c5155077ddbe7a49867e8d9f72bbe79ad8c0f908d784a05ef48d63e069abf4da011d0259091add59915ab221df +EBUILD openxcom-1.0.0_p20180317-r1.ebuild 1740 BLAKE2B 137f4c6f99bf4999230acf3909fe846213171b72dc1ed32fe78934d8609756625c5f78af3d4b304ed4502b1b82065a9dd72718c5038375c15d4e1a9b7baa4915 SHA512 4f7fb6e11cd8fe1003269a08a25a3539c8279fa05037b5f1f7dee1e6b12ea95d345ab0e28434b11baea891f5a54954a6b744f5720ce75d0f113605ad595538de +EBUILD openxcom-9999.ebuild 1808 BLAKE2B ffdd1eab799d2cde44d1b3fda5946183ae1b04e0e50061c58bb5bf426be6ffee5f5508556f9b420090fdbabab62b7862acd69d8bf1e7e4ddd946c1d7a7ff802a SHA512 bffbb930a712f15cf26eafee394bcd0a632b2200075fcd4aceddeffe1087f13298446948626c8da48f1b18182cfcd737ce2b806a659aeb550fca103186e06c0e MISC metadata.xml 335 BLAKE2B c1f058cb6d2d5fb842d9c198a4d68e43457d6bb7f5bed00d5365d1418afc83a54d3d8d816a312f715abf57d942877874ed92cf716477ab912fe2480afbea32bf SHA512 6d1deba17f18970b9425af0038c24be6f0e0fea46a095d34055884d8899442bc1f0a4f72343f2cf1f66f63c5287dc0373086e111b45ee64a47b8715e2237d6cd diff --git a/games-engines/openxcom/files/openxcom-9999-mandir.patch b/games-engines/openxcom/files/openxcom-9999-mandir.patch new file mode 100644 index 000000000000..44d01fae9fe8 --- /dev/null +++ b/games-engines/openxcom/files/openxcom-9999-mandir.patch @@ -0,0 +1,9 @@ +--- a/docs/CMakeLists.txt 2021-02-27 13:15:37.168240019 +0100 ++++ b/docs/CMakeLists.txt 2021-02-27 13:16:28.640486232 +0100 +@@ -38,5 +38,5 @@ + + # Only useful for make install/package under *nix OSes, but not macOS. + if ( UNIX AND NOT APPLE ) +- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openxcom.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6) ++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openxcom.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) + endif () diff --git a/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild b/games-engines/openxcom/openxcom-1.0.0_p20180317-r1.ebuild index e9113fcdbb6c..699360f3785c 100644 --- a/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild +++ b/games-engines/openxcom/openxcom-1.0.0_p20180317-r1.ebuild @@ -1,61 +1,65 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit cmake-utils gnome2-utils +EAPI=7 -COMMIT="ea9ac466221f8b4f8974d2db1c42dc4ad6126564" -DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown" +inherit cmake xdg-utils + +DESCRIPTION="Open-source reimplementation of the popular UFO: Enemy Unknown" HOMEPAGE="https://openxcom.org/" -SRC_URI="https://github.com/SupSuper/OpenXcom/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git" +else + COMMIT="ea9ac466221f8b4f8974d2db1c42dc4ad6126564" + SRC_URI="https://github.com/SupSuper/OpenXcom/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + S="${WORKDIR}/OpenXcom-${COMMIT}" +fi LICENSE="GPL-3+ CC-BY-SA-4.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" IUSE="doc" -RDEPEND=">=dev-cpp/yaml-cpp-0.5.1 +RDEPEND=" + >=dev-cpp/yaml-cpp-0.5.1 media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[flac,mikmod,vorbis]" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-doc/doxygen )" -S="${WORKDIR}/OpenXcom-${COMMIT}" DOCS=( README.md ) src_compile() { - use doc && cmake-utils_src_compile doxygen - cmake-utils_src_compile + cmake_src_compile + use doc && cmake_build doxygen } src_install() { - cmake-utils_src_install - use doc && dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/* -} - -pkg_preinst() { - gnome2_icon_savelist + use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) + cmake_src_install } pkg_postinst() { - gnome2_icon_cache_update - echo + xdg_icon_cache_update + elog "In order to play you need copy GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND," elog "TERRAIN, UFOGRAPH, UFOINTRO, UNITS folders from original X-COM game to" elog "/usr/share/${PN}/UFO" - echo + elog elog "If you want to play the TFTD mod, you need to copy ANIMS, FLOP_INT," elog "GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND, TERRAIN, UFOGRAPH, UNITS folders" elog "from the original Terror from the Deep game to" elog "/usr/share/${PN}/TFTD" - echo + elog elog "If you need or want text in some language other than english, download:" elog "https://openxcom.org/translations/latest.zip and uncompress it in" elog "/usr/share/${PN}/common/Language" } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/games-engines/openxcom/openxcom-9999.ebuild b/games-engines/openxcom/openxcom-9999.ebuild index 7726841e5584..511bec55bed0 100644 --- a/games-engines/openxcom/openxcom-9999.ebuild +++ b/games-engines/openxcom/openxcom-9999.ebuild @@ -1,59 +1,67 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit cmake-utils gnome2-utils git-r3 +EAPI=7 -DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown" +inherit cmake xdg-utils + +DESCRIPTION="Open-source reimplementation of the popular UFO: Enemy Unknown" HOMEPAGE="https://openxcom.org/" -EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git" +else + COMMIT="ea9ac466221f8b4f8974d2db1c42dc4ad6126564" + SRC_URI="https://github.com/SupSuper/OpenXcom/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + S="${WORKDIR}/OpenXcom-${COMMIT}" +fi LICENSE="GPL-3+ CC-BY-SA-4.0" SLOT="0" -KEYWORDS="" IUSE="doc" -RDEPEND=">=dev-cpp/yaml-cpp-0.5.1 +RDEPEND=" + >=dev-cpp/yaml-cpp-0.5.1 media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[flac,mikmod,vorbis]" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-doc/doxygen )" DOCS=( README.md ) +PATCHES=( "${FILESDIR}/${P}-mandir.patch" ) # TODO: GNUInstallDirs + src_compile() { - use doc && cmake-utils_src_compile doxygen - cmake-utils_src_compile + cmake_src_compile + use doc && cmake_build doxygen } src_install() { - cmake-utils_src_install - use doc && dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/* -} - -pkg_preinst() { - gnome2_icon_savelist + use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) + cmake_src_install } pkg_postinst() { - gnome2_icon_cache_update - echo + xdg_icon_cache_update + elog "In order to play you need copy GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND," elog "TERRAIN, UFOGRAPH, UFOINTRO, UNITS folders from original X-COM game to" elog "/usr/share/${PN}/UFO" - echo + elog elog "If you want to play the TFTD mod, you need to copy ANIMS, FLOP_INT," elog "GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND, TERRAIN, UFOGRAPH, UNITS folders" elog "from the original Terror from the Deep game to" elog "/usr/share/${PN}/TFTD" - echo + elog elog "If you need or want text in some language other than english, download:" elog "https://openxcom.org/translations/latest.zip and uncompress it in" elog "/usr/share/${PN}/common/Language" } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update } |