Version bump. Separated patches for fit plugins and qtiplot.pro for better re-usability

Package-Manager: portage-2.1.5_rc6

8 files changed, 84 insertions, 110 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 5f2c08823767..f7836281bf46 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,17 @@
 # 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.20 2008/03/28 18:30:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.21 2008/04/29 14:55:52 bicatali Exp $
+
+*qtiplot-0.9.5 (29 Apr 2008)
+
+  29 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/qtiplot-0.9.3-homepage.patch,
+  -files/qtiplot-0.9.3-systemlibs.patch,
+  +files/qtiplot-0.9.5-fitplugins.patch, +files/qtiplot-0.9.5-profile.patch,
+  qtiplot-0.7.7.ebuild, -qtiplot-0.9.3.ebuild, qtiplot-0.9.4.ebuild,
+  +qtiplot-0.9.5.ebuild:
+  Version bump. Separated patches for fit plugins and qtiplot.pro for better
+  re-usability
 
 *qtiplot-0.9.4 (28 Mar 2008)
 
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 38f2a369e2d3..36c7060088b8 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -4,25 +4,25 @@ Hash: SHA1
 AUX qtiplot-0.7.7-qmake.patch 11384 RMD160 fa0491bd504d3445645817871fa831d0b70b4602 SHA1 5cd18e99d39664ef48e0d18069d89cb4b417a175 SHA256 2d89427ab1304b1ec8165d6ceaedf474a48ba59d55dafbb4977b5ddaab8509ca
 AUX qtiplot-0.8.5-qmake.patch 467 RMD160 00b5de4a8ab62eb3d2b3b7cb4a0a69a92d42cb44 SHA1 6fdb19a48c501b3f1256e7105d383f567f17182e SHA256 51230401a221a49371db906d37eca2b2734346ff82684dc572e37294fbd1ed0f
 AUX qtiplot-0.9.2-systemlibs.patch 4666 RMD160 e6fcf31a5d807e167c858c68847768e3e8fce093 SHA1 e27ab1c0bf647d35778440dc3964fdb6892d47d1 SHA256 3310cbc330e03ee8b2bb1337a1414bb8eff645743dc623a58452d0587d696e84
-AUX qtiplot-0.9.3-homepage.patch 466 RMD160 75d4bef3c3731b36cd19a8f8d674c9ef8fece2cc SHA1 6578f71884a7e83f7a2cfe1c896edc6eca3a8cfd SHA256 dad933a0649075a8d9f30657549152d9e1777495d1a51d3de2feb0366dcf88a3
-AUX qtiplot-0.9.3-systemlibs.patch 5038 RMD160 f0860b416571d2eac53458e7dbc9f75360aed7b4 SHA1 345238af7acd7394d8ab8b340c6189906cd86873 SHA256 761ccfc08b9ca3af54c90ff4d2a195d753586d1ac4451e356c1b283c7a08413d
 AUX qtiplot-0.9.4-systemlibs.patch 4586 RMD160 72e9c8a3dcd26d8465f0321724abd5e4e4c6f35b SHA1 219e58530855509ca3a2f1dcf32efd1e34c2ee73 SHA256 ad876acb11df070e331a0f6ce0c44e074d31b6f78785eb09b0800dc77e68362d
+AUX qtiplot-0.9.5-fitplugins.patch 1354 RMD160 8fc112bed04c45ed1151348413dd56ff900b3cfb SHA1 6f3f065b86eed38cb0c2e301ea74de17bf69f828 SHA256 e61bed99864e0ca3ce013da4d9f5b0fd179d3f8ee5d9c79aafd36ec783882f53
+AUX qtiplot-0.9.5-profile.patch 2970 RMD160 13499538b9b9f5b3a35316b2e3c1a5deae419047 SHA1 e90f6008f636383a3e6c663947c86342965a2df5 SHA256 fe6c745b83ea2915bfbb329af713472e601b5d8db1ec6a5de03cef37a13cf363
 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.3-manual-en.tar.bz2 5389548 RMD160 f1bcc16fb813eae077afde204552ad1c9a2bb095 SHA1 304ef403e9a02c1e4a704c864f2b0c3eb0a7e810 SHA256 258296f936923cb0aa8b8cce75e1241ed146e911e3bbb0343556c4412487aece
