gentoo resync : 02.08.2019

2 files changed, 24 insertions, 21 deletions

diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index b530b8a6c966..665492d65e8b 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,3 +1,3 @@
-DIST openmw-0.44.0.tar.gz 4976422 BLAKE2B 9dec8412aa68ac35ba51926c7e5c5a64ce717ea6677162e0b35439a59c482375b7729bd462fa6e8da2e9b463c1121cdca0a5b42f553095da82a83cefb11986ce SHA512 1b178891274361b7821ac1d3d66976ed5d443545531499d98f7ed30823f3891172cc5dcb3f7382ba0f561774a92b9ad8805e0c9582b78d2f010e4ed661219017
-EBUILD openmw-0.44.0.ebuild 3126 BLAKE2B a561e7129a1d713898afb9496da8cd22cd8730da75b0231edea50b50ef19b505a9052170edde796226822052b541892a3aac88e785d437577c90a44276be27f7 SHA512 6f59963ea39188b1b534972e744cc670d46088a46c6ee9aeabc920b0046f72187e360e6a239215787e1b3958a3383f322d8a4e48f6587bf61837eadaeb9bdbdf
+DIST openmw-0.45.0.tar.gz 4711103 BLAKE2B 85676294b07170dd6845892e9e7b354c5767428584c76ea2e1a64e9f9c72c46c279fdf5043058d37b927cb55e6cf2e2222833129d64954cdcdb3af4eb4b84dc3 SHA512 b968426659457cf486f6756f7ab82cc4cb34a92923c433dd86f711e5d7097f75441ed17daa50d21f15f1847f5aed1f4c3a094a06cfd3f2e9b90aa182742c596f
+EBUILD openmw-0.45.0.ebuild 3154 BLAKE2B bf428a12ad91a4955f7a1a0527e1349a662e20d7ede847593768b69b72dde3318fbef84a9be9693a243eccef5cf02a4a276b0dd9098087eab9e90a189f0ecfde SHA512 c1e0cea4f75ba6eb14b7f2172f342dc2413cc289739122cbe5d604a42e251280f788a794b510b4243c315337b5befe5c3d011c0f3b60082afda25610001ac82e
 MISC metadata.xml 1044 BLAKE2B 132bf7783f4cdac33cfb9bffac4e8a0baf7380f8bb91b262c087ebab4848e6fc97dbac258d600836f1d447536077f063d0dc0ca7348179a61310806f5862ecfe SHA512 c47622fc66013a7c61b1f865619a77707b296b051df54bd75048073b6b5875d97fb300d490a5aba923cc369566ffb5f3dbab16451d1bf48f5f91de18ee7c2116
diff --git a/games-engines/openmw/openmw-0.44.0.ebuild b/games-engines/openmw/openmw-0.45.0.ebuild
index 70c4a527b85f..6a6f448a3fc2 100644
--- a/games-engines/openmw/openmw-0.44.0.ebuild
+++ b/games-engines/openmw/openmw-0.45.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils readme.gentoo-r1
+inherit cmake-utils xdg-utils readme.gentoo-r1
 
 DESCRIPTION="Open source reimplementation of TES III: Morrowind"
 HOMEPAGE="https://openmw.org/"
@@ -14,27 +14,32 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc devtools +qt5"
 
+# 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-games/openscenegraph-qt
 	dev-libs/boost:=[threads]
 	dev-libs/tinyxml[stl]
-	media-libs/libsdl2[joystick,opengl,video,X]
+	media-libs/libsdl2[joystick,opengl,video]
 	media-libs/openal
 	media-video/ffmpeg:=
-	>=sci-physics/bullet-2.86
+	>=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
+		dev-qt/qtcore:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5=
+		dev-qt/qtopengl:5=
+		dev-qt/qtwidgets:5=
 	)
 "
-DEPEND="${RDEPEND}
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen[doc]
@@ -48,12 +53,10 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	# We don't install license files
-	sed -e '/LICDIR/d' \
-		-i CMakeLists.txt || die
+	sed -i '/LICDIR/d' CMakeLists.txt || die
+
 	# Use the system tinyxml headers
-	sed -e 's/"tinyxml.h"/<tinyxml.h>/g' \
-		-e 's/"tinystr.h"/<tinystr.h>/g' \
-		-i extern/oics/ICSPrerequisites.h || die
+	rm -v extern/oics/tiny{str,xml}* || die
 }
 
 src_configure() {
@@ -117,10 +120,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }