Version bump

Package-Manager: portage-2.2_rc87/cvs/Linux i686

4 files changed, 52 insertions, 13 deletions

diff --git a/sci-visualization/gle/ChangeLog b/sci-visualization/gle/ChangeLog
index 1e40db1b997b..6d7af8c093b9 100644
--- a/sci-visualization/gle/ChangeLog
+++ b/sci-visualization/gle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/gle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.10 2010/01/08 15:48:04 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.11 2010/09/27 10:00:15 grozin Exp $
+
+*gle-4.2.3 (27 Sep 2010)
+
+  27 Sep 2010; Andrey Grozin <grozin@gentoo.org> -gle-4.2.1.ebuild,
+  +gle-4.2.3.ebuild, +files/gle-4.2.3-parallel.patch:
+  Version bump
 
   08 Jan 2010; Andrey Grozin <grozin@gentoo.org> gle-4.2.2.ebuild,
   -files/gle-4.2.2-ncurses.patch:
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 544dac2a03df..0d4a8afc8a9b 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,11 +1,11 @@
 AUX 64gle-gentoo.el 161 RMD160 3bb0a12b3db10d0331c272c9386ffc1a3757db58 SHA1 cb2a4da6d13088fe869480efa2ae35c9babe0ea7 SHA256 a14ce47df108c25318471f1ae3ccc6c9984b7e1a2728e16b57cef0a848156a55
 AUX gle-4.2.2-parallel.patch 464 RMD160 61711adb213a073f0f8ff3b02bef39d4ec48e814 SHA1 70f9f5c644629eb20003bd6b39ac4d4da9086a0e SHA256 ac8ecbb9ea3198dfcb57c7cffe22dfbb5fc88f53fa4e68744078fa4f693ed8f0
+AUX gle-4.2.3-parallel.patch 464 RMD160 61711adb213a073f0f8ff3b02bef39d4ec48e814 SHA1 70f9f5c644629eb20003bd6b39ac4d4da9086a0e SHA256 ac8ecbb9ea3198dfcb57c7cffe22dfbb5fc88f53fa4e68744078fa4f693ed8f0
 DIST GLEusersguide.pdf 2244780 RMD160 6f2b8814f100e3971737ad45d017144e5912fd4e SHA1 2039e6b255da68200b5f881f2554bbdd6e82034a SHA256 02c13fe038f8b4b7726ac3e6a74410e299f50cdccb2b040d7ed1fbc99b9cfbef
-DIST gle-graphics-4.2.1f-src.tar.gz 2044787 RMD160 adcd5c56a04a0ba152340ff86e1bb06b585f36a1 SHA1 bcb451e3dac70be5628bcdfb001d53b25e4fe5cb SHA256 2299076808cdfc1d12f76e428f3fec680eabd44d4f352c93e9544cfda19eb2b5
 DIST gle-graphics-4.2.2f-src.tar.gz 2047324 RMD160 018bcc744ad142ad829b3bda5c86b6da2fa709c0 SHA1 038bbda0bd4dfd8bd8da1f628d912f7da8c86676 SHA256 10bdd10b3428726d21641f7b7e792fbf0685bbb12e245ee5f91e0fd19a1af952
-DIST gle-manual-4.2.0.pdf 2529384 RMD160 e24bde8586aa15bf478a5972394261886033fd3d SHA1 699784b0cc6137aee32bba7bcaf34975e6394464 SHA256 646176697850d2e22d58cb99c8f2e806d1b348b1e616939d8a62bfb97a559a20
+DIST gle-graphics-4.2.3f-src.tar.gz 2261802 RMD160 2c3685ec902cefc001bea948f1943c6fcdcbd1c2 SHA1 231e809c6a09830198dd5c34515dcfed0868e57f SHA256 a6a352e5c319ecffd6a3edeca45a1330e0f751a3152724b7e301dfbcc6d1be7c
 DIST gle-manual-4.2.2.pdf 2238766 RMD160 23befacc8b51375ef8832ab39db21c5e497b9cdd SHA1 2b07238a62ca7099648aa9660fd934a88c966a5e SHA256 fbc4ba2613882d2d4ae3f8484c77aa27a257fc1b0ec02a46085c3651a2ace58e
-EBUILD gle-4.2.1.ebuild 2557 RMD160 29f016d4b0a499535c1ee0ef9a294e7d71d3dfbc SHA1 046bd4224dad58c9fb60dc8c954660e23edeaae3 SHA256 97de0947ca7d9e0a1c8de31df0f54664f4e6a6c35721e39afde2935aa6f1bf2f
 EBUILD gle-4.2.2.ebuild 2780 RMD160 47e7b767f4b9b74f983af4dc1d89b5188d6b8b27 SHA1 5638b9297f79f9d2ca07a5010a860b6c8614ece7 SHA256 b9c7489a6114dec3d22923f3178e2fbc2cd5c3dd8ac505dc58e246dbd4c677ae