-DIST qtiplot-0.9.3.tar.bz2 6252872 RMD160 84394b27925441aed574267723a9346ad93b1b8c SHA1 55eb107fa5f61fbaec2793b21b1157934d022f4a SHA256 aa305cf5747a3f787ee076f4e4cf90f3f7c4843c4b0f1161a825520be0f8f16b
 DIST qtiplot-0.9.4-manual-en.tar.bz2 5378862 RMD160 4ecda8eb33fa22b8b7d59c68ac4c39968733dbbf SHA1 41e3bd6b5da3a07417d77adda978e7b236a1321e SHA256 f779d83a82982748ee4426e5f9eda25a2e23a10fb5b8c7fc21ef0446ec844ac6
 DIST qtiplot-0.9.4.tar.bz2 7025345 RMD160 db952eb7a27d8d1ed42d60e814228655e76226cd SHA1 afee76a819b1c6054dc1b4eabd731d03001c21d1 SHA256 7b4f9b734e8b258459a2a8d85beeda0c964340891d64822aa944a1fb93c60da1
-EBUILD qtiplot-0.7.7.ebuild 1103 RMD160 3d43465a82ddeb887c350bc14d72307dfe9d7c70 SHA1 f5115d29c866efc93f69f4bc006dc63508f820fd SHA256 1492680d7b3597fbf917e6b011e5ad53dc2c68f6cd6e31bcc8b3500bbed824e9
+DIST qtiplot-0.9.5-manual-en.tar.bz2 5379734 RMD160 cffbb17564a2e42159ecfc2b62ea462c625fd6c7 SHA1 438556dadcd3dd8d1ab11475fd1884e866834dfe SHA256 bc0d8580750c1cd856f036c68e44d19afcba19b57654dde33ea12a6dea244ff0
+DIST qtiplot-0.9.5.tar.bz2 7047424 RMD160 3ba2aabf727b27f6cb3996b23ffa9fab06661cbe SHA1 3cb1f0b8454c6ca85a63da3da70ec25846d6b70d SHA256 29f6f0b81ee02fa64db2f1024d3fafeedcf22ae498eadef04e5092371d1e3be2
+EBUILD qtiplot-0.7.7.ebuild 1098 RMD160 50d0e366309fcee9a7cf69f71715fd7215966548 SHA1 4d61725b4ec204c099b6f66e70a74f59bf537081 SHA256 f913ffe4fb0f32c572ef81c5df7ba0fdaa4eb70b0e24d9a7c8aa61adca6e10dd
 EBUILD qtiplot-0.8.5.ebuild 1218 RMD160 b1a7916212cb8aabb8a503a14e542d2ae15ca3ab SHA1 fef63fb5398145209f712edb2005e5b0127f548d SHA256 a0ced0f0ee26a36101305794060ada41bf72be6ddc70bd5f961b12a1a229384c
-EBUILD qtiplot-0.9.3.ebuild 2383 RMD160 1e0ffc4aac3f115d6b92eb29b5327689430bb58d SHA1 cc9e3f32ac7c5f2440b1f916aa9f21b56b3da398 SHA256 6796c7f3fcfc31fad0b1ab23dff051ab10a810cb62f9ea13b1243bb168c7ef68
-EBUILD qtiplot-0.9.4.ebuild 2342 RMD160 63bb991579f8bf90208d50e8b0495a7843bf9f49 SHA1 3311a502221cdfdecbcf65b0b724ba5b5558801d SHA256 57b4d6d78d4ae1c6330229bbc1176d75df9fd83f201b28df39a3d5575e2ce52c
-MISC ChangeLog 5982 RMD160 41a6f8d9305c118b8fb7fff7453d91b5fabc0cbd SHA1 1ed94ec298031198fa49e6048aa3b428ff21034c SHA256 435a47e2029755d1dd8afbce2294594de7b8a016ce938cde9c93160ad9ffaa58
+EBUILD qtiplot-0.9.4.ebuild 2299 RMD160 145d0c97d4a7eb60651fb4c8f013ab875f3f269d SHA1 2caf74868ee051c9ce4b62ca764bcf95e5f75423 SHA256 1626dd2f9febc50ed00f5b6f453404ab5950faf9485fa9624fd45b81923c7012
+EBUILD qtiplot-0.9.5.ebuild 2298 RMD160 837d3b0216b8028e1abc9a5598446a829c1a7043 SHA1 b3b9d9884e44d4a9377d5b1ed3065fbe9483bd48 SHA256 0113ceda7bf99e1f9610df2014ce1d10d381e883195cc6b23335e5fe4699008b
+MISC ChangeLog 6411 RMD160 9e7b13692da5ed7d9f912162c3f91460afc9b231 SHA1 0314f52697fea28dd87eeca12a300819fa524fc6 SHA256 c6336256dde268c9375dc508f17646e857dc720dff4a93f9a0cad3b40b3d0c2f
 MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH7Tlg1ycZbhPLE2ARArZYAJ0UgXT4/X8rZ3cjwWyRt7WgWFB/FQCfWJZZ
