commit: a17b08abddfe18d225111b776308718f8f08812b Author: Austin English <wizardedit <AT> gentoo <DOT> org> AuthorDate: Thu Nov 17 00:06:01 2016 +0000 Commit: Austin English <wizardedit <AT> gentoo <DOT> org> CommitDate: Thu Nov 17 00:06:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a17b08ab
games-engines/openxcom: remove deprecated games eclass Also update to EAPI 6 Gentoo-Bug: https://bugs.gentoo.org/574082 Package-Manager: portage-2.3.2 ...enxcom-9999.ebuild => openxcom-1.0.0-r1.ebuild} | 40 ++++++---------------- games-engines/openxcom/openxcom-9999.ebuild | 20 ++++------- 2 files changed, 17 insertions(+), 43 deletions(-) diff --git a/games-engines/openxcom/openxcom-9999.ebuild b/games-engines/openxcom/openxcom-1.0.0-r1.ebuild similarity index 60% copy from games-engines/openxcom/openxcom-9999.ebuild copy to games-engines/openxcom/openxcom-1.0.0-r1.ebuild index b29d5df..65ea890 100644 --- a/games-engines/openxcom/openxcom-9999.ebuild +++ b/games-engines/openxcom/openxcom-1.0.0-r1.ebuild @@ -2,16 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils cmake-utils gnome2-utils git-r3 games +EAPI=6 +inherit eutils cmake-utils gnome2-utils DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown" HOMEPAGE="http://openxcom.org/"; -EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"; +SRC_URI="https://github.com/SupSuper/OpenXcom/archive/v1.0.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3+ CC-BY-SA-4.0" +LICENSE="GPL-3 CC-BY-SA-4.0" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="doc" RDEPEND=">=dev-cpp/yaml-cpp-0.5.1 @@ -22,20 +22,11 @@ RDEPEND=">=dev-cpp/yaml-cpp-0.5.1 DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" -src_unpack() { - git-r3_src_unpack -} +DOCS=( README.txt ) -src_prepare() { - cmake-utils_src_prepare - sed -i -e '/\/res\//d' CMakeLists.txt || die -} +S=${WORKDIR}/OpenXcom-1.0 src_configure() { - mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}" - "-DCMAKE_INSTALL_DATADIR=${GAMES_DATADIR}" - ) cmake-utils_src_configure } @@ -45,15 +36,12 @@ src_compile() { } src_install() { - DOCS="README.md" \ - cmake-utils_src_install - use doc && dohtml -r "${CMAKE_BUILD_DIR}"/docs/html/* + cmake-utils_src_install + use doc && dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/* doicon -s scalable res/linux/icons/openxcom.svg newicon -s 48 res/linux/icons/openxcom_48x48.png openxcom.png newicon -s 128 res/linux/icons/openxcom_128x128.png openxcom.png domenu res/linux/openxcom.desktop - - prepgamesdirs } pkg_preinst() { @@ -62,21 +50,15 @@ pkg_preinst() { } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update echo 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 "${GAMES_DATADIR}/${PN}/UFO" - echo - 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 "${GAMES_DATADIR}/${PN}/TFTD" + elog "/usr/share/${PN}/data" echo elog "If you need or want text in some language other than english, download:" elog "http://openxcom.org/translations/latest.zip and uncompress it in" - elog "${GAMES_DATADIR}/${PN}/common/Language" + elog "/usr/share/${PN}/data/Language" } pkg_postrm() { diff --git a/games-engines/openxcom/openxcom-9999.ebuild b/games-engines/openxcom/openxcom-9999.ebuild index b29d5df..c8d680c 100644 --- a/games-engines/openxcom/openxcom-9999.ebuild +++ b/games-engines/openxcom/openxcom-9999.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit eutils cmake-utils gnome2-utils git-r3 games +EAPI=6 +inherit eutils cmake-utils gnome2-utils git-r3 DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown" HOMEPAGE="http://openxcom.org/"; @@ -32,10 +32,6 @@ src_prepare() { } src_configure() { - mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}" - "-DCMAKE_INSTALL_DATADIR=${GAMES_DATADIR}" - ) cmake-utils_src_configure } @@ -47,36 +43,32 @@ src_compile() { src_install() { DOCS="README.md" \ cmake-utils_src_install - use doc && dohtml -r "${CMAKE_BUILD_DIR}"/docs/html/* + use doc && dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/* doicon -s scalable res/linux/icons/openxcom.svg newicon -s 48 res/linux/icons/openxcom_48x48.png openxcom.png newicon -s 128 res/linux/icons/openxcom_128x128.png openxcom.png domenu res/linux/openxcom.desktop - - prepgamesdirs } pkg_preinst() { - games_pkg_preinst gnome2_icon_savelist } pkg_postinst() { - games_pkg_postinst gnome2_icon_cache_update echo 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 "${GAMES_DATADIR}/${PN}/UFO" + elog "/usr/share/${PN}/UFO" echo 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 "${GAMES_DATADIR}/${PN}/TFTD" + elog "/usr/share/${PN}/TFTD" echo elog "If you need or want text in some language other than english, download:" elog "http://openxcom.org/translations/latest.zip and uncompress it in" - elog "${GAMES_DATADIR}/${PN}/common/Language" + elog "/usr/share/${PN}/common/Language" } pkg_postrm() {