-MISC ChangeLog 2183 RMD160 583275453e05256f3d4249a7703efcb669888ccf SHA1 ad9618271b13a4dca5ab61c6a2afce5f7a035c4f SHA256 fc8fa97482b8f5e71c2028d92e50f39994d1de8a7e6a76ef94b359a3814f80b4
+EBUILD gle-4.2.3.ebuild 2778 RMD160 61c0a4bf713c6403c389035412636b2f195b814e SHA1 055b53629f5ae77188de3b61285f470ca00caaee SHA256 00bac68de1d78b76c04b3e9a44a642fe60515fb57dcd28ed30d170056228eec7
+MISC ChangeLog 2347 RMD160 1b9efc50d0ea8768bed65bc1dabbe2e82b713e1a SHA1 19f82fdb6bfe3231355a4dcb5fa32a28f8c596f3 SHA256 3596708e351db93522a2f91b4a7a467784a5bb892b59f98e17a67090de1c9f97
 MISC metadata.xml 515 RMD160 a04a55d1a6c8f1e947200d546e5e8e22be5d144d SHA1 f9a02c835f68b9d91bda0578045e0631084b607b SHA256 a75689c90bb13cf073d34c175453181823b0f6cc9a824baa69bd56e1308d5c95
diff --git a/sci-visualization/gle/files/gle-4.2.3-parallel.patch b/sci-visualization/gle/files/gle-4.2.3-parallel.patch
new file mode 100644
index 000000000000..1eff8c067102
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.3-parallel.patch
@@ -0,0 +1,21 @@
+--- src/gui/MakefileAC.in.orig	2010-01-06 20:10:04.000000000 +0000
++++ src/gui/MakefileAC.in	2010-01-06 20:21:15.000000000 +0000
+@@ -84,14 +84,14 @@
+ qmake:
+ 	$(QMAKE_PROG) $(QMAKE_OPTS)
+ 
+-domake:
+-	$(MAKE_PROG)
++domake: Makefile
++	$(MAKE)
+ 
+-repmake:
++repmake: Makefile
+ 	perl ../../platform/autopackage/qt-replace.pl Makefile
+ 
+ doclean:
+-	-$(MAKE_PROG) clean
++	-$(MAKE) clean
+ 	-@$(RM) qgle install_qgle_name_mac Makefile
+ 	-@$(RMDIR) moc
+ 	-@$(RMDIR) objects
diff --git a/sci-visualization/gle/gle-4.2.1.ebuild b/sci-visualization/gle/gle-4.2.3.ebuild
index 5f53929d923e..3306862a0ec1 100644
--- a/sci-visualization/gle/gle-4.2.1.ebuild
+++ b/sci-visualization/gle/gle-4.2.3.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/gle-4.2.1.ebuild,v 1.3 2009/12/27 16:35:09 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/gle-4.2.3.ebuild,v 1.1 2010/09/27 10:00:15 grozin Exp $
+
 EAPI=2
-inherit eutils elisp-common qt4
+inherit eutils elisp-common qt4 flag-o-matic autotools
+
 DESCRIPTION="Graphics Layout Engine"
 HOMEPAGE="http://glx.sourceforge.net/"
 MY_P=${PN}-graphics-${PV}
-MAN_V="4.2.0"
+MAN_V=4.2.2
 SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz
 	doc? ( mirror://sourceforge/glx/${PN}-manual-${MAN_V}.pdf
 		   mirror://sourceforge/glx/GLEusersguide.pdf )"
@@ -30,8 +32,19 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-parallel.patch
+	eaclocal
+	eautoconf
+}
+
 src_configure() {
-	econf $(use_with qt4 qt /usr) \
+	# CPPFLAGS are understood as C++ flags
+	append-cppflags ${CXXFLAGS}
+	econf \
+		--without-rpath \
+		--with-manip \
+		$(use_with qt4 qt /usr) \
 		$(use_with X x) \
 		$(use_with jpeg) \
 		$(use_with png) \
@@ -39,9 +52,7 @@ src_configure() {
 }
 
 src_compile() {
-	# emake failed in src/gui (probably qmake stuff)
-	emake -j1 || die "emake failed"
-
+	emake || die "emake failed"
 	if use emacs; then
 		cd contrib/editors/highlighting
 		mv ${PN}-emacs.el ${PN}-mode.el
@@ -52,6 +63,7 @@ src_compile() {
 src_install() {
 	# -jN failed to install some data files
 	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	#emake DESTDIR="${D}" install || die "emake install failed"
 	rmdir "${D}"/usr/share/doc/gle-graphics || die "rmdir gle-graphics failed"
 	dodoc README.txt