commit: ecde017db3b2d03d5fb8f809f9cca162c4d2819d Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Thu Feb 10 09:13:22 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Thu Feb 10 09:17:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecde017d
sci-visualization/gri: treeclean Closes: https://bugs.gentoo.org/741644 Closes: https://bugs.gentoo.org/588686 Closes: https://bugs.gentoo.org/634946 Closes: https://bugs.gentoo.org/561378 Closes: https://bugs.gentoo.org/639198 Closes: https://bugs.gentoo.org/828692 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> profiles/package.mask | 6 -- sci-visualization/gri/Manifest | 1 - sci-visualization/gri/files/50gri-gentoo.el | 3 - .../gri/files/gri-2.12.18-postscript.patch | 97 ---------------------- .../gri/files/gri-2.12.23-perl-5.16.patch | 23 ----- .../gri/files/gri-2.12.23-texinfo5.patch | 32 ------- sci-visualization/gri/gri-2.12.23-r1.ebuild | 84 ------------------- sci-visualization/gri/metadata.xml | 21 ----- 8 files changed, 267 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 95b9d0c64578..fd59a8ba3199 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -279,12 +279,6 @@ dev-java/args4j # Removal on 2022-02-11. Bug #828682. sys-cluster/projections -# Jakov Smolić <[email protected]> (2022-01-12) -# Dead upstream, unmaintained, uses EAPI 5, -# numerous open bugs, fails to compile. -# Removal on 2022-02-11. Bug #828692. -sci-visualization/gri - # Brian Evans <[email protected]> (2022-01-07) # The main consumer, phpunit, does not initiate the new timer correctly # This is likely to cause issues in tests; Unmask if using for other purposes diff --git a/sci-visualization/gri/Manifest b/sci-visualization/gri/Manifest deleted file mode 100644 index f64c3f03e69a..000000000000 --- a/sci-visualization/gri/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gri-2.12.23.tar.gz 1668587 BLAKE2B c7b8e4db5b093599fb9a00870516e3e6a8a93436dc9881f0c889982acd26b9b8637eee261c84be69402361db11c41f7a0989cc29d6bfd5f770a2e8056c89463c SHA512 0b028c56e9603fd00480ad7a92461c1e60f7879d89bffb5b83a2ee52c8870546e584c75478777dbb2d4934095fe9a9d4efd2aa2ff756c1860459a1e0cc0b4216 diff --git a/sci-visualization/gri/files/50gri-gentoo.el b/sci-visualization/gri/files/50gri-gentoo.el deleted file mode 100644 index e07d47c854a4..000000000000 --- a/sci-visualization/gri/files/50gri-gentoo.el +++ /dev/null @@ -1,3 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(autoload 'gri-mode "gri-mode" "Enter Gri-mode." t) -(add-to-list 'auto-mode-alist '("\\.gri\\'" . gri-mode)) diff --git a/sci-visualization/gri/files/gri-2.12.18-postscript.patch b/sci-visualization/gri/files/gri-2.12.18-postscript.patch deleted file mode 100644 index b3f3b7301975..000000000000 --- a/sci-visualization/gri/files/gri-2.12.18-postscript.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -Naur gri-2.12.18/src/extern.hh gri-2.12.18.new/src/extern.hh ---- gri-2.12.18/src/extern.hh 2003-06-07 13:37:55.000000000 -0400 -+++ gri-2.12.18.new/src/extern.hh 2008-11-01 10:46:40.000000000 -0400 -@@ -137,6 +137,7 @@ - - extern int _arrow_type; - extern bool _warn_offpage; -+extern bool _export_postscript; - - extern std::vector<double> _dash; - -diff -Naur gri-2.12.18/src/gr.cc gri-2.12.18.new/src/gr.cc ---- gri-2.12.18/src/gr.cc 2008-09-04 13:32:21.000000000 -0400 -+++ gri-2.12.18.new/src/gr.cc 2008-11-01 10:52:24.000000000 -0400 -@@ -397,7 +397,16 @@ - /* - * write conforming postscript prolog - */ -- fprintf(fp, "%%!PS-Adobe-2.0 EPSF-1.2\n"); -+ //fprintf(fp, "%%!PS-Adobe-2.0 EPSF-1.2\n"); -+ extern bool _export_postscript; -+ if (_export_postscript) -+ { -+ fprintf(fp, "%%!PS-Adobe-2.0\n"); -+ } -+ else -+ { -+ fprintf(fp, "%%!PS-Adobe-2.0 EPSF-1.2\n"); -+ } - if (privacy) - fprintf(fp, "%%%%Creator: %s\n", ""); - else -diff -Naur gri-2.12.18/src/gri.cc gri-2.12.18.new/src/gri.cc ---- gri-2.12.18/src/gri.cc 2006-06-16 19:18:40.000000000 -0400 -+++ gri-2.12.18.new/src/gri.cc 2008-11-01 10:46:40.000000000 -0400 -@@ -35,6 +35,7 @@ - // Globals used elsewhere (variables begin with _). - int _arrow_type; - bool _warn_offpage; -+bool _export_postscript; - std::vector<double> _dash; - std::vector<DataFile> _dataFILE; - std::vector<CmdFile> _cmdFILE; -diff -Naur gri-2.12.18/src/startup.cc gri-2.12.18.new/src/startup.cc ---- gri-2.12.18/src/startup.cc 2008-06-12 08:57:26.000000000 -0400 -+++ gri-2.12.18.new/src/startup.cc 2008-11-01 10:57:26.000000000 -0400 -@@ -188,6 +188,7 @@ - _axes_offset = 0.0; - _use_default_for_query = false; - _warn_offpage = true; -+ _export_postscript = false; - PUT_VAR("..use_default_for_query..", 0.0); - PUT_VAR("..words_in_dataline..", 0.0); // just in case tested - PUT_VAR("..batch..", 0.0); -@@ -681,6 +682,7 @@ - #define FLAG_PUBLICATION 1009 - #define FLAG_SUPERUSER 1010 - #define FLAG_WARN_OFFPAGE 1011 -+#define FLAG_POSTSCRIPT 1012 - // I use the 'FLAG_...' numbers for options that lack single-character abbreviations. - static struct poptOption optionsTable[] = { - { "batch", 'b', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, 'b' }, -@@ -703,6 +705,7 @@ - { "version", 'v', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, 'v' }, - { "warn_offpage", '\0', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, FLAG_WARN_OFFPAGE }, - { "yes", 'y', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, 'y' }, -+ { "postscript", '\0', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, FLAG_POSTSCRIPT }, - { 0, 0, 0, 0, 0 } - }; - const poptContext optCon = -@@ -872,6 +875,8 @@ - printf("Gri cannot read in '%s'\n",optArg); - } - break; -+ case FLAG_POSTSCRIPT -+ _export_postscript = true; - default: - printf("Unknown option\n"); - break; -@@ -1058,6 +1063,8 @@ - } else if (!strcmp(argv[i], "-y") || !strcmp(argv[i], "-yes")) { - _use_default_for_query = true; - PUT_VAR("..use_default_for_query..", 1.0); -+ } else if (!strcmp(argv[i], "-postscript")){ -+ _export_postscript = true; - #if 0 - } else if (!strcmp(argv[i], "-e")) { - // User wants to do cmd in argv[i+1] -@@ -1190,6 +1197,8 @@ - gr_textput(" Makes Gri print out command lines as they are executed.\n"); - gr_textput(" -true or -y\n"); - gr_textput(" Makes Gri think the answer to all `query's is RETURN.\n"); -+ gr_textput(" -postscript\n"); -+ gr_textput(" Export a PostScript file instead of an EPS file.\n"); - #if 0 - gr_textput(" -e cmd\n"); - gr_textput(" BUG: NOT IMPLEMENTED YET!\n"); diff --git a/sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch b/sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch deleted file mode 100644 index 14c89978ce7c..000000000000 --- a/sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch +++ /dev/null @@ -1,23 +0,0 @@ - doc/texinfo2HTML | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/doc/texinfo2HTML b/doc/texinfo2HTML -index 39bed0e..43d3fe6 100755 ---- a/doc/texinfo2HTML -+++ b/doc/texinfo2HTML -@@ -54,12 +54,12 @@ BUGS: - the end is here} and more blah - will not get the \@code{} item converted correctly. - "; --require "ctime.pl"; --require "getopts.pl"; -+use POSIX qw(strftime ctime); -+use Getopt::Std; - - $debug = 0; - --die if !&Getopts('h'); -+die if !getopts('h'); - $print_help = 0; - $print_help = $opt_h if $opt_h; - if ($print_help) { diff --git a/sci-visualization/gri/files/gri-2.12.23-texinfo5.patch b/sci-visualization/gri/files/gri-2.12.23-texinfo5.patch deleted file mode 100644 index dfc56fc574b3..000000000000 --- a/sci-visualization/gri/files/gri-2.12.23-texinfo5.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 93a40c0b444fb5265b21a344b884b1c7bed49b5a Mon Sep 17 00:00:00 2001 -From: Dan Kelley <[email protected]> -Date: Mon, 5 Aug 2013 21:01:46 -0300 -Subject: [PATCH] Bug#718821 fixed - -Problem with a subsubsection following a section. ---- - doc/gri.texi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/doc/gri.texi b/doc/gri.texi -index 57c5e76..d16b6ff 100644 ---- a/doc/gri.texi -+++ b/doc/gri.texi -@@ -18486,7 +18486,7 @@ Versions exist for MSDOS, windows, and Linux operating systems. - (Actually, the windows version is just the MSDOS version, which can be - run inside an msdos window within windows-95, windows-NT, etc.) - --@subsubsection MSDOS Operating System -+@subsection MSDOS Operating System - @cindex compilation under MSDOS - @cindex MSDOS compilation - -@@ -18543,7 +18543,7 @@ To view the output, use a PostScript viewer such as GSview. - - - --@subsubsection LINUX Operating System -+@subsection LINUX Operating System - @cindex compilation under Linux - @cindex linux compilation - @cindex LINUX compilation diff --git a/sci-visualization/gri/gri-2.12.23-r1.ebuild b/sci-visualization/gri/gri-2.12.23-r1.ebuild deleted file mode 100644 index 8940d2cd4c3e..000000000000 --- a/sci-visualization/gri/gri-2.12.23-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit epatch elisp-common - -DESCRIPTION="Language for scientific graphics programming" -HOMEPAGE="http://gri.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="doc emacs examples hdf5" - -DEPEND=" - app-text/ghostscript-gpl - >=sci-libs/netcdf-4 - virtual/latex-base - virtual/imagemagick-tools[png] - emacs? ( >=app-editors/emacs-23.1:* )" -RDEPEND="${DEPEND}" - -SITEFILE="50gri-gentoo.el" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-2.12.18-postscript.patch \ - "${FILESDIR}"/${P}-perl-5.16.patch \ - "${FILESDIR}"/${P}-texinfo5.patch - # Makefile.am contains a call to the missing script that triggers gentoo qa - sed -i -e 's|${SHELL} ../missing --run tex|tex|g' \ - doc/Makefile.in || die - sed \ - -e "/system/d" \ - -i doc/tst_suite/tst_rpn.gri || die -} - -src_compile() { - # gentoo bug #302621 - use hdf5 && has_version sci-libs/hdf5[mpi] && \ - export CXX=mpicxx CC=mpicc - VARTEXFONTS="${T}/fonts" emake - use emacs && elisp-compile src/*.el -} - -src_install() { - default - # license text not necessary - rm "${ED}"/usr/share/gri/doc/license.txt || die - - # install target installs it always and in the wrong location - # remove it here and call elisp-install in case of USE=emacs below - rm -rf "${ED}"/usr/share/emacs || die - - if ! use doc; then - sed -i -e "s/Manual at.*//" "${ED}"/usr/share/gri/startup.msg || die - rm "${ED}"/usr/share/gri/doc/{cmd,}refcard.ps || die - rm -rf "${ED}"/usr/share/gri/doc/html || die - fi - if ! use examples; then - sed -i -e "s/Examples at.*//" "${ED}"/usr/share/gri/startup.msg || die - rm -rf "${ED}"/usr/share/gri/doc/examples || die - fi - #move docs to the proper place - use doc || use examples && \ - mv -f "${ED}"/usr/share/gri/doc/* "${ED}"/usr/share/doc/${PF} - rm -rf "${ED}"/usr/share/gri/doc || die - - if use emacs; then - cd src - elisp-install ${PN} *.{el,elc} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-visualization/gri/metadata.xml b/sci-visualization/gri/metadata.xml deleted file mode 100644 index 9fc07e9a6ee6..000000000000 --- a/sci-visualization/gri/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - Gri is a language for scientific graphics programming. The word - "language" is important: Gri is command-driven, not - point/click. Some users liken Gri to LaTeX, since both provide - extensive power in exchange for patience in learning syntax. Gri can - make x-y graphs, contour graphs, and image graphs, in PostScript and - (someday) SVG formats. Control is provided over all aspects of - drawing, e.g. line widths, colors, and fonts. A TeX-like syntax - provides common mathematical symbols. -</longdescription> - <upstream> - <remote-id type="sourceforge">gri</remote-id> - </upstream> -</pkgmetadata>