-u7Hd/BR4ceimIPxCt0dMB7E=
-=W3Up
+iD8DBQFIFzcC1ycZbhPLE2ARAp0cAJwNRht2A4WjcPVrtWbF8/ZIc5skVwCgka6u
++dK9S403DtAqGb/9tSCThmk=
+=xu/4
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.3-homepage.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.3-homepage.patch
deleted file mode 100644
index 12a9ebd1288e..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.3-homepage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtiplot/src/main.cpp.orig
-+++ qtiplot/src/main.cpp
-@@ -45,7 +45,7 @@
- <br>
- 
-  The QtiPlot web page can be found at<br>
-- <a href="http://soft.proindependent.com/qtiPlot.html">http://soft.proindependent.com/qtiPlot.html</a><br>
-+ <a href="http://soft.proindependent.com/qtiplot.html">http://soft.proindependent.com/qtiplot.html</a><br>
- 
-   \section libs QtiPlot uses the following libraries:
-   <a href="http://www.trolltech.com/products/qt/index.html">Qt</a>,
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.5-fitplugins.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.5-fitplugins.patch
new file mode 100644
index 000000000000..5eb0bec52850
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.5-fitplugins.patch
@@ -0,0 +1,34 @@
+--- fitPlugins/fitRational0/fitRational0.pro.orig	2008-03-06 15:11:53.000000000 +0000
++++ fitPlugins/fitRational0/fitRational0.pro	2008-03-06 15:16:28.000000000 +0000
+@@ -12,12 +12,10 @@
+ DESTDIR           = ../

+  

+ # statically link against GSL in 3rdparty

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

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

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

++INCLUDEPATH += /usr/include/gsl

+ 

+ #dynamically link against GSL installed system-wide

+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

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

+ 

+ target.path=/usr/lib$${libsuff}/qtiplot/plugins

+ INSTALLS += target

+--- fitPlugins/fitRational1/fitRational1.pro.orig	2008-03-06 15:13:35.000000000 +0000
++++ fitPlugins/fitRational1/fitRational1.pro	2008-03-06 15:16:52.000000000 +0000
+@@ -12,12 +12,10 @@
+ DESTDIR           = ../

+  

+ # statically link against GSL in 3rdparty

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

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

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

++INCLUDEPATH += /usr/include/gsl

+ 

+ #dynamically link against GSL installed system-wide

+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

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

+ 

+ target.path=/usr/lib$${libsuff}/qtiplot/plugins

+ INSTALLS += target

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.3-systemlibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch
index ef09eb057a8f..9bb8957130b1 100644
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.3-systemlibs.patch
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch
@@ -1,17 +1,6 @@
---- qtiplot/qtiplot.pro.orig	2008-03-06 15:02:08.000000000 +0000
-+++ qtiplot/qtiplot.pro	2008-03-06 21:57:33.000000000 +0000
-@@ -16,8 +16,8 @@
- # comment the following lines if you haven't subscribed for a QtiPlot binaries maintenance contract

- #RESTRICTED_MODULES += EMF

