revision bump wrt #446410

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 196 insertions, 9 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/Manifest b/dev-games/cegui/Manifest
index b63f9ac1b5e0..371a381118b2 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX cegui-0.6.2b-dups.patch 660 SHA256 d3d9a5af79f49df8c5bff41c3d61034640c9e774e4a01bb28a0891684c95eaf0 SHA512 4f73e930c0476a895687845789ccd59f53986242c61662b87d5b165df43f763dafc97c79f5b590fa5f1cc459c571d4f77843fec893efde1237d4f2e50a2a239b WHIRLPOOL a1c2cf35012f2df8b57ecb448405b50f22642604bf3e79d24e2e2b7e9faf13fc3c811475e5c5e2e039909fc1330f8832a8ce3717d4f700a7fff7380c4ceef237
 AUX cegui-0.6.2b-gcc43.patch 241 SHA256 b2a2e715d4a0a6cdb2f0975c9474ce82edd97a34cdb3fe4d5c3ddbde0440db66 SHA512 1f0eed0154d9b4383b3e8e60ba75de6a873ff5aafe320a1cf85efb775997d53416febdd3e15b2626f533fc1d25569f615e32d1b243e539db92ee4e466e4c6ff3 WHIRLPOOL 42f7ae8134f2fe150ab348da0deac887f185f78fa2872f2317a1d243e6a3fbd423f5018b4ca0d27085cf34866ce87c9e1a896493da9836256f2b0bc282591332
 AUX cegui-0.6.2b-gcc46.patch 296 SHA256 a497069fc8bc50b23b62f321025364d4d2988a575ec7aeb429b25b94b5d6bf11 SHA512 64d0620dca217c3175813e037775c7202a4efcfa15e7190cbef93bdb52380e2ca6cf8e475664c659ac0b44feaa2b3ccade14aafccb870d6a5a51009a518e8b41 WHIRLPOOL f4431f4759dee86112c71cf21b5c161f47855c187735e9ba7943d953a1711ba2ffca3cf78acb32242a7d07e65fc69bd25a04d13cfb9252fcffeb5235c1d7b26d
+AUX cegui-0.7.7-irrlicht-1.8.patch 805 SHA256 ac143fd982865c20ea3d8f790097b5facc4505b13254de7d9e70f4ad76c73373 SHA512 b34fb6eb7f6fa61ea7f1af4985a4f85edd88fcc503b4f54b5277c6849124a181549fbb727fd42d18266be84b9483f8f6391c649f7ef889735612e9a0835cf07a WHIRLPOOL 0f1f8dd8ded96cf18778b0e670e8cae14ce43e8402955c3e532d96164e19367e7955286e2fdb74c79183b2bc7a4b201040a0034982786831a7fc7a32c9037275
 DIST CEGUI-0.6.2-DOCS.tar.gz 18396638 SHA256 f1ea46bd583c486a6c588118573ebde55b06e90b190083e95525820e950ce2c8 SHA512 56ded923f21f18d837d71425e06fe8675a2efa979edde461a9e4e558c213cbb79ff8eeb576211da6ade56526ccdd9644a7a45b3619058615388e3882f96b9fb4 WHIRLPOOL f67c9dba4558c43ec9d14c160f228e974de4364bfe36ebfa9f3fe6bfc290fd5c4f024e954525845cd83645a06d53e6d63776137cbe58c459bcdd0e350d12e9c7
 DIST CEGUI-0.6.2b.tar.gz 2628081 SHA256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f SHA512 52ed7e7a97024138af957815a396dda74b650e7c53542d2d48c5eb95335bec270abca3685c49b05078f4338079334df6bfbcec75e9b7eb21ee40bdbff5f57b20 WHIRLPOOL 3fde683a82fb0be33565adb28fbcb4b7001be99f1b3bdb2d3af9abecc5dc7681d633f141cc19f9eb1dc264d0fb0b2084ea604202a22a3e2cc415bdb6b9686161
 DIST CEGUI-0.7.6.tar.gz 9146821 SHA256 b1b969332f8325ad4b6af7d4607417162d6c06100f4c6569248aed6afcafa3c6 SHA512 fc2660f3d9955463da5d8b22321d99f24a88f2a0dad76dba80f18b70d81bc9e66b3dd8c83cf79408e28e1a83a0f66f746264c4b1169837dd2c67df427c2c5537 WHIRLPOOL 04b4f8d51d91d60f015f9d3da0845353b5d09b93fcda086a93daebc932ce4123737f804cc2fb37fdb92f92ac6c3252eb4225c47fe93a71cc3198ea369f4a4d6e
