Version bump, modernized the ebuild. Now Qt4 only, Qt3 version split in x11-libs/qwplot3d-qt3

(Portage version: 2.1.4_rc3)

6 files changed, 238 insertions, 1 deletions

diff --git a/x11-libs/qwtplot3d/ChangeLog b/x11-libs/qwtplot3d/ChangeLog
index 05015aea1bd4..6eed7222ba97 100644
--- a/x11-libs/qwtplot3d/ChangeLog
+++ b/x11-libs/qwtplot3d/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qwtplot3d
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/ChangeLog,v 1.10 2007/02/23 12:06:47 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtplot3d/ChangeLog,v 1.11 2007/11/28 23:13:49 bicatali Exp $
+
+*qwtplot3d-0.2.7 (28 Nov 2007)
+
+  28 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/qwtplot3d-doxygen.patch, +files/qwtplot3d-examples.patch,
+  +files/qwtplot3d-profile.patch, +qwtplot3d-0.2.7.ebuild:
+  Version bump, modernized the ebuild. Now Qt4 only, Qt3 version split in
+  x11-libs/qwplot3d-qt3. 
 
   23 Feb 2007; Marcus D. Hanwell <cryos@gentoo.org>
   -qwtplot3d-0.2.6-r1.ebuild, qwtplot3d-0.2.6-r2.ebuild:
diff --git a/x11-libs/qwtplot3d/files/digest-qwtplot3d-0.2.7 b/x11-libs/qwtplot3d/files/digest-qwtplot3d-0.2.7
new file mode 100644
index 000000000000..4ba536c3a8ea
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/digest-qwtplot3d-0.2.7
@@ -0,0 +1,3 @@
+MD5 2f14660152e2e26bfeaaeec479ed9f2b qwtplot3d-0.2.7.tgz 183836
+RMD160 0f28462cb95ef6091d73642c8b26ece60d50bfb8 qwtplot3d-0.2.7.tgz 183836
+SHA256 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42 qwtplot3d-0.2.7.tgz 183836
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
new file mode 100644
index 000000000000..b0632a380a2a
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
@@ -0,0 +1,28 @@
+--- qwtplot3d/doc/Doxyfile.doxygen.orig	2007-11-26 22:30:57.000000000 +0000
++++ qwtplot3d/doc/Doxyfile.doxygen	2007-11-26 22:30:03.000000000 +0000
+@@ -116,7 +116,7 @@
+ HTML_ALIGN_MEMBERS     = YES

+ GENERATE_HTMLHELP      = NO

+ CHM_FILE               = qwtplot3d.chm

+-HHC_LOCATION           = "c:\Programme\HTML Help Workshop\hhc.exe"

++#HHC_LOCATION           = "c:\Programme\HTML Help Workshop\hhc.exe"

+ GENERATE_CHI           = NO

+ BINARY_TOC             = YES

+ TOC_EXPAND             = YES

+@@ -181,7 +181,7 @@
+ MACRO_EXPANSION        = NO

+ EXPAND_ONLY_PREDEF     = NO

+ SEARCH_INCLUDES        = YES

+-INCLUDE_PATH           = V:/cvs/qwtplot3d/include/

++INCLUDE_PATH           = ../include

+ INCLUDE_FILE_PATTERNS  = *.h

+ PREDEFINED             = QWT3D_NOT_FOR_DOXYGEN \

+                          QT_VERSION=0x040000

+@@ -212,7 +212,6 @@
+ GRAPHICAL_HIERARCHY    = YES

+ DIRECTORY_GRAPH        = YES

+ DOT_IMAGE_FORMAT       = png

+-DOT_PATH               = V:/graphviz/Graphviz/bin/

+ DOTFILE_DIRS           = 

+ MAX_DOT_GRAPH_WIDTH    = 974

+ MAX_DOT_GRAPH_HEIGHT   = 10000

diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
new file mode 100644
index 000000000000..f142c3379274
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
@@ -0,0 +1,125 @@
+diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp
+--- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/axes/src/axesmainwindow.cpp	2007-11-26 22:21:56.000000000 +0000
+@@ -9,7 +9,7 @@
+ 

+ #include "axes.h"

+ #include "axesmainwindow.h"

+-#include "../../../include/qwt3d_function.h"

++#include <qwt3d_function.h>

+ 

+ using namespace std;

+ using namespace Qwt3D;

+diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro
+--- qwtplot3d.orig/examples/common.pro	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/common.pro	2007-11-26 23:43:33.000000000 +0000
+@@ -1,13 +1,13 @@
+ TEMPLATE     = app

+-CONFIG      += qt warn_on thread debug

++CONFIG      += qt warn_on thread

+ UI_DIR = tmp

+ MOC_DIR      = tmp

+ OBJECTS_DIR  = tmp

+-INCLUDEPATH    += ../../include 

++INCLUDEPATH    += /usr/include/qwtplot3d

+ DEPENDPATH	= $$INCLUDEPATH

+ DESTDIR = ../bin

+ 

+-unix:LIBS += -lqwtplot3d -L../../lib

++unix:LIBS += -lqwtplot3d

+ linux-g++:QMAKE_CXXFLAGS += -fno-exceptions

+ 

