-cegui-0.7.5-r1.ebuild, +cegui-0.7.7.ebuild

Sync with portage and bump to 0.7.7

4 files changed, 174 insertions, 116 deletions

diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog
index e5a68bf..76e1ab6 100644
--- a/dev-games/cegui/ChangeLog
+++ b/dev-games/cegui/ChangeLog
@@ -2,7 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  28 May 2012; Christoph Brill <cbrill@gentoo.org> -cegui-0.7.5.ebuild,
+*cegui-0.7.7 (14 Jul 2012)
+
+  14 Jul 2012; Christoph Brill <egore911@egore911.de> -cegui-0.7.5-r1.ebuild,
+  +cegui-0.7.7.ebuild:
+  Sync with portage and bump to 0.7.7
+
+  28 May 2012; Christoph Brill <egore911@egore911.de> -cegui-0.7.5.ebuild,
   cegui-0.7.5-r1.ebuild:
   Synchronize with portage tree
 
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index 84f9df7..e1d80b8 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -1,7 +1,7 @@
-AUX cegui-0.7.5-gcc46.patch 296 RMD160 9f66d4c32fc999b078d14a71612130b414b3facf SHA1 9a6c508ebcd43382927e27d7d7324402baaa9abf SHA256 a497069fc8bc50b23b62f321025364d4d2988a575ec7aeb429b25b94b5d6bf11
-AUX cegui-0.7.5-tinyxml.patch 984 RMD160 d2f7ff2dfd2519116b32dccc92d130ce3a92e393 SHA1 fffe9d3d43731f74e31c731fa6a636c710af9b96 SHA256 0875cdcc967922c85cceeaf2447bca340de7c1b7297785ce9fadfa0ded75c342
-DIST CEGUI-0.7.5.tar.gz 9058788 RMD160 9602bcfbfe8b81c4fce415e0be341ea974040acc SHA1 75fe8d11c7c91ed3b08e8a2e81ff946699e51cf7 SHA256 21049e31a03fcd4807729c7271756e6d2de834247ece603bb5b5087fae624cb2
-DIST CEGUI-DOCS-0.7.5.tar.gz 11001948 RMD160 17455c07b56594bcd150a1e4f9c31ff5bdcda81d SHA1 4aa8e14ba5f5f577ecda4be17bb8b493ae5c37ba SHA256 2ee19e5bfa4c3a9c3ebc1f399df7276f5688cc2decfc8e175c9db12e464c5c4f
-EBUILD cegui-0.7.5-r1.ebuild 2841 RMD160 df5bb671172dc7cf4c1d59a943681fef7727e4b2 SHA1 e1dbb969e8d30df02df0a5ae77815ba1c1fa167f SHA256 fb2821a33dafe0d187124646cf724b588d75b6568d0e6876796972929975d9fd
-MISC ChangeLog 967 RMD160 b27319bc9afa258d333c891a6e6966384d77a724 SHA1 22ee56a6091e624c72cd3be363e3d2c3ab079303 SHA256 cfa7ab544d69f39431bbf6707abc8d3d7013a70773be7631c9d270c95e5354e5
-MISC metadata.xml 697 RMD160 f208ace191647749ec09d9f1d56a6b4f3a85cb85 SHA1 99cf9b39ea6828daafb50e071638dc39dc5e5cbf SHA256 1d3ec8ba428f2a18f32b586203e95f08965a9e7e03492414019614693640f7c8
+AUX cegui-0.7.5-gcc46.patch 296 SHA256 a497069fc8bc50b23b62f321025364d4d2988a575ec7aeb429b25b94b5d6bf11 SHA512 64d0620dca217c3175813e037775c7202a4efcfa15e7190cbef93bdb52380e2ca6cf8e475664c659ac0b44feaa2b3ccade14aafccb870d6a5a51009a518e8b41 WHIRLPOOL f4431f4759dee86112c71cf21b5c161f47855c187735e9ba7943d953a1711ba2ffca3cf78acb32242a7d07e65fc69bd25a04d13cfb9252fcffeb5235c1d7b26d
+AUX cegui-0.7.5-tinyxml.patch 984 SHA256 0875cdcc967922c85cceeaf2447bca340de7c1b7297785ce9fadfa0ded75c342 SHA512 79445f22aeb01d7cabe67dff84fd88cc22e1fe1b85db11e6942ccdb83c5116242d26a62687bd92652a16148487be72c721633be235364ace6caa5370cfdda886 WHIRLPOOL cfd7de6aea1ffc165a94a6f9f0b5194f10053c7d3ca65a58d42d83dc7e8ff47322d96b15ca849227a61c5f9553d5e61532a6bc0d4cee478f404457308515ae7c
+DIST CEGUI-0.7.7.tar.gz 9176105 SHA256 551e6fe4fffc7586b0ef0434b83ddc2b3889fc8c7eb22d4cca92b1c7ce25059a SHA512 a3adaf1fc8a9adbe7e2eb5939bacbbb6c9b9c5c0299c247e3f562faae1fa5d697634536d2a977925346b49d1060326359fd4739462074b780b6f6649e6f7a4f0 WHIRLPOOL cc394977876137cf0b5b8f75f0ae66eb5a2fcb30e2088b41392f53fdd15a3a4d989ab4784924667f18a12fe569ef3472027e0334e7190cb60fe2d2f596603cf7
+DIST CEGUI-DOCS-0.7.7.tar.gz 14303467 SHA256 21b6fb8841dfb40650d68b3149afe24d7bde7c1986c0e3d86f9c34baa1b00c6c SHA512 cf0745ab9fdc4ca939aabeacf3c15e677ce26a3f4ecf136debc661842adc24955b30460a69238ab65ae65e4367e7da3515125befed2f017aa1b4981f32ccd08c WHIRLPOOL 2faa44214efe454211267f6417a5a0817026e3e46315acabe6b0ead1354443f0396c2bff8ecaa82210d922d59d2d5a6b60b9bab3c6cc2c7184ce6a5f49cd81bc
+EBUILD cegui-0.7.7.ebuild 3688 SHA256 1e5cabfffdaa78a3053fd185fd3ad448adc03918a8853416c083135773a8dc12 SHA512 ff9170a50c11363ca8333e44db7e2074a6ee8e942f35a002f09e036b3a4898bc2b53d55c0ff4eb04b8a93e9a9880b0af97d42d2130e01f3d1d7f0c60462a2e90 WHIRLPOOL a62f734760ac763daeda4ce0359718d29b517b4415e87ec9879392c3fe3405c6a44dea3d9eb18bb0b706e10bf1c14e29490cc8963c1af9d87b95ca44721f96d3
+MISC ChangeLog 1138 SHA256 84662b9fe8e3d3a35f8dbec9ef6eaab0b50e45c127f1605399f601aa121384ee SHA512 d08d37745b19591210a48e72ca66d7119a29bf0f21b0721dfd16b0347b4c60eabee45ab0b4e385bf6f233cbd3b92f3f401bea3c319bc76c57aa692b350cd7101 WHIRLPOOL 7be61323ad03f34940eb540dd3b514f767ec4594c553052a55e288f0d7b8f08f4ac5353e98b4dc0aa1a24c476b6503680fbc41fd13909599de74f64bca7f88f2
+MISC metadata.xml 697 SHA256 1d3ec8ba428f2a18f32b586203e95f08965a9e7e03492414019614693640f7c8 SHA512 8401c2465f9a5372990f32f685612bc1ec5982c699130f9c9117a6d33755bd820a1706b7cb3a657fd468fb646d1847d143384f14bd693febb1e8f41aec633a43 WHIRLPOOL 33bb3e0b6946966c4109c1635ce14d807b9255c325e2037234bfcb7673f0e74c0ad0e5fb19d4019f3dd8826003a5ee2585ec97f4236dcacd7b6d357a8edd03a3
diff --git a/dev-games/cegui/cegui-0.7.5-r1.ebuild b/dev-games/cegui/cegui-0.7.5-r1.ebuild
deleted file mode 100644
index 55607e1..0000000
--- a/dev-games/cegui/cegui-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.5-r1.ebuild,v 1.7 2012/05/03 06:35:30 jdhore Exp $
-
-EAPI=4
-inherit eutils
-
-MY_P=CEGUI-${PV}
-MY_D=CEGUI-DOCS-${PV}
-DESCRIPTION="Crazy Eddie's GUI System"
-HOMEPAGE="http://www.cegui.org.uk/"
-SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz
-	doc? ( mirror://sourceforge/crayzedsgui/${MY_D}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 -ppc x86"
-IUSE="bidi debug devil doc examples expat freeimage gtk irrlicht lua opengl pcre static-libs tinyxml truetype xerces-c xml zip"
-REQUIRED_USE="|| ( xml tinyxml )" # bug 362223
-
-RDEPEND="bidi? ( dev-libs/fribidi )
-	devil? ( media-libs/devil )
-	expat? ( dev-libs/expat )
-	freeimage? ( media-libs/freeimage )
-	truetype? ( media-libs/freetype:2 )
-	irrlicht? ( dev-games/irrlicht )
-	lua? (
-		dev-lang/lua
-		dev-lua/toluapp
-	)
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		media-libs/freeglut
-		media-libs/glew
-	)
-	pcre? ( dev-libs/libpcre )
-	tinyxml? ( dev-libs/tinyxml )
-	xerces-c? ( dev-libs/xerces-c )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tinyxml.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
-
-	# build with newer zlib (bug #389863)
-	sed -i -e '74i#define OF(x) x' cegui/src/minizip/unzip.h || die
-	sed -i -e '125i#define OF(x) x' cegui/src/minizip/ioapi.h || die
-	if use examples ; then
-		cp -r Samples Samples.clean
-		rm -f $(find Samples.clean -name 'Makefile*')
-	fi
-}
-
-src_configure() {
-	# ogre-1.6.5 needs older cegui (bug #387103)
-	econf \
-		--disable-ogre-renderer \
-		$(use_enable bidi bidirectional-text) \
-		$(use_enable debug) \
-		$(use_enable devil) \
-		$(use_enable examples samples) \
-		$(use_enable expat) \
-		$(use_enable freeimage) \
-		$(use_enable truetype freetype) \
-		$(use_enable irrlicht irrlicht-renderer) \
-		$(use_enable lua lua-module) \
-		$(use_enable lua toluacegui) \
-		--enable-external-toluapp \
-		$(use_enable opengl opengl-renderer) \
-		--enable-external-glew \
-		$(use_enable pcre) \
-		$(use_enable tinyxml) \
-		--enable-external-tinyxml \
-		$(use_enable xerces-c) \
-		$(use_enable xml libxml) \
-		$(use_enable zip minizip-resource-provider) \
-		--enable-null-renderer \
-		--enable-tga \
-		--disable-corona \
-		--disable-dependency-tracking \
-		--disable-samples \
-		--disable-silly \
-		$(use_with gtk gtk2) \
-		$(use_enable static-libs static) \
-		--enable-shared
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# remove .la files
-	use static-libs || rm -f "${D}"/usr/*/*.la
-
-	if use doc ; then
-		emake html || die
-		dohtml -r doc/doxygen/html/* || die
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/Samples
-		doins -r Samples.clean/* || die
-	fi
-}
diff --git a/dev-games/cegui/cegui-0.7.7.ebuild b/dev-games/cegui/cegui-0.7.7.ebuild
new file mode 100644
index 0000000..0946b9f
--- /dev/null
+++ b/dev-games/cegui/cegui-0.7.7.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.7.ebuild,v 1.1 2012/07/09 03:14:07 mr_bones_ Exp $
+
+EAPI=4
+inherit eutils
+
+MY_P=CEGUI-${PV}
+MY_D=CEGUI-DOCS-${PV}
+DESCRIPTION="Crazy Eddie's GUI System"
+HOMEPAGE="http://www.cegui.org.uk/"
+SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz
+	doc? ( mirror://sourceforge/crayzedsgui/${MY_D}.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 -ppc ~x86"
+IUSE="bidi debug devil doc examples expat freeimage gtk irrlicht lua ogre opengl pcre static-libs tinyxml truetype xerces-c xml zip"
+REQUIRED_USE="|| ( expat tinyxml xerces-c xml )" # bug 362223
+
+RDEPEND="bidi? ( dev-libs/fribidi )
+	devil? ( media-libs/devil )
+	expat? ( dev-libs/expat )
+	freeimage? ( media-libs/freeimage )
+	truetype? ( media-libs/freetype:2 )
+	irrlicht? ( dev-games/irrlicht )
+	lua? (
+		dev-lang/lua
+		dev-lua/toluapp
+	)
+	ogre? ( >=dev-games/ogre-1.7 )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		media-libs/freeglut
+		media-libs/glew
+	)
+	pcre? ( dev-libs/libpcre )
+	tinyxml? ( dev-libs/tinyxml )
+	xerces-c? ( dev-libs/xerces-c )
+	xml? ( dev-libs/libxml2 )
+	zip? ( sys-libs/zlib[minizip] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P}
+S2=${WORKDIR}/${MY_P}_static
+
+src_unpack() {
+	default
+	cp -a "${S}" "${S2}" || die
+}
+
+src_prepare() {
+	# use minizip from zlib rather than local code
+	if use zip ; then
+		sed -i \
+			-e '/CEGUI_BUILD_MINIZIP_RESOURCE_PROVIDER_TRUE/{
+					s:minizip/ioapi.cpp minizip/unzip.cpp::;
+					s:libCEGUIBase@cegui_bsfx@_la-ioapi.lo::;
+					s:libCEGUIBase@cegui_bsfx@_la-unzip.lo::
+				}' \
+			-e '/^ZLIB_LIBS/s:=.*:= -lminizip:' \
+			cegui/src/Makefile.in || die
+	fi
+	rm -rf cegui/src/minizip
+
+	if use examples ; then
+		cp -r Samples Samples.clean
+		rm -f $(find Samples.clean -name 'Makefile*')
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bidi bidirectional-text)
+		$(use_enable debug)
+		$(use_enable devil)
+		$(use_enable examples samples)
+		$(use_enable expat)
+		$(use_enable truetype freetype)
+		$(use_enable irrlicht irrlicht-renderer)
+		$(use_enable lua lua-module)
+		$(use_enable lua toluacegui)
+		--enable-external-toluapp
+		$(use_enable ogre ogre-renderer)
+		$(use_enable opengl opengl-renderer)
+		--enable-external-glew
+		$(use_enable pcre)
+		$(use_enable tinyxml)
+		--enable-external-tinyxml
+		$(use_enable xerces-c)
+		$(use_enable xml libxml)
+		$(use_enable zip minizip-resource-provider)
+		--enable-null-renderer
+		--enable-stb
+		--enable-tga
+		--disable-corona
+		--disable-dependency-tracking
+		$(use_enable freeimage)
+		--disable-rapidxml
+		--disable-samples
+		--disable-silly
+		$(use_with gtk gtk2)
+	)
+
+	econf \
+		"${myconf[@]}" \
+		--disable-static \
+		--enable-shared
+
+	if use static-libs ; then
+		cd "${S2}" || die
+		econf \
+			"${myconf[@]}" \
+			--enable-static \
+			--disable-shared
+	fi
+
+	# we are doing a double build here cause
+	# the build system does not permit
+	# "--enable-static --enable-shared"
+}
+
+src_compile() {
+	default
+
+	if use static-libs ; then
+		emake -C "${S2}"
+	fi
+}
+
+src_install() {
+	local i
+	default
+
+	if use doc ; then
+		emake html || die
+		dohtml -r doc/doxygen/html/* || die
+	fi
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/Samples
+		doins -r Samples.clean/* || die
+	fi
+
+	if use static-libs ; then
+		find "${S2}" -name "*CEGUI*.a" -exec dolib.a '{}' \;
+
+		# fix/merge .la files
+		for i in `find "${D}" -name "*.la"` ; do
+			sed \
+				-e "s/old_library=''/old_library='$(basename ${i%.la}).a'/" \
+				-i ${i} || die "fixing .la files failed"
+		done
+	else
+		# remove .la files
+		prune_libtool_files --all
+	fi
+}