openmw-0.31.0 - bump

- Set MORROWIND_DATA_FILES and OPENMW_RESOURCE_FILES, defaults no longer
  correct.

3 files changed, 104 insertions, 1 deletions

diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index d5e11c4..ef2c3e7 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -6,4 +6,5 @@ DIST openmw-0.27.0-source.tar.gz 3533777 SHA256 2c71d6fe0b8036f739ee79c359267fdc
 DIST openmw-0.28.0-source.tar.gz 3605814 SHA256 6db333f5a950eb53427a7c827bcce2fb7f5bdd989f4993b0411c4c9816dd41f4 SHA512 06bca0bf3cba639658e92e340031d2e0256b60ddba012f3ca58477ce625c161843863121c3c18615cb0bc9a9df5fcd9ca34d197cc0b89a7599ae35fb3d7ba9f3 WHIRLPOOL 2a410eccb9c936dfccfb3fb99b0ac531d344bcd5cbdc3b4f30359776d7d1c90f0dcb22d5cbf6d4fc421a58bb3af2ccbbcb4b06527c16870b61a5e79534f37580
 DIST openmw-0.29.0.tar.gz 3192730 SHA256 cf284e1116ebec77f98c4e48e1e4379c984e2d52ff71770928ae8e8f9c2d1ce2 SHA512 6bafa30ff00aeb7fc6152f36ada07287b326092cb90a8a53b16d3ba29da8d29bbfb2c1d42654dfe953553854ad2468d22113540d4d60c305f2286a960098b663 WHIRLPOOL 6203245d2310ade5c93d79e90121588132e01fa98dbd977c39890bd2a148e23b223324fde7fb4c49f232997b3ef3db5d4bf4512745b8c23ef8b1b962755ed109
 DIST openmw-0.30.0.tar.gz 3252229 SHA256 3c6a55a6d4e8df220182e125681cbae8eec5e9faabba477cbd80ff4dc84da029 SHA512 4d750e81fe9b8db92c56ac3a5b55cc1613610517190fcd1b6af6c4eac2c2df93cb5fabd90e9b792dd65b51289d576bc28692114371e4debd7e6f583fc022ad2a WHIRLPOOL bf17ecc7970a3f7160aadbdc5157fbd5524e6ade8abaad6983a437521325fdb6b0055698376d757fc37a0a99ed684d1f7a914ca985f3139a0e78ff716c21fa01
+DIST openmw-0.31.0.tar.gz 3324726 SHA256 49189155c4579e0efe62b3f651a5b3acb61349b01e11dba1178ee4cf9846e280 SHA512 6b45f671c411109c956a4ad0abfaa043506464b5f5d3ddea6b358bfecd0032c67e180e5337b13d099036af13b45968b5090f5f1cf6140cf5670cd29f6033c024 WHIRLPOOL 57c4f3ad0b9f15968ee956f5eb9e1240fc89b29854b81449dc31f60167943de9a17f698d4ad288993d81b190b3abd8ab3739306bd25af6b250dc3c97e31de730
 DIST openmw_0.20.0.orig.tar.bz2 1757358 SHA256 6fb88901920d6c28a974885065303639ee6227e9c21fd615334bcdc16d7909eb SHA512 e3180ed3efbc7fcb92339d88ea1dbc0987f81cc006f56926a7862ac1ee5ca4f2119cfa9baa286aa6c98f2d3a4ef0938ebdfecc842877f08e6a229ac66b913e2d WHIRLPOOL 2f5489f1108b8b3ce8aaa092f3c3effb382b859822e0ce2dd057e5552a2f5579ae304aa402a0dd798794a6ff7032b029bb993f37d76b5c32c30de2eb9eefc026