- 

--#CONFIG          += release

--CONFIG          += debug

-+CONFIG          += release

-+#CONFIG          += debug

- #win32: CONFIG   += console

- 

- # what to install and where

-@@ -45,12 +45,12 @@
+--- qtiplot/qtiplot.pro.orig	2008-04-24 18:54:47.622675411 +0000
++++ qtiplot/qtiplot.pro	2008-04-24 19:01:18.639824832 +0000
+@@ -30,12 +30,11 @@
  #!!! Warning: You must modify these paths according to your computer settings

  #############################################################################

  

@@ -26,11 +15,10 @@
 +INCLUDEPATH       += /usr/include/qwt5

 +INCLUDEPATH       += /usr/include/liborigin

 +INCLUDEPATH       += /usr/include/gsl

-+
  

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

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

-@@ -59,17 +59,19 @@
+@@ -44,17 +43,19 @@
  ##################### Linux (Mac OS X) ######################################

  

  # statically link against libraries in 3rdparty

@@ -59,28 +47,17 @@
  

  ##################### Windows ###############################################

  

-@@ -124,8 +126,8 @@
-                   translations/qtiplot_ja.ts \

-                   translations/qtiplot_sv.ts

- 

--#system(lupdate -verbose qtiplot.pro)

--#system(lrelease -verbose qtiplot.pro)

-+system(lupdate -verbose qtiplot.pro)

-+system(lrelease -verbose qtiplot.pro)

- 

- translations.files += translations/qtiplot_de.qm \

-                   translations/qtiplot_es.qm \

-@@ -139,8 +141,7 @@
+@@ -147,8 +148,7 @@
  manual.files += ../manual/html \

  				../manual/qtiplot-manual-en.pdf

  

 -documentation.files += ../README.html \

 -                       ../gpl_licence.txt

-+documentation.files += ../README.html

++documentation.files += ../README.html 

  

  unix: man.files += ../qtiplot.1

  

-@@ -395,8 +396,8 @@
+@@ -403,8 +403,8 @@
  ################# Origin Import (liborigin) ###################

  ###############################################################

  

@@ -91,37 +68,3 @@
  

  ###############################################################

  ################# Module: Plot 2D #############################

---- fitPlugins/fitRational0/fitRational0.pro.orig	2008-03-06 15:11:53.000000000 +0000
-+++ fitPlugins/fitRational0/fitRational0.pro	2008-03-06 15:16:28.000000000 +0000
-@@ -12,12 +12,10 @@
- DESTDIR           = ../

-  

- # statically link against GSL in 3rdparty

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

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

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

-+INCLUDEPATH += /usr/include/gsl

- 

- #dynamically link against GSL installed system-wide

--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

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

- 

- target.path=/usr/lib$${libsuff}/qtiplot/plugins

- INSTALLS += target

---- fitPlugins/fitRational1/fitRational1.pro.orig	2008-03-06 15:13:35.000000000 +0000
-+++ fitPlugins/fitRational1/fitRational1.pro	2008-03-06 15:16:52.000000000 +0000
-@@ -12,12 +12,10 @@
- DESTDIR           = ../

-  

- # statically link against GSL in 3rdparty

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

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

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

-+INCLUDEPATH += /usr/include/gsl

- 

- #dynamically link against GSL installed system-wide

--#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

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

- 

- target.path=/usr/lib$${libsuff}/qtiplot/plugins

- INSTALLS += target

diff --git a/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild b/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild
index d1097ca60b7d..5520d0d1370b 100644
--- a/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.7.7.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.7.7.ebuild,v 1.4 2008/02/13 14:33:59 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild,v 1.5 2008/04/29 14:55:52 bicatali Exp $
 
 inherit eutils multilib qt3
 
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~x86"
 IUSE="bindist"
 
 RDEPEND="$(qt_min_version 3.3)
