gentoo resync : 18.05.2019

5 files changed, 116 insertions, 207 deletions

diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index c2c4553864d2..9078a03c68fe 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,8 +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
+DIST freeorion-0.4.8_p20190501.tar.gz 106506540 BLAKE2B 5442eeeaff486a5525b4282c7ef72001a935c4429fea89a720f94a033a2c29e56855605376efe22d13194ae3f49105fe26f37554d2c8d560bfb76dc69d738128 SHA512 d378c0e9b63118261bf5ac1c99190929ff0cd52b3a270e43fe2be80cc7993457bcc7b70083ff493a6b96b250e1988e40470bef410af5ce3d49644ccf934974d3
 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 1692 BLAKE2B 8c6b111d87af160ae503270c103e5c2de75af27d6674b2b0d61dfdd385396ae0aa9c0ab3bce9baaa7926e0f583a45fc8250576cded97cef8bb316bbc38fdf2a3 SHA512 ca81bc4ada8ecb3bfab5e80bcf6368cb9310c828977f54a2946f4df4c6c3bacb9fce136fa6b725f5f18010820cb45ad33a80249cf6d288dc7e9bbaf926a0c999
+EBUILD freeorion-0.4.8_p20190501.ebuild 1726 BLAKE2B edef9e706747e2d5738461fd0fab96d46317a020ef30e88e6f71ee79887a4843310e1203cd50656fa09dbcd9b727364a5a8cc157a3a066c62fa13206ab93e0fb SHA512 31850b9df32e557f73494bf60c187f563b7c2b2fed16121bd92cda3d1480319752dfb2538ff3362df9ab008d640c95894965bb155b55b012dfaaae1f1389e469
+EBUILD freeorion-9999.ebuild 1726 BLAKE2B edef9e706747e2d5738461fd0fab96d46317a020ef30e88e6f71ee79887a4843310e1203cd50656fa09dbcd9b727364a5a8cc157a3a066c62fa13206ab93e0fb SHA512 31850b9df32e557f73494bf60c187f563b7c2b2fed16121bd92cda3d1480319752dfb2538ff3362df9ab008d640c95894965bb155b55b012dfaaae1f1389e469
 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
deleted file mode 100644
index 8d750687b353..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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"
-
-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
-}
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1.ebuild
deleted file mode 100644
index 1be8614838d4..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.7.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-any-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]
-	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"
-
-pkg_setup() {
-	# build system is using FindPythonLibs.cmake which needs python:2
-	python-any-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
-}
diff --git a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild b/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
new file mode 100644
index 000000000000..2c29c8b5c266
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1 xdg
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="https://www.freeorion.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
+else
+	KEYWORDS="~amd64"
+	if [[ ${PV} = *_p* ]]; then
+		COMMIT="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${COMMIT}"
+	else
+		SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${PV/_/-}"
+	fi
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE="dedicated"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/boost-1.58:=[python,threads,${PYTHON_USEDEP}]
+	!dedicated? (
+		media-libs/freealut
+		>=media-libs/freetype-2.5.5
+		media-libs/glew:=
+		>=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
+		virtual/opengl
+	)
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+
+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_TYPE=Release
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_HEADLESS="$(usex dedicated)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 578e570e2ffd..2c29c8b5c266 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -7,43 +7,51 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake-utils python-single-r1 xdg
 
 DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="http://www.freeorion.org"
+HOMEPAGE="https://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}"
+	if [[ ${PV} = *_p* ]]; then
+		COMMIT="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${COMMIT}"
+	else
+		SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${PV/_/-}"
+	fi
 fi
 
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
-IUSE=""
+IUSE="dedicated"
 
-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
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${RDEPEND}"
 BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/boost-1.58:=[python,threads,${PYTHON_USEDEP}]
+	!dedicated? (
+		media-libs/freealut
+		>=media-libs/freetype-2.5.5
+		media-libs/glew:=
+		>=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
+		virtual/opengl
+	)
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	virtual/pkgconfig"
+"
 
 pkg_setup() {
 	# build system is using FindPythonLibs.cmake which needs python:2
@@ -60,28 +68,14 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE=Release
 		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_HEADLESS="$(usex dedicated)"
 	)
 
-	#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_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}