[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: 12e2340c7bd3c3d54cd0de4a81f06ff5fe4202e8 Author: Pacho Ramos gentoo org> AuthorDate: Fri Sep 29 10:34:38 2023 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Sep 29 10:40:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12e2340c sci-visualization/grace: drop 5.1.25_p9-r3 Signed-off-by: Pacho Ramos gentoo.org> sci-visualization/grace/Manifest | 1 - sci-visualization/grace/grace-5.1.25_p9-r3.ebuild | 112 -- 2 files changed, 113 deletions(-) diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index 6ecd0a3236b3..fdbc3eb13346 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,3 +1,2 @@ DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a DIST grace_5.1.25-13.debian.tar.xz 110248 BLAKE2B 19dce6ed1b9e1d93d87036f5aba5ee262d54a58bc7daf2039fb2246bd2f45e413832561a33f8cb1b793fdf30831b0282f00e60efe3980df7875d2923a9f32f76 SHA512 51ee85525557c630fc3e208eb9b72b8973de6351698766ade1a59af6b9f16bc1b6b9c2c40d2270eb33d55806c4762c7b5d10b14f2a470ff00cfae2c9351bc922 -DIST grace_5.1.25-9.debian.tar.xz 109764 BLAKE2B 0b32a7e08104c463cbd75bf022dfeffb967b5c828ab8866f123e8ed3bb8a0095876f8f3e54b3fc951ddff142561eef921a046fc59cee1ceb02a4643019b11071 SHA512 f2e7d68fc5f03450ea9c88260935f2cfab31cdc38f9a1f4c8a201c1c5172dcc27d521941d005ae13249c4df3aed8c1a9f3a63dad029988c6b2f25f6d177e1390 diff --git a/sci-visualization/grace/grace-5.1.25_p9-r3.ebuild b/sci-visualization/grace/grace-5.1.25_p9-r3.ebuild deleted file mode 100644 index 36bca04cc740.. --- a/sci-visualization/grace/grace-5.1.25_p9-r3.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -FORTRAN_NEEDED=fortran - -inherit desktop fortran-2 toolchain-funcs - -DESCRIPTION="Motif based XY-plotting tool" -HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/; -SRC_URI=" - ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz -" - -SLOT="0" -LICENSE="GPL-2 LGPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="fftw fortran jpeg netcdf png" - -DEPEND=" - media-libs/t1lib - media-libs/tiff:= - sys-libs/zlib - >=x11-libs/motif-2.3:0 - x11-libs/xbae - fftw? ( sci-libs/fftw:3.0= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - netcdf? ( sci-libs/netcdf:= ) - png? ( media-libs/libpng:0= )" -RDEPEND="${DEPEND} - x11-misc/xdg-utils" - -S="${WORKDIR}/${P/_p*}" - -PATCHES=( - # fix for missing defines when fortran is disabled - "${FILESDIR}"/${PN}-5.1.21-fortran.patch - # fix a leak (from freebsd) - "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - - # Debian patches - for p in $(<"${WORKDIR}"/debian/patches/series) ; do - eapply -p1 "${WORKDIR}/debian/patches/${p}" - done - - # don't strip if not asked for - sed -i \ - -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ - {auxiliary,grconvert,src}/Makefile || die - - sed -i \ - -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ - -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ - -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ - -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ - Makefile */Makefile || die "sed failed" - - sed -i \ - -e 's:bin/grconvert:grconvert:' \ - -e 's:auxiliary/fdf2fit:fdf2fit:' \ - gracerc || die -} - -src_configure() { - tc-export CC AR - - # the configure script just produces a basic Make.conf - # and a config.h - econf \ - --disable-pdfdrv \ - --disable-xmhtml \ - --without-bundled-xbae \ - --without-bundled-t1lib \ - --enable-grace-home="${EPREFIX}"/usr/share/${PN} \ - --with-helpviewer="xdg-open %s" \ - --with-editor="xdg-open %s" \ - --with-printcmd="lpr" \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) \ - $(use_with fftw) \ - $(use_enable fortran f77-wrapper) \ - $(use_enable netcdf) \ - $(use_enable jpeg jpegdrv) \ - $(use_enable png pngdrv) \ - $(use_with fortran f77 $(tc-getFC)) -} - -src_install() { -
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/, sci-visualization/grace/files/
commit: 1f68184f654095bb9337e90a7a674b9658f12959 Author: Pacho Ramos gentoo org> AuthorDate: Fri Sep 29 09:55:46 2023 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Sep 29 09:55:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f68184f sci-visualization/grace: Don't overwrite files by default People can still use -noask option if they want. Also apply some C99 fixes from Fedora. Signed-off-by: Pacho Ramos gentoo.org> .../grace/files/grace-5.1.25-honor-noask.patch | 13 +++ sci-visualization/grace/files/grace-c99.patch | 12 +++ sci-visualization/grace/grace-5.1.25_p13-r2.ebuild | 116 + 3 files changed, 141 insertions(+) diff --git a/sci-visualization/grace/files/grace-5.1.25-honor-noask.patch b/sci-visualization/grace/files/grace-5.1.25-honor-noask.patch new file mode 100644 index ..24285e478f04 --- /dev/null +++ b/sci-visualization/grace/files/grace-5.1.25-honor-noask.patch @@ -0,0 +1,13 @@ +--- a/src/files.c~ 2008-04-26 20:25:57.0 +0200 b/src/files.c 2023-09-26 11:39:24.232306135 +0200 +@@ -1098,10 +1098,6 @@ + int noask_save = noask; + + old_fn = get_docname(); +-if (compare_strings(old_fn, fn)) { +-/* If saving under the same name, don't warn about overwriting */ +-noask = TRUE; +-} + + if ((cp = grace_openw(fn)) == NULL) { + noask = noask_save; diff --git a/sci-visualization/grace/files/grace-c99.patch b/sci-visualization/grace/files/grace-c99.patch new file mode 100644 index ..fb87e39848a9 --- /dev/null +++ b/sci-visualization/grace/files/grace-c99.patch @@ -0,0 +1,12 @@ +diff -ur grace-5.1.25.orig/src/utils.c grace-5.1.25/src/utils.c +--- grace-5.1.25.orig/src/utils.c 2022-12-22 10:40:39.391625263 +0100 grace-5.1.25/src/utils.c 2022-12-22 10:41:24.732188992 +0100 +@@ -1391,7 +1391,7 @@ + update_app_title(); + } + +-void lock_dirtystate(flag) ++void lock_dirtystate(int flag) + { + dirtystate_lock = flag; + } diff --git a/sci-visualization/grace/grace-5.1.25_p13-r2.ebuild b/sci-visualization/grace/grace-5.1.25_p13-r2.ebuild new file mode 100644 index ..7a5e42ca6de2 --- /dev/null +++ b/sci-visualization/grace/grace-5.1.25_p13-r2.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +FORTRAN_NEEDED=fortran + +inherit desktop fortran-2 toolchain-funcs xdg + +DESCRIPTION="Motif based XY-plotting tool" +HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/; +SRC_URI=" + ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz +" + +SLOT="0" +LICENSE="GPL-2 LGPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="fftw fortran jpeg netcdf png" + +DEPEND=" + media-libs/t1lib + media-libs/tiff:= + sys-libs/zlib + >=x11-libs/motif-2.3:0 + x11-libs/xbae + fftw? ( sci-libs/fftw:3.0= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + netcdf? ( sci-libs/netcdf:= ) + png? ( media-libs/libpng:0= )" +RDEPEND="${DEPEND} + x11-misc/xdg-utils" + +S="${WORKDIR}/${P/_p*}" + +PATCHES=( + # Fix for missing defines when fortran is disabled + "${FILESDIR}"/${PN}-5.1.21-fortran.patch + # Fix a leak (from freebsd) + "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch + # Honor -noask option and avoid accidentally overwritting files + "${FILESDIR}"/${PN}-5.1.25-honor-noask.patch + # Fix C99 compat (from Fedora) + "${FILESDIR}"/${PN}-c99.patch +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_prepare() { + default + + # Debian patches + for p in $(<"${WORKDIR}"/debian/patches/series) ; do + eapply -p1 "${WORKDIR}/debian/patches/${p}" + done + + # don't strip if not asked for + sed -i \ + -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ + {auxiliary,grconvert,src}/Makefile || die + + sed -i \ + -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ + -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ + -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ + -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ + Makefile */Makefile || die "sed failed" + + sed -i \ + -e 's:bin/grconvert:grconvert:' \ + -e 's:auxiliary/fdf2fit:fdf2fit:' \ + gracerc || die +} + +src_configure() { + tc-export CC AR + + # the configure script just produces a basic Make.conf + # and a config.h + econf \ + --disable-pdfdrv \ + --disable-xmhtml \ + --without-bundled-xbae \ + --without-bundled-t1lib \ + --enable-grace-home="${EPREFIX}"/usr/share/${PN}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: 0c363904ee57d2861b6a7a3bd868a8728fe33708 Author: Sam James gentoo org> AuthorDate: Fri Dec 16 01:32:20 2022 + Commit: Sam James gentoo org> CommitDate: Fri Dec 16 01:38:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c363904 sci-visualization/grace: add media-libs/libtiff subslot dep libtiff changed SONAME. Signed-off-by: Sam James gentoo.org> .../grace/{grace-5.1.25_p13.ebuild => grace-5.1.25_p13-r1.ebuild} | 4 ++-- .../grace/{grace-5.1.25_p9-r1.ebuild => grace-5.1.25_p9-r3.ebuild} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sci-visualization/grace/grace-5.1.25_p13.ebuild b/sci-visualization/grace/grace-5.1.25_p13-r1.ebuild similarity index 98% rename from sci-visualization/grace/grace-5.1.25_p13.ebuild rename to sci-visualization/grace/grace-5.1.25_p13-r1.ebuild index 62952760ef1b..8298d0d1cd3d 100644 --- a/sci-visualization/grace/grace-5.1.25_p13.ebuild +++ b/sci-visualization/grace/grace-5.1.25_p13-r1.ebuild @@ -20,12 +20,12 @@ IUSE="fftw fortran jpeg netcdf png" DEPEND=" media-libs/t1lib - media-libs/tiff:0 + media-libs/tiff:= sys-libs/zlib >=x11-libs/motif-2.3:0 x11-libs/xbae fftw? ( sci-libs/fftw:3.0= ) - jpeg? ( media-libs/libjpeg-turbo:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) netcdf? ( sci-libs/netcdf:= ) png? ( media-libs/libpng:0= )" RDEPEND="${DEPEND} diff --git a/sci-visualization/grace/grace-5.1.25_p9-r1.ebuild b/sci-visualization/grace/grace-5.1.25_p9-r3.ebuild similarity index 96% rename from sci-visualization/grace/grace-5.1.25_p9-r1.ebuild rename to sci-visualization/grace/grace-5.1.25_p9-r3.ebuild index 63d394b7cb71..36bca04cc740 100644 --- a/sci-visualization/grace/grace-5.1.25_p9-r1.ebuild +++ b/sci-visualization/grace/grace-5.1.25_p9-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,12 +20,12 @@ IUSE="fftw fortran jpeg netcdf png" DEPEND=" media-libs/t1lib - media-libs/tiff:0 + media-libs/tiff:= sys-libs/zlib >=x11-libs/motif-2.3:0 x11-libs/xbae fftw? ( sci-libs/fftw:3.0= ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) netcdf? ( sci-libs/netcdf:= ) png? ( media-libs/libpng:0= )" RDEPEND="${DEPEND}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: 19e4da03879cdff274aa134c018fd68ad0edf3b6 Author: Pacho Ramos gentoo org> AuthorDate: Sat Dec 10 16:07:47 2022 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Dec 10 16:08:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e4da03 sci-visualization/grace: add 5.1.25_p13 Signed-off-by: Pacho Ramos gentoo.org> sci-visualization/grace/Manifest| 1 + sci-visualization/grace/grace-5.1.25_p13.ebuild | 112 2 files changed, 113 insertions(+) diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index 9631d15100b4..6ecd0a3236b3 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,2 +1,3 @@ DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a +DIST grace_5.1.25-13.debian.tar.xz 110248 BLAKE2B 19dce6ed1b9e1d93d87036f5aba5ee262d54a58bc7daf2039fb2246bd2f45e413832561a33f8cb1b793fdf30831b0282f00e60efe3980df7875d2923a9f32f76 SHA512 51ee85525557c630fc3e208eb9b72b8973de6351698766ade1a59af6b9f16bc1b6b9c2c40d2270eb33d55806c4762c7b5d10b14f2a470ff00cfae2c9351bc922 DIST grace_5.1.25-9.debian.tar.xz 109764 BLAKE2B 0b32a7e08104c463cbd75bf022dfeffb967b5c828ab8866f123e8ed3bb8a0095876f8f3e54b3fc951ddff142561eef921a046fc59cee1ceb02a4643019b11071 SHA512 f2e7d68fc5f03450ea9c88260935f2cfab31cdc38f9a1f4c8a201c1c5172dcc27d521941d005ae13249c4df3aed8c1a9f3a63dad029988c6b2f25f6d177e1390 diff --git a/sci-visualization/grace/grace-5.1.25_p13.ebuild b/sci-visualization/grace/grace-5.1.25_p13.ebuild new file mode 100644 index ..62952760ef1b --- /dev/null +++ b/sci-visualization/grace/grace-5.1.25_p13.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +FORTRAN_NEEDED=fortran + +inherit desktop fortran-2 toolchain-funcs xdg + +DESCRIPTION="Motif based XY-plotting tool" +HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/; +SRC_URI=" + ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz +" + +SLOT="0" +LICENSE="GPL-2 LGPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="fftw fortran jpeg netcdf png" + +DEPEND=" + media-libs/t1lib + media-libs/tiff:0 + sys-libs/zlib + >=x11-libs/motif-2.3:0 + x11-libs/xbae + fftw? ( sci-libs/fftw:3.0= ) + jpeg? ( media-libs/libjpeg-turbo:0 ) + netcdf? ( sci-libs/netcdf:= ) + png? ( media-libs/libpng:0= )" +RDEPEND="${DEPEND} + x11-misc/xdg-utils" + +S="${WORKDIR}/${P/_p*}" + +PATCHES=( + # fix for missing defines when fortran is disabled + "${FILESDIR}"/${PN}-5.1.21-fortran.patch + # fix a leak (from freebsd) + "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_prepare() { + default + + # Debian patches + for p in $(<"${WORKDIR}"/debian/patches/series) ; do + eapply -p1 "${WORKDIR}/debian/patches/${p}" + done + + # don't strip if not asked for + sed -i \ + -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ + {auxiliary,grconvert,src}/Makefile || die + + sed -i \ + -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ + -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ + -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ + -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ + Makefile */Makefile || die "sed failed" + + sed -i \ + -e 's:bin/grconvert:grconvert:' \ + -e 's:auxiliary/fdf2fit:fdf2fit:' \ + gracerc || die +} + +src_configure() { + tc-export CC AR + + # the configure script just produces a basic Make.conf + # and a config.h + econf \ + --disable-pdfdrv \ + --disable-xmhtml \ + --without-bundled-xbae \ + --without-bundled-t1lib \ + --enable-grace-home="${EPREFIX}"/usr/share/${PN} \ + --with-helpviewer="xdg-open %s" \ + --with-editor="xdg-open %s" \ + --with-printcmd="lpr" \ + --x-includes="${EPREFIX}"/usr/include \ + --x-libraries="${EPREFIX}"/usr/$(get_libdir) \ + $(use_with fftw) \ + $(use_enable fortran f77-wrapper) \ + $(use_enable netcdf) \ + $(use_enable jpeg jpegdrv) \ + $(use_enable png pngdrv) \ + $(use_with fortran f77 $(tc-getFC)) +} + +src_install() { + default + +
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: 711d6c29329da0e3f75ae7599986b6c632aab178 Author: Sam James gentoo org> AuthorDate: Tue Dec 28 22:00:28 2021 + Commit: Sam James gentoo org> CommitDate: Tue Dec 28 22:00:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711d6c29 sci-visualization/grace: depend on netcdf subslot need to be rebuilt when its subslot changes Signed-off-by: Sam James gentoo.org> .../grace/{grace-5.1.25_p9.ebuild => grace-5.1.25_p9-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-visualization/grace/grace-5.1.25_p9.ebuild b/sci-visualization/grace/grace-5.1.25_p9-r1.ebuild similarity index 98% rename from sci-visualization/grace/grace-5.1.25_p9.ebuild rename to sci-visualization/grace/grace-5.1.25_p9-r1.ebuild index f2ad5c47aa26..63d394b7cb71 100644 --- a/sci-visualization/grace/grace-5.1.25_p9.ebuild +++ b/sci-visualization/grace/grace-5.1.25_p9-r1.ebuild @@ -26,7 +26,7 @@ DEPEND=" x11-libs/xbae fftw? ( sci-libs/fftw:3.0= ) jpeg? ( virtual/jpeg:0 ) - netcdf? ( sci-libs/netcdf ) + netcdf? ( sci-libs/netcdf:= ) png? ( media-libs/libpng:0= )" RDEPEND="${DEPEND} x11-misc/xdg-utils"
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: 288daee02e2ce2cf89217d7b80ef5ee352fce9f7 Author: Jakov Smolić gentoo org> AuthorDate: Wed Oct 6 07:50:45 2021 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Oct 6 08:31:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288daee0 sci-visualization/grace: drop 5.1.25_p7 Signed-off-by: Jakov Smolić gentoo.org> sci-visualization/grace/Manifest | 1 - sci-visualization/grace/grace-5.1.25_p7.ebuild | 111 - 2 files changed, 112 deletions(-) diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index e49f89b6400..9631d15100b 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,3 +1,2 @@ DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a -DIST grace_5.1.25-7.debian.tar.xz 108904 BLAKE2B 17265969d0501e1b1306733178a680b93d1d5fa96d63df4c14e5b3cba70b68d44d90a77d6ec0aa5243c2a79048bb75aedefeae1a2bab551a6315d253ee831735 SHA512 2fa34337858454c8a28b666fccb7157e9c4895b828f25171c4c6b68316abbf6d4bc54032f1de01ccb6b86068f7059ae2462d18b4a273341f588f49fc35f1bb61 DIST grace_5.1.25-9.debian.tar.xz 109764 BLAKE2B 0b32a7e08104c463cbd75bf022dfeffb967b5c828ab8866f123e8ed3bb8a0095876f8f3e54b3fc951ddff142561eef921a046fc59cee1ceb02a4643019b11071 SHA512 f2e7d68fc5f03450ea9c88260935f2cfab31cdc38f9a1f4c8a201c1c5172dcc27d521941d005ae13249c4df3aed8c1a9f3a63dad029988c6b2f25f6d177e1390 diff --git a/sci-visualization/grace/grace-5.1.25_p7.ebuild b/sci-visualization/grace/grace-5.1.25_p7.ebuild deleted file mode 100644 index 9a41b41a096..000 --- a/sci-visualization/grace/grace-5.1.25_p7.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -FORTRAN_NEEDED=fortran - -inherit desktop fortran-2 toolchain-funcs - -DESCRIPTION="Motif based XY-plotting tool" -HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/; -SRC_URI=" - ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz -" - -SLOT="0" -LICENSE="GPL-2 LGPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="fftw fortran jpeg netcdf png" - -DEPEND=" - media-libs/t1lib - media-libs/tiff:0 - sys-libs/zlib - >=x11-libs/motif-2.3:0 - x11-libs/xbae - fftw? ( sci-libs/fftw:3.0= ) - jpeg? ( virtual/jpeg:0 ) - netcdf? ( sci-libs/netcdf ) - png? ( media-libs/libpng:0= )" -RDEPEND="${DEPEND} - x11-misc/xdg-utils" - -S="${WORKDIR}/${P/_p*}" - -PATCHES=( - # fix for missing defines when fortran is disabled - "${FILESDIR}"/${PN}-5.1.21-fortran.patch - # fix a leak (from freebsd) - "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - - # Debian patches - for p in $(<"${WORKDIR}"/debian/patches/series) ; do - eapply -p1 "${WORKDIR}/debian/patches/${p}" - done - - # don't strip if not asked for - sed -i \ - -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ - {auxiliary,grconvert,src}/Makefile || die - - sed -i \ - -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ - -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ - -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ - -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ - Makefile */Makefile || die "sed failed" - - sed -i \ - -e 's:bin/grconvert:grconvert:' \ - -e 's:auxiliary/fdf2fit:fdf2fit:' \ - gracerc || die -} - -src_configure() { - tc-export CC AR - - # the configure script just produces a basic Make.conf - # and a config.h - econf \ - --disable-pdfdrv \ - --disable-xmhtml \ - --without-bundled-xbae \ - --without-bundled-t1lib \ - --enable-grace-home="${EPREFIX}"/usr/share/${PN} \ - --with-helpviewer="xdg-open %s" \ - --with-editor="xdg-open %s" \ - --with-printcmd="lpr" \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) \ - $(use_with fftw) \ - $(use_enable fortran f77-wrapper) \ - $(use_enable netcdf) \ - $(use_enable jpeg jpegdrv) \ - $(use_enable png pngdrv) \ - $(use_with fortran f77 $(tc-getFC)) -} - -src_install() { - default - - dosym
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: ac31c0380bb6625ce185d82194fe528cdccafa85 Author: Pacho Ramos gentoo org> AuthorDate: Thu Feb 11 18:56:27 2021 + Commit: Pacho Ramos gentoo org> CommitDate: Thu Feb 11 18:56:27 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac31c038 sci-visualization/grace: New debian patchset Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Pacho Ramos gentoo.org> sci-visualization/grace/Manifest | 1 + sci-visualization/grace/grace-5.1.25_p9.ebuild | 112 + 2 files changed, 113 insertions(+) diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index cfd0de27643..e49f89b6400 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,2 +1,3 @@ DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a DIST grace_5.1.25-7.debian.tar.xz 108904 BLAKE2B 17265969d0501e1b1306733178a680b93d1d5fa96d63df4c14e5b3cba70b68d44d90a77d6ec0aa5243c2a79048bb75aedefeae1a2bab551a6315d253ee831735 SHA512 2fa34337858454c8a28b666fccb7157e9c4895b828f25171c4c6b68316abbf6d4bc54032f1de01ccb6b86068f7059ae2462d18b4a273341f588f49fc35f1bb61 +DIST grace_5.1.25-9.debian.tar.xz 109764 BLAKE2B 0b32a7e08104c463cbd75bf022dfeffb967b5c828ab8866f123e8ed3bb8a0095876f8f3e54b3fc951ddff142561eef921a046fc59cee1ceb02a4643019b11071 SHA512 f2e7d68fc5f03450ea9c88260935f2cfab31cdc38f9a1f4c8a201c1c5172dcc27d521941d005ae13249c4df3aed8c1a9f3a63dad029988c6b2f25f6d177e1390 diff --git a/sci-visualization/grace/grace-5.1.25_p9.ebuild b/sci-visualization/grace/grace-5.1.25_p9.ebuild new file mode 100644 index 000..f2ad5c47aa2 --- /dev/null +++ b/sci-visualization/grace/grace-5.1.25_p9.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +FORTRAN_NEEDED=fortran + +inherit desktop fortran-2 toolchain-funcs + +DESCRIPTION="Motif based XY-plotting tool" +HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/; +SRC_URI=" + ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz +" + +SLOT="0" +LICENSE="GPL-2 LGPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="fftw fortran jpeg netcdf png" + +DEPEND=" + media-libs/t1lib + media-libs/tiff:0 + sys-libs/zlib + >=x11-libs/motif-2.3:0 + x11-libs/xbae + fftw? ( sci-libs/fftw:3.0= ) + jpeg? ( virtual/jpeg:0 ) + netcdf? ( sci-libs/netcdf ) + png? ( media-libs/libpng:0= )" +RDEPEND="${DEPEND} + x11-misc/xdg-utils" + +S="${WORKDIR}/${P/_p*}" + +PATCHES=( + # fix for missing defines when fortran is disabled + "${FILESDIR}"/${PN}-5.1.21-fortran.patch + # fix a leak (from freebsd) + "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_prepare() { + default + + # Debian patches + for p in $(<"${WORKDIR}"/debian/patches/series) ; do + eapply -p1 "${WORKDIR}/debian/patches/${p}" + done + + # don't strip if not asked for + sed -i \ + -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ + {auxiliary,grconvert,src}/Makefile || die + + sed -i \ + -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ + -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ + -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ + -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ + Makefile */Makefile || die "sed failed" + + sed -i \ + -e 's:bin/grconvert:grconvert:' \ + -e 's:auxiliary/fdf2fit:fdf2fit:' \ + gracerc || die +} + +src_configure() { + tc-export CC AR + + # the configure script just produces a basic Make.conf + # and a config.h + econf \ + --disable-pdfdrv \ + --disable-xmhtml \ + --without-bundled-xbae \ + --without-bundled-t1lib \ + --enable-grace-home="${EPREFIX}"/usr/share/${PN} \ + --with-helpviewer="xdg-open %s" \ + --with-editor="xdg-open %s" \ + --with-printcmd="lpr" \ + --x-includes="${EPREFIX}"/usr/include \ + --x-libraries="${EPREFIX}"/usr/$(get_libdir) \ + $(use_with fftw) \ + $(use_enable fortran f77-wrapper) \ + $(use_enable netcdf) \ + $(use_enable jpeg jpegdrv) \ + $(use_enable png pngdrv) \ + $(use_with fortran f77 $(tc-getFC)) +} +
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/, sci-visualization/grace/files/
commit: a6703fca35511c20e213730116c95152ce5e18d7 Author: Jakov Smolic sartura hr> AuthorDate: Wed Jan 20 10:16:19 2021 + Commit: David Seifert gentoo org> CommitDate: Wed Jan 20 10:16:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6703fca sci-visualization/grace: Remove old Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> sci-visualization/grace/Manifest | 2 - .../grace/files/grace-5.1.21-netcdf.patch | 11 --- .../grace/files/grace-5.1.22-ldflags.patch | 41 .../grace/files/grace-5.1.22-mkstemp.patch | 55 --- sci-visualization/grace/grace-5.1.25.ebuild| 107 - 5 files changed, 216 deletions(-) diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index 2814e718975..cfd0de27643 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,4 +1,2 @@ DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a -DIST grace.png 338 BLAKE2B 3a109acd9e44929b9efe1fd6b707459b71cfbb601b98a00619096becff8d89fb46f2fe34f4a5c5974b125b4bed9b5f2452fee669627146ba00976dd43a7778b0 SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 -DIST grace.png.tar 10240 BLAKE2B 3e99cd04a92b547ed5440475363b140d0183c92d1865f0b4564890f705a87df4e55624d681fa77408948a841eac4358465e49e65fa02615e31ec54ffb84f059d SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf DIST grace_5.1.25-7.debian.tar.xz 108904 BLAKE2B 17265969d0501e1b1306733178a680b93d1d5fa96d63df4c14e5b3cba70b68d44d90a77d6ec0aa5243c2a79048bb75aedefeae1a2bab551a6315d253ee831735 SHA512 2fa34337858454c8a28b666fccb7157e9c4895b828f25171c4c6b68316abbf6d4bc54032f1de01ccb6b86068f7059ae2462d18b4a273341f588f49fc35f1bb61 diff --git a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch deleted file mode 100644 index d843cb4b284..000 --- a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch +++ /dev/null @@ -1,11 +0,0 @@ a/configure2007-02-16 22:44:49.0 + -+++ b/configure2007-09-28 23:03:29.0 +0100 -@@ -15181,7 +15181,7 @@ - int main(void) { - char *vlib; - vlib = nc_inq_libvers(); --if (strcmp(vlib, "3.0") < 0) { -+if (((vlib[0] == '"') && (strcmp(vlib, "\"3.0") < 0)) || ((vlib[0] != '"') && (strcmp(vlib, "3.0") < 0))){ - exit(1); - } - exit(0); diff --git a/sci-visualization/grace/files/grace-5.1.22-ldflags.patch b/sci-visualization/grace/files/grace-5.1.22-ldflags.patch deleted file mode 100644 index 2a65cd23336..000 --- a/sci-visualization/grace/files/grace-5.1.22-ldflags.patch +++ /dev/null @@ -1,41 +0,0 @@ -Respect LDFLAGS - -http://bugs.gentoo.org/show_bug.cgi?id=336984 - grace-5.1.22/src/Makefile -+++ grace-5.1.22/src/Makefile -@@ -37,10 +37,10 @@ - include Make.dep - - xmgrace$(EXE) : $(GROBJS) $(PARS_C) $(GUIOBJS) $(CEPHES_LIB) -- $(CC) $(CFLAGS) $(GROBJS) $(GUIOBJS) -o $@ $(LDFLAGS) $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) $(GROBJS) $(GUIOBJS) -o $@ $(LIBS) - - grace$(EXE) : $(GROBJS) $(PARS_C) $(CEPHES_LIB) -- $(CC) $(CFLAGS) $(GROBJS) -o $@ $(LDFLAGS) $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) $(GROBJS) -o $@ $(LIBS) - - - buildinfo$(EXE) : buildinfo$(O) grace-5.1.22/auxiliary/Makefile -+++ grace-5.1.22/auxiliary/Makefile -@@ -22,7 +22,7 @@ - devclean : distclean - - convcal$(EXE) : convcal.c -- $(CC) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS) - - install : $(AUXILIARIES) $(PROGRAMS) $(SCRIPTS) - $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary grace-5.1.22/grconvert/Makefile -+++ grace-5.1.22/grconvert/Makefile -@@ -23,7 +23,7 @@ - all : $(PROG) - - $(PROG) : $(OBJS) -- $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - $(OBJS) : grconvert.h - diff --git a/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch b/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch deleted file mode 100644 index 402a5162c58..000 --- a/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur grace-5.1.22/src/editpwin.c grace-5.1.22.new/src/editpwin.c grace-5.1.22/src/editpwin.c2006-06-03 17:19:52.0 -0400 -+++ grace-5.1.22.new/src/editpwin.c2008-07-26 12:45:21.0 -0400 -@@ -776,12 +776,12
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: 0f3d927c6122e0e4ea8c0a9597e60aff876e920d Author: Pacho Ramos gentoo org> AuthorDate: Wed Feb 12 22:11:53 2020 + Commit: Pacho Ramos gentoo org> CommitDate: Wed Feb 12 22:11:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f3d927c sci-visualization/grace: Drop old Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Pacho Ramos gentoo.org> sci-visualization/grace/Manifest | 1 - sci-visualization/grace/grace-5.1.23-r1.ebuild | 110 - sci-visualization/grace/grace-5.1.23.ebuild| 110 - 3 files changed, 221 deletions(-) diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index a1e8b782fbc..2814e718975 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,4 +1,3 @@ -DIST grace-5.1.23.tar.gz 2501364 BLAKE2B 805edb081b008a43a37a03666704b149d6edf5d9d2e6313102a0e9ccda3bd7b4a0a79616d7f7df5061d7bc5f48afe0334942b8862483488dc866f7594b0596a4 SHA512 84b75639a5065fb0a39204b55e82471be90d78b22530e541a4e58cb5bcd94a59d51e91da38d9fecb9c23e21744c0c3b31bb9db4fd26c656233a19cffd1eef7d3 DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a DIST grace.png 338 BLAKE2B 3a109acd9e44929b9efe1fd6b707459b71cfbb601b98a00619096becff8d89fb46f2fe34f4a5c5974b125b4bed9b5f2452fee669627146ba00976dd43a7778b0 SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 DIST grace.png.tar 10240 BLAKE2B 3e99cd04a92b547ed5440475363b140d0183c92d1865f0b4564890f705a87df4e55624d681fa77408948a841eac4358465e49e65fa02615e31ec54ffb84f059d SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf diff --git a/sci-visualization/grace/grace-5.1.23-r1.ebuild b/sci-visualization/grace/grace-5.1.23-r1.ebuild deleted file mode 100644 index 74c9a9f993c..000 --- a/sci-visualization/grace/grace-5.1.23-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -FORTRAN_NEEDED=fortran - -inherit eutils fortran-2 multilib toolchain-funcs - -DESCRIPTION="Motif based XY-plotting tool" -HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/; -SRC_URI=" - http://pkgs.fedoraproject.org/cgit/grace.git/plain/grace.png - https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar - ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz; - -SLOT="0" -LICENSE="GPL-2 LGPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="fortran fftw jpeg netcdf png" - -DEPEND=" - media-libs/t1lib - media-libs/tiff:0 - sys-libs/zlib - >=x11-libs/motif-2.3:0 - x11-libs/xbae - fftw? ( sci-libs/fftw:2.1 ) - jpeg? ( virtual/jpeg:0 ) - netcdf? ( sci-libs/netcdf ) - png? ( media-libs/libpng:0= )" -RDEPEND="${DEPEND} - x11-misc/xdg-utils" - -pkg_setup() { - fortran-2_pkg_setup - tc-export CC AR -} - -src_prepare() { - # move tmpnam to mkstemp (adapted from debian) - epatch "${FILESDIR}"/${PN}-5.1.22-mkstemp.patch - # fix configure instead of aclocal.m4 - epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch - # fix for missing defines when fortran is disabled - epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch - # fix a leak (from freebsd) - epatch \ - "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch \ - "${FILESDIR}"/${PN}-5.1.22-ldflags.patch - - # don't strip if not asked for - sed -i \ - -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ - {auxiliary,grconvert,src}/Makefile || die - - sed -i \ - -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ - -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ - -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ - -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ - Makefile */Makefile || die "sed failed" - - sed -i \ - -e 's:bin/grconvert:grconvert:' \ - -e 's:auxiliary/fdf2fit:fdf2fit:' \ - gracerc || die -} - -src_configure() { - local myconf - if use fortran; then - myconf="--with-f77=$(tc-getFC)" - else - myconf="--without-f77" - fi - - # the configure script just produces a basic Make.conf - # and a config.h - econf \ - --disable-pdfdrv \ - --disable-xmhtml \ - --without-bundled-xbae \ -
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: 7320c400764ee206fe13585b337f7fd28fb2642d Author: Pacho Ramos gentoo org> AuthorDate: Wed Feb 12 22:11:11 2020 + Commit: Pacho Ramos gentoo org> CommitDate: Wed Feb 12 22:11:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7320c400 sci-visualization/grace: Apply Debian fixes/patches Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Pacho Ramos gentoo.org> sci-visualization/grace/Manifest | 1 + sci-visualization/grace/grace-5.1.25_p7.ebuild | 111 + 2 files changed, 112 insertions(+) diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index 144b683f3c5..a1e8b782fbc 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -2,3 +2,4 @@ DIST grace-5.1.23.tar.gz 2501364 BLAKE2B 805edb081b008a43a37a03666704b149d6edf5d DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a DIST grace.png 338 BLAKE2B 3a109acd9e44929b9efe1fd6b707459b71cfbb601b98a00619096becff8d89fb46f2fe34f4a5c5974b125b4bed9b5f2452fee669627146ba00976dd43a7778b0 SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 DIST grace.png.tar 10240 BLAKE2B 3e99cd04a92b547ed5440475363b140d0183c92d1865f0b4564890f705a87df4e55624d681fa77408948a841eac4358465e49e65fa02615e31ec54ffb84f059d SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf +DIST grace_5.1.25-7.debian.tar.xz 108904 BLAKE2B 17265969d0501e1b1306733178a680b93d1d5fa96d63df4c14e5b3cba70b68d44d90a77d6ec0aa5243c2a79048bb75aedefeae1a2bab551a6315d253ee831735 SHA512 2fa34337858454c8a28b666fccb7157e9c4895b828f25171c4c6b68316abbf6d4bc54032f1de01ccb6b86068f7059ae2462d18b4a273341f588f49fc35f1bb61 diff --git a/sci-visualization/grace/grace-5.1.25_p7.ebuild b/sci-visualization/grace/grace-5.1.25_p7.ebuild new file mode 100644 index 000..b3869610988 --- /dev/null +++ b/sci-visualization/grace/grace-5.1.25_p7.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +FORTRAN_NEEDED=fortran + +inherit desktop fortran-2 toolchain-funcs + +DESCRIPTION="Motif based XY-plotting tool" +HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/; +SRC_URI=" + ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz +" + +SLOT="0" +LICENSE="GPL-2 LGPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="fftw fortran jpeg netcdf png" + +DEPEND=" + media-libs/t1lib + media-libs/tiff:0 + sys-libs/zlib + >=x11-libs/motif-2.3:0 + x11-libs/xbae + fftw? ( sci-libs/fftw:3.0= ) + jpeg? ( virtual/jpeg:0 ) + netcdf? ( sci-libs/netcdf ) + png? ( media-libs/libpng:0= )" +RDEPEND="${DEPEND} + x11-misc/xdg-utils" + +S="${WORKDIR}/${P/_p*}" + +PATCHES=( + # fix for missing defines when fortran is disabled + "${FILESDIR}"/${PN}-5.1.21-fortran.patch + # fix a leak (from freebsd) + "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_prepare() { + default + + # Debian patches + for p in $(<"${WORKDIR}"/debian/patches/series) ; do + eapply -p1 "${WORKDIR}/debian/patches/${p}" + done + + # don't strip if not asked for + sed -i \ + -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ + {auxiliary,grconvert,src}/Makefile || die + + sed -i \ + -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ + -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ + -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ + -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ + Makefile */Makefile || die "sed failed" + + sed -i \ + -e 's:bin/grconvert:grconvert:' \ + -e 's:auxiliary/fdf2fit:fdf2fit:' \ + gracerc || die +} + +src_configure() { + tc-export CC AR + + # the configure script just produces a basic Make.conf + # and a config.h + econf \ + --disable-pdfdrv \ + --disable-xmhtml \ + --without-bundled-xbae \ + --without-bundled-t1lib \ + --enable-grace-home="${EPREFIX}"/usr/share/${PN} \ + --with-helpviewer="xdg-open %s" \ + --with-editor="xdg-open %s" \ + --with-printcmd="lpr" \ +
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/files/
commit: cb4b127ed15d489541e55acc8fa21422dd424e1a Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Wed Aug 9 09:40:43 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Aug 13 11:24:44 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4b127e sci-visualization/grace: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/5370 .../grace/files/grace-5.1.22-libpng15.patch | 19 --- 1 file changed, 19 deletions(-) diff --git a/sci-visualization/grace/files/grace-5.1.22-libpng15.patch b/sci-visualization/grace/files/grace-5.1.22-libpng15.patch deleted file mode 100644 index 1e27bb385c6..000 --- a/sci-visualization/grace/files/grace-5.1.22-libpng15.patch +++ /dev/null @@ -1,19 +0,0 @@ a/src/rstdrv.c -+++ b/src/rstdrv.c -@@ -53,6 +53,7 @@ - #endif - - #ifdef HAVE_LIBPNG -+# include - # include - #endif - -@@ -885,7 +886,7 @@ - return; - } - --if (setjmp(png_ptr->jmpbuf)) { -+if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(_ptr, _ptr); - return; - }
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/files/, sci-visualization/grace/
commit: 9fa31de207ec8ee6bf88d3862243c6735efdd410 Author: Gerhard Bräunlich gmx net> AuthorDate: Sat Jan 28 17:16:35 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Jan 29 22:51:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa31de2 sci-visualization/grace: Version bump to 5.1.25, EAPI bump 5 -> 6 Package-Manager: portage-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/3702 sci-visualization/grace/Manifest | 1 + .../grace/files/grace-5.1.21-fortran.patch | 4 +- .../grace/files/grace-5.1.21-netcdf.patch | 4 +- .../grace/files/grace-5.1.22-dlmodule.patch| 4 +- .../grace/files/grace-5.1.22-libpng15.patch| 4 +- sci-visualization/grace/grace-5.1.25.ebuild| 108 + 6 files changed, 117 insertions(+), 8 deletions(-) diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index f73411c..1fd4085 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,4 +1,5 @@ DIST grace-5.1.22.tar.gz 2516576 SHA256 4ce8f058b6c1267a842419a3edbf471421dea9cf5744783745b6cb375cdf5f25 SHA512 0187f0305ff5e404e9adab60e9f3d328121c9ab8352f0b65fa523e2e9078dcee073d347a252a5e8b516728cae24b1ac0718b5011ab17247ae9ea9149336866d4 WHIRLPOOL 206ceb7dee5572e756fe67d528925705ab3b56913f26d8c9b066b07423cdd6b4e70c0739e3b66bdf7aa992dae243755f81ea097e1a33b94817322bc30b33274a DIST grace-5.1.23.tar.gz 2501364 SHA256 69527950fd9c056a76b7a6bf4ac37a9b87acc565c12a941ffae3c9c5a822ca10 SHA512 84b75639a5065fb0a39204b55e82471be90d78b22530e541a4e58cb5bcd94a59d51e91da38d9fecb9c23e21744c0c3b31bb9db4fd26c656233a19cffd1eef7d3 WHIRLPOOL f807245acd084973d6436f404fc9eb146543a8ce34e0089ded098e771564e9d3bc6ae7023463674101cd161a1463ab3b97ee80df5b18e191b1e9ab94c7e6afc4 +DIST grace-5.1.25.tar.gz 2957689 SHA256 751ab9917ed0f6232073c193aba74046037e185d73b77bab0f5af3e3ff1da2ac SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a WHIRLPOOL 3c74003882b4f3455b17563b94649bb7a2abd66df4a386b0da4e91498174b414a96b705b081c8c2a1d5532b2709b2b02f5fe18145a2fc1071f2900ccef7f6e95 DIST grace.png 338 SHA256 70130b7ddb7a64cf2d866aaf472d8badb12d72ac288275709689c631e23da9bc SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 WHIRLPOOL 6cef65fc9329e7f49541e193a84c4f86498f422951ced1bd228ce854bab43a9ba5d9dfb44f780b1dcb030892cebd657d6de385df92710062f56c38f1e6cccd94 DIST grace.png.tar 10240 SHA256 05215c72a2f45b513ba508287b5f693af145719b7a85497320d1e1e17695e99c SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf WHIRLPOOL 448e1c659475e38331c3ff2f050de52feb01db9623c0a250c7702debe920abf7e9bc56373f442d91d11ad6f55da3e9bbc58f52c1251223bdf405202ae8309556 diff --git a/sci-visualization/grace/files/grace-5.1.21-fortran.patch b/sci-visualization/grace/files/grace-5.1.21-fortran.patch index 921d965..cdec666 100644 --- a/sci-visualization/grace/files/grace-5.1.21-fortran.patch +++ b/sci-visualization/grace/files/grace-5.1.21-fortran.patch @@ -1,5 +1,5 @@ grace_np/gracef_np.c.orig 2008-03-03 11:45:12.0 + -+++ grace_np/gracef_np.c 2008-03-03 12:05:37.0 + +--- a/grace_np/gracef_np.c 2008-03-03 11:45:12.0 + b/grace_np/gracef_np.c 2008-03-03 12:05:37.0 + @@ -1,5 +1,11 @@ #include diff --git a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch index eabb274..d843cb4 100644 --- a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch +++ b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch @@ -1,5 +1,5 @@ configure.orig 2007-02-16 22:44:49.0 + -+++ configure 2007-09-28 23:03:29.0 +0100 +--- a/configure2007-02-16 22:44:49.0 + b/configure2007-09-28 23:03:29.0 +0100 @@ -15181,7 +15181,7 @@ int main(void) { char *vlib; diff --git a/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch index 9e36b34..02fa06a 100644 --- a/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch +++ b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch @@ -1,5 +1,5 @@ src/dlmodule.c.orig2005-11-13 07:45:16.0 +0900 -+++ src/dlmodule.c 2008-06-16 15:28:33.0 +0900 +--- a/src/dlmodule.c 2005-11-13 07:45:16.0 +0900 b/src/dlmodule.c 2008-06-16 15:28:33.0 +0900 @@ -89,6 +89,9 @@ return RETURN_FAILURE; } diff --git a/sci-visualization/grace/files/grace-5.1.22-libpng15.patch b/sci-visualization/grace/files/grace-5.1.22-libpng15.patch index 43db9e0..1e27bb3 100644 ---
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: 700a3ee9813bca4f17fc53fb21ab10eaff0978c3 Author: Gerhard Bräunlich gmx net> AuthorDate: Sat Jan 28 17:18:07 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Jan 29 22:51:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700a3ee9 sci-visualization/grace: Removing EAPI 4 ebuilds Package-Manager: portage-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/3702 sci-visualization/grace/Manifest | 1 - sci-visualization/grace/grace-5.1.22-r2.ebuild | 107 sci-visualization/grace/grace-5.1.22-r3.ebuild | 111 - 3 files changed, 219 deletions(-) diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index 1fd4085..fc2c7f5 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,4 +1,3 @@ -DIST grace-5.1.22.tar.gz 2516576 SHA256 4ce8f058b6c1267a842419a3edbf471421dea9cf5744783745b6cb375cdf5f25 SHA512 0187f0305ff5e404e9adab60e9f3d328121c9ab8352f0b65fa523e2e9078dcee073d347a252a5e8b516728cae24b1ac0718b5011ab17247ae9ea9149336866d4 WHIRLPOOL 206ceb7dee5572e756fe67d528925705ab3b56913f26d8c9b066b07423cdd6b4e70c0739e3b66bdf7aa992dae243755f81ea097e1a33b94817322bc30b33274a DIST grace-5.1.23.tar.gz 2501364 SHA256 69527950fd9c056a76b7a6bf4ac37a9b87acc565c12a941ffae3c9c5a822ca10 SHA512 84b75639a5065fb0a39204b55e82471be90d78b22530e541a4e58cb5bcd94a59d51e91da38d9fecb9c23e21744c0c3b31bb9db4fd26c656233a19cffd1eef7d3 WHIRLPOOL f807245acd084973d6436f404fc9eb146543a8ce34e0089ded098e771564e9d3bc6ae7023463674101cd161a1463ab3b97ee80df5b18e191b1e9ab94c7e6afc4 DIST grace-5.1.25.tar.gz 2957689 SHA256 751ab9917ed0f6232073c193aba74046037e185d73b77bab0f5af3e3ff1da2ac SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a WHIRLPOOL 3c74003882b4f3455b17563b94649bb7a2abd66df4a386b0da4e91498174b414a96b705b081c8c2a1d5532b2709b2b02f5fe18145a2fc1071f2900ccef7f6e95 DIST grace.png 338 SHA256 70130b7ddb7a64cf2d866aaf472d8badb12d72ac288275709689c631e23da9bc SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 WHIRLPOOL 6cef65fc9329e7f49541e193a84c4f86498f422951ced1bd228ce854bab43a9ba5d9dfb44f780b1dcb030892cebd657d6de385df92710062f56c38f1e6cccd94 diff --git a/sci-visualization/grace/grace-5.1.22-r2.ebuild b/sci-visualization/grace/grace-5.1.22-r2.ebuild deleted file mode 100644 index 1798c0f.. --- a/sci-visualization/grace/grace-5.1.22-r2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -FORTRAN_NEEDED=fortran - -inherit eutils fortran-2 multilib toolchain-funcs - -DESCRIPTION="Motif based XY-plotting tool" -HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/; -SRC_URI=" - https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar - ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz; - -SLOT="0" -LICENSE="GPL-2 LGPL-2" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="fortran fftw jpeg netcdf png" - -DEPEND=" - media-libs/t1lib - media-libs/tiff - sys-libs/zlib - >=x11-libs/motif-2.3:0 - x11-libs/xbae - fftw? ( sci-libs/fftw:2.1 ) - jpeg? ( virtual/jpeg ) - netcdf? ( sci-libs/netcdf ) - png? ( media-libs/libpng )" -RDEPEND="${DEPEND} - x11-misc/xdg-utils" - -pkg_setup() { - fortran-2_pkg_setup - tc-export CC -} - -src_prepare() { - # move tmpnam to mkstemp (adapted from debian) - epatch "${FILESDIR}"/${P}-mkstemp.patch - # fix configure instead of aclocal.m4 - epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch - # fix for missing defines when fortran is disabled - epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch - # fix a leak (from freebsd) - epatch "${FILESDIR}"/${P}-dlmodule.patch \ - "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-libpng15.patch - - # don't strip if not asked for - sed -i \ - -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ - {auxiliary,grconvert,src}/Makefile || die - - sed -i \ - -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ - -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ - -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ - -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ - Makefile */Makefile || die "sed failed" - - sed -i \ - -e 's:bin/grconvert:grconvert:' \ - -e 's:auxiliary/fdf2fit:fdf2fit:' \ - gracerc || die -} - -src_configure() { - local myconf - if use fortran; then - myconf="--with-f77=$(tc-getFC)" - else - myconf="--without-f77" -
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: 363de36710b6e74076cc42b68dd666f2afde657c Author: David Seifert gentoo org> AuthorDate: Sat May 14 23:28:48 2016 + Commit: David Seifert gentoo org> CommitDate: Sat May 14 23:28:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363de367 sci-visualization/grace: Fix QA MissingSlotDep Package-Manager: portage-2.2.28 sci-visualization/grace/grace-5.1.23-r1.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sci-visualization/grace/grace-5.1.23-r1.ebuild b/sci-visualization/grace/grace-5.1.23-r1.ebuild index 1b589ec..130d9e3 100644 --- a/sci-visualization/grace/grace-5.1.23-r1.ebuild +++ b/sci-visualization/grace/grace-5.1.23-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -22,14 +22,14 @@ IUSE="fortran fftw jpeg netcdf png" DEPEND=" media-libs/t1lib - media-libs/tiff + media-libs/tiff:0 sys-libs/zlib >=x11-libs/motif-2.3:0 x11-libs/xbae fftw? ( sci-libs/fftw:2.1 ) - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:0 ) netcdf? ( sci-libs/netcdf ) - png? ( media-libs/libpng )" + png? ( media-libs/libpng:0= )" RDEPEND="${DEPEND} x11-misc/xdg-utils"
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/grace/
commit: 11f65f2b7a4740a5ed10a791f1f7c0345edd0062 Author: David Seifert gentoo org> AuthorDate: Sat May 14 23:27:35 2016 + Commit: David Seifert gentoo org> CommitDate: Sat May 14 23:27:35 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f65f2b sci-visualization/grace: Fix QA MissingSlotDep Package-Manager: portage-2.2.28 sci-visualization/grace/grace-5.1.23.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sci-visualization/grace/grace-5.1.23.ebuild b/sci-visualization/grace/grace-5.1.23.ebuild index fdabc90..aa1dc54 100644 --- a/sci-visualization/grace/grace-5.1.23.ebuild +++ b/sci-visualization/grace/grace-5.1.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -22,14 +22,14 @@ IUSE="fortran fftw jpeg netcdf png" DEPEND=" media-libs/t1lib - media-libs/tiff + media-libs/tiff:0 sys-libs/zlib >=x11-libs/motif-2.3:0 x11-libs/xbae fftw? ( sci-libs/fftw:2.1 ) - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:0 ) netcdf? ( sci-libs/netcdf ) - png? ( media-libs/libpng )" + png? ( media-libs/libpng:0= )" RDEPEND="${DEPEND} x11-misc/xdg-utils"