@@ -12,17 +13,18 @@ DIST CEGUI-DOCS-0.7.6.tar.gz 11809064 SHA256 891285f68284b75211874c27bdea55dbc35
 DIST CEGUI-DOCS-0.7.7.tar.gz 14303467 SHA256 21b6fb8841dfb40650d68b3149afe24d7bde7c1986c0e3d86f9c34baa1b00c6c SHA512 cf0745ab9fdc4ca939aabeacf3c15e677ce26a3f4ecf136debc661842adc24955b30460a69238ab65ae65e4367e7da3515125befed2f017aa1b4981f32ccd08c WHIRLPOOL 2faa44214efe454211267f6417a5a0817026e3e46315acabe6b0ead1354443f0396c2bff8ecaa82210d922d59d2d5a6b60b9bab3c6cc2c7184ce6a5f49cd81bc
 EBUILD cegui-0.6.2b.ebuild 2503 SHA256 be76082e512f27fb71cc449834c7f280bc561cfc8addee74c1a826973f1a03df SHA512 fd07478d53f1540d502ec41699bedaf915a1da573207c1042087034f46cde41b65442791a709c058978c910baf4566ee7c0e4dd7d0a0c21674d4eee8f739883e WHIRLPOOL a898261284b4938e788a8200140e0828fcf870987ef1ac5ba07309d46187f01bf587f2830b8130e080b8e32afc47779d83642c71ffe28304862a7905c9b99247
 EBUILD cegui-0.7.6-r1.ebuild 3840 SHA256 1fac6f0c9bbe9cf60aa8ea05d5e391156146026313640b12cda0a42b6d673608 SHA512 183c13d09cce1bcab075590776ef566c279b4a5519ce00eebc4c50090a70dee79a09aabb21972d161871a8567e26222db187450266e2c3d284eee2eaaf81ad97 WHIRLPOOL d4c4197387833dcc637508c5da3d4963ca607cf02b84121c71c940cbb48aaa07ed47ec41ebeeb75012cf092977858efb63207de55378f9a6ade618c33710817b
+EBUILD cegui-0.7.7-r1.ebuild 3687 SHA256 d53ef6afb790f272f483a32be84b6d84c09566238e4fe8afe6890d63b6c5d545 SHA512 c2489914020cf6ebb772c4c19f7b0f22c8cb8e74db3d919f199fc1c20b5852b872a08fdea178d4ad23d256cbff310d6fbdca01e3cae565d075e212662ddea190 WHIRLPOOL 2d76aabff2b97a2f648641d5b6f1224a70c8e1ba961f06b6e2f49e632eb6f8a10fca4fa75196de5f5f56963f2145643db9ac427620d23b43a771cd74bfcf7a50
 EBUILD cegui-0.7.7.ebuild 3642 SHA256 f13d3722049de0ccbfdf99da7f5292dd8ecc5c69b0f41358ee8287d17bcd5f81 SHA512 81196bf9897a3d22eb6d9710c9d346ba42ef1c36ebcb98c2e89e71784284ecb781e3bc0a3975071a7792918062520015777f684f797a65737ea55e66d24332b5 WHIRLPOOL 730af9c7eccc17175892b5b5a94e3bb9af8941a0e1c82689173a4e3e44b195354e146f345bdc357c525ecd58229c4bce00272a75df49e84b802b570313905283
