gentoo resync : 30.05.2020

8 files changed, 163 insertions, 12 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index efc52174092a..4b2f5c7946ea 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 78bb79d87080..19e73e8f5e44 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -2,4 +2,5 @@ AUX openmw-0.45.0-osg-3.6.5-1.patch 2715 BLAKE2B 9b08b8cad0afd58170389f97cfca232
 AUX openmw-0.45.0-osg-3.6.5-2.patch 642 BLAKE2B 4ece0c64eefdbd249de648fc3c85087f392bddb073033872b26a85dbfc044a7b7b11097bc5a322d3a8b074ccde75ee507f7254c9bed2386480f2962acad505e4 SHA512 a5e5e11ffdeb96f921edf2dc3e787ed5be21ae816330841da263518df29c58a7231980194519db426e3ac45602320f108b4de9e262d643c58c23652beb4dde9d
 DIST openmw-0.45.0.tar.gz 4711103 BLAKE2B 85676294b07170dd6845892e9e7b354c5767428584c76ea2e1a64e9f9c72c46c279fdf5043058d37b927cb55e6cf2e2222833129d64954cdcdb3af4eb4b84dc3 SHA512 b968426659457cf486f6756f7ab82cc4cb34a92923c433dd86f711e5d7097f75441ed17daa50d21f15f1847f5aed1f4c3a094a06cfd3f2e9b90aa182742c596f
 EBUILD openmw-0.45.0.ebuild 3181 BLAKE2B a307152c8ee882a2fffeb13cee467905421a31781d446eb6d87618f8c040b08bae35f924408aca7eb1e63fd5a88a8166255a25df2d8ac4ed9d36c28a6dd86f74 SHA512 7db0200339d854d1f0eac9fbbbb5457c647ef0a2ae4a7abf9a52707e722ae6643356f88293d114c034672e8c50c1d77ecf1391c5156e18061ba59168f97d0f66
