Added the forgotten patch

(Portage version: 2.2.0_alpha90/cvs/Linux i686)

4 files changed, 6 insertions, 197 deletions

diff --git a/sci-visualization/gle/ChangeLog b/sci-visualization/gle/ChangeLog
index 8b8d7b1580e8..e8d2db174aa2 100644
--- a/sci-visualization/gle/ChangeLog
+++ b/sci-visualization/gle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.18 2012/03/09 08:24:20 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.19 2012/03/10 21:00:53 grozin Exp $
+
+  10 Mar 2012; Andrey Grozin <grozin@gentoo.org> -gle-4.2.4.ebuild,
+  -files/gle-4.2.4-parallel.patch, -files/gle-4.2.4-qt-4.8.patch,
+  +files/gle-4.2.4b-parallel.patch:
+  Added the forgotten patch
 
 *gle-4.2.4b (09 Mar 2012)
 
diff --git a/sci-visualization/gle/files/gle-4.2.4-qt-4.8.patch b/sci-visualization/gle/files/gle-4.2.4-qt-4.8.patch
deleted file mode 100644
index e44391c807e3..000000000000
--- a/sci-visualization/gle/files/gle-4.2.4-qt-4.8.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Description: Backport upstream patch to build against qt4.8
-Author: Jan Struyf <jstruyf34@struyf-ye.org>
-Origin: upstream, http://glx.git.sourceforge.net/git/gitweb.cgi?p=glx/gle;a=patch;h=b0cf21c1d6fbad25da849f658feb82b433091977
-Bug-Ubuntu: https://launchpad.net/bugs/935114
-
-Index: gle-graphics/configure.ac
-===================================================================
---- gle-graphics.orig/configure.ac	2012-02-24 19:39:59.000000000 +0100
-+++ gle-graphics/configure.ac	2012-02-24 19:39:59.000000000 +0100
-@@ -73,8 +73,10 @@
- HAVE_CYGWIN=0
- HAVE_MINGW=0
- HAVE_LIBZ=0
-+HAVE_LIBGLU_H=0
- QT_CONFIG="CONFIG += release"
- QT_RPATH=
-+QT_LIBGLU_LIB=
- 
- HAVE_STATIC_LIBPNG=0
- HAVE_STATIC_LIBTIFF=0
-@@ -574,6 +576,14 @@
-         HAVE_QT=1
-         QMAKE_VERS=`$QMAKE_PROG -v | tail -n 1`
-     fi
-+    
-+    AC_CHECK_HEADERS(GL/glu.h,
-+    [AC_DEFINE(HAVE_LIBGLU_H)],
-+    [])
-+    
-+    AC_CHECK_LIB(GLU,gluLookAt,
-+    [QT_LIBGLU_LIB=-lGLU],
-+    [])
- fi
- 
- if test "x$HAVE_RPATH" != "x0"; then
-@@ -805,6 +815,7 @@
- AC_SUBST(MAKE_AUTOPACKAGE)
- AC_SUBST(QT_CONFIG)
- AC_SUBST(QT_RPATH)
-+AC_SUBST(QT_LIBGLU_LIB)
- AC_SUBST(HAVE_EXTRA_FONTS)
- 
- AC_CONFIG_FILES([Makefile src/gle/Makefile src/gle/bitmap/Makefile src/gle/letzfitz/Makefile src/gle/surface/Makefile src/gle/tokens/Makefile src/fbuild/Makefile src/makefmt/Makefile src/manip/Makefile src/TeX/Makefile src/gui/MakefileAC src/gui/qgle.pro src/doc/gle.1 platform/autoconf/gle-graphics.pc platform/autopackage/gle4.apspec])
-Index: gle-graphics/src/config.h.in
-===================================================================
---- gle-graphics.orig/src/config.h.in	2012-02-24 19:39:59.000000000 +0100
-+++ gle-graphics/src/config.h.in	2012-02-24 19:39:59.000000000 +0100
-@@ -72,6 +72,7 @@
- #undef HAVE_STDINT_H
- #undef HAVE_INTTYPES_H
- #undef HAVE_SYS_PARAM_H
-+#undef HAVE_LIBGLU_H
- 
- #undef HAVE_NCURSES_H
- #undef HAVE_CURSES_H
-Index: gle-graphics/src/gui/3dviewer.cpp
-===================================================================
---- gle-graphics.orig/src/gui/3dviewer.cpp	2012-02-24 19:39:59.000000000 +0100
-+++ gle-graphics/src/gui/3dviewer.cpp	2012-02-24 19:39:59.000000000 +0100
-@@ -23,9 +23,15 @@
- #include "../gle/cutils.h"
- #include "../gle/gle-block.h"
- #include "../gle/surface/gsurface.h"
-+#include "../config.h"
- 
- #include <math.h>
- 
-+#ifdef HAVE_LIBGLU_H
-+       #include <GL/glu.h>
-+#endif
-+
-+
- QGLE3DWidget::QGLE3DWidget(QWidget *parent, GLEInterface* iface)
-      : QGLWidget(parent)
- {
-Index: gle-graphics/src/gui/qgle.pro.in
-===================================================================
---- gle-graphics.orig/src/gui/qgle.pro.in	2012-02-24 18:48:09.857237000 +0100
-+++ gle-graphics/src/gui/qgle.pro.in	2012-02-24 19:54:34.345962872 +0100
-@@ -176,7 +176,7 @@
- 
- # add the "lib" directory to the search path of the linker
- unix {
--	LIBS += @QT_RPATH@
-+	LIBS += @QT_RPATH@ @QT_LIBGLU_LIB@
- }
- 
- # vim:et
diff --git a/sci-visualization/gle/files/gle-4.2.4-parallel.patch b/sci-visualization/gle/files/gle-4.2.4b-parallel.patch
index 1eff8c067102..1eff8c067102 100644
--- a/sci-visualization/gle/files/gle-4.2.4-parallel.patch
+++ b/sci-visualization/gle/files/gle-4.2.4b-parallel.patch
diff --git a/sci-visualization/gle/gle-4.2.4.ebuild b/sci-visualization/gle/gle-4.2.4.ebuild
deleted file mode 100644
index b14887d308ab..000000000000
--- a/sci-visualization/gle/gle-4.2.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/gle-4.2.4.ebuild,v 1.2 2012/03/08 11:27:27 grozin Exp $
-
-EAPI=4
-inherit eutils elisp-common qt4-r2 flag-o-matic autotools
-
-DESCRIPTION="Graphics Layout Engine"
-HOMEPAGE="http://glx.sourceforge.net/"
-MY_P=${PN}-graphics-${PV}
-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 )"
-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-opengl:4 )
-	jpeg? ( virtual/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}-qt-4.8.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
-	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
-	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/*
-		insinto /usr/share/vim/vimfiles/indent
-		doins indent/*
-		insinto /usr/share/vim/vimfiles/syntax
-		doins syntax/*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}