diff --git a/games-engines/openmw/openmw-0.31.0.ebuild b/games-engines/openmw/openmw-0.31.0.ebuild
new file mode 100644
index 0000000..2ecfe0b
--- /dev/null
+++ b/games-engines/openmw/openmw-0.31.0.ebuild
@@ -0,0 +1,100 @@
+# By Eroen, 2013-2014
+# Distributed under the terms of the ISC license
+# $Header: $
+
+EAPI=5
+
+inherit eutils flag-o-matic versionator games cmake-utils
+[[ $(get_version_component_range $(get_version_component_count)) == *999? ]] && inherit git-r3
+
+DESCRIPTION="Unofficial open source engine reimplementation of the game Morrowind"
+HOMEPAGE="http://openmw.org/"
+LICENSE="GPL-3 MIT BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+launcher minimal +opencs profile test +tr1"
+
+if [[ ${PV} == *999? ]]; then
+	EGIT_REPO_URI="git://github.com/OpenMW/openmw.git"
+	if [[ $(get_version_component_count) -ge 4 ]]; then
+		EGIT_BRANCH=openmw$(get_version_component_range 2)
+	fi
+else
+	SRC_URI="http://github.com/OpenMW/${PN}/archive/${P}.tar.gz"
+	S=${WORKDIR}/${PN}-${P}
+fi
+
+OPENMW_LIBS="dev-games/mygui
+	dev-libs/tinyxml
+	media-libs/openal
+	virtual/ffmpeg
+	sci-physics/bullet"
+LAUNCHER_LIBS="app-arch/unshield
+	dev-qt/qtcore
+	dev-qt/qtgui"
+OPENCS_LIBS="dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtxmlpatterns"
+
+HDEPEND=""
+# boost[threads]: can't test https://bugs.gentoo.org/458404
+# libsdl2[-directfb]: https://bugs.gentoo.org/503130
+LIBDEPEND="${OPENMW_LIBS}
+	launcher? ( ${LAUNCHER_LIBS} )
+	opencs? ( ${OPENCS_LIBS} )
+	dev-games/ogre[boost,cg,freeimage,opengl,threads,zip]
+	dev-libs/boost:=[threads]
+	media-libs/libsdl2[-directfb(-)]"
+DEPEND="${LIBDEPEND}
+	test? ( dev-cpp/gmock[tr1=]
+	    dev-cpp/gtest[tr1=] )"
+[[ ${EAPI} == *-hdepend ]] || DEPEND+=" ${HDEPEND}"
+RDEPEND="${LIBDEPEND}"
+
+pkg_setup() {
+	if use test && ! use tr1; then
+		append-cflags -DGTEST_USE_OWN_TR1_TUPLE=1
+		append-cxxflags -DGTEST_USE_OWN_TR1_TUPLE=1
+	fi
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
+		-DDATAROOTDIR="${GAMES_DATADIR_BASE}"
+		-DDATADIR="${GAMES_DATADIR}/${PN}"
+		-DSYSCONFDIR="${GAMES_SYSCONFDIR}"/${PN}
+		-DMORROWIND_DATA_FILES="${GAMES_DATADIR}/${PN}/data"
+		-DOPENMW_RESOURCE_FILES="${GAMES_DATADIR}/${PN}/resources"
+		$(cmake-utils_use_build launcher LAUNCHER)
+		$(cmake-utils_use_build opencs OPENCS)
+		$(cmake-utils_use_build !minimal BSATOOL)
+		$(cmake-utils_use_build !minimal ESMTOOL)
+		$(cmake-utils_use_build !minimal MWINIIMPORTER)
+		$(cmake-utils_use_with profile CODE_COVERAGE)
+		-DUSE_SYSTEM_TINYXML=ON
+		$(cmake-utils_use_build test UNITTESTS)
+		)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	./openmw_test_suite || die
+	popd > /dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -rf "${D}"/usr/share/licenses || die
+	sed -e "s:resources=resources:resources=${GAMES_DATADIR}/${PN}/resources:" \
+		-i "${D}/${GAMES_SYSCONFDIR}"/${PN}/openmw.cfg || die
+	prepgamesdirs
+	# /etc/openmw/ is hardcoded, but we set SYSCONFDIR for games.eclass
+	mv -t "${D}"/etc "${D}/${GAMES_SYSCONFDIR}"/${PN} || die
+	rmdir "${D}/${GAMES_SYSCONFDIR}" || die
+}
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index b8b190e..41fbea4 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -69,6 +69,8 @@ src_configure() {
 		-DDATAROOTDIR="${GAMES_DATADIR_BASE}"
 		-DDATADIR="${GAMES_DATADIR}/${PN}"
 		-DSYSCONFDIR="${GAMES_SYSCONFDIR}"/${PN}
+		-DMORROWIND_DATA_FILES="${GAMES_DATADIR}/${PN}/data"
+		-DOPENMW_RESOURCE_FILES="${GAMES_DATADIR}/${PN}/resources"
 		$(cmake-utils_use_build launcher LAUNCHER)
 		$(cmake-utils_use_build opencs OPENCS)
 		$(cmake-utils_use_build !minimal BSATOOL)
@@ -89,7 +91,7 @@ src_test() {
 
 src_install() {
 	cmake-utils_src_install
-	rm -r "${D}"/usr/share/licenses
+	rm -rf "${D}"/usr/share/licenses || die
 	sed -e "s:resources=resources:resources=${GAMES_DATADIR}/${PN}/resources:" \
 		-i "${D}/${GAMES_SYSCONFDIR}"/${PN}/openmw.cfg || die
 	prepgamesdirs