Fixed compilation with qt-4.8, removed old

Package-Manager: portage-2.2.0_alpha90/cvs/Linux i686

7 files changed, 105 insertions, 171 deletions

diff --git a/sci-visualization/gle/ChangeLog b/sci-visualization/gle/ChangeLog
index 59cbabc60f85..70f42b9e32c1 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.16 2012/01/09 07:05:24 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/ChangeLog,v 1.17 2012/03/08 11:27:27 grozin Exp $
+
+  08 Mar 2012; Andrey Grozin <grozin@gentoo.org> -gle-4.2.3b.ebuild,
+  -files/gle-4.2.3b-overflows.patch, -files/gle-4.2.3b-parallel.patch,
+  gle-4.2.4.ebuild, +files/gle-4.2.4-qt-4.8.patch:
+  Fixed compilation with qt-4.8, removed old
 
 *gle-4.2.4 (09 Jan 2012)
 
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 6b81c28953ba..097786573465 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,12 +1,9 @@
 AUX 64gle-gentoo.el 161 RMD160 3bb0a12b3db10d0331c272c9386ffc1a3757db58 SHA1 cb2a4da6d13088fe869480efa2ae35c9babe0ea7 SHA256 a14ce47df108c25318471f1ae3ccc6c9984b7e1a2728e16b57cef0a848156a55
-AUX gle-4.2.3b-overflows.patch 466 RMD160 c10b1cf28b396586834e45e14433370763915787 SHA1 7eece556ca720a81555f284f66c55e424a9be115 SHA256 0c566eb6e98207859e22cef9318bfec07d62792b6277b35717c51a5df79c9725
-AUX gle-4.2.3b-parallel.patch 464 RMD160 61711adb213a073f0f8ff3b02bef39d4ec48e814 SHA1 70f9f5c644629eb20003bd6b39ac4d4da9086a0e SHA256 ac8ecbb9ea3198dfcb57c7cffe22dfbb5fc88f53fa4e68744078fa4f693ed8f0
 AUX gle-4.2.4-parallel.patch 464 RMD160 61711adb213a073f0f8ff3b02bef39d4ec48e814 SHA1 70f9f5c644629eb20003bd6b39ac4d4da9086a0e SHA256 ac8ecbb9ea3198dfcb57c7cffe22dfbb5fc88f53fa4e68744078fa4f693ed8f0
+AUX gle-4.2.4-qt-4.8.patch 2887 RMD160 5853d38cfdbef4fd8406fe95ea23fd706d1835d8 SHA1 2ab52ce7b33de53820b9811469d6ffbcb3f8e991 SHA256 d1d1bbfe6cbdd5093cab59bd53299cd32f9be7fcf319d0baaa5e636c522280fd
 DIST GLEusersguide.pdf 2244780 RMD160 6f2b8814f100e3971737ad45d017144e5912fd4e SHA1 2039e6b255da68200b5f881f2554bbdd6e82034a SHA256 02c13fe038f8b4b7726ac3e6a74410e299f50cdccb2b040d7ed1fbc99b9cfbef
-DIST gle-graphics-4.2.3bf-src.tar.gz 2262745 RMD160 60381d22ad8e1d17d8cbd9736522b768e2476bfd SHA1 7a0b0ff1be264ce1e7606419f80362efe06c60b5 SHA256 18c2b35cc3b669b0f8246a7ed7068feff7ab747254b0b8a215ebc98a6991121f
 DIST gle-graphics-4.2.4f-src.tar.gz 2321209 RMD160 779a4d43de7a1968fa6e6b49a56983224bf9f064 SHA1 a9d23931c4da1cca4d4618cf5959b27c4bccf26d SHA256 0da6fe583e25011d3996151893b37ee946653ecedcccef1449d15e9fb8efea5b
 DIST gle-manual-4.2.2.pdf 2238766 RMD160 23befacc8b51375ef8832ab39db21c5e497b9cdd SHA1 2b07238a62ca7099648aa9660fd934a88c966a5e SHA256 fbc4ba2613882d2d4ae3f8484c77aa27a257fc1b0ec02a46085c3651a2ace58e
