version bump

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

4 files changed, 195 insertions, 2 deletions

diff --git a/dev-games/mygui/ChangeLog b/dev-games/mygui/ChangeLog
index ddcdaa5ac2bc..2fbec7c69853 100644
--- a/dev-games/mygui/ChangeLog
+++ b/dev-games/mygui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/mygui
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/mygui/ChangeLog,v 1.6 2014/03/08 23:17:25 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/mygui/ChangeLog,v 1.7 2014/08/24 18:01:18 hasufell Exp $
+
+*mygui-3.2.1 (24 Aug 2014)
+
+  24 Aug 2014; Julian Ospald <hasufell@gentoo.org> +mygui-3.2.1.ebuild,
+  +files/mygui-3.2.1-FHS.patch, metadata.xml:
+  version bump
 
   08 Mar 2014; Julian Ospald <hasufell@gentoo.org> mygui-3.2.0-r1.ebuild:
   add subslot dep for dev-games/ogre
diff --git a/dev-games/mygui/files/mygui-3.2.1-FHS.patch b/dev-games/mygui/files/mygui-3.2.1-FHS.patch
new file mode 100644
index 000000000000..b0a6b09eb31a
--- /dev/null
+++ b/dev-games/mygui/files/mygui-3.2.1-FHS.patch
@@ -0,0 +1,44 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Oct 27 22:39:31 UTC 2012
+Subject: FHS
+
+paths hardcoded until upstream fixed the logic
+
+--- Common/Base/Ogre/BaseManager.cpp
++++ Common/Base/Ogre/BaseManager.cpp
+@@ -49,13 +49,13 @@
+ 		mWindow(nullptr),
+ 		mExit(false),
+ 		mPluginCfgName("plugins.cfg"),
+-		mResourceXMLName("resources.xml"),
++		mResourceXMLName("/etc/MYGUI/resources.xml"),
+ 		mResourceFileName("MyGUI_Core.xml")
+ 	{
+ 		#if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
+ 			mResourcePath = macBundlePath() + "/Contents/Resources/";
+ 		#else
+-			mResourcePath = "";
++			mResourcePath = "/etc/MYGUI/";
+ 		#endif
+ 	}
+ 
+--- CMake/InstallResources.cmake
++++ CMake/InstallResources.cmake
+@@ -24,7 +24,7 @@
+ 	else ()
+ 		install(FILES
+ 			${MYGUI_BINARY_DIR}/bin/${FILENAME}
+-			DESTINATION "bin"
++			DESTINATION "/etc/MYGUI"
+ 		)
+ 	endif ()
+ endfunction(install_file)
+@@ -51,7 +51,7 @@
+ 	if (WIN32)
+ 		set(MYGUI_MEDIA_DIR "../../Media")
+ 	elseif (UNIX)
+-		set(MYGUI_MEDIA_DIR "../share/MYGUI/Media")
++		set(MYGUI_MEDIA_DIR "${CMAKE_INSTALL_PREFIX}/share/MYGUI/Media")
+ 	else ()
+ 		set(MYGUI_MEDIA_DIR "../../Media")
+ 	endif ()
diff --git a/dev-games/mygui/metadata.xml b/dev-games/mygui/metadata.xml
index 8641cc3a627a..bdf5c1988794 100644
--- a/dev-games/mygui/metadata.xml
+++ b/dev-games/mygui/metadata.xml
@@ -18,8 +18,10 @@
 	</upstream>
 	<use>
 		<flag name="linguas_ru">Install some additional russian docs if 'doc' useflag enabled</flag>
+		<flag name="opengl">Use the opengl render subsystem. (cannot combine with ogre)</flag>
+		<flag name="ogre">Use the ogre render subsystem. (cannot combine with opengl)</flag>
 		<flag name="plugins">Build MyGUI plugins</flag>
-		<flag name="samples">Install MyGUI demos</flag>
+		<flag name="samples">Install MyGUI demos (needs ogre USE flag)</flag>
 		<flag name="tools">Build the tools for development</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-games/mygui/mygui-3.2.1.ebuild b/dev-games/mygui/mygui-3.2.1.ebuild
