gentoo resync : 18.03.2018

4 files changed, 21 insertions, 41 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index f9bfa9812023..61ae0ec44454 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/openxcom/Manifest b/games-engines/openxcom/Manifest
index 02e8fcbfdf2e..81e041ceac10 100644
--- a/games-engines/openxcom/Manifest
+++ b/games-engines/openxcom/Manifest
@@ -1,4 +1,4 @@
-DIST openxcom-1.0.0.tar.gz 2068640 BLAKE2B ce1c35d3d25e5f327549b3656f4b41d6e37503619c7ccb13ee5382faba905f491c01a0e2af03b70b7237bea3f3fd4a51f7a2be2c44c1feade1b848ad1a414fa3 SHA512 597abd2e7160551a3d6020d7c6fec863f86b708910ee582d446f2a5f97be94dc7e2522ede2e7ab4f62a2d21acf07ce441a435f74b530950e2f0b5791c00e06ab
-EBUILD openxcom-1.0.0-r1.ebuild 1664 BLAKE2B c9a5decd4f6fdb9e599fc87c3949d1df09f63bea1ce787657af96c08fe0ed3b4178b22b418cc4b534ca93abb21c47b21565bf1df0d587d3896e579b95ab8c97f SHA512 d108cf355c660b9257a7f0171179dbffbfd19f95b4a87f14bb75c210128178336c91f44d0461c7f9027ad5eaa8342b0ceb2f007b20d26e9b5ac0f088c773781d
-EBUILD openxcom-9999.ebuild 1966 BLAKE2B 45347ac7ace0561753e6c489aba478db52ce034e1d893a129b678812733f6156638dba1c3e0defa3aa3ed5c45423b08fb05e91c5ba5b6a15e5a6f6908f1f3ac3 SHA512 9184487964697db4056dc46fe861227d908607a891c6f961479c390f5e36944cd95f454ba10a4ffd7ecf349e46199d32064a574e2b63ea1911bf4151b6e55cb8
+DIST openxcom-1.0.0_p20180317.tar.gz 2801430 BLAKE2B 8a3718fc99f733c145034509b596de8dd17a8bdfe1aa05b68571c66245eea45f997488e57a2811f604e0aac702e30614fcd55ecc71858f49b357afb9e8fc5de4 SHA512 57ff9a9cbbbf48b8c4f792458edf0590d7d0df9a5805eab13a4c984713311e98587afca00778e82bd66fb2f330b354ca80703b87922a92f9ae48e5bdecf68442
+EBUILD openxcom-1.0.0_p20180317.ebuild 1688 BLAKE2B b92228f8e3e56fd56377db763572efcd9a62079bdef4b24cd3b9a9f28e243369b99ff78ec3fdbdc56d3b0f64ab03efcbec9ac9fa8f0b670d1094ec01e6e468dc SHA512 ba17a563fccac3c33144a20a39ae71f7ea5f428493bb21647ef964a24406432cb4b9aace4b0f08453163a4214e3229bdb6b81da841bef6e4a9ddc442acee04ea
+EBUILD openxcom-9999.ebuild 1570 BLAKE2B 3de2f64f856739aae41266dbcceac882a46023acd2cf14a0b2c5202a615e9278f71377edc377a7c64797d7ca47f1eb89a29ace81e600b1b26897022c890738fd SHA512 33e069dec392fe983ec773150bd13aeb396569bb311e556751805e66e804cd6071123856d6d2b5be26fa4c0d20ea1fafaea4052ae6d3e1e66130e7180212a5ba
 MISC metadata.xml 335 BLAKE2B c1f058cb6d2d5fb842d9c198a4d68e43457d6bb7f5bed00d5365d1418afc83a54d3d8d816a312f715abf57d942877874ed92cf716477ab912fe2480afbea32bf SHA512 6d1deba17f18970b9425af0038c24be6f0e0fea46a095d34055884d8899442bc1f0a4f72343f2cf1f66f63c5287dc0373086e111b45ee64a47b8715e2237d6cd
diff --git a/games-engines/openxcom/openxcom-1.0.0-r1.ebuild b/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild
index fcbf6ebf2629..2b0cd1f377b6 100644
--- a/games-engines/openxcom/openxcom-1.0.0-r1.ebuild
+++ b/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils cmake-utils gnome2-utils
+inherit cmake-utils gnome2-utils
 
+COMMIT="ea9ac466221f8b4f8974d2db1c42dc4ad6126564"
 DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown"
 HOMEPAGE="http://openxcom.org/"
-SRC_URI="https://github.com/SupSuper/OpenXcom/archive/v1.0.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/SupSuper/OpenXcom/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3 CC-BY-SA-4.0"
+LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
@@ -21,13 +22,8 @@ RDEPEND=">=dev-cpp/yaml-cpp-0.5.1
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-DOCS=( README.txt )
-
-S=${WORKDIR}/OpenXcom-1.0
-
-src_configure() {
-	cmake-utils_src_configure
-}
+S="${WORKDIR}/OpenXcom-${COMMIT}"
+DOCS=( README.md )
 
 src_compile() {
 	use doc && cmake-utils_src_compile doxygen
@@ -37,14 +33,9 @@ src_compile() {
 src_install() {
 	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
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
@@ -53,11 +44,16 @@ pkg_postinst() {
 	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 "/usr/share/${PN}/data"
+	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 "/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 "/usr/share/${PN}/data/Language"
+	elog "/usr/share/${PN}/common/Language"
 }
 
 pkg_postrm() {
diff --git a/games-engines/openxcom/openxcom-9999.ebuild b/games-engines/openxcom/openxcom-9999.ebuild
index 6732dfdefa91..746a5950a0a8 100644
--- a/games-engines/openxcom/openxcom-9999.ebuild
+++ b/games-engines/openxcom/openxcom-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils cmake-utils gnome2-utils git-r3
+inherit cmake-utils gnome2-utils git-r3
 
 DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown"
 HOMEPAGE="http://openxcom.org/"
@@ -21,18 +21,7 @@ RDEPEND=">=dev-cpp/yaml-cpp-0.5.1
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-src_unpack() {
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e '/\/res\//d' CMakeLists.txt || die
-}
-
-src_configure() {
-	cmake-utils_src_configure
-}
+DOCS=( README.md )
 
 src_compile() {
 	use doc && cmake-utils_src_compile doxygen
@@ -40,13 +29,8 @@ src_compile() {
 }
 
 src_install() {
-	DOCS="README.md" \
-		cmake-utils_src_install
+	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
 }
 
 pkg_preinst() {