Removed bundled gl2ps and fixed some QA

(Portage version: 2.2_rc28/cvs/Linux x86_64)

3 files changed, 63 insertions, 18 deletions

diff --git a/x11-libs/qwtplot3d/ChangeLog b/x11-libs/qwtplot3d/ChangeLog
index b9a2214b7edf..ac2e7c77ca92 100644
--- a/x11-libs/qwtplot3d/ChangeLog
+++ b/x11-libs/qwtplot3d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qwtplot3d
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/ChangeLog,v 1.14 2008/07/28 21:54:21 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/ChangeLog,v 1.15 2009/04/07 18:51:30 bicatali Exp $
+
+*qwtplot3d-0.2.7-r1 (07 Apr 2009)
+
+  07 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/qwtplot3d-sys-gl2ps.patch, -qwtplot3d-0.2.7.ebuild,
+  +qwtplot3d-0.2.7-r1.ebuild:
+  Removed bundled gl2ps and fixed some QA
 
   28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> qwtplot3d-0.2.6-r2.ebuild:
   QA: Get rid of deprecated qt_min_version(). Quoting issues.
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
new file mode 100644
index 000000000000..83c70ef825b7
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
@@ -0,0 +1,31 @@
+--- qwtplot3d.pro.orig	2009-04-07 19:45:29.985645378 +0100
++++ qwtplot3d.pro	2009-04-07 19:46:50.095747068 +0100
+@@ -80,13 +80,11 @@
+            include/qwt3d_graphplot.h \

+            include/qwt3d_multiplot.h

+ 

+-# gl2ps support

+-HEADERS+=3rdparty/gl2ps/gl2ps.h \

+-         include/qwt3d_io_gl2ps.h

++# gl2ps support taken from system libs

++HEADERS+=include/qwt3d_io_gl2ps.h

+          

+-SOURCES+=src/qwt3d_io_gl2ps.cpp \

+-         3rdparty/gl2ps/gl2ps.c

+-

++SOURCES+=src/qwt3d_io_gl2ps.cpp

++unix:LIBS += -lg2ps

+ # zlib support for gl2ps

+ zlib {

+   DEFINES += GL2PS_HAVE_ZLIB

+--- src/qwt3d_io_gl2ps.cpp.orig	2009-04-07 19:44:38.536418391 +0100
++++ src/qwt3d_io_gl2ps.cpp	2009-04-07 19:45:03.685133854 +0100
+@@ -4,7 +4,7 @@
+ 

+ #include <time.h>

+ #include "qwt3d_openglhelper.h"

+-#include "../3rdparty/gl2ps/gl2ps.h"

++#include <gl2ps.h>

+ #include "qwt3d_io_gl2ps.h"

+ #include "qwt3d_plot.h"

+ 

diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r1.ebuild
index 45fd90c1c348..1b505fa2223a 100644
--- a/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild
+++ b/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild,v 1.5 2008/07/27 14:23:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r1.ebuild,v 1.1 2009/04/07 18:51:30 bicatali Exp $
 
-EAPI=1
-inherit multilib qt4
+EAPI=2
+inherit eutils qt4
 
 DESCRIPTION="Qt4/OpenGL-based 3D widget library for C++"
 HOMEPAGE="http://qwtplot3d.sourceforge.net/"
@@ -15,28 +15,32 @@ IUSE="doc examples"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 )
-		<x11-libs/qt-4.4:4 )"
+		<x11-libs/qt-4.4:4[opengl] )
+	x11-libs/gl2ps"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-QT4_BUILT_WITH_USE_CHECK="opengl"
-
 S="${WORKDIR}/${PN}"
 
-src_unpack () {
-	unpack ${A}
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-profile.patch
 	epatch "${FILESDIR}"/${PN}-examples.patch
 	epatch "${FILESDIR}"/${PN}-doxygen.patch
+	epatch "${FILESDIR}"/${PN}-sys-gl2ps.patch
+	cat >> ${PN}.pro <<-EOF
+		target.path = /usr/$(get_libdir)
+		headers.path = /usr/include/${PN}
+		headers.files = \$\$HEADERS
+		INSTALLS = target headers
+	EOF
+	qt4_src_prepare
 }
 
-src_compile () {
-	echo >> ${PN}.pro "target.path = /usr/$(get_libdir)"
-	echo >> ${PN}.pro "headers.path = /usr/include/${PN}"
-	echo >> ${PN}.pro "headers.files = \$\$HEADERS"
-	echo >> ${PN}.pro "INSTALLS = target headers"
+src_configure() {
+	eqmake4
+}
 
-	eqmake4 ${PN}.pro || die "eqmake4 failed"
+src_compile() {
 	emake || die "emake failed"
 	 if use doc ; then
 		 cd doc
@@ -50,5 +54,8 @@ src_install () {
 		insinto /usr/share/doc/${PF}
 		doins -r examples || die "doins examples failed"
 	fi
-	use doc && dohtml -r doc/web/doxygen/*
+	if use doc; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/web/doxygen/* || die
+	fi
 }