public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-games/cegui: cegui-0.7.6-r1.ebuild ChangeLog
@ 2012-03-03 21:25 Mike Frysinger (vapier)
  0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2012-03-03 21:25 UTC (permalink / raw
  To: gentoo-commits

vapier      12/03/03 21:25:22

  Modified:             ChangeLog
  Added:                cegui-0.7.6-r1.ebuild
  Log:
  Build against system minizip #389863.  Re-enable ogre support #406475 by hasufell.
  
  (Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

Revision  Changes    Path
1.41                 dev-games/cegui/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?r1=1.40&r2=1.41

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ChangeLog	25 Jan 2012 01:01:51 -0000	1.40
+++ ChangeLog	3 Mar 2012 21:25:22 -0000	1.41
@@ -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.40 2012/01/25 01:01:51 tristan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.41 2012/03/03 21:25:22 vapier Exp $
+
+*cegui-0.7.6-r1 (03 Mar 2012)
+
+  03 Mar 2012; Mike Frysinger <vapier@gentoo.org> +cegui-0.7.6-r1.ebuild:
+  Build against system minizip #389863. Re-enable ogre support #406475 by
+  hasufell.
 
 *cegui-0.7.6 (25 Jan 2012)
 



1.1                  dev-games/cegui/cegui-0.7.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.1&content-type=text/plain

Index: cegui-0.7.6-r1.ebuild
===================================================================
# 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.6-r1.ebuild,v 1.1 2012/03/03 21:25:22 vapier Exp $

EAPI="4"

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}
	dev-util/pkgconfig
	doc? ( app-doc/doxygen )"

S=${WORKDIR}/${MY_P}

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() {
	econf \
		$(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) \
		$(use_enable static-libs static) \
		--enable-shared
}

src_install() {
	default

	# 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
}






^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-games/cegui: cegui-0.7.6-r1.ebuild ChangeLog
@ 2012-05-20 15:33 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 7+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-05-20 15:33 UTC (permalink / raw
  To: gentoo-commits

ago         12/05/20 15:33:06

  Modified:             cegui-0.7.6-r1.ebuild ChangeLog
  Log:
  Stable for amd64, wrt bug #412675
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  dev-games/cegui/cegui-0.7.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?r1=1.2&r2=1.3

Index: cegui-0.7.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cegui-0.7.6-r1.ebuild	3 May 2012 06:35:30 -0000	1.2
+++ cegui-0.7.6-r1.ebuild	20 May 2012 15:33:05 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.6-r1.ebuild,v 1.2 2012/05/03 06:35:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v 1.3 2012/05/20 15:33:05 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 -ppc ~x86"
+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
 



1.44                 dev-games/cegui/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	3 May 2012 06:35:30 -0000	1.43
+++ ChangeLog	20 May 2012 15:33:05 -0000	1.44
@@ -1,6 +1,9 @@
 # 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.43 2012/05/03 06:35:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.44 2012/05/20 15:33:05 ago Exp $
+
+  20 May 2012; Agostino Sarubbo <ago@gentoo.org> cegui-0.7.6-r1.ebuild:
+  Stable for amd64, wrt bug #412675
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> cegui-0.6.2b.ebuild,
   cegui-0.7.5-r1.ebuild, cegui-0.7.6-r1.ebuild:






^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-games/cegui: cegui-0.7.6-r1.ebuild ChangeLog
@ 2012-05-20 18:33 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 7+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-05-20 18:33 UTC (permalink / raw
  To: gentoo-commits

ago         12/05/20 18:33:44

  Modified:             cegui-0.7.6-r1.ebuild ChangeLog
  Log:
  Reverted to ~amd64 due to problem with poco
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  dev-games/cegui/cegui-0.7.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?r1=1.3&r2=1.4

Index: cegui-0.7.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cegui-0.7.6-r1.ebuild	20 May 2012 15:33:05 -0000	1.3
+++ cegui-0.7.6-r1.ebuild	20 May 2012 18:33:43 -0000	1.4
@@ -1,6 +1,6 @@
 # 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.6-r1.ebuild,v 1.3 2012/05/20 15:33:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v 1.4 2012/05/20 18:33:43 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 -ppc ~x86"
+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
 



1.45                 dev-games/cegui/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?r1=1.44&r2=1.45

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog	20 May 2012 15:33:05 -0000	1.44
+++ ChangeLog	20 May 2012 18:33:43 -0000	1.45
@@ -1,6 +1,9 @@
 # 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.44 2012/05/20 15:33:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.45 2012/05/20 18:33:43 ago Exp $
+
+  20 May 2012; Agostino Sarubbo <ago@gentoo.org> cegui-0.7.6-r1.ebuild:
+  Reverted to ~amd64 due to problem with poco
 
   20 May 2012; Agostino Sarubbo <ago@gentoo.org> cegui-0.7.6-r1.ebuild:
   Stable for amd64, wrt bug #412675






^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-games/cegui: cegui-0.7.6-r1.ebuild ChangeLog
@ 2012-05-26 15:30 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 7+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-05-26 15:30 UTC (permalink / raw
  To: gentoo-commits

ago         12/05/26 15:30:49

  Modified:             cegui-0.7.6-r1.ebuild ChangeLog
  Log:
  Stable for amd64, wrt bug #412675
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  dev-games/cegui/cegui-0.7.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?r1=1.4&r2=1.5

Index: cegui-0.7.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cegui-0.7.6-r1.ebuild	20 May 2012 18:33:43 -0000	1.4
+++ cegui-0.7.6-r1.ebuild	26 May 2012 15:30:49 -0000	1.5
@@ -1,6 +1,6 @@
 # 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.6-r1.ebuild,v 1.4 2012/05/20 18:33:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v 1.5 2012/05/26 15:30:49 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 -ppc ~x86"
+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
 



1.46                 dev-games/cegui/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?r1=1.45&r2=1.46

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog	20 May 2012 18:33:43 -0000	1.45
+++ ChangeLog	26 May 2012 15:30:49 -0000	1.46
@@ -1,6 +1,9 @@
 # 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.45 2012/05/20 18:33:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.46 2012/05/26 15:30:49 ago Exp $
+
+  26 May 2012; Agostino Sarubbo <ago@gentoo.org> cegui-0.7.6-r1.ebuild:
+  Stable for amd64, wrt bug #412675
 
   20 May 2012; Agostino Sarubbo <ago@gentoo.org> cegui-0.7.6-r1.ebuild:
   Reverted to ~amd64 due to problem with poco






^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-games/cegui: cegui-0.7.6-r1.ebuild ChangeLog
@ 2012-06-07 21:51 Julian Ospald (hasufell)
  0 siblings, 0 replies; 7+ messages in thread
From: Julian Ospald (hasufell) @ 2012-06-07 21:51 UTC (permalink / raw
  To: gentoo-commits

hasufell    12/06/07 21:51:20

  Modified:             cegui-0.7.6-r1.ebuild ChangeLog
  Log:
  fix static-libs useflag wrt bug #412675
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  dev-games/cegui/cegui-0.7.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?r1=1.5&r2=1.6

Index: cegui-0.7.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cegui-0.7.6-r1.ebuild	26 May 2012 15:30:49 -0000	1.5
+++ cegui-0.7.6-r1.ebuild	7 Jun 2012 21:51:20 -0000	1.6
@@ -1,9 +1,11 @@
 # 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.6-r1.ebuild,v 1.5 2012/05/26 15:30:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v 1.6 2012/06/07 21:51:20 hasufell Exp $
 
 EAPI="4"
 
+inherit eutils
+
 MY_P=CEGUI-${PV}
 MY_D=CEGUI-DOCS-${PV}
 DESCRIPTION="Crazy Eddie's GUI System"
@@ -43,6 +45,12 @@
 	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
@@ -65,45 +73,67 @@
 }
 
 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 \
-		$(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) \
-		$(use_enable static-libs static) \
+		"${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_install() {
+src_compile() {
 	default
 
-	# remove .la files
-	use static-libs || rm -f "${D}"/usr/*/*.la
+	if use static-libs ; then
+		emake -C "${S2}"
+	fi
+}
+
+src_install() {
+	local i
+	default
 
 	if use doc ; then
 		emake html || die
@@ -113,4 +143,18 @@
 		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
 }



1.47                 dev-games/cegui/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?r1=1.46&r2=1.47

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChangeLog	26 May 2012 15:30:49 -0000	1.46
+++ ChangeLog	7 Jun 2012 21:51:20 -0000	1.47
@@ -1,6 +1,9 @@
 # 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.46 2012/05/26 15:30:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.47 2012/06/07 21:51:20 hasufell Exp $
+
+  07 Jun 2012; Julian Ospald <hasufell@gentoo.org> cegui-0.7.6-r1.ebuild:
+  fix static-libs useflag wrt bug #412675
 
   26 May 2012; Agostino Sarubbo <ago@gentoo.org> cegui-0.7.6-r1.ebuild:
   Stable for amd64, wrt bug #412675






^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-games/cegui: cegui-0.7.6-r1.ebuild ChangeLog
@ 2012-06-10 23:01 Julian Ospald (hasufell)
  0 siblings, 0 replies; 7+ messages in thread
From: Julian Ospald (hasufell) @ 2012-06-10 23:01 UTC (permalink / raw
  To: gentoo-commits

hasufell    12/06/10 23:01:12

  Modified:             cegui-0.7.6-r1.ebuild ChangeLog
  Log:
  fix compilation of USE="static-libs zip" wrt bug #420293
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  dev-games/cegui/cegui-0.7.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?r1=1.6&r2=1.7

Index: cegui-0.7.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cegui-0.7.6-r1.ebuild	7 Jun 2012 21:51:20 -0000	1.6
+++ cegui-0.7.6-r1.ebuild	10 Jun 2012 23:01:12 -0000	1.7
@@ -1,6 +1,6 @@
 # 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.6-r1.ebuild,v 1.6 2012/06/07 21:51:20 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v 1.7 2012/06/10 23:01:12 hasufell Exp $
 
 EAPI="4"
 
@@ -70,6 +70,11 @@
 		cp -r Samples Samples.clean
 		rm -f $(find Samples.clean -name 'Makefile*')
 	fi
+
+	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug #420293
+	# and http://www.cegui.org.uk/mantis/view.php?id=813
+	sed -i '1i#define OF(x) x' \
+		"${S2}"/cegui/src/minizip/{ioapi,unzip}.h || die
 }
 
 src_configure() {



1.48                 dev-games/cegui/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?r1=1.47&r2=1.48

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog	7 Jun 2012 21:51:20 -0000	1.47
+++ ChangeLog	10 Jun 2012 23:01:12 -0000	1.48
@@ -1,6 +1,9 @@
 # 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.47 2012/06/07 21:51:20 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.48 2012/06/10 23:01:12 hasufell Exp $
+
+  10 Jun 2012; Julian Ospald <hasufell@gentoo.org> cegui-0.7.6-r1.ebuild:
+  fix compilation of USE="static-libs zip" wrt bug #420293
 
   07 Jun 2012; Julian Ospald <hasufell@gentoo.org> cegui-0.7.6-r1.ebuild:
   fix static-libs useflag wrt bug #412675






^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-games/cegui: cegui-0.7.6-r1.ebuild ChangeLog
@ 2012-06-18 18:10 Julian Ospald (hasufell)
  0 siblings, 0 replies; 7+ messages in thread
From: Julian Ospald (hasufell) @ 2012-06-18 18:10 UTC (permalink / raw
  To: gentoo-commits

hasufell    12/06/18 18:10:06

  Modified:             cegui-0.7.6-r1.ebuild ChangeLog
  Log:
  stable for x86 wrt bug #412675
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  dev-games/cegui/cegui-0.7.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild?r1=1.7&r2=1.8

Index: cegui-0.7.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cegui-0.7.6-r1.ebuild	10 Jun 2012 23:01:12 -0000	1.7
+++ cegui-0.7.6-r1.ebuild	18 Jun 2012 18:10:06 -0000	1.8
@@ -1,6 +1,6 @@
 # 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.6-r1.ebuild,v 1.7 2012/06/10 23:01:12 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v 1.8 2012/06/18 18:10:06 hasufell Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 -ppc ~x86"
+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
 



1.49                 dev-games/cegui/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/cegui/ChangeLog?r1=1.48&r2=1.49

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChangeLog	10 Jun 2012 23:01:12 -0000	1.48
+++ ChangeLog	18 Jun 2012 18:10:06 -0000	1.49
@@ -1,6 +1,9 @@
 # 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.48 2012/06/10 23:01:12 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.49 2012/06/18 18:10:06 hasufell Exp $
+
+  18 Jun 2012; Julian Ospald <hasufell@gentoo.org> cegui-0.7.6-r1.ebuild:
+  stable for x86 wrt bug #412675
 
   10 Jun 2012; Julian Ospald <hasufell@gentoo.org> cegui-0.7.6-r1.ebuild:
   fix compilation of USE="static-libs zip" wrt bug #420293






^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2012-06-18 18:10 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-18 18:10 [gentoo-commits] gentoo-x86 commit in dev-games/cegui: cegui-0.7.6-r1.ebuild ChangeLog Julian Ospald (hasufell)
  -- strict thread matches above, loose matches on Subject: below --
2012-06-10 23:01 Julian Ospald (hasufell)
2012-06-07 21:51 Julian Ospald (hasufell)
2012-05-26 15:30 Agostino Sarubbo (ago)
2012-05-20 18:33 Agostino Sarubbo (ago)
2012-05-20 15:33 Agostino Sarubbo (ago)
2012-03-03 21:25 Mike Frysinger (vapier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox