version bump

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

5 files changed, 215 insertions, 19 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/Manifest b/dev-games/mygui/Manifest
index 8a81121fd77d..6761ad06b08c 100644
--- a/dev-games/mygui/Manifest
+++ b/dev-games/mygui/Manifest
@@ -4,26 +4,29 @@ Hash: SHA256
 AUX mygui-3.2.0-FHS.patch 1672 SHA256 098414560499f620b42a46832d4a3ff002582399224c2fdf53adf440d47bb3e5 SHA512 76e78fdf0fcf79765997279d4eb7594255cb3a42c5042ea3d849210a34b16dc86f0e32f829b45ab4045f7e9fee32953ec868915f1d591f0fd4dde94675e0075c WHIRLPOOL a58b552331854da185ce3b2518e40823d2545b7f731936cba3f389c5890cf014acd75b56e320856e9004518d65842c001a2e2d4067431af2aa633c76318490c3
 AUX mygui-3.2.0-build.patch 2816 SHA256 3ca747abd0eafbb4bd67076cdb8a739cec2192bc33467adfd13ab6228b3aa8ae SHA512 cdee522192db35213530c195c525e0bfd6bbb2d6cf041d0e4fec923bf2665d6c5c813933725167d5106097ee06040e790d9d2fa5a31a6e421215387159125020 WHIRLPOOL c6534d64de21ca2f7e2b00b6162287b0ced253b698006112d2d736b49c41c3db8a20c4a2fbc5ee6729374c362697c3c4a76b4b785d3124497a3be55c55587278
 AUX mygui-3.2.0-underlinking.patch 398 SHA256 7ae82493e90b9543bf592060348adff59b64c5469ea3b3d08a44f416ac27a614 SHA512 ad0e5e0e8aacdb65ea9195175f597eb95f265b07d0154482f2380ae6e837672d5d41b6d43b1266abb12dec319625426dd65a892aca7fdca297131bd4db2312b9 WHIRLPOOL 195a7786c561b9844e8385dd562e336ef88feeff13d1703e246a34bf28a9f6919c9ba9899bbe50b5f2f0b25efc7b5916046bec083f8ddd20168da8b4d3caf890
+AUX mygui-3.2.1-FHS.patch 1131 SHA256 5322f7e35402a1cf5dfcb9e0caca41d4c70631dd38d080bf9a859936b61cd472 SHA512 0486cbcbc96531a18b61e6ce77f7ad487117561683d3be73a0f38103c8744cab0bb9df303b200897ae765df9bba20f77e489a06bdc4615f14ee38371c6f26595 WHIRLPOOL 66775cfdf6a0ffcc36ea929c92b622fb1caa14b3cd6372a6c93881fa47ec8ab0b30586c61162f81b730776082fed23be45e25d8bd4a5cec13bd8d7dc7d25091d
+DIST MyGUI3.2.1.tar.gz 22076936 SHA256 37232d736159cd7d1a4d0291d714964505b7edc8d65cb0147533259d102f78cc SHA512 38a5fd89504f6f620d4bf539ab3e369695572adfa75bc846e2eb63c1ccd6d3d4edc3ec0f24e720edd0c780a36ec35eae251e32a6ee457f129b3ca9e88cab8f91 WHIRLPOOL 78929a8215f145bfa47a26d29aa37ac5aacdb0e46f41d082e808562ee8874e5f5a449eba98abfd280c1c87a69cc05ef3edb8a52296ebd206a084feaafd80d1b9
 DIST MyGUI_3.2.0.zip 14383788 SHA256 1704006f364b733b2d2cc6807c6dc10833cf695542b797aee50b8fd061eea19a SHA512 8ff8de065a6f355a03e45bfeac6d8db706ee7a122346f41ef26664dc8280d4d1cba8ac943afbaae27c5a1b7fb8bfa8729a1758cc87e8764370284aec943f9278 WHIRLPOOL 982c8fd9e714d7ebc5583a884953ef41fd6a2b2c1f62ec56bc81768ee607135116c14973e3eb4f528e636cf3ca1df6dd155931ea93b26fe537a66cb09a44aba4
 EBUILD mygui-3.2.0-r1.ebuild 3239 SHA256 790e08b00c131355219b96fdfbae1e8a888d7dc7e94a57a03bba5399c8185d04 SHA512 03fd3005af940e9f6a3a7f34e00e7735e511f9bc79b0dd3fcc83f46e085827e608ebae095bbbb05f6d5ea18d7c3b55b0d8afb6dff90855dc924a3a13703cb24c WHIRLPOOL 89f274c0a563f4108998b4be6643c0ac699a728a5834679b1f26d1ab7853d0d917ef0b7c49027d4e6e0366eb2319283b5b96a90932ab97a50e53be2610e8c79b
