diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /sci-visualization/grace | |
parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) |
gentoo resync : 22.01.2021
Diffstat (limited to 'sci-visualization/grace')
-rw-r--r-- | sci-visualization/grace/Manifest | 6 | ||||
-rw-r--r-- | sci-visualization/grace/files/grace-5.1.21-netcdf.patch | 11 | ||||
-rw-r--r-- | sci-visualization/grace/files/grace-5.1.22-ldflags.patch | 41 | ||||
-rw-r--r-- | sci-visualization/grace/files/grace-5.1.22-mkstemp.patch | 55 | ||||
-rw-r--r-- | sci-visualization/grace/grace-5.1.25.ebuild | 107 |
5 files changed, 0 insertions, 220 deletions
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index da1f3d787516..5049c12978c1 100644 --- a/sci-visualization/grace/Manifest +++ b/sci-visualization/grace/Manifest @@ -1,13 +1,7 @@ AUX grace-5.1.21-fortran.patch 649 BLAKE2B c0de10fc82809fa0ec73e6fdc03e7b50ac18f0cf49eaf817b84419038078667db24adc953d7c24ef009807d9310c0226ed00eabb902dd36eedc8060e3156ab06 SHA512 29331f67e0a23a2c180aff1c864fde6cd7b41d835a0eff63135c1f5840b2c67263c409c355d1c453133668f2dbde032f7525859ce2e579d52db8884f08554baa -AUX grace-5.1.21-netcdf.patch 412 BLAKE2B 555d782c2e87ec9c7c665b034f1e110ba091a164993b47bc0975f5e0f9600d3d485dc6af92db98ca707d1d1c2a36a70e9a41f254e9c9cd2d07831d0c8364c898 SHA512 b80651039fe60d7784839061081d9f2d64cd67a71e80f834d938f62266a825666e11c424bdd92a9a0808e148537c56106c79f4be943abf36925923f7fd89b347 AUX grace-5.1.22-dlmodule.patch 355 BLAKE2B baee835ed77d6720f145a7973a5a1e58359d129eb514b4e8ec13f3390dcd39f9842cee30a6ac131b79c2f3deaffecf76e41ddb5df0b8a26f67aa1b85959aaddb SHA512 8ce040b56992712a11f2d00aa1aca67120e16df187ffed9541bb5fdc390c7555461d3ccbfbc3448e68d9a41b6b3bf9d1d2f3dca10259393c96665e3ba489ef34 -AUX grace-5.1.22-ldflags.patch 1161 BLAKE2B 0fcc7850a91bd127b0780a05cf54c4a96000371cfe07808894d69bb37aeb3351190bd6b25e2a9a7dde85833ed5663530f5502eed37985f628b99510ed07a44b7 SHA512 43950d98c61cbeaa93d84d1c4b37233a49150ef804b6a00ffbcccc4dd926878bafa9d24007640f193c323e093f0c4c731ac676f5e5d410c8e814796babdf6e0a -AUX grace-5.1.22-mkstemp.patch 1664 BLAKE2B 90d2a665a06f18790bcb1c70004ca6a9f9d7fafdf0912ab6e94ca18cda751eb38588b6a51a14a0ffd887164782b00d542dceede9df475b6f6891c89991235b12 SHA512 e7ba04f9be93e2bb12e5f78894eec255b76ee85463ec35b2890ff111f9f64567c67effec1678d4a953a602be3d0ecd2123487e3dd88704d325b369e59750ad44 AUX grace.desktop 161 BLAKE2B a401e23fc2ee22cd47c36becfa742f5acafd2359185a92f1156159c2ea480a17a82219182873aaf9da4e6582bce6ac1ef62b66b1330759214fc21a364c376ac6 SHA512 6d43de6f8d5f85c3fff36202320864ea3611d3ee842efa677ad59ae1390c6499f9f14aefd37345c0cec62024637b057e804efd26577c45b4f7a5bb6717952b2a 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 -EBUILD grace-5.1.25.ebuild 2753 BLAKE2B 78ab5459159144aa0a03ab5f330e67a5fbb7b3c780f30513c60ae378b1f0e97f3d29e53c666e869a8fd89d0b02ddafcc7aa3dbe4f1cb670321fa120bdf5ae0e0 SHA512 c1dc4d6fe7d15b50a679eca7d078252f77fd7ddeaa9ef5b8416e9e8bee500828a89963f62de64ff127ecba1bb6505c64f82751e608c56f710721770d80ef93e4 EBUILD grace-5.1.25_p7.ebuild 2793 BLAKE2B 07606b425149de775a1bbba59d5c4d5aac7f8fc7e151f6680bdc418bff2765741b9f40ca7274cf640d0cee204dc54e66847ed8d4bd129cc1cc1d2ad36678a35d SHA512 a4052a5875c804de320ac949496816b4897b136f6e632b86482d9085044dc1bb0b7fc054303007f36e804c78f8e6df61c9c82edf92ff346d4e4fd53e8da649b2 MISC metadata.xml 728 BLAKE2B 087a570a2455d567a7ed9e78378b88fc84d5356e8a2daf2e7e465af2f430ea737314a811319c9712c0c43e11364c17738716ae70c5574382716da1642bb09fec SHA512 5016a02966ab7697fb9b3e2ff0a203ddec6eb901b168acf0641829c5a35c4618a32c104edd6ecb04beb097b29ffc1550a4af06a809cb5bdfe54dee4180cc24c3 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 d843cb4b284c..000000000000 --- a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure 2007-02-16 22:44:49.000000000 +0000 -+++ b/configure 2007-09-28 23:03:29.000000000 +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 2a65cd233361..000000000000 --- 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 402a5162c584..000000000000 --- 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.c 2006-06-03 17:19:52.000000000 -0400 -+++ grace-5.1.22.new/src/editpwin.c 2008-07-26 12:45:21.000000000 -0400 -@@ -776,12 +776,12 @@ - */ - void do_ext_editor(int gno, int setno) - { -- char *fname, ebuf[256]; -+ char fname[64], ebuf[256]; - FILE *cp; - int save_autos; - -- fname = tmpnam(NULL); -- cp = grace_openw(fname); -+ strcpy(fname, "grace-XXXXXX"); -+ cp = fdopen(mkstemp(fname), "wb"); - if (cp == NULL) { - return; - } -diff -Naur grace-5.1.22/src/plotone.c grace-5.1.22.new/src/plotone.c ---- grace-5.1.22/src/plotone.c 2005-05-19 16:30:25.000000000 -0400 -+++ grace-5.1.22.new/src/plotone.c 2008-07-26 12:45:40.000000000 -0400 -@@ -121,19 +121,27 @@ - sprintf(print_file, "%s.%s", get_docbname(), dev.fext); - } - strcpy(fname, print_file); -+ prstream = grace_openw(fname); - } else { -+ int hdfd; - s = get_print_cmd(); - if (s == NULL || s[0] == '\0') { - errmsg("No print command defined, output aborted"); - return; - } -- tmpnam(fname); -- /* VMS doesn't like extensionless files */ -- strcat(fname, ".prn"); -+ strcpy(fname, "grace-hardcopy-XXXXXX"); -+ hdfd=mkstemp(fname); -+ if (hdfd == -1) { -+ errmsg("Could not create a temporary file, output aborted."); -+ return; -+ } -+ prstream = fdopen(hdfd, "wb"); -+ if (prstream == NULL) { -+ errmsg("Could not create a temporary file, output aborted."); -+ return; -+ } - } - -- prstream = grace_openw(fname); -- - if (prstream == NULL) { - return; - } diff --git a/sci-visualization/grace/grace-5.1.25.ebuild b/sci-visualization/grace/grace-5.1.25.ebuild deleted file mode 100644 index cc86861fbe77..000000000000 --- a/sci-visualization/grace/grace-5.1.25.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FORTRAN_NEEDED=fortran - -inherit eutils fortran-2 toolchain-funcs - -DESCRIPTION="Motif based XY-plotting tool" -HOMEPAGE="https://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="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:2.1= ) - jpeg? ( virtual/jpeg:0 ) - netcdf? ( sci-libs/netcdf ) - png? ( media-libs/libpng:0= )" -RDEPEND="${DEPEND} - x11-misc/xdg-utils" - -PATCHES=( - # move tmpnam to mkstemp (adapted from debian) - "${FILESDIR}"/${PN}-5.1.22-mkstemp.patch - # fix configure instead of aclocal.m4 - "${FILESDIR}"/${PN}-5.1.21-netcdf.patch - # 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 - "${FILESDIR}"/${PN}-5.1.22-ldflags.patch -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - - # 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 ../../${PN}/examples /usr/share/doc/${PF}/examples - dosym ../../${PN}/doc /usr/share/doc/${PF}/html - - doman "${ED%/}"/usr/share/doc/${PF}/html/*.1 - rm -f "${ED%/}"/usr/share/doc/${PF}/html/*.1 || die - - domenu "${FILESDIR}"/${PN}.desktop - doicon "${WORKDIR}"/${PN}.png -} |