diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2010-01-06 02:42:13 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2010-01-06 02:42:13 +0000 |
commit | e1e0991b17d5cb7fb1beda730d2fed77853391e8 (patch) | |
tree | 1b7b04aca6ff6801260210c45a12f845c08a376c /sci-visualization | |
parent | Removed old (diff) | |
download | gentoo-2-e1e0991b17d5cb7fb1beda730d2fed77853391e8.tar.gz gentoo-2-e1e0991b17d5cb7fb1beda730d2fed77853391e8.tar.bz2 gentoo-2-e1e0991b17d5cb7fb1beda730d2fed77853391e8.zip |
Forced python, seems to be unavoidable, bug #289532
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization')
-rw-r--r-- | sci-visualization/scidavis/ChangeLog | 6 | ||||
-rw-r--r-- | sci-visualization/scidavis/scidavis-0.2.3.ebuild | 20 |
2 files changed, 14 insertions, 12 deletions
diff --git a/sci-visualization/scidavis/ChangeLog b/sci-visualization/scidavis/ChangeLog index cbac6a421c67..311f9b5bfd64 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.10 2010/01/03 20:42:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.11 2010/01/06 02:42:13 bicatali Exp $ + + 06 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> + scidavis-0.2.3.ebuild: + Forced python, seems to be unavoidable, bug #289532 03 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> scidavis-0.2.3.ebuild: Unrestrict x11-libs/qwt depend to allow also 5.2.0 (latest) wrt #299511. diff --git a/sci-visualization/scidavis/scidavis-0.2.3.ebuild b/sci-visualization/scidavis/scidavis-0.2.3.ebuild index 3c0e6c0f0280..857e3b1f224f 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.3 2010/01/03 20:42:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild,v 1.4 2010/01/06 02:42:13 bicatali Exp $ EAPI=2 inherit eutils qt4 fdo-mime @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="python" +IUSE="" LANGS="de es fr ja ru sv" for l in ${LANGS}; do @@ -31,12 +31,12 @@ CDEPEND="sys-libs/zlib DEPEND="${CDEPEND} dev-util/pkgconfig - python? ( >=dev-python/sip-4.7 )" + >=dev-python/sip-4.7" RDEPEND="${CDEPEND} - python? ( >=dev-python/PyQt4-4.4[X] - dev-python/pygsl - sci-libs/scipy )" + >=dev-python/PyQt4-4.4[X] + dev-python/pygsl + sci-libs/scipy" src_prepare() { epatch "${FILESDIR}"/${P}-profile.patch @@ -50,11 +50,9 @@ src_prepare() { -e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \ -i fit*/*/*.pro || die "sed plugins failed" - if use python; then - sed -i \ - -e '/^include( python.pri )$/d' \ - ${PN}/${PN}.pro || die "sed python failed" - fi + sed -i \ + -e '/^include( python.pri )$/d' \ + ${PN}/${PN}.pro || die "sed python failed" } src_configure() { |