diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-12-19 22:58:58 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-12-19 22:58:58 +0000 |
| commit | 3f7b3b843da3b146b7c69daa1a87ee369187e051 (patch) | |
| tree | f7560208a285f9b8d9efff8ba5cdf2f3b883e1fe /sci-visualization | |
| parent | Add Prefix keywords (same as virtual/jdk) (diff) | |
| download | gentoo-2-3f7b3b843da3b146b7c69daa1a87ee369187e051.tar.gz gentoo-2-3f7b3b843da3b146b7c69daa1a87ee369187e051.tar.bz2 gentoo-2-3f7b3b843da3b146b7c69daa1a87ee369187e051.zip | |
Merged zlib fixes from sci-visualization/qtiplot, #395139
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization')
| -rw-r--r-- | sci-visualization/scidavis/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-visualization/scidavis/scidavis-0.2.4.ebuild | 17 |
2 files changed, 16 insertions, 6 deletions
diff --git a/sci-visualization/scidavis/ChangeLog b/sci-visualization/scidavis/ChangeLog index 5fe34cfb13bc..44fbcfa9181d 100644 --- a/sci-visualization/scidavis/ChangeLog +++ b/sci-visualization/scidavis/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-visualization/scidavis # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.17 2011/03/06 09:10:57 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.18 2011/12/19 22:58:58 jlec Exp $ + + 19 Dec 2011; Justin Lecher <jlec@gentoo.org> scidavis-0.2.4.ebuild: + Merged zlib fixes from sci-visualization/qtiplot, #395139 06 Mar 2011; Justin Lecher <jlec@gentoo.org> scidavis-0.2.3.ebuild, scidavis-0.2.4.ebuild: diff --git a/sci-visualization/scidavis/scidavis-0.2.4.ebuild b/sci-visualization/scidavis/scidavis-0.2.4.ebuild index 550b959cb5be..7e056f31d11e 100644 --- a/sci-visualization/scidavis/scidavis-0.2.4.ebuild +++ b/sci-visualization/scidavis/scidavis-0.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.4 2011/03/06 09:10:57 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.4.ebuild,v 1.5 2011/12/19 22:58:58 jlec Exp $ EAPI="3" @@ -20,13 +20,14 @@ for l in ${LANGS}; do IUSE="${IUSE} linguas_${l}" done -CDEPEND="sys-libs/zlib +CDEPEND=" + dev-cpp/muParser + sci-libs/gsl + sys-libs/zlib x11-libs/qwt:5[svg] >=x11-libs/qwtplot3d-0.2.7 || ( >=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" + x11-libs/qt-qt3support:4" # remove because unsupported for now # sci-libs/liborigin:2" @@ -56,6 +57,12 @@ src_prepare() { sed -i \ -e '/^include( python.pri )$/d' \ ${PN}/${PN}.pro || die "sed python failed" + sed \ + -e '1i#define OF(x) x' \ + -i 3rdparty/minigzip/minigzip.c || die +# sed \ +# -e "/minigzip.c/s:^.*$:LIBS += -lminizip:g" \ +# -i scidavis/sourcefiles.pri || die } src_install() { |