-EBUILD gle-4.2.3b.ebuild 2825 RMD160 15739f8fa680a74a5019198a590c519581e030bd SHA1 308f133c4808f7d99a0ccadddbf1ea91c802e752 SHA256 1d5b84aa47631e2af2db79b13fff7384de49db0e99ea4ad46d356d746370a159
-EBUILD gle-4.2.4.ebuild 2781 RMD160 576bbb4cc0b93c70b1f2831a848e4cbf6f6f8247 SHA1 6738cf3f3df1e942718e9663ae7e463592722163 SHA256 bc142b049be8451d16c30b829072489d21d5f8ac0c7cfd72598cc132f42bd276
-MISC ChangeLog 3224 RMD160 af84269f1fd5d02727d8ae7573e153117ef24997 SHA1 bcffc92e2352619b31337052b93521ceafaed755 SHA256 de961bb21a8dee952b38d71c30c8a359a9809a9547fa38744396b173d8234cba
+EBUILD gle-4.2.4.ebuild 2687 RMD160 f0966e3e6e0c455a044a491c34b70163c879821b SHA1 f0d2d5388e621b86093143b9def1735e2bb511cd SHA256 ec4015b99146737d507d129bd5a0444f594ec2a75beab002e878f4603f9dae78
+MISC ChangeLog 3461 RMD160 c2c459cdcd22e9352f7dd3513ac890b1966b6a24 SHA1 8f1356dacd344562e0f39d2f15ba68d32114eaa4 SHA256 be9d2610bd71359215ca288e1007da1d557b606a688d88a080dd1dde2ca15625
 MISC metadata.xml 515 RMD160 a04a55d1a6c8f1e947200d546e5e8e22be5d144d SHA1 f9a02c835f68b9d91bda0578045e0631084b607b SHA256 a75689c90bb13cf073d34c175453181823b0f6cc9a824baa69bd56e1308d5c95
diff --git a/sci-visualization/gle/files/gle-4.2.3b-overflows.patch b/sci-visualization/gle/files/gle-4.2.3b-overflows.patch
deleted file mode 100644
index 2a1650707144..000000000000
--- a/sci-visualization/gle/files/gle-4.2.3b-overflows.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix buffer overflows
-
-http://bugs.gentoo.org/show_bug.cgi?id=338823
-
---- src/gle/d_svg.cpp
-+++ src/gle/d_svg.cpp
-@@ -636,7 +636,7 @@
- 	static int init_done;
- 	FILE *fptr;
- 	char *s;
--	char inbuff[90];
-+	char inbuff[200];
- 	if (init_done) return;
- 	init_done = true;
- 
---- src/gle/d_ps.cpp
-+++ src/gle/d_ps.cpp
-@@ -1002,7 +1002,7 @@
- 	static int init_done;
- 	FILE *fptr;
- 	char *s;
--	char inbuff[90];
-+	char inbuff[200];
- 	if (init_done) return;
- 	init_done = true;
- 
\ No newline at end of file
diff --git a/sci-visualization/gle/files/gle-4.2.3b-parallel.patch b/sci-visualization/gle/files/gle-4.2.3b-parallel.patch
deleted file mode 100644
index 1eff8c067102..000000000000
--- a/sci-visualization/gle/files/gle-4.2.3b-parallel.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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/files/gle-4.2.4-qt-4.8.patch b/sci-visualization/gle/files/gle-4.2.4-qt-4.8.patch
new file mode 100644
index 000000000000..e44391c807e3
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.4-qt-4.8.patch
@@ -0,0 +1,88 @@
+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/gle-4.2.3b.ebuild b/sci-visualization/gle/gle-4.2.3b.ebuild
deleted file mode 100644
index 01f17b2481d4..000000000000
--- a/sci-visualization/gle/gle-4.2.3b.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gle/gle-4.2.3b.ebuild,v 1.4 2011/06/10 12:07:38 grozin Exp $
-
-EAPI=2
-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}-overflows.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
-}
diff --git a/sci-visualization/gle/gle-4.2.4.ebuild b/sci-visualization/gle/gle-4.2.4.ebuild
index a9e79e6161fe..b14887d308ab 100644
--- a/sci-visualization/gle/gle-4.2.4.ebuild
+++ b/sci-visualization/gle/gle-4.2.4.ebuild
@@ -1,8 +1,8 @@
 # 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.1 2012/01/09 07:05:24 grozin Exp $
+# $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=2
+EAPI=4
 inherit eutils elisp-common qt4-r2 flag-o-matic autotools
 
 DESCRIPTION="Graphics Layout Engine"
@@ -34,6 +34,7 @@ S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-parallel.patch
+	epatch "${FILESDIR}"/${P}-qt-4.8.patch
 	eaclocal
 	eautoconf
 }
@@ -52,7 +53,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 	if use emacs; then
 		cd contrib/editors/highlighting
 		mv ${PN}-emacs.el ${PN}-mode.el
@@ -62,8 +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"
+	emake -j1 DESTDIR="${D}" install
 	rmdir "${D}"/usr/share/doc/gle-graphics || die "rmdir gle-graphics failed"
 	dodoc README.txt
 
@@ -91,11 +91,11 @@ src_install() {
 		cd contrib/editors/highlighting/vim
 		chmod 644 ftplugin/* indent/* syntax/*
 		insinto /usr/share/vim/vimfiles/ftplugins
-		doins ftplugin/* || die
+		doins ftplugin/*
 		insinto /usr/share/vim/vimfiles/indent
-		doins indent/* || die
+		doins indent/*
 		insinto /usr/share/vim/vimfiles/syntax
-		doins syntax/* || die
+		doins syntax/*
 	fi
 }