-MISC ChangeLog 7164 SHA256 193fe4f23ee11e4a10ed681cf7be157f1aab13b066540a25fc9ce831815ed97b SHA512 92f965df51a76867fea21f7d78e8e31c56f7a163c53011d8a75f7d5c01ccd6fdebb31ba5b1475923cb4d21dbc4aa3d5d695566185fabfaa4cdaa8dce5ec2191f WHIRLPOOL 31e928d1a6f437d30cb1ca6ddb1d941c9c15442b96c5ca9d26494097a73f9c66a307de02b572af25809306cab3ea61c0882bfa4b937536087c6f7b0db115ba42
+MISC ChangeLog 7340 SHA256 4172e8bd157ece4a8a8a7d2eb909b6df9f14b1930029669e6b6beb7664caa957 SHA512 d78e28cfb94d11f31993a278fe2522d0bbb109d85625da5ff699bb3ca6fef534a151210a2cf37e19cc76751e048f2359b818aad56b95c0ed0f82bc69dca926e7 WHIRLPOOL 87cab73c88d63a80a4ee177cf7d13a547834e91b6c30b99f2201e0dfe14d2215688013417ee316193de19310b57bcb3f8729f6c2acb9617b34f19c2b1275be9c
 MISC metadata.xml 558 SHA256 9b89adc7d9ebb8284daf3aaeb00facae942818a075698be43a1b9911e1ad56d9 SHA512 6c4f778f395cf32ace7b281a610546a26b4a688f960e3a21e4a45a778609ff2a443f746ef14b9107a8ca8ec9cf8956327de81219746382a598d9cb5e7f397c4c WHIRLPOOL 1f041358a03b00882ab22433fa2d334b2b04252f874e09f6fb574029f7b11dd64463ebd0e0cfb6b03dd90e9dedb5ef1b2a937d87bf1869fa1f33554fb45b31f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQwn3vAAoJEFpvPKfnPDWzU7QIAIu6WG0WDXqMiAmi97yBkYwa
-Y9JrP4o/TPBbAN5gd4npWfXNmmTQMrYklX0oTPdlQxwcIBoElIE2wwsxXqHuifuo
-lMNFmcrNt65s3YAFwYG4HOzHJoCNP9RMKYev7QmKulGFGbbifh5+fIfNvG5e+fqb
-IqjkdV+Pnf2PQgJfg4dQo5ZWScsKsO/Dc7bqfmXjr7KvvV4aK/RP7VQy1Yig8ojH
-SmdmTZwYzcF93Lh4sGYz3NlOyOr57hju+1tSMX1OX8KU8kFc9M4zEX1Hbkodp5EP
-syCcwmfeQSPEele/Pj9lHK/PsvqFOcN8BLd/LJb1tdF3TRC40/0QHIJ9h6/eIwo=
-=yp18
+iQEcBAEBCAAGBQJQ05S3AAoJEFpvPKfnPDWzzHUH/jsTCdQ8ayKWIYaL/jWKi/6t
+lLq/bAcAf6vIKcVcmN0/cvT2Jiezufr3E1jz4MMMjiWt2DmnCjR/RfP0gXLZgvww
+Et2+NyjD4GgpirUZ/vyzrNa5Pjl6iFB2BKTVPn2NuQ5zNoPxK41vHmovan5dZf2X
+dwAfpg7fqeKzPTDXmPDBixqlK1rpNmdPRh7DNSQVAwqUMTMFIW+aOr/+Aq+5RMOW
+hoQwvnCF8Znn7+lUCwegbtofesGurfYkJnKpLSq1FcJC+bBTgn2K3G84ZQeSpClz
+ESbvQJRxVdwRw5XFZsll/pfGmpueFEd9WvDy+7ubJV/ucZBNrScPBZQSzMHvMW0=
+=2j57
 -----END PGP SIGNATURE-----
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,