summaryrefslogtreecommitdiff
path: root/sci-electronics
diff options
context:
space:
mode:
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/Manifest.gzbin9039 -> 8881 bytes
-rw-r--r--sci-electronics/drawtiming/Manifest6
-rw-r--r--sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild37
-rw-r--r--sci-electronics/drawtiming/files/drawtiming-0.7.1-gcc43.patch10
-rw-r--r--sci-electronics/drawtiming/files/drawtiming-0.7.1-imagemagick-7.patch137
-rw-r--r--sci-electronics/drawtiming/files/drawtiming-0.7.1-ldflags.patch36
-rw-r--r--sci-electronics/drawtiming/metadata.xml19
-rw-r--r--sci-electronics/eagle/Manifest2
-rw-r--r--sci-electronics/eagle/eagle-7.7.0-r1.ebuild2
-rw-r--r--sci-electronics/electronics-menu/Manifest2
-rw-r--r--sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild25
-rw-r--r--sci-electronics/gsmc/Manifest2
-rw-r--r--sci-electronics/gsmc/gsmc-1.1-r2.ebuild21
-rw-r--r--sci-electronics/irsim/Manifest6
-rw-r--r--sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch16
-rw-r--r--sci-electronics/irsim/files/irsim-9.7.79-datadir.patch4
-rw-r--r--sci-electronics/irsim/irsim-9.7.93.ebuild30
-rw-r--r--sci-electronics/petrify/Manifest2
-rw-r--r--sci-electronics/petrify/petrify-4.2-r1.ebuild17
-rw-r--r--sci-electronics/splat/Manifest4
-rw-r--r--sci-electronics/splat/files/splat-1.2.2-gcc43.patch4
-rw-r--r--sci-electronics/splat/splat-1.4.2.ebuild55
22 files changed, 84 insertions, 353 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 8f78a104d3af..753e629ba612 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
Binary files differ
diff --git a/sci-electronics/drawtiming/Manifest b/sci-electronics/drawtiming/Manifest
deleted file mode 100644
index b7918d552b7b..000000000000
--- a/sci-electronics/drawtiming/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX drawtiming-0.7.1-gcc43.patch 279 BLAKE2B 63595887c90acdcd5055e502dae85cf2b94c5108b2e555a84561cf34ebb7009ca4f47dbb6c568dc149d211e3de511a153ee86df65a1c5a34fcdec139991add58 SHA512 73306c65e8e3ce4227626734952e107f0b518b1e7af3ca77efe00fa9afe813567a631b401569173a643927143807b9ff5add1996f25b82922d5a174b00543c1a
-AUX drawtiming-0.7.1-imagemagick-7.patch 5615 BLAKE2B 4b51bedeec295dd9bcef64ad1c8e34f6183c75532333e0b44eb15e86f13e9700e93b966b14e44beffa2e050e94d96ef2a5079602b11bfc014cf28ecbd00db6dc SHA512 1bf07304353c538ba24777613f12fd887d6d911d45488b37318e34c081381c1b4c2005bfc1135fd28f7b5fc26897078809aeabfcd77f7ef4ffb5dbdbd9381721
-AUX drawtiming-0.7.1-ldflags.patch 1290 BLAKE2B 38081c0b2daff6c2f1ab3c5718188d9b3285c3f4cd7efb252893877a25f97ae232257bead08dd53a33e6a193086469de3288d3c8ba2b12c54e59cda13aec7015 SHA512 cc77a8fed890e7d9a1713667c818437a8cfafc96d3efa328df77b1bf660e3536460da4e899e158c4515c4ecec07319cad05a4ecac5f3e13b0eb004c11d042076
-DIST drawtiming-0.7.1.tar.gz 123714 BLAKE2B 60e5f4c741d5a273860d5bddd872d1df01be4c256531b1cbfe3baeab46ce569618bc371f6d65959d77071ac66946f3a934b351841d643ac154ee59ad5fb23052 SHA512 f474ee372967f05abfa49a15d635279ee23715f1472a82aab8890f8144eab3fdb7fc0529510ed7f92b7073097d77ee2266e5a97f55e755292416e126537fcbbd
-EBUILD drawtiming-0.7.1-r2.ebuild 869 BLAKE2B 113fb531a7c606525ba5c7b2cb0848fb5b2b2076cc7ba37b79a06072fce64116635d7c910abe30aa5ec27a86cd8991b0e5065ce57ada963274df87917d67cedc SHA512 281a8ac57020dc63141138f22eecc51dceb42ca43564155bc5481177fc8c3965d96aaa0f02acb5a9db75f304cb437973cfb5deff18683d6dd3816d8d82f7c80c
-MISC metadata.xml 798 BLAKE2B daa9a0033fc7e8a5a2a688f461906f1b991f4245d51143e02ce17f1b9c20dfba2af967d4853c70649634b9866468adc5b362925a6d6796c21cfce9fac1fd30da SHA512 ebe66f645447adf66360697448c77c066a80adaf08a58d9c4dbbd323014ed73d990c71d5c88f3dfbf87ea1a6ada8e72267a25ea9c746f27440afd07a8f36b1fb
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>
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index 79982ed7acf0..7da5eb41ffd7 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -4,5 +4,5 @@ DIST eagle-lin32-7.7.0.run 51488593 BLAKE2B e1556b7abe6fb405632015f39bdd8e8c6189
DIST eagle-lin64-7.3.0.run 48248700 BLAKE2B e7d8a7a23e0023159d626203bba2cf195fad3eac54b9b72947c9e72e7bb3f3534ce2545857ce76e70302eb1d2042cc30f9c327fc2a5a4dd4287e82aef4393dc6 SHA512 bd158b25ed682c63405b90358f82ffcb0903c7f5e5ae81737efcb56b6074a78125de31909c64f31a5f4bab7727c63b6aa0c7af0f6440793010f7f6de3f92f681
DIST eagle-lin64-7.7.0.run 51108322 BLAKE2B 1458199821328e811632cdb7457f256b9d97c40005c0ce71eb65d9c3f75049618e76e0c7e3cbb2e3171649bb412270409fd601bfe6f51c79c6cc3d01c12fcf66 SHA512 1f0b38be16b87f67f64709e7e39b888592240d98cdcb7b81ee77f236d9cdea5127e661db5cff470d9673f8247bea49732be3b443cdc5fbd1dca34e26896a6770
EBUILD eagle-7.3.0-r1.ebuild 3578 BLAKE2B 5eb7ae0701afd9547b6431344327809e6ca1cd2cb505a59261481531d2ffcf1766d9ecfd7c82633b2e445adbf2199a20b2ed605e5e6adc33cca3d97dc11d70bc SHA512 f20a8a5cb4ebfb2c6bb64458288e1896594eec5add05465fe7b42a2da383cd4a598e3a47790c68215d84267d66b7f22fe2ad6c59aba38be80646297b1193d36f
-EBUILD eagle-7.7.0-r1.ebuild 3580 BLAKE2B 8375385083919c05e572911bd1f6c079dbfaf842a2517d0a08f1deba2c13f9c1ebf3f8fb5bbdcf04c42005aa93cb6c1d3eab11ce377966b979b9c326cf61d6d3 SHA512 1c5ac0e9437f83d74ed5bc4809a5ccdcf9219fc89f7262eee4928a24d49d88029f0b19df041a55153daeec9e0c8b4868580bdfa44b0db8ac51298ff37c8aaa1c
+EBUILD eagle-7.7.0-r1.ebuild 3579 BLAKE2B b06d493126ab36ba3eee3f29c6fe24512090d5bab4a9088023962e5d1f250e728b6b01f6760e9078d8115629ca67c47b7acf2afe1ab1c142d3c3daed1b19b1d3 SHA512 aa6160dad1a535dae47fbeab44f13173958f3246b4784a52205c38aeb82529ad7b647be36653405a31e381520beeb1cf2f36a66e8ea1a64a94e58407d38fcdaa
MISC metadata.xml 671 BLAKE2B fe104f5979bd1c3443983d0dd04b14fbce7c9f07b789a3faca57b3aacd3031855dd3eeda11775179f44a86b6f96274c235a574affb7b02abc21db34ce2e4c770 SHA512 e45c4c1d534e47500ad9a1354d568b879ba0b098f792c7bce74638148b153089fb85f2e5eb8198fe15406ded94981622be00db5572ec2d53dfca3d46f163d960
diff --git a/sci-electronics/eagle/eagle-7.7.0-r1.ebuild b/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
index f723b0377c57..fb11538a4b6d 100644
--- a/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
+++ b/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="cadsoft-2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
IUSE="doc"
QA_PREBUILT="opt/eagle/bin/eagle"
diff --git a/sci-electronics/electronics-menu/Manifest b/sci-electronics/electronics-menu/Manifest
index a38be7ea17db..6b4c8fe040c8 100644
--- a/sci-electronics/electronics-menu/Manifest
+++ b/sci-electronics/electronics-menu/Manifest
@@ -1,3 +1,3 @@
DIST electronics-menu-1.0.tar.gz 12284 BLAKE2B 767aa286375b509879d784f82290f3fac8bad0614466a566405ce67f2f06e5b04272cbd58410655dd258dfee9eb6b4cf3af0e9b5a00a247cd79165968dd06dd6 SHA512 c4619d6dfd0641da772a7026af50b0ba1ededee6a5be84ede1c058671764f8c9a7d55e44a018f6bd42bbef0a29d513df5e9056a9a345999a2493fa62d2300b0a
-EBUILD electronics-menu-1.0-r1.ebuild 568 BLAKE2B 6995fc46c4660d61cb0702811acb0e0e566a3fce4f50ea502f9b7417fffd2ad85f45bfa0cdef699020f462eea229704bc5ece14b689c43dc4dc63871cd408c20 SHA512 10e0f5415bb97bcf86b8f2832af10567a98b6fa39bd1be767f8c41b6e30f1ea1a6586582e4fb8ddf8dedc03147e4be974e747d3f2626aaaede2a88b118aaf105
+EBUILD electronics-menu-1.0-r1.ebuild 332 BLAKE2B 80537b2de0f607889f7b4b8b5eba373f67f9f177403988b6e2f75d58a9b22a7abe99788577f7f89ace0838603e6ccec02a4a55512f3f8632ed62eaf53aa18a59 SHA512 99c635dd7f7a5c8e931c5e3ba570bfcaa6e4e82ac8bd4f3cc9f9b8f38fb3d6fc02f508c65c03da4f17537d280913552a675c7b6837bb7ced7ae16f1b4c50b577
MISC metadata.xml 510 BLAKE2B 6345a1d48e8b0c75e2a02bda8615f73f5923796762f62fa08b75a36855ce7e51ca7d4a3d92875b7345892c5003f724b9f6a9542d55ac774090ca0a2131ea1fcf SHA512 2a79ec82566c1493a1f25cdbb30ed4c970d96989caae79614ee40febaa642bb6db96c1bdf4ce3ea081448d0d8550aaa8ce385f5c2ae4060a42842ba6b3b11232
diff --git a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
index ed84cdc627fc..04593c37fc4f 100644
--- a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
+++ b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit gnome2-utils
+inherit xdg
DESCRIPTION="Creates an \"Electronics\" desktop menu"
HOMEPAGE="http://www.gpleda.org/"
@@ -12,24 +12,3 @@ SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
- emake DESTDIR="${ED}" install
- dodoc README
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/sci-electronics/gsmc/Manifest b/sci-electronics/gsmc/Manifest
index 0e34119576fa..9ae48888e6e9 100644
--- a/sci-electronics/gsmc/Manifest
+++ b/sci-electronics/gsmc/Manifest
@@ -1,4 +1,4 @@
AUX gsmc-1.1-autotools.patch 1271 BLAKE2B 05eec2b3d68c813411fb7b43b6a75a7215d9051eb67cca758265034d117c08905f8efed98b1dba326de122d6c0ff5eaa19d7a4a9816b7d7e759fb6311eac1435 SHA512 440798845fdd9fe7cc38a226961c83b38e75b5c39338341b327fd9b29e074323531dd3413aa6375052ac4741e98a12115c545b128a026f44704f72ceded0f217
DIST gsmc-1.1.tar.gz 122726 BLAKE2B 540ac5fcb2057990f1b95c6be844bd3b84c7f0bca8064bf65d93d67dffacfc7dd4197b8de5477518674a8876fe7e69e0ba1e5a24e278c2d8422b35f64343f422 SHA512 ea9db9e4917d82e0d9fa40318a971b63443611ab91b2321115d68fa4083de1879086e5c3392607347e3222fabb9efd5f8175ebb8cd122da479fac1ce7e2d9696
-EBUILD gsmc-1.1-r2.ebuild 653 BLAKE2B cd928b97cfacb569c7cfa9d532d035c93eef74962caaefff35d03df794359033b66662af00ad33c1361828bb9e6065e5a7a7ef49eaf55c55ce8cbd8e7273ccfc SHA512 8bac043e1a66b062df81a9a5e21d2946fd5cf0e0e7ed7aa374e7a83f1213ea7bdb766660998fe1d3b10de9d1e812c358d9e9c408e64df4832489dfbe7a628300
+EBUILD gsmc-1.1-r2.ebuild 639 BLAKE2B 8a3c20fbadf0fb66059e765fe900f2e73080783bbf60aa90e25dbaf157459a66ec5b7e6f8f35767567539a71ec6c6f5a90b934e025fac9c9692c3d6890aa065f SHA512 6100313e7c2555dc25b7636b20da6364335104c79f4a768cb014a870ef9cc85d6924ad7d783ca7d3c42e8aabd242fddde5a7c491b09ee9515821e340b5a455b0
MISC metadata.xml 265 BLAKE2B 4a63b8e6f06e5a84e96b45b0873124bb88226e83380ca4b23b73c4583fab34aa3472804d04acf269f2952cb03a2b500a020acc219c2176587200ffc92daa49c3 SHA512 21c421dc2864d898fdf1e5b723e323a6dbbd72cfd32b57eb14776345aba19611c7c64305c63f058fc4767fbd937c9a6252a3b296354739cde07bcc50dc48b756
diff --git a/sci-electronics/gsmc/gsmc-1.1-r2.ebuild b/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
index ee9e8125fd81..a3da3ce6921a 100644
--- a/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
+++ b/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=8
-inherit autotools epatch
+inherit autotools
DESCRIPTION="A GTK program for doing Smith Chart calculations"
HOMEPAGE="https://www.qsl.net/ik5nax/"
@@ -12,17 +12,20 @@ SRC_URI="https://www.qsl.net/ik5nax/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-CDEPEND="
+DEPEND="
dev-libs/glib:2
- x11-libs/gtk+:2"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
+ x11-libs/gtk+:2
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-autotools.patch
+)
src_prepare() {
- epatch "${FILESDIR}/${P}-autotools.patch"
+ default
eautoreconf
}
diff --git a/sci-electronics/irsim/Manifest b/sci-electronics/irsim/Manifest
index f56f3f313689..d2ce35abb0f6 100644
--- a/sci-electronics/irsim/Manifest
+++ b/sci-electronics/irsim/Manifest
@@ -1,5 +1,5 @@
-AUX irsim-9.7.72-ldflags.patch 1855 BLAKE2B cb99e706e01c41d35d3e02f7f946d206bee2197738ab8be75e414059625118dbeb5e7949a30302773495005beff58b1d35c16325437817b17c93dfb4240ae197 SHA512 8ead19ef40e93353d158c8bd5794b1e71278d49386e1f7becbe0f33ffb31ca91906fd7c967fd77b8735d25ab723dbe52ec81931d751380908969a0517ca9637b
-AUX irsim-9.7.79-datadir.patch 757 BLAKE2B d00b871b4f6d2c6a0f99e3d9e80d8ad11bc61973e05d287f69b1bc7ec9dac305741e5058fe7e0a1914def1740703a4aaa92e5d60308a967effa1a4b98653fdae SHA512 28104437434073079b875e4590bd1aaeff8246a785460e136327c8e428f5d13826cd586d9b69b41e1138f2d7357c0b9d8fc56784347e98117e1838bd8a6aa94e
+AUX irsim-9.7.72-ldflags.patch 1567 BLAKE2B f9045d363b3f7f25a7d03039f01343745402dcb1652583060448d8cc1db89d242d763c1cd3c9aa18882634ebf9f3cb03c9505f7648e15145902da9ff53bf678d SHA512 1a19a2c5aa951396b79b657fa45d8ec2787d47aab31b62b699693029475a4444bbbf5a57c687dd2becb9d89c73e9446822a4d57984c59fa09dcc526bc84532b5
+AUX irsim-9.7.79-datadir.patch 735 BLAKE2B 31e0b55f97f36d5b65965e67ce6e7879148e3f620c838c00c370d6229beb705c2040507dd741c8aac6051ff8d9e4a1634641a19e6292594f6f1dc667553e52aa SHA512 0bd832b47d47898bd167f2ae309892fe6ab55bb5dd60321c1bf3861d1ffcbf7f72d49d9f291693de8ca0558b5df6f725d671393870c33697f03e36256fbc40a6
DIST irsim-9.7.93.tgz 465721 BLAKE2B f40e1216f51a51a38ee52628532989ee307db1ff3b0daa4f047a1a3eb04bd49d903382f67c1c4bae4366147f4448eb9699cdc47cffe712fa70a9d34c5bf13d00 SHA512 441a803935c178bdd663360df058142c07d91aecd158d6be8f10b670fc2a295e79839914de6a85ced58a79591625c514e2ceabe87486092d8a1784c7e47a02b3
-EBUILD irsim-9.7.93.ebuild 1083 BLAKE2B 1e27d80b5d881581f3b3693499e687aa23d1e6b469c03573936640162bf9afc52d53bb0a12b2b72179a44eabc66cd059a301a94145874ac87ded422b3ac237e8 SHA512 b1a6798848cae5bb938aee5e011730eb2c72a7db4ab82c2cfd8bf5b672b4ba56f24dee33cc254fd656013b6175e9c2c3b2d4eaaa708d616778f758b742cf56e1
+EBUILD irsim-9.7.93.ebuild 958 BLAKE2B 3528559abf9b9f366eaa1c960f4dc5640c3d19e9e8c76f209866f8a58b682c45946a03f6908d2d43114247f2ad739d9d737d4df27e1ea3b8e07dd871b97fb330 SHA512 a9527de34b8f2e5c76d66d02e3c61d8ce51c4504dbc5cac1a34d21bf649f59276faaed9ada9ff8ef2ace014852ebf8a71b9b8c8cf4bb20c4360177bd4b9cd7b2
MISC metadata.xml 644 BLAKE2B de25bee0f8d6f5186f163c94504e8693ffab983b8a7957945f11086c5d9be2c8b054c7b212cc289852aa603d7702b39f98f4e348212171a0e3bbb0e269fd298c SHA512 3251cd8e81a1ff0d440718fd39a6f8cd8334ed71f04c44235a8946388e3ead12b879bd1bb964688749291e5146082b4c51bd570efafc271516e72eb28a85e414
diff --git a/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch b/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch
index d219415eb5e8..8c50e2ea2b17 100644
--- a/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch
+++ b/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch
@@ -1,5 +1,5 @@
---- tcltk/Makefile.old 2011-04-26 17:40:36.000000000 +0000
-+++ tcltk/Makefile 2011-04-26 17:41:05.000000000 +0000
+--- a/tcltk/Makefile
++++ b/tcltk/Makefile
@@ -26,7 +26,7 @@
${CP} irsimexec $(DESTDIR)${TCLDIR}/irsimexec
@@ -9,8 +9,8 @@
${LIBS} ${LIB_SPECS}
irsim.tcl: irsim.tcl.in
---- irsim/Makefile.old 2011-04-26 17:46:38.000000000 +0000
-+++ irsim/Makefile 2011-04-26 17:47:21.000000000 +0000
+--- a/irsim/Makefile
++++ b/irsim/Makefile
@@ -22,7 +22,7 @@
tclirsim${SHDLIB_EXT}: ${EXTRA_LIBS}
@echo --- making irsim Tcl library \(tclirsim${SHDLIB_EXT}\)
@@ -20,8 +20,8 @@
${EXTRA_LIBS} -lc ${LIBS} ${LD_EXTRA_LIBS}
$(DESTDIR)${BINDIR}/irsim:
---- random/Makefile.old 2011-04-26 17:48:46.000000000 +0000
-+++ random/Makefile 2011-04-26 17:49:02.000000000 +0000
+--- a/random/Makefile
++++ b/random/Makefile
@@ -21,7 +21,7 @@
random${SHDLIB_EXT}: randwrap.o
@echo --- making random Tcl library
@@ -31,8 +31,8 @@
${MAC_SHARED} -lc ${LIBS} ${LD_EXTRA_LIBS}
install-tcl: $(DESTDIR)${TCLDIR}/random${SHDLIB_EXT}
---- tclsubckt/Makefile.old 2011-04-26 17:50:23.000000000 +0000
-+++ tclsubckt/Makefile 2011-04-26 17:50:45.000000000 +0000
+--- a/tclsubckt/Makefile
++++ b/tclsubckt/Makefile
@@ -22,7 +22,7 @@
diglib${SHDLIB_EXT}: diglib.o
@echo --- making diglib subcircuit shared library
diff --git a/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch b/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch
index ca4fd4628575..12ee3ba00964 100644
--- a/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch
+++ b/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch
@@ -1,5 +1,5 @@
---- irsim-9.7.79/scripts/defs.mak.in
-+++ irsim-9.7.79/scripts/defs.mak.in
+--- a/scripts/defs.mak.in
++++ b/scripts/defs.mak.in
@@ -12,6 +12,7 @@
exec_prefix = @exec_prefix@
bindir = @bindir@
diff --git a/sci-electronics/irsim/irsim-9.7.93.ebuild b/sci-electronics/irsim/irsim-9.7.93.ebuild
index 967389cbcee7..c2ea4a864883 100644
--- a/sci-electronics/irsim/irsim-9.7.93.ebuild
+++ b/sci-electronics/irsim/irsim-9.7.93.ebuild
@@ -1,9 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-inherit epatch multilib
+EAPI=8
DESCRIPTION="IRSIM is a \"switch-level\" simulator"
HOMEPAGE="http://opencircuitdesign.com/irsim/"
@@ -12,29 +10,25 @@ SRC_URI="http://opencircuitdesign.com/irsim/archive/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-lang/tcl:0
- dev-lang/tk:0"
-DEPEND="${RDEPEND}
- app-shells/tcsh"
+RDEPEND="
+ dev-lang/tcl:=
+ dev-lang/tk:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-shells/tcsh"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-9.7.72-ldflags.patch
- epatch "${FILESDIR}"/${PN}-9.7.79-datadir.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.7.72-ldflags.patch
+ "${FILESDIR}"/${PN}-9.7.79-datadir.patch
+)
src_configure() {
# Short-circuit top-level configure script to retain CFLAGS
- cd scripts
+ cd scripts || die
econf
}
-src_install() {
- emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install
- dodoc README
-}
-
pkg_postinst() {
einfo
einfo "You will probably need to add to your ~/.Xdefaults"
diff --git a/sci-electronics/petrify/Manifest b/sci-electronics/petrify/Manifest
index 08a5a75a2d45..10d0723d8531 100644
--- a/sci-electronics/petrify/Manifest
+++ b/sci-electronics/petrify/Manifest
@@ -1,3 +1,3 @@
DIST petrify-4.2-linux.tgz 1117093 BLAKE2B 9768610f253944f7c64a4566b25dcc9997799f459c015c1231b3f25ef94025652855fcd6399b32afb34f5a08d6c832a11e271901c0deda3170ae22664f9eb12b SHA512 d3cdc4991ec5084ec5b676d74a2af935459fadfa3479d09871f5a4723205b576ab8f3f91e44cd37a4c47c7ae687ead7e25c7aae3d6eae29d2896b3a215cb1980
-EBUILD petrify-4.2-r1.ebuild 751 BLAKE2B 1ee541e9f0941a390d41cb52930479f2d79729dbd573dca38bb95a28721d0c30e4d85618b1c4316661ab699aa45185ae131f47463c7a0ffc791580dcd518b9c6 SHA512 5d2a93f4f0e743b22a28f92c0fbed919fdd1f121188664025ad8c8ea99cfad1ee1cd6e52f8fb8a44ff60619dda52ee2e38ff8c9dce3dd3905fccd43762a2edc7
+EBUILD petrify-4.2-r1.ebuild 738 BLAKE2B 941920bcfd2b93615944d1df7cfdc447a8b7316c9615ac892a56be1b9c7a515a0b9e6bcb0ef849cf8e672e137f56f212a7e6715b92c01f49271a745131cd184e SHA512 dc3f52aa6bab2538b376034686a0fe4b993102959592b48b290550af43dbd3c61b2b8346709c7c3f48648fef29b968528dafabf4e446ebff90667ea4eea06508
MISC metadata.xml 773 BLAKE2B 9f5936ba1824cbfc9fc90ef30a26f42b32cc13507672793a8603d0daf24d9f01d55a528a85aa24db99383489654773ea985fc3996e5d88830ae3211bd3cc3279 SHA512 adf3f72fff9efed5f9a715940d1068ca390bd2095e8b4e89e611ca571cfd79b3882c8753552e1ded63f9beec2774d945bc541ac162f9532c4a6b35a217325ca4
diff --git a/sci-electronics/petrify/petrify-4.2-r1.ebuild b/sci-electronics/petrify/petrify-4.2-r1.ebuild
index 2782e4be8402..4620813921eb 100644
--- a/sci-electronics/petrify/petrify-4.2-r1.ebuild
+++ b/sci-electronics/petrify/petrify-4.2-r1.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
DESCRIPTION="Synthesize Petri nets into asynchronous circuits"
HOMEPAGE="http://www.lsi.upc.edu/~jordicf/petrify/"
SRC_URI="http://www.lsi.upc.edu/~jordicf/petrify/distrib/petrify-4.2-linux.tgz"
+S="${WORKDIR}"/${PN}
LICENSE="Old-MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND="media-gfx/graphviz"
-DEPEND=""
RESTRICT="strip"
-QA_PREBUILT="/opt/petrify/petrify"
-
-S="${WORKDIR}"/${PN}
+QA_PREBUILT="opt/petrify/petrify"
src_install() {
exeinto /opt/petrify
@@ -27,9 +24,11 @@ src_install() {
dosym petrify /opt/petrify/draw_astg
dosym petrify /opt/petrify/write_sg
- dodoc doc/*
+ dodoc -r doc/.
doman man/man1/*
dodir /etc/env.d
- echo "PATH=${EPREFIX}/opt/petrify" > "${ED}"/etc/env.d/00petrify
+ newenvd - 00petrify <<- _EOF_
+ PATH="${EPREFIX}/opt/petrify"
+ _EOF_
}
diff --git a/sci-electronics/splat/Manifest b/sci-electronics/splat/Manifest
index e2663e144dc4..7db09c2feb4f 100644
--- a/sci-electronics/splat/Manifest
+++ b/sci-electronics/splat/Manifest
@@ -1,4 +1,4 @@
-AUX splat-1.2.2-gcc43.patch 205 BLAKE2B f145e08d07cf755914700690737f6ebc4230c598083495d1abe99586fa4302fd5e361c5277fe3daf494686e2ea551941f4a32c953f2f4c407474f2ba2ebac357 SHA512 ce99a5688305cc0bc53544b8c57cd73d3a9ccaaa7bce1115f63ee79c93c06f9ec80d694fcedcbded35b1f12d9b8b1d79022de7afb7fa43980710c4928c6dcf21
+AUX splat-1.2.2-gcc43.patch 180 BLAKE2B 9f6101e7fc1625e0660f871079da0d072b12d6514f57afd71be8c7c521f0098768ae70dfc103831803dcc7a96d545c897abca4ca110d49e310eb983a18292225 SHA512 01ecd4cd08575d354c94d78e02c9117ef613e71664f7fed9b64239907051f4170e56dc9dc9368ec08fa67d81fdc9bb67805e3eacb7c40a9663e52dd2d81d0638
DIST splat-1.4.2.tar.bz2 356823 BLAKE2B 7e4fe835128ae88b6d44d87159a5eab8652eed26876a637e613f57177ebfca8df7433455b53124318a2a0277bd09ca2cb9ce74ab205f5c6d1417fa736934b3fa SHA512 223b6184b1df35052709ba3b0e8679b9f6a2933c98ac433b0f07cd93b07213f55399a6eeb8e955a86fb59d13e09d891fc085ac17594f561268da239c30e885bb
-EBUILD splat-1.4.2.ebuild 2406 BLAKE2B 172d56cfcbd32ffa51e442f8ce3e9af80c6e6b78bec38c7808c7ba4eb9f2241c4def7fb5f981a9970193b738cfcd16b230a99ba2eb5a90ca148de7983eed9ec4 SHA512 ad5ae8dfcf7db3356bf958ad99be9faaf14ffb61299334cc46c74d4ad73cba8d8bd5c2ee1be9d36235afada02373fff3ae0c1a0943f19872852369653202dc81
+EBUILD splat-1.4.2.ebuild 2114 BLAKE2B cc1973f7cdb66137addc32f89f32f5349819110f8c41a21c49cdfd9fe354bc591fcbbabfe1214a433244da51f050d8f478872dc8ffe2c48730c37f67c7530c9e SHA512 5812f517eae1bea8c5a222adbd56a7b0f0a2f4fd94bc5032bb6d179d460650fe41621b45e7ee354c7ef0427fe3c8af7fe1f4b5fc12e07738392d996d9f12a499
MISC metadata.xml 740 BLAKE2B 20f01ab6e9fb164deaf70b2e0442a3d5c0df7131197da4e9a07c9928f14124e2d803a7779ddbd43d2d714ee57b48086ddd04c86bbe1dd4e565395f9eeede9a29 SHA512 7aae74c935e1a47b38e5bcbc08348e954625c5eb21fee593ab5d2662bcc2724f40ca4c62bc58145c9856b1a4167f23ce4b27c930f43eea4089f0edddcb1e82ee
diff --git a/sci-electronics/splat/files/splat-1.2.2-gcc43.patch b/sci-electronics/splat/files/splat-1.2.2-gcc43.patch
index 11e65e77f14a..be906150b9fd 100644
--- a/sci-electronics/splat/files/splat-1.2.2-gcc43.patch
+++ b/sci-electronics/splat/files/splat-1.2.2-gcc43.patch
@@ -1,5 +1,5 @@
---- splat-1.2.1.orig/utils/fontdata.c
-+++ splat-1.2.1/utils/fontdata.c
+--- a/utils/fontdata.c
++++ b/utils/fontdata.c
@@ -32,6 +32,7 @@
#include <string.h>
#include <stdlib.h>
diff --git a/sci-electronics/splat/splat-1.4.2.ebuild b/sci-electronics/splat/splat-1.4.2.ebuild
index d9bb7221cd65..8a0b78e7f312 100644
--- a/sci-electronics/splat/splat-1.4.2.ebuild
+++ b/sci-electronics/splat/splat-1.4.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="RF Signal Propagation, Loss, And Terrain analysis tool"
HOMEPAGE="https://www.qsl.net/kd2bd/splat.html"
@@ -14,18 +14,20 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="doc hires l10n_es"
-DEPEND="sys-libs/zlib
- app-arch/bzip2"
+DEPEND="
+ app-arch/bzip2
+ sys-libs/zlib
+"
RDEPEND="${DEPEND}"
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.2.2-gcc43.patch"
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.2-gcc43.patch
+)
src_configure() {
# fake resulting file from interactive configuration script
# using default resolution
- cat <<- EOF > "${S}/splat.h"
+ cat <<- EOF > "${S}/splat.h" || die
/* Parameters for 3 arc-second standard resolution mode of operation */
#define MAXPAGES 9
#define HD_MODE 0
@@ -33,7 +35,7 @@ src_configure() {
if use hires; then
# fake resulting file from interactive configuration script
# using default resolution
- cat <<- EOF > "${S}/hires.h"
+ cat <<- EOF > "${S}/hires.h" || die
/* Parameters for 3 arc-second hires resolution mode of operation */
#define MAXPAGES 9
#define HD_MODE 1
@@ -42,20 +44,21 @@ src_configure() {
}
src_compile() {
- local CC=$(tc-getCC) CXX=$(tc-getCXX)
+ tc-export CC CXX
- ${CXX} -Wall ${CXXFLAGS} ${LDFLAGS} itwom3.0.cpp splat.cpp -o rfsplat -lm -lbz2 || die
+ cp {splat,rfsplat}.cpp || die
+ emake LDLIBS="-lm -lbz2" -E "rfsplat: itwom3.0.o"
if use hires; then
- cp "${S}/hires.h" "${S}/splat.h"
- ${CXX} -Wall ${CXXFLAGS} ${LDFLAGS} itwom3.0.cpp splat.cpp -o rfsplat-hd -lm -lbz2 || die
+ cp {hires,splat}.h || die
+ cp {splat,rfsplat-hd}.cpp || die
+ emake LDLIBS="-lm -lbz2" -E "rfsplat-hd: itwom3.0.o"
fi
- cd utils
- ${CC} -Wall ${CFLAGS} ${LDFLAGS} citydecoder.c -o citydecoder
- ${CC} -Wall ${CFLAGS} ${LDFLAGS} usgs2sdf.c -o usgs2sdf
- ${CC} -Wall ${CFLAGS} ${LDFLAGS} srtm2sdf.c -o srtm2sdf -lbz2
- #${CC} -Wall ${CFLAGS} ${LDFLAGS} fontdata.c -o fontdata -lz
- ${CC} -Wall ${CFLAGS} ${LDFLAGS} bearing.c -o bearing -lm
+ cd utils || die
+
+ emake citydecoder usgs2sdf
+ emake LDLIBS=-lbz2 srtm2sdf
+ emake LDLIBS=-lm bearing
}
src_install() {
@@ -63,9 +66,8 @@ src_install() {
use l10n_es && SPLAT_LANG="spanish"
# splat binary
dobin rfsplat
- if use hires; then
- dobin rfsplat-hd
- fi
+
+ use hires && dobin rfsplat-hd
# utilities
dobin utils/{citydecoder,usgs2sdf,srtm2sdf,postdownload,bearing}
@@ -74,17 +76,16 @@ src_install() {
dodoc CHANGES README utils/fips.txt
newdoc utils/README README.UTILS
- if use doc; then
- dodoc docs/${SPLAT_LANG}/{pdf/splat.pdf,postscript/splat.ps}
- fi
+ use doc && dodoc docs/${SPLAT_LANG}/{pdf/splat.pdf,postscript/splat.ps}
+
#sample data
docinto sample_data
- dodoc sample_data/*
+ dodoc -r sample_data/.
}
pkg_postinst() {
elog "The original SPLAT! command got renamed to 'rfsplat' to avoid"
- elog "filename collission with app-portage/splat."
+ elog "filename collision with app-portage/splat."
elog ""
elog "Be aware that it is still referenced as 'splat' in the documentation."
}