4 files changed, 125 insertions, 3 deletions
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 16d3354..6ad6172 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -10,4 +10,5 @@ DIST openmw-0.31.0.tar.gz 3324726 SHA256 49189155c4579e0efe62b3f651a5b3acb61349b
 DIST openmw-0.32.0.tar.gz 3390759 SHA256 9aa94b5ac5f06a6d6b631328e50a81ce58000cec3954c722799305660d6c1161 SHA512 5d61cd8da2dc82eaabe70ad0b575712e0b237987df270957f2746cd6c3f5b3e2041fdfaef2fc5aa5146fbfa034b62baa29212717b3b25678335fa9d8a5b34a53 WHIRLPOOL 886087ed02449356319d8d12be172e19f583bf566fc46c65453163b9de86f66c833257022e9cc7fa6ad3cc28308e90422950c5b169c4d035215cd34170676d67
 DIST openmw-0.33.0.tar.gz 3524287 SHA256 62baa03eb206bea760c6b2b0260ae1a942eac34e7439a114398d2101154f4a83 SHA512 96525ee794277284f39a18bbbd01361422273ef073917b5e51ec7951bb15e59e0d0dd39ba70311588d4b18adccffac5c4fed4d9bf9e37ca0e865869277e795f9 WHIRLPOOL ab9df256ff107fcd361a6308c6bcb49aeb5a40289a224173d6d9f883042491c09a1f90af982be257c2e425d8dd1ec44a04025622d41c21c23c9683db182dfd30
 DIST openmw-0.33.1.tar.gz 3524305 SHA256 ba599fac3254980fc5552e4d1ea714a0493e06304a1dbeb85a5e7dc1e3ccd157 SHA512 4c912fdf95c577a3c105117718d757d23924d30147314bf0a4b685417ba196165c19ab1802a01b6adb686c4e07d1d9ab83e98a4b913d12604e9e76ba13488163 WHIRLPOOL 5b1d703495bcc6e53774118048d92f160b51eba267c7f3769aaa0acd283a3b8e964049cc860b9731bb1f30f66874cb059ec11ffa68f8cfb8b146710929c4071d
+DIST openmw-0.34.0.tar.gz 4066579 SHA256 4091adc26ea2f9919db12ccbe6eb2e615a869500bc5bb69e959ba5b321caa40d SHA512 fd0f49819e56006680660ee7196773f27e7ac493e65205b5e82ad66d4eb78dfb380737baee8507e341fbcdc5e9f5fc81ad6295cf257b09ec753639fd5ceeeeeb WHIRLPOOL 7ea492b5e8a00ee7f3a1b84cf4607c57f3fd17cae60986ac1eed79b0ce963ed6c279b43d3033b7725708108cab855cfb61a0b43bec500a2cc871f15a3a721a6c
 DIST openmw_0.20.0.orig.tar.bz2 1757358 SHA256 6fb88901920d6c28a974885065303639ee6227e9c21fd615334bcdc16d7909eb SHA512 e3180ed3efbc7fcb92339d88ea1dbc0987f81cc006f56926a7862ac1ee5ca4f2119cfa9baa286aa6c98f2d3a4ef0938ebdfecc842877f08e6a229ac66b913e2d WHIRLPOOL 2f5489f1108b8b3ce8aaa092f3c3effb382b859822e0ce2dd057e5552a2f5579ae304aa402a0dd798794a6ff7032b029bb993f37d76b5c32c30de2eb9eefc026
diff --git a/games-engines/openmw/metadata.xml b/games-engines/openmw/metadata.xml
index 66d3541..9de7236 100644
--- a/games-engines/openmw/metadata.xml
+++ b/games-engines/openmw/metadata.xml
@@ -5,6 +5,7 @@
 		OpenMW is an attempt to reimplement the popular role playing game Morrowind. It aims to be a fully playable, open source implementation of the game. You must own Morrowind to use OpenMW.
 	</longdescription>
 	<use>
+		<flag name="installer">Build installer for copying game data from CDROM</flag>
 		<flag name="launcher">Build launcher</flag>
 		<flag name="minimal">Don't build utilities that don't require extra dependencies</flag>
 		<flag name="opencs">Build OpenMW Construction Set</flag>
diff --git a/games-engines/openmw/openmw-0.34.0.ebuild b/games-engines/openmw/openmw-0.34.0.ebuild
new file mode 100644
index 0000000..4fd7dfc
--- /dev/null
+++ b/games-engines/openmw/openmw-0.34.0.ebuild
@@ -0,0 +1,117 @@
+# 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="installer +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-3.2.1
+	dev-libs/tinyxml
+	media-libs/openal
+	>=virtual/ffmpeg-0.9
+	sci-physics/bullet"
+INSTALLER_LIBS="app-arch/unshield
+	dev-qt/qtcore
+	dev-qt/qtgui"
+LAUNCHER_LIBS="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}
+	installer? ( ${INSTALLER_LIBS} )
+	launcher? ( ${LAUNCHER_LIBS} )
+	opencs? ( ${OPENCS_LIBS} )
+	>=dev-games/ogre-1.9[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}"
+
+DOCS=""
+
+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}"
+		-DGLOBAL_DATA_PATH="${GAMES_DATADIR}"
+		-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 installer WIZARD)
+		$(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_build !minimal MYGUI_PLUGIN)
+		$(cmake-utils_use_build !minimal NIFTEST)
+		$(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
+	rmdir "${D}/${GAMES_SYSCONFDIR}" || die
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	if [[ -d ${ROOT%/}/etc/openmw ]]; then
+		ewarn
+		ewarn "Systemwide configuration was moved from /etc/openmw to ${GAMES_SYSCONFDIR}/${PN}"
+		ewarn "Please take any steps necessary to accomodate this."
+	fi
+}
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 76b7b55..21889ea 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://openmw.org/"
 LICENSE="GPL-3 MIT BitstreamVera"
 SLOT="0"
 KEYWORDS=""
-IUSE="+launcher minimal +opencs profile test +tr1"
+IUSE="installer +launcher minimal +opencs profile test +tr1"
 
 if [[ ${PV} == *999? ]]; then
 	EGIT_REPO_URI="git://github.com/OpenMW/openmw.git"
@@ -29,9 +29,11 @@ OPENMW_LIBS=">=dev-games/mygui-3.2.1
 	media-libs/openal
 	>=virtual/ffmpeg-0.9
 	sci-physics/bullet"
-LAUNCHER_LIBS="app-arch/unshield
+INSTALLER_LIBS="app-arch/unshield
 	dev-qt/qtcore
 	dev-qt/qtgui"
+LAUNCHER_LIBS="dev-qt/qtcore
+	dev-qt/qtgui"
 OPENCS_LIBS="dev-qt/qtcore
 	dev-qt/qtgui
 	dev-qt/qtxmlpatterns"
@@ -40,6 +42,7 @@ HDEPEND=""
 # boost[threads]: can't test https://bugs.gentoo.org/458404
 # libsdl2[-directfb]: https://bugs.gentoo.org/503130
 LIBDEPEND="${OPENMW_LIBS}
+	installer? ( ${INSTALLER_LIBS} )
 	launcher? ( ${LAUNCHER_LIBS} )
 	opencs? ( ${OPENCS_LIBS} )
 	>=dev-games/ogre-1.9[boost,cg,freeimage,opengl,threads,zip]
@@ -75,7 +78,7 @@ src_configure() {
 		-DMORROWIND_DATA_FILES="${GAMES_DATADIR}/${PN}/data"
 		-DOPENMW_RESOURCE_FILES="${GAMES_DATADIR}/${PN}/resources"
 		-DGLOBAL_CONFIG_PATH=/etc/ # Compatibility with old commits
-		-DGLOBAL_DATA_PATH="${GAMES_DATADIR}"/
+		$(cmake-utils_use_build installer WIZARD)
 		$(cmake-utils_use_build launcher LAUNCHER)
 		$(cmake-utils_use_build opencs OPENCS)
 		$(cmake-utils_use_build !minimal BSATOOL)