diff options
| -rw-r--r-- | sci-visualization/grace/Manifest | 2 | ||||
| -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, 216 deletions
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest index 2814e7189753..cfd0de276438 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 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 -} |