-	>=x11-libs/qwt-4.2.0
+	<x11-libs/qwt-5
 	<x11-libs/qwtplot3d-0.2.7
 	!bindist? ( sci-libs/gsl )
 	bindist? ( <sci-libs/gsl-1.10 )"
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.4.ebuild
index e4e797599463..4780c8f5ead6 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.4.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.4.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.4.ebuild,v 1.1 2008/03/28 18:30:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.4.ebuild,v 1.2 2008/04/29 14:55:52 bicatali Exp $
 
 inherit eutils multilib qt4
 
@@ -26,7 +26,7 @@ CDEPEND=">=x11-libs/qwt-5.0.2
 	!bindist? ( sci-libs/gsl )
 	bindist? ( <sci-libs/gsl-1.10 )"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	python? ( >=dev-python/sip-4.5.2 )"
 
@@ -36,8 +36,6 @@ RDEPEND="${CDEPEND}
 		dev-python/pygsl
 		sci-libs/scipy )"
 
-QT4_BUILT_WITH_USE_CHECK="qt3support"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -45,7 +43,7 @@ src_unpack() {
 
 	# docs: remove default doc building
 	sed -i -e '/manual/d' qtiplot.pro qtiplot/qtiplot.pro \
-		|| die "die sed for docs failed"
+		|| die "sed for docs failed"
 	sed -i -e "s:doc/${PN}:doc/${PF}:" qtiplot/qtiplot.pro
 
 	if ! use python; then
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.5.ebuild
index 302ac051ff8c..78f046c55fe2 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.3.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.5.ebuild
@@ -1,7 +1,8 @@
 # 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.3.ebuild,v 1.2 2008/03/15 11:16:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.5.ebuild,v 1.1 2008/04/29 14:55:52 bicatali Exp $
 
+EAPI="1"
 inherit eutils multilib qt4
 
 DESCRIPTION="Qt based clone of the Origin plotting package"
@@ -26,7 +27,7 @@ CDEPEND=">=x11-libs/qwt-5.0.2
 	!bindist? ( sci-libs/gsl )
 	bindist? ( <sci-libs/gsl-1.10 )"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	python? ( >=dev-python/sip-4.5.2 )"
 
@@ -36,24 +37,22 @@ RDEPEND="${CDEPEND}
 		dev-python/pygsl
 		sci-libs/scipy )"
 
-QT4_BUILT_WITH_USE_CHECK="qt3support"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-systemlibs.patch
-	epatch "${FILESDIR}"/${P}-homepage.patch
+	epatch "${FILESDIR}"/${P}-profile.patch
+	epatch "${FILESDIR}"/${P}-fitplugins.patch
 
-	# docs: remove default doc building
-	sed -i -e '/manual/d' qtiplot.pro qtiplot/qtiplot.pro \
-		|| die "die sed for docs failed"
-	sed -i -e "s:doc/${PN}:doc/${PF}:" qtiplot/qtiplot.pro
+	sed -i \
+		-e '/manual/d'\
+		-e '/3rd/d' \
+		qtiplot.pro || die "sed qtiplot.pro failed"
 
 	if ! use python; then
 		sed -i \
 			-e '/^SCRIPTING_LANGS += Python/d' \
 			-e '/sipcmd/d' \
-			${PN}/${PN}.pro || die "sed for python option failed"
+			qtiplot/qtiplot.pro || die "sed for python option failed"
 	fi
 
 	# the lib$$suff did not work in the fitRational*.pro files
@@ -66,7 +65,7 @@ src_unpack() {
 		if ! use linguas_${l}; then
 			sed -i \
 				-e "s:translations/qtiplot_${l}.ts::" \
-				${PN}/${PN}.pro || die
+				qtiplot/qtiplot.pro || die
 		fi
 	done
 }
@@ -84,14 +83,14 @@ src_install() {
 	doman qtiplot.1 || die "doman failed"
 
 	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/qtiplot-manual-en \
+		insinto /usr/share/doc/${PF}/html
+		doins -r "${WORKDIR}"/qtiplot-manual-en/* \
 			|| die "install manual failed"
 	fi
 
 	if use python; then
-		cd "${S}"/${PN}
 		insinto /etc
-		doins qtiplotrc.py qtiUtil.py || die
+		doins qtiplot/{qtiplotrc,qtiUtil}.py \
+			|| die "install python config failed"
 	fi
 }