+ win32{

+@@ -25,7 +25,7 @@
+ ISQT4 = $$find(MYVERSION, ^[2-9])

+ 

+ !isEmpty( ISQT4 ) {

+-RESOURCES     = ../images.qrc

++#RESOURCES     = ../images.qrc

+ QT += opengl

+ }

+ 

+diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp
+--- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp	2007-11-26 22:22:48.000000000 +0000
+@@ -6,7 +6,7 @@
+ 

+ #include "enrichmentmainwindow.h"

+ #include "enrichments.h"

+-#include "../../../include/qwt3d_function.h"

++#include <qwt3d_function.h>

+ 

+ using namespace Qwt3D;

+ 

+diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h
+--- qwtplot3d.orig/examples/mesh2/src/colormapreader.h	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/colormapreader.h	2007-11-26 22:23:19.000000000 +0000
+@@ -5,7 +5,7 @@
+ #include <qframe.h>

+ #include <qpixmap.h>

+ 

+-#include "../../../include/qwt3d_types.h"

++#include <qwt3d_types.h>

+ 

+ #if QT_VERSION < 0x040000

+ 

+diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h
+--- qwtplot3d.orig/examples/mesh2/src/functions.h	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/functions.h	2007-11-26 22:23:47.000000000 +0000
+@@ -2,8 +2,8 @@
+ #define __EXAMPLE_H__

+ 

+ #include <math.h>

+-#include "../../../include/qwt3d_parametricsurface.h"

+-#include "../../../include/qwt3d_function.h"

++#include <qwt3d_parametricsurface.h>

++#include <qwt3d_function.h>

+ 

+ using namespace Qwt3D;

+ 

+diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h
+--- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/lightingdlg.h	2007-11-26 22:24:41.000000000 +0000
+@@ -3,10 +3,10 @@
+ 

+ #include <math.h>

+ #include <qapplication.h>

+-#include "../../../include/qwt3d_parametricsurface.h"

+-#include "../../../include/qwt3d_surfaceplot.h"

+-#include "../../../include/qwt3d_enrichment.h"

+-#include "../../../include/qwt3d_color.h"

++#include <qwt3d_parametricsurface.h>

++#include <qwt3d_surfaceplot.h>

++#include <qwt3d_enrichment.h>

++#include <qwt3d_color.h>

+ 

+ #if QT_VERSION < 0x040000

+ #include "lightingdlgbase.h"

+diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp
+--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp	2007-11-26 22:25:33.000000000 +0000
+@@ -33,9 +33,9 @@
+ #include "colormapreader.h"

+ #include "lightingdlg.h"

+ #include "femreader.h"

+-#include "../../../include/qwt3d_io.h"

+-#include "../../../include/qwt3d_io_gl2ps.h"

+-#include "../../../include/qwt3d_io_reader.h"

++#include <qwt3d_io.h>

++#include <qwt3d_io_gl2ps.h>

++#include <qwt3d_io_reader.h>

+ 

+ using namespace Qwt3D;

+ using namespace std;

+diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h
+--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h	2007-11-26 22:26:09.000000000 +0000
+@@ -1,7 +1,7 @@
+ #ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code

+ #define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code

+ 

+-#include "../../../include/qwt3d_surfaceplot.h"

++#include <qwt3d_surfaceplot.h>

+ 

+ 

+ #if QT_VERSION < 0x040000

diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
new file mode 100644
index 000000000000..831ad558d2f4
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
@@ -0,0 +1,27 @@
+--- qwtplot3d.orig/qwtplot3d.pro	2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/qwtplot3d.pro	2007-11-26 23:45:18.000000000 +0000
+@@ -3,7 +3,7 @@
+ 

+ TARGET            = qwtplot3d

+ TEMPLATE          = lib

+-CONFIG           += qt warn_on opengl thread zlib debug

++CONFIG           += qt warn_on opengl thread zlib

+ MOC_DIR           = tmp

+ OBJECTS_DIR       = tmp

+ INCLUDEPATH       = include

+@@ -21,7 +21,7 @@
+ win32:CONFIG -= zlib

+ 

+ linux-g++:TMAKE_CXXFLAGS += -fno-exceptions

+-unix:VERSION = 0.2.6

++unix:VERSION = 0.2.7

+ 

+ # Input

+ SOURCES += src/qwt3d_axis.cpp \

+@@ -92,4 +92,4 @@
+   DEFINES += GL2PS_HAVE_ZLIB

+   win32:LIBS += zlib.lib

+ 	unix:LIBS  += -lz

+-}
+\ No newline at end of file
++}

diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild
new file mode 100644
index 000000000000..62cb4c0859f7
--- /dev/null
+++ b/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 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.1 2007/11/28 23:13:49 bicatali Exp $
+
+inherit multilib qt4
+
+DESCRIPTION="Qt4/OpenGL-based 3D widget library for C++"
+HOMEPAGE="http://qwtplot3d.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc examples"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="$(qt4_min_version 4)"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack () {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-profile.patch
+	epatch "${FILESDIR}"/${PN}-examples.patch
+	epatch "${FILESDIR}"/${PN}-doxygen.patch
+}
+
+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"
+
+	eqmake4 ${PN}.pro || die "eqmake4 failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die "doins examples failed"
+	fi
+	use doc && dohtml -r doc/web/doxygen/*
+}