Version bump. Fixes bug #238632.

(Portage version: 2.2_rc9/cvs/Linux 2.6.26-SENTINEL-2 i686)

4 files changed, 97 insertions, 9 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 5bebe70f18b2..d39467110524 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.32 2008/08/26 03:07:35 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.33 2008/09/25 14:29:36 markusle Exp $
+
+*qtiplot-0.9.7.2 (25 Sep 2008)
+
+  25 Sep 2008; Markus Dittrich <markusle@gentoo.org>
+  -qtiplot-0.9.6.2.ebuild,
+  +files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch,
+  +files/qtiplot-0.9.7.2-pro.patch, +qtiplot-0.9.7.2.ebuild:
+  Version bump. Fixes bug #238632.
+  NOTE: This version uses an improved liborigin file parser 
+  and is not compatible any more with sci-libs/liborigin. Hence,
+  we use the included liborigin sources for now until upstream
+  hopefully updates liborigin as well.
 
 *qtiplot-0.9.7 (26 Aug 2008)
 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch
new file mode 100644
index 000000000000..2c98b330bf24
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch
@@ -0,0 +1,13 @@
+# fix gcc-4.3 missing headers 
+
+diff -Naur qtiplot-0.9.7.2/3rdparty/liborigin/OriginObj.h qtiplot-0.9.7.2.new/3rdparty/liborigin/OriginObj.h
+--- qtiplot-0.9.7.2/3rdparty/liborigin/OriginObj.h	2008-09-21 13:22:33.000000000 -0400
++++ qtiplot-0.9.7.2.new/3rdparty/liborigin/OriginObj.h	2008-09-25 10:07:27.000000000 -0400
+@@ -33,6 +33,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cstring>
+ #include "boost/variant.hpp"
+ #include "boost/date_time/posix_time/ptime.hpp"
+ 
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch
new file mode 100644
index 000000000000..c4b53197e3ba
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.2-pro.patch
@@ -0,0 +1,61 @@
+diff -Naur qtiplot-0.9.7.2/qtiplot/qtiplot.pro qtiplot-0.9.7.2.new/qtiplot/qtiplot.pro
+--- qtiplot-0.9.7.2/qtiplot/qtiplot.pro	2008-09-22 08:15:41.000000000 -0400
++++ qtiplot-0.9.7.2.new/qtiplot/qtiplot.pro	2008-09-25 10:16:00.000000000 -0400
+@@ -17,7 +17,7 @@
+ # Uncomment the following line if you want to perform a custom installation using

+ # the *.path variables defined bellow.

+ ######################################################################################

+-#CONFIG          += CustomInstall

++CONFIG          += CustomInstall

+ 

+ CONFIG          += release

+ #CONFIG          += debug

+@@ -27,13 +27,12 @@
+ #!!! Warning: You must modify these paths according to your computer settings

+ #############################################################################

+ 

+-INCLUDEPATH       += ../3rdparty/muparser/include

+-INCLUDEPATH       += ../3rdparty/qwtplot3d/include

+-INCLUDEPATH       += ../3rdparty/qwt/src

+-INCLUDEPATH       += ../3rdparty/liborigin

+-INCLUDEPATH       += ../3rdparty/gsl/include

+-INCLUDEPATH       += ../3rdparty/zlib123/include

+-INCLUDEPATH       += ../3rdparty/boost_1_36_0

++INCLUDEPATH       += /usr/include/muparser

++INCLUDEPATH       += /usr/include/qwtplot3d

++INCLUDEPATH       += /usr/include/qwt5

++INCLUDEPATH       += ../3rdparty/liborigin
++INCLUDEPATH       += /usr/include/gsl

++INCLUDEPATH       += /usr/include/boost

+ 

+ ##################### 3rd PARTY LIBRARIES SECTION ###########################

+ #!!! Warning: You must modify these paths according to your computer settings

+@@ -42,17 +41,19 @@
+ ##################### Linux (Mac OS X) ######################################

+ 

+ # statically link against libraries in 3rdparty

+-unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

+-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a

+-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

+-unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

+-unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

++#unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

++#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a

++#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

++#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

++#unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

+ 

+ # dynamically link against dependencies if they are installed system-wide

+-#unix:LIBS         += -lmuparser

+-#unix:LIBS         += -lqwtplot3d

+-#unix:LIBS         += -lqwt

+-#unix:LIBS         += -lgsl -lgslcblas

++unix:LIBS         += -lmuparser

++unix:LIBS         += -lqwtplot3d

++unix:LIBS         += -lqwt

++unix:LIBS         += $$system(pkg-config --libs gsl)

++#unix:LIBS         += -lorigin

++unix:LIBS         += -lz

+ 

+ ##################### Windows ###############################################

+ 

diff --git a/sci-visualization/qtiplot/qtiplot-0.9.6.2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.2.ebuild
index 900035becb3a..8da530789f96 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.6.2.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.6.2.ebuild,v 1.7 2008/08/25 22:43:50 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.2.ebuild,v 1.1 2008/09/25 14:29:36 markusle Exp $
 
 EAPI="1"
 inherit eutils multilib qt4 fdo-mime python
@@ -8,7 +8,7 @@ inherit eutils multilib qt4 fdo-mime python
 DESCRIPTION="Qt based clone of the Origin plotting package"
 HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
 SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2
-	doc? ( mirror://gentoo/${P}-manual-en.tar.bz2 )"
+	doc? ( mirror://gentoo/${PN}-0.9.7-manual-en.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,11 +22,11 @@ done
 
 CDEPEND=">=x11-libs/qwt-5.1
 	>=x11-libs/qwtplot3d-0.2.7
-	|| ( ( x11-libs/qt-gui:4 x11-libs/qt-qt3support:4
-			x11-libs/qt-assistant:4 )
-		<x11-libs/qt-4.4:4 )
+	x11-libs/qt-gui:4
+	x11-libs/qt-qt3support:4
+	x11-libs/qt-assistant:4
 	>=dev-cpp/muParser-1.28
-	>=sci-libs/liborigin-20080225
+	dev-libs/boost
 	!bindist? ( sci-libs/gsl )
 	bindist? ( <sci-libs/gsl-1.10 )"
 
@@ -46,7 +46,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-pro.patch
-	epatch "${FILESDIR}"/${P}-fitplugins.patch
+	epatch "${FILESDIR}"/${PN}-0.9.6.2-fitplugins.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7-gcc4.3.patch
+	epatch "${FILESDIR}"/${P}-liborigin-gcc4.3.patch
 
 	sed -i \
 		-e '/manual/d'\
@@ -99,7 +101,7 @@ src_install() {
 
 	if use doc; then
 		insinto /usr/share/doc/${PF}/html
-		doins -r "${WORKDIR}"/qtiplot-manual-en/* \
+		doins -r "${WORKDIR}"/qtiplot-manual/* \
 			|| die "install manual failed"
 		rm -rf "${D}"/usr/share/doc/${PF}/html/*/.svn
 	fi