Removed bundled gl2ps and fixed some QA

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

4 files changed, 76 insertions, 20 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/Manifest b/x11-libs/qwtplot3d/Manifest
index fb7a656156a8..a5d93848ae6a 100644
--- a/x11-libs/qwtplot3d/Manifest
+++ b/x11-libs/qwtplot3d/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qwtplot3d-doxygen.patch 1089 RMD160 bb09e96fbbe756640c3735c5a713ad02b3952c05 SHA1 a60a51469d3ccead63b7b25556338799b4379b31 SHA256 04114570357018265d32bd8a0fd3d96dae6735dde4aaec07ea62f2382e97ff54
 AUX qwtplot3d-examples.patch 4764 RMD160 12a702542c9f834bd1b7b58af54b348a8f237236 SHA1 f239b95320062c05b18d5a89c9dbec9b2f56f206 SHA256 ddd2f6f9a3d075237e4908806e64318580496c856465749ce605f8506ca0e6de
 AUX qwtplot3d-profile.patch 717 RMD160 328c212e334d53f79234069b84c1b8a43675f790 SHA1 2b81c2c2a563a4083545356874966aa8cdf196ca SHA256 4fcbc15ae0e33317b03270b8d4534ea7f2d68d02ccc588813acc20af5b2ca1ac
+AUX qwtplot3d-sys-gl2ps.patch 914 RMD160 1d4e35149835bd4a86c74122254dde30d6496650 SHA1 38efa4e9b67e436c013de09bbcf8e15cab9d3a10 SHA256 353c0f035149b606996cd48eff04627aec62f5b7c1d68f53cb7775f75b696ad7
 DIST qwtplot3d-0.2.6.tgz 148834 RMD160 ce2120f603ba87c4bfb3679457c0c041f4891bcc SHA1 23330688ed2ca6e738e9ef5259e01fcca6aba2e7 SHA256 ea7c2ea3d55960ee60019e0a5a5a63385bdcf7026a6385099fd8b31350803125
 DIST qwtplot3d-0.2.7.tgz 183836 RMD160 0f28462cb95ef6091d73642c8b26ece60d50bfb8 SHA1 4463fafb8420a91825e165da7a296aaabd70abea SHA256 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42
 DIST qwtplot3d-doc.zip 776909 RMD160 bcf5494287447e66c1b277d2edfdd68c07402594 SHA1 a41072a28a04b96c4575d2bdd42b4c48308959e7 SHA256 093e1d6b387551635f42bc5cf977951627c3a9c690c7f28f401e5082dfa72483
 EBUILD qwtplot3d-0.2.6-r2.ebuild 1874 RMD160 be87aa908c36e47bc29418371adee0addcaf0873 SHA1 75308aa6f918541cbda5212601f79286eb4040ac SHA256 cb55f8f28cc9488ed43204a1a8288d9d6852fc431718376a51edc447b3e9e3a5
-EBUILD qwtplot3d-0.2.7.ebuild 1447 RMD160 f4dc239d34d5ade3caa3fc0bfa1333e8252dad9a SHA1 dd2b79acbf0092e1eb4d42597000226d0d05e2dd SHA256 bb9f2c7c26342d7ab39da9778310ae9ccdf38e86a64db74eb6f9e82f83d85cf4
-MISC ChangeLog 2327 RMD160 78503d7917117b2dd7c8a7c2f954a8ee4c52d073 SHA1 877d9a94b256e91b967c53c06a9e05b52d2b906a SHA256 1ad7f4cebce54c1e30af886858a87aa8f208a3c72d3b5d08445b5c7382084693
+EBUILD qwtplot3d-0.2.7-r1.ebuild 1477 RMD160 256c1cfa687b57fd1e66f6a52ebb8a2d789e0c7f SHA1 8efca1b51c6675a4d370f4c80539332bb5ac8f1a SHA256 8d884ba2a5a667ca282bbae2c140ab70f07d6647e1ebd48da371fc867c715fe6
+MISC ChangeLog 2554 RMD160 71808cbf4101062ab9042d22526963ae67347bc4 SHA1 a139c3f18cfecf6484343890d4ac9153915b3a35 SHA256 22a3873bbe2cefdabde293a94fb66e9de34b9e9e7722bd90649bd84ed2c98bc6
 MISC metadata.xml 401 RMD160 8d2f7fd100b718f7deccf20a0fd5c7858393c0b3 SHA1 0eb3974e1cdf16c1df5d3a4c13214c36302f6fcf SHA256 b9ba2aa2e27cc4605fc4fb411015019b67ca9bd120814e3ac840cba6b917d52c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknboLgACgkQ1ycZbhPLE2AFHACgrMyje5J3ApZTcbDrcMWFwHgQ
+UYQAoILxMatC6JClXUlDepumQQgWkpY1
+=9jCY
+-----END PGP SIGNATURE-----
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
 }