Version bump. Introduced patch to build in parallel and a fix to properly include the manip ncurses tools

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 182 insertions, 3 deletions

diff --git a/sci-visualization/gle/ChangeLog b/sci-visualization/gle/ChangeLog
index ecdac1041cce..f12027cc478a 100644
--- a/sci-visualization/gle/ChangeLog
+++ b/sci-visualization/gle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/gle
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.8 2009/12/27 16:35:09 grozin Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.9 2010/01/07 17:38:04 bicatali Exp $
+
+*gle-4.2.2 (07 Jan 2010)
+
+  07 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> +gle-4.2.2.ebuild,
+  +files/gle-4.2.2-ncurses.patch, +files/gle-4.2.2-parallel.patch:
+  Version bump. Introduced patch to build in parallel and a fix to properly
+  include the manip ncurses tools
 
   27 Dec 2009; Andrey Grozin <grozin@gentoo.org> -gle-4.2.0.ebuild,
   gle-4.2.1.ebuild:
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 5bc1ce317c37..a7e4c83f397b 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,7 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 64gle-gentoo.el 161 RMD160 3bb0a12b3db10d0331c272c9386ffc1a3757db58 SHA1 cb2a4da6d13088fe869480efa2ae35c9babe0ea7 SHA256 a14ce47df108c25318471f1ae3ccc6c9984b7e1a2728e16b57cef0a848156a55
+AUX gle-4.2.2-ncurses.patch 892 RMD160 bc742a579c108ba118a95920f6ffebb9d7b41b5f SHA1 aa601835e7631531821cb6156a847aa31753146a SHA256 205f0434d47e2fdce3e8b9db8533af701d4e751a848938a8a31569b81f218eea
+AUX gle-4.2.2-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 83e9a7d1dc31cb5bc4673a527f676573de5d1545 SHA1 e829f3a5289e87e16e8e5de9ac2339d12c8ac7df SHA256 28a4a2ef29b08d25a8495d779033ded12d1aae9528d4be375d207a74562d9e19
 DIST gle-manual-4.2.0.pdf 2529384 RMD160 e24bde8586aa15bf478a5972394261886033fd3d SHA1 699784b0cc6137aee32bba7bcaf34975e6394464 SHA256 646176697850d2e22d58cb99c8f2e806d1b348b1e616939d8a62bfb97a559a20
