commit: bc2c5da7dc3c85a35af6d8d79c1617501fa96d94 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Fri Dec 15 07:20:59 2017 +0000 Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru> CommitDate: Fri Dec 15 07:20:59 2017 +0000 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=bc2c5da7
games-engines/openxcom: version bump, cleanup Package-Manager: Portage-2.3.13, Repoman-2.3.3 Manifest-Sign-Key: A018DE8C games-engines/openxcom/metadata.xml | 2 +- games-engines/openxcom/openxcom-1.0.0.ebuild | 67 ---------------------- ...0806.ebuild => openxcom-1.0.0_p20171215.ebuild} | 39 ++++++------- 3 files changed, 19 insertions(+), 89 deletions(-) diff --git a/games-engines/openxcom/metadata.xml b/games-engines/openxcom/metadata.xml index 0bbbca9..e9e8cb0 100644 --- a/games-engines/openxcom/metadata.xml +++ b/games-engines/openxcom/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer> +<maintainer type="person"> <email>[email protected]</email> <name>Azamat H. Hackimov</name> </maintainer> diff --git a/games-engines/openxcom/openxcom-1.0.0.ebuild b/games-engines/openxcom/openxcom-1.0.0.ebuild deleted file mode 100644 index 80e8dc3..0000000 --- a/games-engines/openxcom/openxcom-1.0.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/openxcom/openxcom-1.0.0.ebuild,v 1.1 2014/06/14 19:33:21 mr_bones_ Exp $ - -EAPI=5 -inherit eutils cmake-utils gnome2-utils games - -DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown" -HOMEPAGE="http://openxcom.org/"; -SRC_URI="http://openxcom.org/wp-content/uploads/downloads/2014/06/${P}.tar.gz"; - -LICENSE="GPL-3 CC-BY-SA-4.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -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" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -DOCS=( README.txt ) - -src_configure() { - mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}" - "-DDATADIR=${GAMES_DATADIR}/${PN}" - ) - cmake-utils_src_configure -} - -src_compile() { - use doc && cmake-utils_src_compile doxygen - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - use doc && dohtml -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}/data" -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-engines/openxcom/openxcom-1.0.0_p20150806.ebuild b/games-engines/openxcom/openxcom-1.0.0_p20171215.ebuild similarity index 55% rename from games-engines/openxcom/openxcom-1.0.0_p20150806.ebuild rename to games-engines/openxcom/openxcom-1.0.0_p20171215.ebuild index 2ec6282..114c2b0 100644 --- a/games-engines/openxcom/openxcom-1.0.0_p20150806.ebuild +++ b/games-engines/openxcom/openxcom-1.0.0_p20171215.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI=5 +EAPI=6 -inherit cmake-utils games git-2 +inherit cmake-utils git-r3 DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown" HOMEPAGE="http://openxcom.org/"; # For translation files -SRC_URI="http://openxcom.org/git_builds/openxcom_git_master_2015_08_06_1651.zip"; +#SRC_URI="http://openxcom.org/git_builds/openxcom_git_master_2015_09_25_2120.zip"; EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"; -EGIT_COMMIT=9a8641a7993c53e5f81f6748f08af3d7a4b72d8f +EGIT_COMMIT=19efea3da04465ddc4d61a3a6aae25d0eff105a3 LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug doc" -RDEPEND="app-arch/unzip - >=dev-cpp/yaml-cpp-0.5.1 +RDEPEND=">=dev-cpp/yaml-cpp-0.5.3 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image @@ -28,14 +26,14 @@ RDEPEND="app-arch/unzip DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" -S="${WORKDIR}/OpenXcom" +#S="${WORKDIR}/OpenXcom" DOCS=( README.md ) src_configure() { mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}" - "-DDATADIR=${GAMES_DATADIR}/${PN}" + "-DCMAKE_INSTALL_BINDIR=/usr/bin" + "-DCMAKE_INSTALL_DATADIR=/usr/share" ) cmake-utils_src_configure } @@ -47,12 +45,12 @@ src_compile() { src_install() { cmake-utils_src_install - use doc && dohtml -r "${CMAKE_BUILD_DIR}"/docs/html/* + use doc && dodoc -r "${CMAKE_BUILD_DIR}/docs/html/" - for i in "common" "standard/xcom1" "standard/xcom2" ; do - insinto "${GAMES_DATADIR}/${PN}/${i}/" - doins -r "../openxcom/${i}/Language/" - done +# for i in "common" "standard/xcom1" "standard/xcom2" ; do +# insinto "${GAMES_DATADIR}/${PN}/${i}/" +# doins -r "../openxcom/${i}/Language/" +# done # insinto "${GAMES_DATADIR}/${PN}/standard/xcom1/Language/" # doins -r "../openxcom/standard/xcom1/Language/" # insinto "${GAMES_DATADIR}/${PN}/standard/xcom2/Language/" @@ -61,12 +59,11 @@ src_install() { doicon res/linux/icons/openxcom.svg domenu res/linux/openxcom.desktop - prepgamesdirs } pkg_postinst() { - games_pkg_postinst - 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}/data" + elog "In order to play you need copy UFO or TFTD game data" + elog "(GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND, TERRAIN, UFOGRAPH," + elog "UFOINTRO, UNITS folders) to" + elog "/usr/share/${PN}/UFO or /usr/share/${PN}/TFTD respectively." }
