build with newer zlib (bug #389863); kill ogre use flag (bug #387103)

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog
index f92f09cbbe424b51a33b05aa77f7a5a904c963f1..d7c32749290e6490f2d33f7f1e1cdb4e583e03f5 100644 (file)
--- a/dev-games/cegui/ChangeLog
+++ b/dev-games/cegui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-games/cegui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.38 2011/10/09 16:44:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.39 2011/11/09 02:04:08 mr_bones_ Exp $
+
+  09 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> cegui-0.7.5-r1.ebuild:
+  build with newer zlib (bug #389863); kill ogre use flag (bug #387103)
 
   09 Oct 2011; Markus Meier <maekke@gentoo.org> cegui-0.7.5-r1.ebuild:
   x86 stable, bug #375503

diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index 3fee384ffb4cbb1e89337212896faf781f304886..766c491150e8fa2912cdb65934e7749eb200f373 100644 (file)
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cegui-0.6.2b-dups.patch 660 RMD160 908321a10f0917f9ef30fa8a67145bbcc2e28620 SHA1 5bbdbfaec76121daa450817cfedf7f5c38e00b7a SHA256 d3d9a5af79f49df8c5bff41c3d61034640c9e774e4a01bb28a0891684c95eaf0
 AUX cegui-0.6.2b-gcc43.patch 241 RMD160 d0b104b161a655da3ffb9aff0e53cc355beccd8e SHA1 521978347c5ad85c64a6c0727ddcef441fc349d9 SHA256 b2a2e715d4a0a6cdb2f0975c9474ce82edd97a34cdb3fe4d5c3ddbde0440db66
 AUX cegui-0.6.2b-gcc46.patch 296 RMD160 9f66d4c32fc999b078d14a71612130b414b3facf SHA1 9a6c508ebcd43382927e27d7d7324402baaa9abf SHA256 a497069fc8bc50b23b62f321025364d4d2988a575ec7aeb429b25b94b5d6bf11
@@ -11,14 +8,7 @@ DIST CEGUI-0.6.2b.tar.gz 2628081 RMD160 890a8af12eb1ed4b7de0765c1f1a521ad5b1d213
 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.6.2b.ebuild 2504 RMD160 2e87daad44a30f3fb89762b7de3ed98b33d9ace1 SHA1 ef91e048d023f67181d6528a52ba8590ed30a5f2 SHA256 afab7d31fe7b911e4870c9104cd1ad6c51a4c75ae5f6dafc7c133e83a8877227
-EBUILD cegui-0.7.5-r1.ebuild 2591 RMD160 44172fbc44d6f6cd75924547ca93f1d57a0de6dc SHA1 ce42edefa9ebb6bfa57231d31ad1046df40af4af SHA256 ef2388bae1c48238fb1891a63d442d99b50142d784f9f0c268fc9b46d829deef
+EBUILD cegui-0.7.5-r1.ebuild 2704 RMD160 11472278f7f628292a8e84be4a22c6d0e3158cb3 SHA1 3fdfdf2acfe85a0c0c3d34e065c75dbfdb204edc SHA256 d74d094aa6d95424d1e9c915d426c83feefe7924ab7884ffde82de76a70dcb14
 EBUILD cegui-0.7.5.ebuild 2531 RMD160 8f9db86fe99c7352c2129f3488e9460bc0beaafd SHA1 97e25a0864836548730d65f4d3ac82457d88f574 SHA256 0c550f9e5d778f94ea65d5df5f9407ea34720646809e932c1c9843708ee15520
-MISC ChangeLog 5214 RMD160 d294118af3666bfb1e13187a6f67f483189914f8 SHA1 2091d8ec3b19434b5f760f4810bf215962fd0a0e SHA256 39b5934a34cac6f35922e4ba9493a44df19b6ec22565951a2ec67db583a94c9e
+MISC ChangeLog 5368 RMD160 f0da48b2d33493926cd561fe15a85f7dde808373 SHA1 d771ba85be863ad89c8e6f16edb57d1cf14d00e6 SHA256 8b38baede2081b559639b5ff4c5a396774bb0c53288c59dd130d93a6d24d73d3
 MISC metadata.xml 558 RMD160 528f673643b01b6b0999eb432da7b92ba67daa78 SHA1 5cbd46ca0d6ed654b23c86b9569304bcc6378bfc SHA256 9b89adc7d9ebb8284daf3aaeb00facae942818a075698be43a1b9911e1ad56d9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk6Rz7wACgkQkKaRLQcq0GKKwACeNmDnwtBmTA30r/VjdIy+Sxp1
-QqsAn1yOvmFV5EDNimQzJ499HJuCGa4+
-=HDur
------END PGP SIGNATURE-----

diff --git a/dev-games/cegui/cegui-0.7.5-r1.ebuild b/dev-games/cegui/cegui-0.7.5-r1.ebuild
index b25f1e55c8fc5fbccbf8aee5937d806b175c70af..b329561900cb440b4486eddcb7604c3d8d67611b 100644 (file)
--- a/dev-games/cegui/cegui-0.7.5-r1.ebuild
+++ b/dev-games/cegui/cegui-0.7.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.4 2011/10/09 16:44:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.5-r1.ebuild,v 1.5 2011/11/09 02:04:08 mr_bones_ Exp $
 
 EAPI=4
 inherit eutils
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.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"
+IUSE="bidi debug devil doc examples expat gtk irrlicht lua opengl pcre static-libs tinyxml truetype xerces-c xml zip"
 REQUIRED_USE="|| ( xml tinyxml )" # bug 362223
 
 RDEPEND="bidi? ( dev-libs/fribidi )
@@ -27,7 +27,6 @@ RDEPEND="bidi? ( dev-libs/fribidi )
                dev-lang/lua
                dev-lua/toluapp
        )
-       ogre? ( dev-games/ogre )
        opengl? (
                virtual/opengl
                virtual/glu
@@ -48,6 +47,8 @@ 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
        if use examples ; then
                cp -r Samples Samples.clean
                rm -f $(find Samples.clean -name 'Makefile*')
@@ -55,7 +56,9 @@ src_prepare() {
 }
 
 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) \
@@ -66,7 +69,6 @@ src_configure() {
                $(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) \