Version bump. Fixes bug #238632.

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26-SENTINEL-2 i686

5 files changed, 102 insertions, 13 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/Manifest b/sci-visualization/qtiplot/Manifest
index aecb50f1ac94..974c270bedfb 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -3,15 +3,16 @@ AUX qtiplot-0.8.5-qmake.patch 467 RMD160 00b5de4a8ab62eb3d2b3b7cb4a0a69a92d42cb4
 AUX qtiplot-0.9.6.2-fitplugins.patch 1568 RMD160 af8b05f8f49dd567fa3619b9efe799f1d74632e6 SHA1 b5c53f8a33de778366e5f1072fe283bb357d2311 SHA256 63df38507723ce3ef8ce897d9db7f0c0e86424790b8f855f529de0a48fdf1a48
 AUX qtiplot-0.9.6.2-pro.patch 2707 RMD160 ecf6c26ff4aa2269a2e4f698490b4999a1db0a08 SHA1 cb39c99487aec6027ec9feba5d410111d5cfb834 SHA256 e00d6bdbdf2cf6d587e977f56b6ce2888070beef0d1a7c0021e3f3b59522b37e
 AUX qtiplot-0.9.7-gcc4.3.patch 668 RMD160 4c4a4b6da2cb235a5d6af7866ef5526fc77fea72 SHA1 da38423aca779a3cb68ba91f50d036c807b5a0bd SHA256 1c729cddaf606fab563f1c8409fe80d37898f00836ff6498b63ffa6ac954afc5
+AUX qtiplot-0.9.7.2-liborigin-gcc4.3.patch 478 RMD160 aed7f2a772422df874144983261e22b29d9dae5c SHA1 0557981aad551dda9ad79f813acc3f00b54fc278 SHA256 239d40c778f00f55247a450c5fe9b5923d28360930aa4da48686f796f3a48068
+AUX qtiplot-0.9.7.2-pro.patch 2801 RMD160 520d78a8fac28567b8edaf8195c0c34285e77f5c SHA1 377a610c852fa40b322b839325616f4e4101430d SHA256 559d5ce6eacf5df1f08cd835582f8ce22444be5fe756543df0320f765d4a3e70
 DIST qtiplot-0.7.7.zip 812738 RMD160 6f62b32059eec57bf931b5bae9f524672d436ee9 SHA1 b201e600ec057ff0f7b4b4572850b0b072a0e0fb SHA256 937849c42cc3047df3975d1cb7a26a2503a499d548066937589340f55bd1ab01
 DIST qtiplot-0.8.5.tar.bz2 530579 RMD160 72f4f60f1171c57e6c2614a1a5a7b6dfc3bda4f5 SHA1 d8142877bfc86fad8a43e64f6f3e0a16126e5f0a SHA256 81831d8dfaddbdf32d85a6e7eaf0e54e2321e2fba6ffaabfe6943bc326a6f874
-DIST qtiplot-0.9.6.2-manual-en.tar.bz2 11111305 RMD160 1f641931815165db2bc2c31e5720fad53cf9aa0e SHA1 28bcbb6f70513096f0d1e729cbed862a3898eacb SHA256 1945b8158b20907c072c3f89ffc5ce7e6dd7b86dce37d2ab79388b19c81446ca
-DIST qtiplot-0.9.6.2.tar.bz2 6482625 RMD160 d980a703ee0094b54748d8b55c51720493e5bfb3 SHA1 5231cc3b3c92da78268595ae9ca50363ce768bfc SHA256 16f624eb6cd5e4d153adcbc1b84598a9fc5028cad4c9d34022839c2805a8dcbb
 DIST qtiplot-0.9.7-manual-en.tar.bz2 5890732 RMD160 fc6270d6333f229599e298b092d61a61c6f78287 SHA1 5242ea8ff10a2455c53a0f2bd5638a0bf09f09c7 SHA256 8475f8f9f57a06062c49ea7cad00582a158ef004c9ced898f4d7b181d8bf5e0a
+DIST qtiplot-0.9.7.2.tar.bz2 6584563 RMD160 0b62644a660a84b9f90d0e335987316151853356 SHA1 99ff2bcfda83ac67911a3cde10c0cca1eb077188 SHA256 2cd4b9ee4fc84ce1c5c73efdfa8a909ae129a0f04ad9995ebae818e12a879f87
 DIST qtiplot-0.9.7.tar.bz2 6500723 RMD160 bfb47a46aa37e99486cfe7f9e9a0c0787432d46d SHA1 6885b6c10a5370c8a7c0eae16f82026abf6f0551 SHA256 72472a990e14bcdbbb875cb8244b90086db6c3027097db6a77d4559aa741ebc5
 EBUILD qtiplot-0.7.7.ebuild 1095 RMD160 a5ccfad6cdadadf0f11600f9b8114f9c7fb8ae2b SHA1 e6008083cbd394f979d675035c6c11fb6771fc26 SHA256 b4019c8262709376fc6d2d6fc34150da0d1079db79718d3c50adc06ed3f95c03
 EBUILD qtiplot-0.8.5.ebuild 1215 RMD160 e34d3e44ffcc28647798ef7619dfeaa1e4789adc SHA1 d3dae0497b8b4e2b5b5b889e8dc399a443dad549 SHA256 f98a4f12419637657977c68d340bd826ad6267ed61413e4015690437c693fa9b
-EBUILD qtiplot-0.9.6.2.ebuild 3171 RMD160 170bdf3cb0a1d7d818549b92360db0e91fd80081 SHA1 d731a0c372773b1f5a6d79703b615fe54d7ef623 SHA256 ebead93bbf3ee577c3f05715bdf2b102548e9f8ecbe6548c37beead259456ae2
+EBUILD qtiplot-0.9.7.2.ebuild 3233 RMD160 a9c7062f4410b6934433534bdfdb1c0bd3fca60b SHA1 7a8cfd6ccb7e22f5b6816d782cb1345da6eaf30f SHA256 b26a33de5b7efb475c6ce54d94f8e798d79320db482250b1760b9bc392562fc6
 EBUILD qtiplot-0.9.7.ebuild 3191 RMD160 00fb99f3e6ec63f5b68c1b3727d573325aa3c4c2 SHA1 22ff2bbf16cad3ab6fbcdb73a340401d8a71e8cc SHA256 e87ec8e3e9af44611a5f52605b2538c0b43cf9d675a4e57eb2a93ffba78f0284
-MISC ChangeLog 8728 RMD160 2f72778c18c818d50658bf7792f2f35ba3845569 SHA1 1871c28a9fd248189be851a058c6f5382a18d785 SHA256 face05096077b30494d8b4701fa019515542bd30083efb817708daae6273c626
+MISC ChangeLog 9214 RMD160 10114e2a7426c91992b62bc6d55fe9eb170a8a65 SHA1 8a0bfbd24cfc92b6c192dfc3399ce37498021215 SHA256 864da0bfd9bd9ea546f37952b7ede1c461a5a3217096d30d1488f68be377bd88
 MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
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