From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- sci-electronics/drawtiming/Manifest | 9 ++ .../drawtiming/drawtiming-0.7.1-r1.ebuild | 32 +++++ .../drawtiming/drawtiming-0.7.1-r2.ebuild | 37 ++++++ .../drawtiming/files/drawtiming-0.7.1-gcc43.patch | 10 ++ .../files/drawtiming-0.7.1-imagemagick-7.patch | 137 +++++++++++++++++++++ .../files/drawtiming-0.7.1-ldflags.patch | 36 ++++++ sci-electronics/drawtiming/metadata.xml | 19 +++ 7 files changed, 280 insertions(+) create mode 100644 sci-electronics/drawtiming/Manifest create mode 100644 sci-electronics/drawtiming/drawtiming-0.7.1-r1.ebuild create mode 100644 sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild create mode 100644 sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch create mode 100644 sci-electronics/drawtiming/files/drawtiming-0.7.1-imagemagick-7.patch create mode 100644 sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch create mode 100644 sci-electronics/drawtiming/metadata.xml (limited to 'sci-electronics/drawtiming') diff --git a/sci-electronics/drawtiming/Manifest b/sci-electronics/drawtiming/Manifest new file mode 100644 index 000000000000..e76d8e8b1252 --- /dev/null +++ b/sci-electronics/drawtiming/Manifest @@ -0,0 +1,9 @@ +AUX drawtiming-0.7.1-gcc43.patch 279 SHA256 79289e7588957f210c554646d7f666ef17792510e26ce1c403381302864e31b5 SHA512 73306c65e8e3ce4227626734952e107f0b518b1e7af3ca77efe00fa9afe813567a631b401569173a643927143807b9ff5add1996f25b82922d5a174b00543c1a WHIRLPOOL c5a5599aa17c866f917c8b9d4384afa72beaec7f9a840ab902b8bf5cb66b88ba4858ddb28b68707e9358a421b2033ddef14cbfc0ee580e2a4a1cca9d218f5b85 +AUX drawtiming-0.7.1-imagemagick-7.patch 5615 SHA256 e32887df82506a35185a8388918df3b531a89913870e5a6db02fc71c01deb242 SHA512 1bf07304353c538ba24777613f12fd887d6d911d45488b37318e34c081381c1b4c2005bfc1135fd28f7b5fc26897078809aeabfcd77f7ef4ffb5dbdbd9381721 WHIRLPOOL 89492732faf6c84530a9ba360bb4e87ead98014bc43029beef7bbf6a0663487dc0153dc75ca0e594372fe1084fcb0fec46a89b009591d87f3417b3b61adb25a3 +AUX drawtiming-0.7.1-ldflags.patch 1290 SHA256 a4265ba35dc8732ce014032a3f62b7ef15e2a0406412991c0e4da3b636f419e3 SHA512 cc77a8fed890e7d9a1713667c818437a8cfafc96d3efa328df77b1bf660e3536460da4e899e158c4515c4ecec07319cad05a4ecac5f3e13b0eb004c11d042076 WHIRLPOOL f7469f9fbcf14df749de349183fcc9aa4dec3bc1f470f5d4413a9f757eb30e3205d9ec4ca665da0bbd249359b96c2c674ab34b22a5b47cd942671a1a98c31bc8 +DIST drawtiming-0.7.1.tar.gz 123714 SHA256 ae35a369f71f03b219d23f56329ced73100f79ffda38dd8d31d1e9e510f3cf6e SHA512 f474ee372967f05abfa49a15d635279ee23715f1472a82aab8890f8144eab3fdb7fc0529510ed7f92b7073097d77ee2266e5a97f55e755292416e126537fcbbd WHIRLPOOL 98bc338ce9befe48679aef6e60963e723ad89b9ec4ab199be9d9af5bbc924aab8f9a48790bcac5a5612f9e2d644641a870939303b622a1b4f0340340d1c2925c +EBUILD drawtiming-0.7.1-r1.ebuild 694 SHA256 84d6085b531be34c84757ab4d44e595ecb52692a702b3f0a1224abe3a46c60cf SHA512 1ae829bc924a70f66e9c122e6144f2a3c52b184fad7efea63374fbfd25753831cce2f222c9346f33c67cc331be372ce998758b93dd43c6d7e29c73d5ca474a62 WHIRLPOOL 008cb4e19d4670b7115722f50dcc625cab1202c7bca8d13eec58acb671ba728311fb52744688ae6ce02ed627e9a29fe33aadeb562615498bfa431a2992e97a88 +EBUILD drawtiming-0.7.1-r2.ebuild 874 SHA256 faae3be3145d8095478f556f9366a99d0c89a33b98a465801fa478e15bee9c8e SHA512 d3ab4a344f249b186b361a21119eba0e8df1a2a763c4b5b5aafb18318c692883b754c7b0ba2bc7d2fc62dc4a340b227dd2c01ac622c020ce5e94fcf610e30852 WHIRLPOOL adf8bc73ca5e30d36ecb7371e2bbea912738cd6d7a8ffd68d3af795bf5fc404db75e490fb4b325d6eaf63aa0d0fb3a3d258fcf3707b982a218fbd7a4f4102be0 +MISC ChangeLog 3042 SHA256 f2cf879e4d64db9aed8df2fe732c143d4236214893ce2eabbce725f7239c63bc SHA512 e40405845d5c20e96beb637969f88e8f2067a10e1a8d34e3450685b0de8b6f906f6b00ce5bed66d14b5c6a533271f2026d3aecf647fffd33287e53ad86ff6ed7 WHIRLPOOL ef28097927bae38f618181b7a96903e8b7547c908ddf123cabef8cfcd427ac8bc24773627dc9ae8559b9b3d167b833cc0bed70d8a7393f3165bd78ff3a400216 +MISC ChangeLog-2015 907 SHA256 0e6dfb0f7405a388637ccacea2f13d88a925cc01c97dc81607caecb099ad6557 SHA512 3c8cf7ff3769197082b7039e9fe58c5f5f35d691fa7c8ba22193fdb273dfa6308ced2388358a92dc069754509a5c57eb37db5173da7c8cada50db14f74aefff8 WHIRLPOOL 396991cae284cd47a398e72f5a254ffba9adb61a24e53d4d10f4064abe456eac9da82561383ce9cdd777187b7fcc97033adacf4037b2a157dd65f04adabda3a1 +MISC metadata.xml 798 SHA256 655ee397982aac1c56ce56b12e71fc7e63eb4f7e2908f4e9995a93334f7eb031 SHA512 ebe66f645447adf66360697448c77c066a80adaf08a58d9c4dbbd323014ed73d990c71d5c88f3dfbf87ea1a6ada8e72267a25ea9c746f27440afd07a8f36b1fb WHIRLPOOL 3a159081c26152dfba6429b5c8cc1e096f53c7c86905c9747ac4c33439400b19f96e523f02dffdce4bf3827b73c283500e84a603711aaecda5082b55a5265d93 diff --git a/sci-electronics/drawtiming/drawtiming-0.7.1-r1.ebuild b/sci-electronics/drawtiming/drawtiming-0.7.1-r1.ebuild new file mode 100644 index 000000000000..7fbcf0e95f8f --- /dev/null +++ b/sci-electronics/drawtiming/drawtiming-0.7.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils + +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() { + epatch "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-ldflags.patch +} + +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/drawtiming-0.7.1-r2.ebuild b/sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild new file mode 100644 index 000000000000..baa109d58d36 --- /dev/null +++ b/sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools eutils + +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 new file mode 100644 index 000000000000..4249c79aa6e1 --- /dev/null +++ b/sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch @@ -0,0 +1,10 @@ +--- 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 + #include ++#include + 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 new file mode 100644 index 000000000000..8f075a57200a --- /dev/null +++ b/sci-electronics/drawtiming/files/drawtiming-0.7.1-imagemagick-7.patch @@ -0,0 +1,137 @@ +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 shaft, head; ++ vector 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 head; ++ vector head; + + gc.push (); + gc.stroke_color ("blue"); +@@ -688,7 +688,7 @@ + + // ------------------------------------------------------------ + +-void magick_gc::bezier (const std::list &points) { ++void magick_gc::bezier (const std::vector &points) { + drawables.push_back (DrawableBezier (points)); + } + +@@ -724,7 +724,7 @@ + + // ------------------------------------------------------------ + +-void magick_gc::polygon (const std::list &points) ++void magick_gc::polygon (const std::vector &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 &points) = 0; ++ virtual void bezier (const std::vector &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 &points) = 0; ++ virtual void polygon (const std::vector &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 drawables; ++ std::vector drawables; + + public: + ~magick_gc (void); + +- void bezier (const std::list &points); ++ void bezier (const std::vector &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 &points); ++ void polygon (const std::vector &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 &points) { +- std::list::const_iterator i = points.begin(); ++void postscript_gc::bezier (const std::vector &points) { ++ std::vector::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 &points) { ++void postscript_gc::polygon (const std::vector &points) { + static const char *ops[] = {"stroke", "fill"}; +- std::list::const_iterator i; ++ std::vector::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 &points); ++ void bezier (const std::vector &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 &points); ++ void polygon (const std::vector &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 new file mode 100644 index 000000000000..d50621f76796 --- /dev/null +++ b/sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch @@ -0,0 +1,36 @@ +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) +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 new file mode 100644 index 000000000000..74ef293ca5d2 --- /dev/null +++ b/sci-electronics/drawtiming/metadata.xml @@ -0,0 +1,19 @@ + + + + + sci-electronics@gentoo.org + Gentoo Electronics Project + + + 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. + + + drawtiming + + -- cgit v1.2.3