diff options
| -rw-r--r-- | profiles/package.mask | 6 | ||||
| -rw-r--r-- | sci-electronics/drawtiming/Manifest | 1 | ||||
| -rw-r--r-- | sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild | 37 | ||||
| -rw-r--r-- | sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch | 10 | ||||
| -rw-r--r-- | sci-electronics/drawtiming/files/drawtiming-0.7.1-imagemagick-7.patch | 137 | ||||
| -rw-r--r-- | sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch | 36 | ||||
| -rw-r--r-- | sci-electronics/drawtiming/metadata.xml | 19 |
7 files changed, 0 insertions, 246 deletions
diff --git a/profiles/package.mask b/profiles/package.mask index 14d0f27c08b4..eb4b6f71673a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -320,12 +320,6 @@ app-portage/deltup # No revdeps. Removal on 2021-08-26. Bug #752408. app-text/lout -# David Seifert <soap@gentoo.org> (2021-07-26) -# Fails to build with GCC 11, terrible codebase, tests fail with -# modern ImageMagick, last release over 12 years ago. -# Bug #725436, #786915, removal in 30 days. -sci-electronics/drawtiming - # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-07-12) # Version 3.3.0 suffers from ridiculously high CPU usage, this version has # therefore been retracted upstream. diff --git a/sci-electronics/drawtiming/Manifest b/sci-electronics/drawtiming/Manifest deleted file mode 100644 index 07bb57dc401f..000000000000 --- a/sci-electronics/drawtiming/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST drawtiming-0.7.1.tar.gz 123714 BLAKE2B 60e5f4c741d5a273860d5bddd872d1df01be4c256531b1cbfe3baeab46ce569618bc371f6d65959d77071ac66946f3a934b351841d643ac154ee59ad5fb23052 SHA512 f474ee372967f05abfa49a15d635279ee23715f1472a82aab8890f8144eab3fdb7fc0529510ed7f92b7073097d77ee2266e5a97f55e755292416e126537fcbbd diff --git a/sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild b/sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild deleted file mode 100644 index 5982ce19dcd1..000000000000 --- a/sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools epatch - -DESCRIPTION="Command line tool for drawing timing diagrams" -HOMEPAGE="http://drawtiming.sourceforge.net/index.html" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="examples" - -DEPEND="media-gfx/imagemagick[cxx]" -RDEPEND="${DEPEND}" - -src_prepare() { - mv "${S}"/configure.in "${S}"/configure.ac - epatch "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-ldflags.patch - if has_version ">=media-gfx/imagemagick-7.0.5.7" ;then - epatch "${FILESDIR}"/${P}-imagemagick-7.patch - fi - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog README THANKS - if use examples; then - insinto "/usr/share/doc/${PF}/examples" - doins samples/*.txt - fi -} diff --git a/sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch b/sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch deleted file mode 100644 index 4249c79aa6e1..000000000000 --- a/sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/timing.cc.old 2011-06-01 18:27:42.000000000 +0000 -+++ src/timing.cc 2011-06-01 18:28:09.000000000 +0000 -@@ -23,6 +23,7 @@ - #include "timing.h" - #include <map> - #include <fstream> -+#include <cstring> - using namespace std; - using namespace timing; - using namespace Magick; diff --git a/sci-electronics/drawtiming/files/drawtiming-0.7.1-imagemagick-7.patch b/sci-electronics/drawtiming/files/drawtiming-0.7.1-imagemagick-7.patch deleted file mode 100644 index 8f075a57200a..000000000000 --- a/sci-electronics/drawtiming/files/drawtiming-0.7.1-imagemagick-7.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -u drawtiming-0.7.1.old/configure.in drawtiming-0.7.1/configure.in ---- drawtiming-0.7.1.old/configure.ac 2009-04-03 02:59:52.000000000 +0000 -+++ drawtiming-0.7.1/configure.ac 2017-06-01 15:20:15.168508458 +0000 -@@ -15,7 +15,7 @@ - [], [with_magick=check]) - - AS_IF([test "x$with_magick" != "xno"], -- [PKG_CHECK_MODULES([MAGICK], [ImageMagick++])], -+ [PKG_CHECK_MODULES([MAGICK], [Magick++])], - [AC_DEFINE([LITE],[1],[Build without ImageMagick])]) - - AC_OUTPUT(Makefile drawtiming.spec src/Makefile doc/Makefile samples/Makefile) -diff -u -r drawtiming-0.7.1.old/src/timing.cc drawtiming-0.7.1/src/timing.cc ---- drawtiming-0.7.1.old/src/timing.cc 2017-06-05 15:36:36.603638861 +0000 -+++ drawtiming-0.7.1/src/timing.cc 2017-06-02 12:48:03.523309638 +0000 -@@ -517,7 +517,7 @@ - // ------------------------------------------------------------ - - static void draw_dependency (gc &gc, int x0, int y0, int x1, int y1) { -- list<Coordinate> shaft, head; -+ vector<Coordinate> shaft, head; - - gc.push (); - gc.stroke_color ("blue"); -@@ -571,7 +571,7 @@ - - static void draw_delay (gc &gc, int x0, int y0, int x1, int y1, int y2, - const string &text) { -- list<Coordinate> head; -+ vector<Coordinate> head; - - gc.push (); - gc.stroke_color ("blue"); -@@ -688,7 +688,7 @@ - - // ------------------------------------------------------------ - --void magick_gc::bezier (const std::list<Magick::Coordinate> &points) { -+void magick_gc::bezier (const std::vector<Magick::Coordinate> &points) { - drawables.push_back (DrawableBezier (points)); - } - -@@ -724,7 +724,7 @@ - - // ------------------------------------------------------------ - --void magick_gc::polygon (const std::list<Magick::Coordinate> &points) -+void magick_gc::polygon (const std::vector<Magick::Coordinate> &points) - { - drawables.push_back (DrawablePolygon (points)); - } -diff -u -r drawtiming-0.7.1.old/src/timing.h drawtiming-0.7.1/src/timing.h ---- drawtiming-0.7.1.old/src/timing.h 2009-04-03 03:02:40.000000000 +0000 -+++ drawtiming-0.7.1/src/timing.h 2017-06-02 12:49:35.780468543 +0000 -@@ -129,13 +129,13 @@ - gc (void) : width(0), height(0) { } - virtual ~gc() { } - -- virtual void bezier (const std::list<Magick::Coordinate> &points) = 0; -+ virtual void bezier (const std::vector<Magick::Coordinate> &points) = 0; - virtual void fill_color (const std::string &name) = 0; - virtual void fill_opacity (int op) = 0; - virtual void font (const std::string &name) = 0; - virtual void line (int x1, int y1, int x2, int y2) = 0; - virtual void point_size (int size) = 0; -- virtual void polygon (const std::list<Magick::Coordinate> &points) = 0; -+ virtual void polygon (const std::vector<Magick::Coordinate> &points) = 0; - virtual void pop (void) = 0; - virtual void push (void) = 0; - virtual void scaling (double hscale, double vscale) = 0; -@@ -146,18 +146,18 @@ - - #ifndef LITE - class magick_gc : public gc { -- std::list<Magick::Drawable> drawables; -+ std::vector<Magick::Drawable> drawables; - - public: - ~magick_gc (void); - -- void bezier (const std::list<Magick::Coordinate> &points); -+ void bezier (const std::vector<Magick::Coordinate> &points); - void fill_color (const std::string &name); - void fill_opacity (int op); - void font (const std::string &name); - void line (int x1, int y1, int x2, int y2); - void point_size (int size); -- void polygon (const std::list<Magick::Coordinate> &points); -+ void polygon (const std::vector<Magick::Coordinate> &points); - void pop (void); - void push (void); - void scaling (double hscale, double vscale); -diff -u -r drawtiming-0.7.1.old/src/timing.cc drawtiming-0.7.1/src/timing.cc ---- drawtiming-0.7.1.old/src/timing.cc 2017-06-05 15:36:36.603638861 +0000 -+++ drawtiming-0.7.1/src/timing.cc 2017-06-02 12:48:03.523309638 +0000 -@@ -790,8 +790,8 @@ - - // ------------------------------------------------------------ - --void postscript_gc::bezier (const std::list<Magick::Coordinate> &points) { -- std::list<Magick::Coordinate>::const_iterator i = points.begin(); -+void postscript_gc::bezier (const std::vector<Magick::Coordinate> &points) { -+ std::vector<Magick::Coordinate>::const_iterator i = points.begin(); - - ps_text << "newpath\n"; - ps_text << i->x () << ' ' << (height - i->y ()) << " moveto\n"; -@@ -840,9 +840,9 @@ - - // ------------------------------------------------------------ - --void postscript_gc::polygon (const std::list<Magick::Coordinate> &points) { -+void postscript_gc::polygon (const std::vector<Magick::Coordinate> &points) { - static const char *ops[] = {"stroke", "fill"}; -- std::list<Magick::Coordinate>::const_iterator i; -+ std::vector<Magick::Coordinate>::const_iterator i; - int j; - - for (j = 0; j < 2; j++) { -diff -u -r drawtiming-0.7.1.old/src/timing.h drawtiming-0.7.1/src/timing.h ---- drawtiming-0.7.1.old/src/timing.h 2009-04-03 03:02:40.000000000 +0000 -+++ drawtiming-0.7.1/src/timing.h 2017-06-02 12:49:35.780468543 +0000 -@@ -176,13 +176,13 @@ - postscript_gc (void); - ~postscript_gc (void); - -- void bezier (const std::list<Magick::Coordinate> &points); -+ void bezier (const std::vector<Magick::Coordinate> &points); - void fill_color (const std::string &name); - void fill_opacity (int op); - void font (const std::string &name); - void line (int x1, int y1, int x2, int y2); - void point_size (int size); -- void polygon (const std::list<Magick::Coordinate> &points); -+ void polygon (const std::vector<Magick::Coordinate> &points); - void pop (void); - void push (void); - void scaling (double hscale, double vscale); diff --git a/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch b/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch deleted file mode 100644 index d50621f76796..000000000000 --- a/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: Switch LDADD with LDFLAGS - This change is to move the objects before the libs. to fix an FTBFS when - --as-needed is passed to gcc. -Author: …Øمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> -Forwarded: yes ---- drawtiming-0.7.1.orig/src/Makefile.am -+++ drawtiming-0.7.1/src/Makefile.am -@@ -3,7 +3,7 @@ - - bin_PROGRAMS = drawtiming - drawtiming_SOURCES = main.cc globals.h parser.yy scanner.ll timing.cc timing.h --drawtiming_LDFLAGS = @MAGICK_LIBS@ -+drawtiming_LDADD = @MAGICK_LIBS@ - - EXTRA_DIST = parser.h - BUILT_SOURCES = parser.h ---- drawtiming-0.7.1.orig/src/Makefile.in -+++ drawtiming-0.7.1/src/Makefile.in -@@ -51,7 +51,7 @@ - am_drawtiming_OBJECTS = main.$(OBJEXT) parser.$(OBJEXT) \ - scanner.$(OBJEXT) timing.$(OBJEXT) - drawtiming_OBJECTS = $(am_drawtiming_OBJECTS) --drawtiming_LDADD = $(LDADD) -+drawtiming_LDADD = @MAGICK_LIBS@ $(LDADD) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -159,7 +159,7 @@ - AM_CXXFLAGS = @MAGICK_CFLAGS@ -DYYDEBUG=1 - AM_YFLAGS = -d - drawtiming_SOURCES = main.cc globals.h parser.yy scanner.ll timing.cc timing.h --drawtiming_LDFLAGS = @MAGICK_LIBS@ -+drawtiming_LDFLAGS = @LDFLAGS@ - EXTRA_DIST = parser.h - BUILT_SOURCES = parser.h - all: $(BUILT_SOURCES) diff --git a/sci-electronics/drawtiming/metadata.xml b/sci-electronics/drawtiming/metadata.xml deleted file mode 100644 index 74ef293ca5d2..000000000000 --- a/sci-electronics/drawtiming/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-electronics@gentoo.org</email> - <name>Gentoo Electronics Project</name> - </maintainer> - <longdescription> - This package provides a command line tool for documenting hardware - and software designs through timing diagrams. It reads signal descriptions - from a text file with an intuitive syntax, and outputs a timing diagram to - an image file. Notation typical of timing diagrams found in the Electrical - Engineering discipline is used, including arrows indicating causal - relationships between signal transitions. - </longdescription> - <upstream> - <remote-id type="sourceforge">drawtiming</remote-id> - </upstream> -</pkgmetadata> |