+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
-MISC ChangeLog 1710 RMD160 581b2733a6a015bd2da33ca8e088d0534ae11f3f SHA1 b5862bd706679afd735fd2d3156d7b3402603f0b SHA256 d8355bb88b0803ff72fe4140a21d7b15cbaf7a2d084cd254f871afb4e64a4ebc
+EBUILD gle-4.2.2.ebuild 2823 RMD160 d4d4e12df1661a84ff62220fd18a5578d0174765 SHA1 d78ab558d57bb986574a070abbd81339d2937327 SHA256 d02f77265aaaa4a433ff2858cc6601c023a337ad02138ac39ec6d22efb5a5814
+MISC ChangeLog 1990 RMD160 eed9a828276390fc7373ccb673eb8af176476915 SHA1 8f62039a46a9df42cd29e8e997247c387cc9491d SHA256 cdafcdca62115e0e1fabd0d690f24cd0eaa3a496062ffb2728a8c183b0ef96d4
 MISC metadata.xml 515 RMD160 a04a55d1a6c8f1e947200d546e5e8e22be5d144d SHA1 f9a02c835f68b9d91bda0578045e0631084b607b SHA256 a75689c90bb13cf073d34c175453181823b0f6cc9a824baa69bd56e1308d5c95
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktGJLIACgkQ1ycZbhPLE2Ae0gCfXAe5An6+vudootWlRUYnG10z
+Fl0AoIQ087URVk1KdC8osD6CHb+0TMmn
+=23IM
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/gle/files/gle-4.2.2-ncurses.patch b/sci-visualization/gle/files/gle-4.2.2-ncurses.patch
new file mode 100644
index 000000000000..e8add0967527
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.2-ncurses.patch
@@ -0,0 +1,27 @@
+--- configure.ac.orig	2010-01-07 04:37:57.000000000 +0000
++++ configure.ac	2010-01-07 04:42:01.000000000 +0000
+@@ -621,12 +621,12 @@
+    LIBS=$SIMPLE_LIBS
+    LDFLAGS=$SIMPLE_LDFLAGS
+ 
+-   AC_SEARCH_LIBS(wbkgdset,ncurses curses,
++   AC_SEARCH_LIBS(wbkgdset,ncurses,
+    [
+       MAKE_MANIP=1
+    ],
+-   [],[-ltinfo])
+-   AC_SEARCH_LIBS(keypad,tinfo,[],[],[])
++   [],[-lncurses])
++   AC_SEARCH_LIBS(keypad,ncurses,[],[],[])
+    AC_CHECK_HEADER([ncurses.h],
+    [
+       HAVE_NCURSES_H=1
+@@ -649,7 +649,7 @@
+    MANIP_LIBS=$LIBS
+    MANIP_LDFLAGS=$LDFLAGS
+    if test "x$with_staticlink" = "xyes"; then
+-      MANIP_LIBS="$SIMPLE_LIBS -Wl,-Bstatic -lncurses -ltinfo -lm -Wl,-Bdynamic -ldl"
++      MANIP_LIBS="$SIMPLE_LIBS -Wl,-Bstatic -lncurses -lm -Wl,-Bdynamic -ldl"
+       #MANIP_LIBS="$SIMPLE_LIBS -Wl,-Bstatic -lncurses -lm -Wl,-Bdynamic -ldl"
+    else
+       MANIP_LIBS="$MANIP_LIBS -lm"
diff --git a/sci-visualization/gle/files/gle-4.2.2-parallel.patch b/sci-visualization/gle/files/gle-4.2.2-parallel.patch
new file mode 100644
index 000000000000..1eff8c067102
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.2-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.2.ebuild b/sci-visualization/gle/gle-4.2.2.ebuild
new file mode 100644
index 000000000000..d61eafd20ff2
--- /dev/null
+++ b/sci-visualization/gle/gle-4.2.2.ebuild
@@ -0,0 +1,109 @@
+# 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.2.ebuild,v 1.1 2010/01/07 17:38:04 bicatali Exp $
+
+EAPI=2
+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="${PV}"
+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 )"
+SLOT="0"
+LICENSE="BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )"
+IUSE="X qt4 jpeg png tiff doc emacs vim-syntax"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses
+	X? ( x11-libs/libX11 )
+	qt4? ( x11-libs/qt-gui:4 )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	emacs? ( virtual/emacs )"
+
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+	virtual/latex-base
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-parallel.patch
+	epatch "${FILESDIR}"/${P}-ncurses.patch
+	eaclocal
+	eautoconf
+}
+
+src_configure() {
+	# 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) \
+		$(use_with tiff)
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use emacs; then
+		cd contrib/editors/highlighting
+		mv ${PN}-emacs.el ${PN}-mode.el
+		elisp-compile ${PN}-mode.el || die
+	fi
+}
+
+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
+
+	if use qt4; then
+		newicon src/gui/images/gle_icon.png gle.png
+		make_desktop_entry qgle GLE gle
+		newdoc src/gui/readme.txt gui_readme.txt
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/${PN}-manual-${MAN_V}.pdf \
+			"${DISTDIR}"/GLEusersguide.pdf
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el || die
+	fi
+
+	if use vim-syntax ; then
+		dodir /usr/share/vim/vimfiles/ftplugins \
+			/usr/share/vim/vimfiles/indent \
+			/usr/share/vim/vimfiles/syntax
+		cd contrib/editors/highlighting/vim
+		chmod 644 ftplugin/* indent/* syntax/*
+		insinto /usr/share/vim/vimfiles/ftplugins
+		doins ftplugin/* || die
+		insinto /usr/share/vim/vimfiles/indent
+		doins indent/* || die
+		insinto /usr/share/vim/vimfiles/syntax
+		doins syntax/* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}