-MISC metadata.xml 1044 BLAKE2B 132bf7783f4cdac33cfb9bffac4e8a0baf7380f8bb91b262c087ebab4848e6fc97dbac258d600836f1d447536077f063d0dc0ca7348179a61310806f5862ecfe SHA512 c47622fc66013a7c61b1f865619a77707b296b051df54bd75048073b6b5875d97fb300d490a5aba923cc369566ffb5f3dbab16451d1bf48f5f91de18ee7c2116
+EBUILD openmw-9999.ebuild 3369 BLAKE2B 65fb37a972d19e2d47b2b7b7c7b1a6aa2a4f13e5383f32654c8aa7bad2450829e01c56e41310e574d62fd5b0d9d0cf0f1dcfb3ee4f6beeac5a20bd003ff5c36a SHA512 968d75c244e28a689ed8096330e453c88d57dfc6e40b7f9c0d6725978a4849c760ca4351a9485891b4bf419297c512369d28ad673eec285b1fcee0606060e260
+MISC metadata.xml 1278 BLAKE2B 5a79eef3251275f05d388d0236edd548baf111ce140cbfd6942851909039299f5bf6460d01b2a8c760c82c46a6b5880e0316c1cc0c4eda9a1599ce76b127c8ee SHA512 96b66a7c7f8cb4303b9853640e8e11f7be48bd7e5d644db9468ac0b43c1254e670f2e84a2117dbdd31c9709207c58d0ad523e3310287515bc11fa0e58de5c4ab
diff --git a/games-engines/openmw/metadata.xml b/games-engines/openmw/metadata.xml
index 191124d297e1..9927592a87fe 100644
--- a/games-engines/openmw/metadata.xml
+++ b/games-engines/openmw/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
new file mode 100644
index 000000000000..ac6ee3301bce
--- /dev/null
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils readme.gentoo-r1
+
+DESCRIPTION="Open source reimplementation of TES III: Morrowind"
+HOMEPAGE="https://openmw.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/OpenMW/openmw.git"}
+else
+	SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="GPL-3 MIT BitstreamVera ZLIB"
+SLOT="0"
+IUSE="doc devtools test +qt5"
+RESTRICT="!test? ( test )"
+
+# FIXME: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory,
+# used when BUILD_OPENCS flag is enabled. See bug #676266.
+
+RDEPEND="
+	dev-games/mygui
+	>=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib]
+	dev-libs/boost:=[threads]
+	dev-libs/tinyxml[stl]
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/openal
+	media-video/ffmpeg:=
+	>=sci-physics/bullet-2.86:=
+	virtual/opengl
+	qt5? (
+		app-arch/unshield
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[doc]
+		dev-python/sphinx
+	)
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# We don't install license files
+	sed -i '/LICDIR/d' CMakeLists.txt || die
+
+	# Use the system tinyxml headers
+	rm -v extern/oics/tiny{str,xml}* || die
+}
+
+src_configure() {
+	use devtools && ! use qt5 && \
+		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
+
+	local mycmakeargs=(
+		-DBUILD_BSATOOL=$(usex devtools)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_ESMTOOL=$(usex devtools)
+		-DBUILD_LAUNCHER=$(usex qt5)
+		-DBUILD_NIFTEST=$(usex devtools)
+		-DBUILD_OPENCS=$(usex devtools $(usex qt5))
+		-DBUILD_WIZARD=$(usex qt5)
+		-DBUILD_UNITTESTS=$(usex test)
+		-DGLOBAL_DATA_PATH=/usr/share
+		-DICONDIR="/usr/share/icons/hicolor/256x256/apps"
+		-DMORROWIND_DATA_FILES="/usr/share/morrowind-data"
+		-DUSE_SYSTEM_TINYXML=ON
+		-DDESIRED_QT_VERSION=5
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_src_compile doc
+		find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
+			-name '*.md5' -type f -delete || die
+		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. )
+	fi
+}
+
+src_test() {
+	"${BUILD_DIR}/openmw_test_suite" || die
+}
+
+src_install() {
+	cmake_src_install
+
+	local DOC_CONTENTS="
+	You need the original Morrowind data files. If you haven't
+	installed them yet, you can install them straight via the
+	installation wizard which is the officially supported method
+	(either by using the launcher or by calling 'openmw-wizard'
+	directly).\n"
+
+	if ! use qt5; then
+		local DOC_CONTENTS+="\n\n
+		USE flag 'qt5' is disabled, 'openmw-launcher' and
+		'openmw-wizard' are not available. You are on your own for
+		making the Morrowind data files available and pointing
+		openmw at them.\n\n
+		Additionally; you must import the Morrowind.ini file before
+		running openmw with the Morrowind data files for the first
+		time. Typically this can be done like so:\n\n
+		\t mkdir -p ~/.config/openmw\n
+		\t openmw-iniimporter /path/to/Morrowind.ini ~/.config/openmw/openmw.cfg"
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-engines/residualvm/Manifest b/games-engines/residualvm/Manifest
index 19fc9cd7736e..4e8eb904ca58 100644
--- a/games-engines/residualvm/Manifest
+++ b/games-engines/residualvm/Manifest
@@ -1,7 +1,7 @@
 AUX residualvm-0.3.1-freetype_pkgconfig.patch 4909 BLAKE2B 07df1a76ce6ba266602e7f32953d7072b3f1d67490c5bce2c3c35fc6a7bc1de643713e6448d07b0385f0ce6cf35e4ac1a2045a34b27293c36b5440c578b2db6b SHA512 1adece199451586af0c3e9d39f9ee432f58142d206fed5993340c6f0ec5b890f8813c5b0df190c04339e73fdcd7dbd7b7294889ec55678b848b68fc05955d0da
 DIST residualvm-0.2.1-sources.tar.bz2 5533814 BLAKE2B befcb42c823d31ff1e8793d0c902bfdf6b3728530c97b3f43ada5d3b2903a0cddba3247095d1674e62cdd75a6db28a7a5f3b1437e5c39cb5eccb37dff9d52fad SHA512 9eed93770ef1ad828934c32e937b861c93f1ebbb0d936f3f56668e654588f734dc88e29446f0a69f8f26475e96b8ce7ca85318758b99aabc9586756692c721da
 DIST residualvm-0.3.1-sources.tar.bz2 6711799 BLAKE2B 93d21bc5ee2c567b1ef256a69a2634761cd52211a0b2d926edc67b65e0cc1bf23b41c91225e6d43990d61e6c3761acf19defaa9b477ad882d332ad77c71af1a6 SHA512 491a77f1775718795d93f099fa39ec5888755ac1df610089c17209334b98ae783271078ed03a61ced09835aa327446804a55522d4b83f618dd3b843c231444a0
-EBUILD residualvm-0.2.1-r1.ebuild 1791 BLAKE2B 72cb7fe160b57c2e5d2858fd2aeb3f5b82041374f7523a64f43b69eb211c877d69898e1c2fcf15ba7111ea75ca24a14215cf0d892a65a4ccca47d2e659eed9e8 SHA512 e18cd04be84436fc4f13de9c9aaafa27f5888dfb0cc24e6713916105d515089e1ca23c7870da98138d8c2e673b8f79d54e13904b5b1966530277e485b875f661
-EBUILD residualvm-0.3.1-r2.ebuild 2301 BLAKE2B 145d7961483d6979102a874c633d276f57f5f7a40fcb4ed0d2e7d8b6dad7d7756f080e78690fadaadc99fb0539606da79b744619edb0901da31ffb205fbf6d59 SHA512 a256d62bccff17ff1f576d18c6d2a7815d3f888119eee9a58aaae1687758036def989e750aa39464154163f397e6eccd43325a3b937dc721e54126318afbcf32
-EBUILD residualvm-9999.ebuild 2136 BLAKE2B e13c159ad425d3413423cda03c0a3eb403208354f5b539bbb3ebf19a1c49fbf67bf30f554c6db8be9e27061257ba762d2ee99159d3018acbbb716f74caa99d01 SHA512 9489c5c76b2b8acb1d56b868152415ecd796bdf84e84b40206dea8475bd1387c353d700546f903de93316ff1f6479d670700e74f52e4845d4015dae9e2766b74
+EBUILD residualvm-0.2.1-r1.ebuild 1789 BLAKE2B 82af9d1d7e89216bd821d2192aa1255beaf1d9c1898f68e0bd308795f13e2c56dc310c0de2bfc4b015fd212e83209def10f6968c0c3c459428ac73efd0d36a48 SHA512 f1c4ae7f30667c83720c6d870017e747acd22b56697edcf38eb7e00ab03236ad5610e83e7956302a297fda1fe11c3a0a1356403d609413a0dc0ef5e0ef677257
+EBUILD residualvm-0.3.1-r2.ebuild 2303 BLAKE2B 04a8a3158043a2668e5659269ac53958a91c630e445b6f5b841d14ff4bad5d8d26e97994febbb1a5fe3220882c5b32e9403616b2acb061a3faa4b9e16fd35e46 SHA512 ba04b02d1d8229099477e9dacfe2c38e22b5a73431e1be3193e5a2d5e089f20c5a31c8774ca3eb921e94b93689a8e0e698e6dfa862d21fd34c21f537eb5ce56e
+EBUILD residualvm-9999.ebuild 2138 BLAKE2B 23a9b027b5538be820d3f1e01c61064cc7dd4cf4f22b76126c850220a62ec476bdecbd94f802ee03f5c43cc21bf70e80e9947dd2cfa8168d7671842ec91dd4bb SHA512 c338b67ebeeb1fe9522d6629b599e79c839ef36151c6eaa4b9b35d7db902238435c1bb5f7bf728bd38bb255fcd37e7f5330e22162ad20cd15508c64fc813a229
 MISC metadata.xml 409 BLAKE2B 16d2ffcf68a4dad35833cf3f1929a1fb89811b08b6de461c7f90f02974ab04fbf7b809faac18dcabec9012607155c5dda0f7bbee54ad9863d3c9a38bc7bfc5ea SHA512 b54a3d662972aad050c3ad263de572b531b51b2d99580c2dd450d404dd5002362eaa33c40715e1055a9026680940cdc64a3b9b283dafc844be54f33848c5ea41
diff --git a/games-engines/residualvm/residualvm-0.2.1-r1.ebuild b/games-engines/residualvm/residualvm-0.2.1-r1.ebuild
index 5d005b46ebc2..15565c002aeb 100644
--- a/games-engines/residualvm/residualvm-0.2.1-r1.ebuild
+++ b/games-engines/residualvm/residualvm-0.2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils toolchain-funcs gnome2-utils
 
 DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures"
-HOMEPAGE="http://www.residualvm.org/"
+HOMEPAGE="https://www.residualvm.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-sources.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/games-engines/residualvm/residualvm-0.3.1-r2.ebuild b/games-engines/residualvm/residualvm-0.3.1-r2.ebuild
index fd5eba9a2772..43512e6b067d 100644
--- a/games-engines/residualvm/residualvm-0.3.1-r2.ebuild
+++ b/games-engines/residualvm/residualvm-0.3.1-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit desktop toolchain-funcs xdg
 
 DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures"
-HOMEPAGE="http://www.residualvm.org/"
+HOMEPAGE="https://www.residualvm.org/"
 if [[ "${PV}" = 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/residualvm/residualvm.git"
 else
-	SRC_URI="http://www.residualvm.org/downloads/release/${PV}/${P}-sources.tar.bz2"
+	SRC_URI="https://www.residualvm.org/downloads/release/${PV}/${P}-sources.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/games-engines/residualvm/residualvm-9999.ebuild b/games-engines/residualvm/residualvm-9999.ebuild
index da2087300c2d..18b1a8d14d7c 100644
--- a/games-engines/residualvm/residualvm-9999.ebuild
+++ b/games-engines/residualvm/residualvm-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit desktop toolchain-funcs xdg
 
 DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures"
-HOMEPAGE="http://www.residualvm.org/"
+HOMEPAGE="https://www.residualvm.org/"
 if [[ "${PV}" = 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/residualvm/residualvm.git"
 else
-	SRC_URI="http://www.residualvm.org/downloads/release/${PV}/${P}-sources.tar.bz2"
+	SRC_URI="https://www.residualvm.org/downloads/release/${PV}/${P}-sources.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="GPL-2 LGPL-2.1"