commit: 3088bcd9e6f979dcfb124b2b5151ee26cc4d6727 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Wed Oct 25 20:36:35 2023 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Wed Oct 25 20:37:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3088bcd9
sci-visualization/scidavis: fix compat with zlib-1.3-r1 See-also: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=491bf8bd3ef621da49b168736a04f23aa4c7719c Closes: https://bugs.gentoo.org/913142 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> .../scidavis/{scidavis-2.9.0.ebuild => scidavis-2.9.0-r1.ebuild} | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sci-visualization/scidavis/scidavis-2.9.0.ebuild b/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild similarity index 83% rename from sci-visualization/scidavis/scidavis-2.9.0.ebuild rename to sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild index 1d4d6aacecf7..d57c2b132cbf 100644 --- a/sci-visualization/scidavis/scidavis-2.9.0.ebuild +++ b/sci-visualization/scidavis/scidavis-2.9.0-r1.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit python-single-r1 cmake docs virtualx xdg DESCRIPTION="Application for Scientific Data Analysis and Visualization" -HOMEPAGE="http://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/"; +HOMEPAGE="https://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/"; SRC_URI="https://github.com/SciDAVis/scidavis/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+ ZLIB" @@ -35,7 +35,7 @@ RDEPEND=" dev-qt/qtwidgets:5 dev-qt/qtxml:5 sci-libs/gsl:= - sys-libs/zlib[minizip] + >=sys-libs/zlib-1.3[minizip] x11-libs/qwt:5 x11-libs/qwtplot3d origin? ( sci-libs/liborigin ) @@ -62,11 +62,6 @@ src_prepare() { # Remove things which are packaged elsewhere rm -r 3rdparty/qwt5-qt5 3rdparty/qwtplot3d 3rdparty/liborigin || die - - # OF has been renamed in Gentoo https://bugs.gentoo.org/383179 - # Note this is *not* packaged in sys-libs/zlib[minizip] because - # this file resides in the test directory in upstream zlib - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' 3rdparty/minigzip/minigzip.c || die } src_configure() {
