[gentoo-commits] gentoo-x86 commit in dev-games/cegui: cegui-0.7.6-r1.ebuild ChangeLog

[Julian Ospald (hasufell)]

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@g.o> cegui-0.7.6-r1.ebuild:
+  fix static-libs useflag wrt bug #412675
 
   26 May 2012; Agostino Sarubbo <ago@g.o> cegui-0.7.6-r1.ebuild:
   Stable for amd64, wrt bug #412675