new file mode 100644
index 000000000000..19baa2f1035d
--- /dev/null
+++ b/dev-games/mygui/mygui-3.2.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/mygui/mygui-3.2.1.ebuild,v 1.1 2014/08/24 18:01:18 hasufell Exp $
+
+EAPI=5
+CMAKE_REMOVE_MODULES="yes"
+CMAKE_REMOVE_MODULES_LIST="FindFreetype"
+inherit eutils cmake-utils flag-o-matic multilib
+
+MY_PN=MyGUI
+MY_P=${MY_PN}${PV}
+
+DESCRIPTION="A library for creating GUIs for games"
+HOMEPAGE="http://mygui.info/"
+SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +ogre -opengl plugins samples static-libs test tools linguas_ru"
+REQUIRED_USE="ogre? ( !opengl )
+	opengl? ( !ogre )"
+
+RDEPEND="
+	media-libs/freetype:2
+	ogre? (
+		dev-games/ogre:=[freeimage,opengl]
+		samples? ( dev-games/ois )
+	)
+	opengl? ( virtual/opengl )
+	tools? ( dev-games/ois )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/mygui-${MY_P}
+STATIC_BUILD=${WORKDIR}/${P}_build_static
+
+pkg_setup() {
+	if use samples && use !ogre ; then
+		ewarn "Samples disabled, because they only work with ogre!"
+		ewarn "Enable ogre USE flag if you want to use samples."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2.0-underlinking.patch \
+		"${FILESDIR}"/${PN}-3.2.0-build.patch \
+		"${FILESDIR}"/${PN}-3.2.1-FHS.patch
+}
+
+src_configure() {
+	use debug && append-cppflags -DDEBUG
+
+	local mycmakeargs=()
+
+	# static configuration
+	if use static-libs ; then
+		mycmakeargs=( -DMYGUI_STATIC=ON
+			-DMYGUI_BUILD_DOCS=OFF
+			-DMYGUI_INSTALL_DOCS=OFF
+			-DMYGUI_USE_FREETYPE=ON
+			$(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
+			-DMYGUI_BUILD_DEMOS=OFF
+			-DMYGUI_INSTALL_SAMPLES=OFF
+			-DMYGUI_BUILD_TOOLS=OFF
+			-DMYGUI_INSTALL_TOOLS=OFF
+			-DMYGUI_BUILD_WRAPPER=OFF
+			-DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") )
+
+		CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_configure
+		unset mycmakeargs
+	fi
+
+	# main configuration
+	mycmakeargs=( -DMYGUI_STATIC=OFF
+		$(cmake-utils_use doc MYGUI_BUILD_DOCS)
+		$(cmake-utils_use doc MYGUI_INSTALL_DOCS)
+		-DMYGUI_USE_FREETYPE=ON
+		$(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
+		$(usex ogre "$(cmake-utils_use samples MYGUI_BUILD_DEMOS)" "-DMYGUI_BUILD_DEMOS=OFF")
+		$(usex ogre "$(cmake-utils_use samples MYGUI_INSTALL_SAMPLES)" "-DMYGUI_INSTALL_SAMPLES=OFF")
+		$(cmake-utils_use tools MYGUI_BUILD_TOOLS)
+		$(cmake-utils_use tools MYGUI_INSTALL_TOOLS)
+		-DMYGUI_BUILD_WRAPPER=OFF
+		-DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") )
+
+	if use tools || (use samples && use ogre) ; then
+		mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=ON )
+	else
+		mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=OFF )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# build system does not support building static and shared at once,
+	# run a double build
+	if use static-libs ; then
+		CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_compile
+	fi
+
+	cmake-utils_src_compile
+
+	use doc && emake -C "${CMAKE_BUILD_DIR}"/Docs api-docs
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use static-libs ; then
+		find "${STATIC_BUILD}" -name "*.a" \! -name "libCommon.a" -exec dolib.a '{}' \;
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins "${STATIC_BUILD}"/pkgconfig/MYGUIStatic.pc
+	fi
+
+	if use doc ; then
+		dohtml -r "${CMAKE_BUILD_DIR}"/Docs/html/*
+
+		if use linguas_ru ; then
+			docompress -x /usr/share/doc/${PF}/Papers
+			dodoc -r Docs/Papers
+		fi
+	fi
+
+	keepdir /etc/MYGUI
+	fperms o+w /etc/MYGUI
+
+	# test media not needed at runtime
+	rm -rf "${D}"/usr/share/MYGUI/Media/UnitTests
+	# wrapper not available for linux, remove related media
+	rm -rf "${D}"/usr/share/MYGUI/Media/Wrapper
+}
+
+pkg_postinst() {
+	einfo
+	elog "ogre.cfg and Ogre.log are created as"
+	elog "/etc/MYGUI/mygui-ogre.cfg and /etc/MYGUI/mygui-Ogre.log"
+	einfo
+}