gentoo resync : 21.07.2018

3 files changed, 121 insertions, 0 deletions

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index e57fd5ee697f..c0c01140c297 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,6 +1,8 @@
+AUX freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch 1030 BLAKE2B d0b4a58e85fd878fc5d332ca0f552889aff752fd8198f66d217cc54aad1ddb83cf24108d978bd0155b13a6db9d7f11f35f2b76f76456acd9ab38b1e28dbc5332 SHA512 ffd493373ccb0051aa2b41d0bd740865fa13db3ed50fbf95e83c6d97fe81e3ff04c24e865d73b011dbd0085c45a0b1a915c62eaa103ecf29a3264030d1d9ae4e
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
 DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d
 EBUILD freeorion-0.4.7.1-r3.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20
+EBUILD freeorion-0.4.7.1-r4.ebuild 1772 BLAKE2B 3ad940d0d84c67cdb19c1ac21a9a15e8bfd933869fdb5fb66fc55145d7dc7d1579db052020416caf565b5511968c9ff0dd377b94536ecbe9cfc4a7a0bcf6e70a SHA512 c1bea06c10cec7172b21baefcf858c4f73ce9aaccb7745d233e55a68ec862443999faf4404a945df284fb6423d265c5b0ad3acf9e725d31d6b16e89a37fa66b2
 EBUILD freeorion-0.4.7.1.ebuild 1679 BLAKE2B d60e8dca3465f700cc629f8df45b4f92efbfa1814e6d4dd2c23b40c13684cc614c947c40e931810095487cf3070077dc8ba36b36a3fcf51e5b3c657f6b6f4607 SHA512 88f9d3905770f0a97a3938d58bad1c6698c5d8b651718a19cb634aaef857582023051700bc692ae59a2b8ee83b1da6841fff1a576078f7df1705e388b6faca7b
 EBUILD freeorion-9999.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20
 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch b/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch
new file mode 100644
index 000000000000..f7ccdba126bb
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch
@@ -0,0 +1,34 @@
+From 77bdc407d0760a529e40914d16248dce01fd4778 Mon Sep 17 00:00:00 2001
+From: O01eg <o01eg@yandex.ru>
+Date: Wed, 8 Nov 2017 16:07:57 +0300
+Subject: [PATCH] Fix #1843
+
+---
+ CMakeLists.txt    | 2 +-
+ GG/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/CMakeLists.txt	2018-06-03 11:36:04.631832409 -0400
++++ b/CMakeLists.txt	2018-06-03 11:36:20.678821846 -0400
+@@ -484,7 +484,7 @@
+         ${Boost_INCLUDE_DIRS}
+         ${OPENGL_INCLUDE_DIR}
+         ${GLEW_INCLUDE_DIRS}
+-        ${SDL_INCLUDE_DIRS}
++        ${SDL_INCLUDE_DIR}
+         ${OPENAL_INCLUDE_DIR}
+         ${OGG_INCLUDE_DIRS}
+         ${VORBIS_INCLUDE_DIRS}
+diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt
+index 5d3c157362..c5bf3825d8 100644
+--- a/GG/CMakeLists.txt
++++ b/GG/CMakeLists.txt
+@@ -184,7 +184,7 @@ target_include_directories(GiGiSDL SYSTEM
+         ${Boost_INCLUDE_DIRS}
+         ${OPENGL_INCLUDE_DIR}
+         ${GLEW_INCLUDE_DIRS}
+-        ${SDL_INCLUDE_DIRS}
++        ${SDL_INCLUDE_DIR}
+ )
+ 
+ target_link_libraries(GiGiSDL
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
new file mode 100644
index 000000000000..e3471161e466
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1 gnome2-utils
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="http://www.freeorion.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
+	media-libs/freealut
+	media-libs/freetype
+	media-libs/glew:=
+	media-libs/libsdl2
+	>=media-libs/libogg-1.1.3
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	>=media-libs/libvorbis-1.1.2
+	media-libs/openal
+	sci-physics/bullet
+	sys-libs/zlib
+	virtual/opengl
+	!dev-games/gigi"
+	# Use bundled gigi as of freeorion-0.4.3
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-backport-sdl2-include-dir-fix.patch" )
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -e "s/-O3//" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPEE=Release
+		-DRELEASE_COMPILE_FLAGS=""
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc ChangeLog.md
+
+	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}