revision bump wrt #446410

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

3 files changed, 186 insertions, 1 deletions

diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog
index 75a923385afc..034f69c85839 100644
--- a/dev-games/cegui/ChangeLog
+++ b/dev-games/cegui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/cegui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.53 2012/12/07 23:38:23 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.54 2012/12/20 22:44:04 hasufell Exp $
+
+*cegui-0.7.7-r1 (20 Dec 2012)
+
+  20 Dec 2012; Julian Ospald <hasufell@gentoo.org> +cegui-0.7.7-r1.ebuild,
+  +files/cegui-0.7.7-irrlicht-1.8.patch:
+  revision bump wrt #446410
 
   07 Dec 2012; Julian Ospald <hasufell@gentoo.org> cegui-0.7.7.ebuild:
   prepare deps for irrlicht-1.8 import
diff --git a/dev-games/cegui/cegui-0.7.7-r1.ebuild b/dev-games/cegui/cegui-0.7.7-r1.ebuild
new file mode 100644
index 000000000000..f753cb40fca4
--- /dev/null
+++ b/dev-games/cegui/cegui-0.7.7-r1.ebuild
@@ -0,0 +1,161 @@
+# 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-r1.ebuild,v 1.1 2012/12/20 22:44:04 hasufell 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 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 )
+	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() {
+	epatch "${FILESDIR}"/${P}-irrlicht-1.8.patch
+
+	# 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
+		--disable-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
+}
diff --git a/dev-games/cegui/files/cegui-0.7.7-irrlicht-1.8.patch b/dev-games/cegui/files/cegui-0.7.7-irrlicht-1.8.patch
new file mode 100644
index 000000000000..2a61db655a74
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.7.7-irrlicht-1.8.patch
@@ -0,0 +1,18 @@
+http://crayzedsgui.hg.sourceforge.net/hgweb/crayzedsgui/cegui_mk2/rev/51125cc0aab5
+
+--- a/cegui/src/RendererModules/Irrlicht/CEGUIIrrlichtGeometryBuffer.cpp
++++ b/cegui/src/RendererModules/Irrlicht/CEGUIIrrlichtGeometryBuffer.cpp
+@@ -303,7 +303,12 @@
+     else */
+     {
+         d_material.MaterialType = irr::video::EMT_ONETEXTURE_BLEND;
+-        d_material.MaterialTypeParam = irr::video::pack_texureBlendFunc(
++        d_material.MaterialTypeParam =
++#if IRRLICHT_VERSION_MAJOR > 1 || (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8)
++            irr::video::pack_textureBlendFunc(
++#else
++            irr::video::pack_texureBlendFunc(
++#endif
+                 irr::video::EBF_SRC_ALPHA,
+                 irr::video::EBF_ONE_MINUS_SRC_ALPHA,
+                 irr::video::EMFN_MODULATE_1X,