Corrected qt-assistent-4.7 DEP, 335756; move to qt4-r2 eclass

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

4 files changed, 21 insertions, 19 deletions

diff --git a/sci-visualization/scidavis/ChangeLog b/sci-visualization/scidavis/ChangeLog
index 22c1411c126b..57280bb337ce 100644
--- a/sci-visualization/scidavis/ChangeLog
+++ b/sci-visualization/scidavis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/scidavis
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.14 2010/04/26 20:36:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.15 2010/10/10 17:27:25 jlec Exp $
+
+  10 Oct 2010; Justin Lecher <jlec@gentoo.org> scidavis-0.2.3.ebuild,
+  scidavis-0.2.4.ebuild:
+  Corrected qt-assistent-4.7 DEP, 335756; move to qt4-r2 eclass
 
   26 Apr 2010; Markus Meier <maekke@gentoo.org> scidavis-0.2.3.ebuild:
   amd64 stable, bug #300267
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index 66d3e2e79521..0862b4bbd7cc 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -6,14 +6,14 @@ AUX scidavis-0.2.3-sip49.patch 1079 RMD160 bfd6ee4495c64b1f8e4f2c3acafedb44f5f8a
 AUX scidavis-0.2.4-profile.patch 3722 RMD160 66c8a23d240a7c85cbf82bd0ae3340be2df7858b SHA1 f7f0655b12b5427a7f26cfee36f0e23820022390 SHA256 cb289d9d0e45252af9c9ac44b7596eb4a7fec6ea1388ff1df39d576b21a9d0cb
 DIST scidavis-0.2.3.tar.bz2 1309491 RMD160 ca3c3232af443bcf3c0a254ad2c1aea4cb1b1c2a SHA1 410e84d894c6cecca0b2c657709f81320eae022b SHA256 812e965709072ca3d583c5844c2ba85e5a3614605806754ec0ec86dc14f5df20
 DIST scidavis-0.2.4.tar.bz2 1426695 RMD160 a265a8fea2e26ca26e0ba08dd3069389bb5f4735 SHA1 f8e0eeac08f0e06fe12cb55bb6b008c3963cb3de SHA256 81381c3a9c2e66c25945cbdfb4e6270f94f0adb0832b6947ba05fa79f0f439f6
-EBUILD scidavis-0.2.3.ebuild 1868 RMD160 b0b32711ade3a38ab80f68b5a6ca354383c2bf92 SHA1 4528ce347c8f6d9c7545a4d9dbd89967fc9a80eb SHA256 1a3ab22f7263eff109438a8e04b92e9fe980eecf00afc4e2510f372d0568f8db
-EBUILD scidavis-0.2.4.ebuild 1888 RMD160 6e00f5748d93eaaabac5bd09b900cbe905ef67bd SHA1 cc70cec364d5fd0d0603ed4773fce24952c46cef SHA256 d4a1fcf5fbe8b5521d1ef8f70a85dbc4a451932c0bf171e3a68ff3d5954c2fdf
-MISC ChangeLog 3016 RMD160 86a209a17ebd1cda92824603096886ae60faa27b SHA1 dc7f112521609531101f21030f5b2ce8ce69d2d5 SHA256 6ff680170df369a6c07fd6a7063e1503507893c45ebb1c40d044139ad38114a9
+EBUILD scidavis-0.2.3.ebuild 1920 RMD160 c50a24032bc37f225262f1d81fbb8564e65e8954 SHA1 abe5564e9d9f8988277b5cc3884abfc2a69ebc31 SHA256 8ad653977817e2bcb1ba40de8b701240b88093fbb43f671c095ff61ac0a68ead
+EBUILD scidavis-0.2.4.ebuild 1865 RMD160 cc2444ec73ad2e10c33a82b159d872f3064b7c00 SHA1 8b1c874a0ef9d7e64509dcc3c4412d10b8fc85dc SHA256 756f246c680c47c59cbc3e99ee7b7eeac89ff95841dd7d030e594cedc7ae50ff
+MISC ChangeLog 3174 RMD160 118fb87274398c6dba664f2fc75efe636732e6fc SHA1 c8acdef583468409794f1cafdcb6f0c940d023ad SHA256 da8e4090be05e3ae68ea2da6e8410756db0a94545ff6e597697382e63663cab7
 MISC metadata.xml 394 RMD160 1d6b5ccbd9c2820b9744c46afb90677f1e55bfb1 SHA1 8afc8ac6dda2ffbff823a343fb50a28fd75e29b6 SHA256 bfe78b4c2ef8ac7942bbd94c5a65f0408dc9f663aa9446dd99dbc09a3675cb6a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkvV+PAACgkQkKaRLQcq0GKMzACgl5NTBazaL2C9eLwwwOhHxRAz