-MISC ChangeLog 1005 SHA256 c6b1d4fd9c2d8d9ffbbbf75b7a2d70d11c34a7d325f8543753b4a2e65840074c SHA512 cb4a75567eab92ebec5348e6178ca6da05aec9371b90d692f8bec2217541f631be2ccfe9c3b14bb5e96eac46cd2573c85e4c79ca981a2c09c9fd9667740dd92b WHIRLPOOL 24a475d7be4b904e8a77e147598ca9eb3ce67c0ea11c2080e00afdfe706c218b27eaa7e10077b16bd00a65ead4d104b6be339809f0fb8a3b4c26d07b05101678
-MISC metadata.xml 1929 SHA256 84a5a276d38026489665b7c42713d47bd1a138475466a3fc929f3560b1bc5dcc SHA512 620c83d026718c853c50f9d02968084b3f4e5d870a57e33f8b5a42206df28dd9071f0da786b35cf026d5d52a71d4b702fccfe72f57ee0a8c847834a84539889d WHIRLPOOL fcc3ed6fe4c6e3a418c7c7f76ad205918e202bd429e3bffe4d234f5bf5a105a9d4211b3f1d33f12d64af1394d44d06b859e6c36cd45f3d24849871903df6728d
+EBUILD mygui-3.2.1.ebuild 3772 SHA256 ce6108cd4e5368c129daffc35dae0bbe85cdae0f58ae4c06a0dad7bf23fb8d6d SHA512 dfd2db26ebce2150feb59b731d77e94a3a86c9228f76d9b4cae7943586b8c82f138cfb4f996002e0d49504413a6816c617b8a29eef0b628d17b4747896f3a3bd WHIRLPOOL 5f416669beb2e5f53c21de4a6ddcd8556e1fabf927ec9523c80c8d1a4b88f207bb3fb505a1540f9443c6918c036f11120215d53e6d80b09ecefbc50421dfb19b
+MISC ChangeLog 1167 SHA256 92461c4cf247e5d7eeb4feba34f6ed5677e42fbd186cfc25be5bbff9f5ba9733 SHA512 af110e43ac67b9753b45ea637581dbc9e2e55f7cd4432e06c29f8a778accfed522c8b7c3e71453ed16653d026d177962e6057e329e22dabed5f57997e73cf6c2 WHIRLPOOL 069134bf611fd652749e164ecda40b0ac417d358a57a014aab7853ea3552ba6b09e55c3a591fa2f1a12dc42887cdfcbd7633a2a3c7514712823c61409a4f956e
+MISC metadata.xml 2127 SHA256 2839f05326a6232704c71e59a105916e949815b256660858d78544a2729a6faa SHA512 3d510722e6ed2316d22110e469c62c0ddbeec4c948d08a986ee89fbd9d5bb58f6dcb148280504110c3add0de39be3a693ecd7fab263031c3030c28309a4d4b0b WHIRLPOOL f7b15902546ecaba0a72133dfa988dca26b2740d74e5a58ae4eedf63f2f883fcb2c37fe0bc5aeb88ff2b9ded2cb99f861731ff58df522c98b7ff77013a55b906
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTG6UJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT+ihvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgo/oP/3Z6o4ptFFN/ntx3m1Xc5q50
-GziG1oFj0x+dEF2zgrU/1x/BGUP8w2dED0SfeGirzqGGWXlVlAN8EMz56BW1oTA8
-AxJ2Avr7z3LNfZnHadorUZcuSffwWPI8Mg4T+lmOBeyW6/pGfFAl92mgX3w+DG0y
-jOMsRvl7zdOofKVpZkoiaRlFm2hh4b8r5HKYDXUFIjrQM5IflpI4uTREsZ4kGxts
-Q5IAIXaaaXfXyvgc8jzudkKLwpCLyZ2jM07fYDpEkqbIxXVBtGOYwFVwzIYp96bV
-o55vlQE5oNO4WKG29+5QiPfyZSnTTFp+wulyju9J+0eBR7MGwbWdkrlzoozxEV5b
-38JQcYVrqF7ycfOhjoU3sowfOjuwWFl5+Dx7Kx4PbHQqZpXHgBWZj1RxZ44WgZ36
-9RXTdmASTlHTYJcEkG/CefDo57dE5mA6x2SC/cnMsdid/tcJf0nO7GA4ZavHFkEJ
-5h2WdvOP0mqzp4Ci8zB9l26cTuhHdo2UYQUdfZDmN0b1cPS/pfXZNNaSUqnacCbY
-cF2zmfj6mTpRod23lt6poEsCMK2bYK/BZOk0eJyC1V9QuyXKcae8OZmaEXJombf6
-PoQlt200h24tUVhd0rX3WNX86kqdgyPsGpwVEulUNam1wKnb/ifpW11X/7yOkh/r
-qEyiHOj9f6hY6sLgTeay
-=PGgA
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgyGYQAJnnJM+4d4COXvKWTqPiyxkK
+gjaJDXGin3vptotn/eV3v+76zllHJhI1NwLaGtuXWTetLkdW5ECyN+9MQIO/4u16
+rq3j7PPaWODd7mOaDGSXqLTz0R/3KYQeDPiRQAWqOp/SxzsKYMfHAFnBrm5337rE
+bEuKp14G592skcDX1u3saUiv1/HhAWlUuGTuhGLCl2kUFdJR31+sgZWASaa51hWi
+I8DSkeUxrqfaBrfaM6UlEey6RJRRnnnaUiwaQtGwRvouOX/70q9a/Q3LLxnCT0+s
+jtuc3fdDhtxBUI73ifnkhYJs1CwrZ4JrtBHOJKYGsuqDo3TSBhC8+yP9AuMaZLh2
+EnECgLxps/yy/b68BCM+0MQJsJnm4P9O77W4rCTFaO7EAbhy2XMfpDwsRUE06gby
+Kbq5sZhbE/fwBDP4ldocvVDpod1YBjiqMeU/EDrlNLc2nHeDIwm/S5gSR7OO16Cx
+BRRENa79FzIrIRWty5XgPh9UQewIFMB7eiwGpeHTnmLc1tRCuuMpOHwCO/kmQKL1
+wYMXChZJ9pOQGjolSHlGwrqOmJe8nIcX9MVGOUkAundlEcw6JiCPinibt3WlsjDx
+O18F+3ZaZZej7UI56OVrAEIla4WBTXmkKm2+hauGBJlkwZf+GmvqWWtKp5xiVq7c
+i9IB60Zym6fO8LvP7/cY
+=IJ0V
 -----END PGP SIGNATURE-----
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
+}