-RFsAn2Zu6wgcSQ49xPJ9dvzf0SYVM1Rs
-=Ygv7
+iEYEARECAAYFAkyx94gACgkQgAnW8HDreRbR7ACgwulTEzpCN/dIp2eLIbkYkRfF
+QaYAn1813BW3rrRWYceNa0E3maAv/RvP
+=h1R6
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/scidavis/scidavis-0.2.3.ebuild b/sci-visualization/scidavis/scidavis-0.2.3.ebuild
index aa4fafb355e4..bb79a48df6b9 100644
--- a/sci-visualization/scidavis/scidavis-0.2.3.ebuild
+++ b/sci-visualization/scidavis/scidavis-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild,v 1.6 2010/04/26 20:36:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild,v 1.7 2010/10/10 17:27:25 jlec Exp $
 
 EAPI=2
 inherit eutils qt4 fdo-mime
@@ -22,7 +22,7 @@ done
 CDEPEND="sys-libs/zlib
 	>=x11-libs/qwt-5.1[svg]
 	>=x11-libs/qwtplot3d-0.2.7
-	x11-libs/qt-assistant:4
+	|| ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
 	x11-libs/qt-qt3support:4
 	>=dev-cpp/muParser-1.30
 	>=sci-libs/gsl-1.8"
diff --git a/sci-visualization/scidavis/scidavis-0.2.4.ebuild b/sci-visualization/scidavis/scidavis-0.2.4.ebuild
index 8e3566621638..c216f8952ef5 100644
--- a/sci-visualization/scidavis/scidavis-0.2.4.ebuild
+++ b/sci-visualization/scidavis/scidavis-0.2.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.4.ebuild,v 1.1 2010/03/15 22:09:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.4.ebuild,v 1.2 2010/10/10 17:27:25 jlec Exp $
 
 EAPI="3"
 
-inherit eutils fdo-mime prefix qt4
+inherit eutils fdo-mime prefix qt4-r2
 
 DESCRIPTION="Scientific Data Analysis and Visualization"
 HOMEPAGE="http://scidavis.sourceforge.net/"
@@ -23,7 +23,7 @@ done
 CDEPEND="sys-libs/zlib
 	>=x11-libs/qwt-5.1[svg]
 	>=x11-libs/qwtplot3d-0.2.7
-	x11-libs/qt-assistant:4
+	|| ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
 	x11-libs/qt-qt3support:4
 	>=dev-cpp/muParser-1.30
 	>=sci-libs/gsl-1.8"
@@ -39,6 +39,8 @@ RDEPEND="${CDEPEND}
 	dev-python/pygsl
 	sci-libs/scipy"
 
+DOCS="README CHANGES"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-profile.patch
 	eprefixify ${PN}/${PN}.pro
@@ -56,13 +58,9 @@ src_prepare() {
 		${PN}/${PN}.pro || die "sed python failed"
 }
 
-src_configure() {
-	eqmake4
-}
-
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
-	dodoc README CHANGES || die
+	qt4-r2_src_install
+
 	doicon scidavis/icons/hicolor-48/scidavis.png || die
 	cd ${PN}/translations
 	insinto /usr/share/${PN}/translations