14 files changed, 97 insertions, 1048 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 4f20b3660f67..c202ef2c800a 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/geda-suite/Manifest b/sci-electronics/geda-suite/Manifest
index 7dae73fbbf81..dc0e8501468d 100644
--- a/sci-electronics/geda-suite/Manifest
+++ b/sci-electronics/geda-suite/Manifest
@@ -1,2 +1,2 @@
-EBUILD geda-suite-20171223.ebuild 641 BLAKE2B 1d4542e79cfed04af6f23423a73f75b16dce3d9055b55b54587a28e93fbee22996299774af915c00a1bb05652ae6c5dc22b6188913d2baf3a52c898c6e1a2fcd SHA512 75d6a72171717460d30a955cc78991f0a1f69e833e63ff14eec4ffd9f62aad69ccda4481ebe5c9aacaa1b5637a804a795a7e4c20a348803b294b479e4dbaadcd
+EBUILD geda-suite-20171223-r1.ebuild 595 BLAKE2B b3aa6a2a265b0f34f49268340a13178f1535dcb1fc2c697fb832017c32651b442a515a541fc34aa9369cd3ed5c69c617c40ef35fcf18bc2c4625efc69deff90c SHA512 f87027a4666e101dcfbf2e4e035ba3bbffcef297917ea6aeb851f2191d9c1556ffe06635c01b842c7cc2e4fe955f6e09e918ba3e49a5e71126e17e98c4dad05c
 MISC metadata.xml 275 BLAKE2B 9881119cf5c31889f750c01cbf8f3db4b26cf0c92ae29ccd45c42032ea9454b0d9c1193e42692d88abdaff067171bb00927d2c291922932a7f38b484b8ed89a1 SHA512 8e06b994ef5f02a1e192c3d5a91244012f1c2f0cc29d8cd5ed7ccc7adc178d3a9b61abcb7b4dfa96ad616bf45447ff463357d0b5640606d48f70cdd0def1968d
diff --git a/sci-electronics/geda-suite/geda-suite-20171223.ebuild b/sci-electronics/geda-suite/geda-suite-20171223-r1.ebuild
index b042cef805b9..2037f821735f 100644
--- a/sci-electronics/geda-suite/geda-suite-20171223.ebuild
+++ b/sci-electronics/geda-suite/geda-suite-20171223-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,6 @@ RDEPEND="sci-electronics/geda
 	>=sci-electronics/gnucap-0.35.20091207
 	>=sci-electronics/gwave-20090213-r1
 	sci-electronics/pcb
-	>=sci-electronics/geda-xgsch2pcb-0.1.3-r3
 	>=sci-electronics/iverilog-0.9.6
 	sci-electronics/ngspice
 	sci-electronics/gspiceui
diff --git a/sci-electronics/gresistor/Manifest b/sci-electronics/gresistor/Manifest
deleted file mode 100644
index 1086b1fe9450..000000000000
--- a/sci-electronics/gresistor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX SimpleGladeApp.py 11794 BLAKE2B 5b6fb7dbd376031fd551eb7762d7f12a8b4451bbc710310f51c21f0ddca20d5c5b78d04329a70b65fdfdd2d8e4c2956273857c82a8091fb858699f40b0b162fe SHA512 d6eb78b2e138d5b0813b993177106bc3713172ca65a7561584eea314053bc49e27fa784465ca87fa678d65382252bffda733a4c3e846f6161bd4dffa01e83d36
-DIST gresistor-0.0.2.tar.gz 10240 BLAKE2B d3b624c7e7abdbbe40d978b507f0b66d464aa6836e96d1b1c78a37b8365dfda451cf5051192fd2f3fd15a75d092c4bfb81fe0e6c0f087dc4a175603da6df47a3 SHA512 263483f5712a48f2095bddf620520233e2843c64c1a03a7924cecb856de8fdcac601100cda4dc9f1943ff7753ffaaab04e25032416dd9438fe3f17d7d6681072
-EBUILD gresistor-0.0.2-r1.ebuild 838 BLAKE2B 06fef921db4742b57f85f9576715b91ff50e052afcc38090b81e153bea3b028cd67873f0c3d48c68128f8fa2782003e7e5091d842a6e00632d96c0ab24c7b103 SHA512 9c73da2c7f861f054e2bf28d57929ff43acbc60ab6d7507cfd9c442dd1b8cd0490dc24a66b4e6fa631e66781237554ab10b51b42e4f5a741ad53d7c64e3604f1
-MISC metadata.xml 246 BLAKE2B d696d8b94de8a32ca51bbce05b1aad9b9fb3b14355f8b2a6560ee719e21bcaa9cd32e764911bf652224bd2a7009c1ac4a5ad948b88cc4e1e5c01d0889a668151 SHA512 b0fee99b0b02e57eca1c4f80ac656743e02b333842779dbc3ce8a988d2d0fea788a867aa55a9b7fc49f8724594848e5d164b7f41edc8bb2e9d178c3b52792667
diff --git a/sci-electronics/gresistor/files/SimpleGladeApp.py b/sci-electronics/gresistor/files/SimpleGladeApp.py
deleted file mode 100644
index 90c598cc4fff..000000000000
--- a/sci-electronics/gresistor/files/SimpleGladeApp.py
+++ /dev/null
@@ -1,341 +0,0 @@
-"""
- SimpleGladeApp.py
- Module that provides an object oriented abstraction to pygtk and libglade.
- Copyright (C) 2004 Sandino Flores Moreno
-"""
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-
-import os
-import sys
-import re
-
-import tokenize
-import gtk
-import gtk.glade
-import weakref
-import inspect
-
-__version__ = "1.0"
-__author__ = 'Sandino "tigrux" Flores-Moreno'
-
-def bindtextdomain(app_name, locale_dir=None):
-    """    
-    Bind the domain represented by app_name to the locale directory locale_dir.
-    It has the effect of loading translations, enabling applications for different
-    languages.
-
-    app_name:
-        a domain to look for translations, tipically the name of an application.
-
-    locale_dir:
-        a directory with locales like locale_dir/lang_isocode/LC_MESSAGES/app_name.mo
-        If omitted or None, then the current binding for app_name is used.
-    """    
-    try:
-        import locale
-        import gettext
-        locale.setlocale(locale.LC_ALL, "")
-        gtk.glade.bindtextdomain(app_name, locale_dir)
-        gettext.install(app_name, locale_dir, unicode=1)
-    except (IOError,locale.Error), e:
-        print "Warning", app_name, e
-        __builtins__.__dict__["_"] = lambda x : x
-
-
-class SimpleGladeApp:
-
-    def __init__(self, path, root=None, domain=None, **kwargs):
-        """
-        Load a glade file specified by glade_filename, using root as
-        root widget and domain as the domain for translations.
-
-        If it receives extra named arguments (argname=value), then they are used
-        as attributes of the instance.
-
-        path:
-            path to a glade filename.
-            If glade_filename cannot be found, then it will be searched in the
-            same directory of the program (sys.argv[0])
-
-        root:
-            the name of the widget that is the root of the user interface,
-            usually a window or dialog (a top level widget).
-            If None or ommited, the full user interface is loaded.
-
-        domain:
-            A domain to use for loading translations.
-            If None or ommited, no translation is loaded.
-
-        **kwargs:
-            a dictionary representing the named extra arguments.
-            It is useful to set attributes of new instances, for example:
-                glade_app = SimpleGladeApp("ui.glade", foo="some value", bar="another value")
-            sets two attributes (foo and bar) to glade_app.
-        """        
-        if os.path.isfile(path):
-            self.glade_path = path
-        else:
-            glade_dir = os.path.dirname( sys.argv[0] )
-            self.glade_path = os.path.join(glade_dir, path)
-        for key, value in kwargs.items():
-            try:
-                setattr(self, key, weakref.proxy(value) )
-            except TypeError:
-                setattr(self, key, value)
-        self.glade = None
-        self.install_custom_handler(self.custom_handler)
-        self.glade = self.create_glade(self.glade_path, root, domain)
-        if root:
-            self.main_widget = self.get_widget(root)
-        else:
-            self.main_widget = None
-        self.normalize_names()
-        self.add_callbacks(self)
-        self.new()
-
-    def __repr__(self):
-        class_name = self.__class__.__name__
-        if self.main_widget:
-            root = gtk.Widget.get_name(self.main_widget)
-            repr = '%s(path="%s", root="%s")' % (class_name, self.glade_path, root)
-        else:
-            repr = '%s(path="%s")' % (class_name, self.glade_path)
-        return repr
-
-    def new(self):
-        """
-        Method called when the user interface is loaded and ready to be used.
-        At this moment, the widgets are loaded and can be refered as self.widget_name
-        """
-        pass
-
-    def add_callbacks(self, callbacks_proxy):
-        """
-        It uses the methods of callbacks_proxy as callbacks.
-        The callbacks are specified by using:
-            Properties window -> Signals tab
-            in glade-2 (or any other gui designer like gazpacho).
-
-        Methods of classes inheriting from SimpleGladeApp are used as
-        callbacks automatically.
-
-        callbacks_proxy:
-            an instance with methods as code of callbacks.
-            It means it has methods like on_button1_clicked, on_entry1_activate, etc.
-        """        
-        self.glade.signal_autoconnect(callbacks_proxy)
-
-    def normalize_names(self):
-        """
-        It is internally used to normalize the name of the widgets.
-        It means a widget named foo:vbox-dialog in glade
-        is refered self.vbox_dialog in the code.
-
-        It also sets a data "prefixes" with the list of
-        prefixes a widget has for each widget.
-        """
-        for widget in self.get_widgets():
-            widget_name = gtk.Widget.get_name(widget)
-            prefixes_name_l = widget_name.split(":")
-            prefixes = prefixes_name_l[ : -1]
-            widget_api_name = prefixes_name_l[-1]
-            widget_api_name = "_".join( re.findall(tokenize.Name, widget_api_name) )
-            gtk.Widget.set_name(widget, widget_api_name)
-            if hasattr(self, widget_api_name):
-                raise AttributeError("instance %s already has an attribute %s" % (self,widget_api_name))
-            else:
-                setattr(self, widget_api_name, widget)
-                if prefixes:
-                    gtk.Widget.set_data(widget, "prefixes", prefixes)
-
-    def add_prefix_actions(self, prefix_actions_proxy):
-        """
-        By using a gui designer (glade-2, gazpacho, etc)
-        widgets can have a prefix in theirs names
-        like foo:entry1 or foo:label3
-        It means entry1 and label3 has a prefix action named foo.
-
-        Then, prefix_actions_proxy must have a method named prefix_foo which
-        is called everytime a widget with prefix foo is found, using the found widget
-        as argument.
-
-        prefix_actions_proxy:
-            An instance with methods as prefix actions.
-            It means it has methods like prefix_foo, prefix_bar, etc.
-        """        
-        prefix_s = "prefix_"
-        prefix_pos = len(prefix_s)
-
-        is_method = lambda t : callable( t[1] )
-        is_prefix_action = lambda t : t[0].startswith(prefix_s)
-        drop_prefix = lambda (k,w): (k[prefix_pos:],w)
-
-        members_t = inspect.getmembers(prefix_actions_proxy)
-        methods_t = filter(is_method, members_t)
-        prefix_actions_t = filter(is_prefix_action, methods_t)
-        prefix_actions_d = dict( map(drop_prefix, prefix_actions_t) )
-
-        for widget in self.get_widgets():
-            prefixes = gtk.Widget.get_data(widget, "prefixes")
-            if prefixes:
-                for prefix in prefixes:
-                    if prefix in prefix_actions_d:
-                        prefix_action = prefix_actions_d[prefix]
-                        prefix_action(widget)
-
-    def custom_handler(self,
-            glade, function_name, widget_name,
-            str1, str2, int1, int2):
-        """
-        Generic handler for creating custom widgets, internally used to
-        enable custom widgets (custom widgets of glade).
-
-        The custom widgets have a creation function specified in design time.
-        Those creation functions are always called with str1,str2,int1,int2 as
-        arguments, that are values specified in design time.
-
-        Methods of classes inheriting from SimpleGladeApp are used as
-        creation functions automatically.
-
-        If a custom widget has create_foo as creation function, then the
-        method named create_foo is called with str1,str2,int1,int2 as arguments.
-        """
-        try:
-            handler = getattr(self, function_name)
-            return handler(str1, str2, int1, int2)
-        except AttributeError:
-            return None
-
-    def gtk_widget_show(self, widget, *args):
-        """
-        Predefined callback.
-        The widget is showed.
-        Equivalent to widget.show()
-        """
-        widget.show()
-
-    def gtk_widget_hide(self, widget, *args):
-        """
-        Predefined callback.
-        The widget is hidden.
-        Equivalent to widget.hide()
-        """
-        widget.hide()
-
-    def gtk_widget_grab_focus(self, widget, *args):
-        """
-        Predefined callback.
-        The widget grabs the focus.
-        Equivalent to widget.grab_focus()
-        """
-        widget.grab_focus()
-
-    def gtk_widget_destroy(self, widget, *args):
-        """
-        Predefined callback.
-        The widget is destroyed.
-        Equivalent to widget.destroy()
-        """
-        widget.destroy()
-
-    def gtk_window_activate_default(self, window, *args):
-        """
-        Predefined callback.
-        The default widget of the window is activated.
-        Equivalent to window.activate_default()
-        """
-        widget.activate_default()
-
-    def gtk_true(self, *args):
-        """
-        Predefined callback.
-        Equivalent to return True in a callback.
-        Useful for stopping propagation of signals.
-        """
-        return True
-
-    def gtk_false(self, *args):
-        """
-        Predefined callback.
-        Equivalent to return False in a callback.
-        """
-        return False
-
-    def gtk_main_quit(self, *args):
-        """
-        Predefined callback.
-        Equivalent to self.quit()
-        """
-        self.quit()
-
-    def main(self):
-        """
-        Starts the main loop of processing events.
-        The default implementation calls gtk.main()
-
-        Useful for applications that needs a non gtk main loop.
-        For example, applications based on gstreamer needs to override
-        this method with gst.main()
-
-        Do not directly call this method in your programs.
-        Use the method run() instead.
-        """
-        gtk.main()
-
-    def quit(self):
-        """
-        Quit processing events.
-        The default implementation calls gtk.main_quit()
-        
-        Useful for applications that needs a non gtk main loop.
-        For example, applications based on gstreamer needs to override
-        this method with gst.main_quit()
-        """
-        gtk.main_quit()
-
-    def run(self):
-        """
-        Starts the main loop of processing events checking for Control-C.
-
-        The default implementation checks wheter a Control-C is pressed,
-        then calls on_keyboard_interrupt().
-
-        Use this method for starting programs.
-        """
-        try:
-            self.main()
-        except KeyboardInterrupt:
-            self.on_keyboard_interrupt()
-
-    def on_keyboard_interrupt(self):
-        """
-        This method is called by the default implementation of run()
-        after a program is finished by pressing Control-C.
-        """
-        pass
-
-    def install_custom_handler(self, custom_handler):
-        gtk.glade.set_custom_handler(custom_handler)
-
-    def create_glade(self, glade_path, root, domain):
-        return gtk.glade.XML(self.glade_path, root, domain)
-
-    def get_widget(self, widget_name):
-        return self.glade.get_widget(widget_name)
-
-    def get_widgets(self):
-        return self.glade.get_widget_prefix("")        
diff --git a/sci-electronics/gresistor/gresistor-0.0.2-r1.ebuild b/sci-electronics/gresistor/gresistor-0.0.2-r1.ebuild
deleted file mode 100644
index 1a626f02b108..000000000000
--- a/sci-electronics/gresistor/gresistor-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Translate a resistor color codes into a readable value"
-HOMEPAGE="https://sourceforge.net/projects/gresistor/"
-SRC_URI="mirror://sourceforge/gresistor/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-	')
-	gnome-base/libglade:2.0[${PYTHON_SINGLE_USEDEP}]
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/Version=0.0.2/Version=1.0/g' ${PN}.desktop || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	python_domodule "${FILESDIR}/SimpleGladeApp.py"
-	domenu ${PN}.desktop
-}
diff --git a/sci-electronics/gresistor/metadata.xml b/sci-electronics/gresistor/metadata.xml
deleted file mode 100644
index 7361a73ad6e7..000000000000
--- a/sci-electronics/gresistor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gresistor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-electronics/iverilog/Manifest b/sci-electronics/iverilog/Manifest
index 7aec7c64a31a..0212a1e52caf 100644
--- a/sci-electronics/iverilog/Manifest
+++ b/sci-electronics/iverilog/Manifest
@@ -1,6 +1,5 @@
 AUX iverilog-10.3-file-missing.patch 8849 BLAKE2B 2cb72c6d2b769ae0ac601f950b62dd0c3ad460df593a6a033794a5bfa482d1aa18e74502a8f54456c96df86ba12fe61827e0439764d05e0b5d5b00ae1d71d870 SHA512 bb954e9669fdfaea30a9bf711a2d7b5cf38906dc3665752746a9e0d8738dc07a79d90b33ba82dfe665a8181910b3b3083a78d06607562d684f6d9b8bc1741368
 AUX iverilog-10.3-fno-common.patch 777 BLAKE2B 99ce15739f0d86dd838e652542152cc7b2301a3dee605b7aff299ef3588576b21ed21ae19468a3dcca200cee4b6cd3271125837d75e83dbed770d07cd2eeb83a SHA512 2e10fbb03649da90e97977b18922fb74527d0256fdd6b819ba69cafe64c3a38f09cf47619448fd34a47a2ebf72af406c18d276885189f2381157ba99c1994319
-AUX iverilog-9999-file-missing.patch 23993 BLAKE2B 8e4016f9aa65dc260f249a95cbd68e64719000fd23871af05f224d0b808b62a2568cc65768efc8a7f22e9fbb47784b18040cabf47a523f1f565cbc9a15fb501e SHA512 ffd4516b73bb776ad95fc792bf6c0c67cee05b472c637827823a17d3c074401f464a92d5d4c650bafe47d3bd4ffd5baabb157b67d0413f0b54c76b1fd7e5f24a
 DIST iverilog-10.3.tar.gz 1600835 BLAKE2B 107c57c61fb27c18f4020f7853bf6ca83d1a86fdc73c57ea207828baf6b7a26d42e43ce7b33580f050a4c0b8f63bca6accecf678323a3bbbee1eb9c1d8fa2caa SHA512 67076e19a208576c21a0462ff7d15d00a9d47740c47518a5523bd928b3118360d85eb84c317963717d15e5246ece3727259f6ff3baf59e195340530cc9086a1d
 DIST verilog-0.9.6.tar.gz 1219982 BLAKE2B 12f7dfb1ab8b7e4524cf0a3061ce801bfa741015fc1446aef7ffe51c42d76b5d0578e78ce13cd8c3fb6bac580e9da1ed11ca03e1fd02f8cb75dd74425546f851 SHA512 63c18f211eb9711547db65b859551063129cf18acb1196eaa88562f194231079fe929a6f7b8fbe2160863c521f02dde079e792f1b0bbe1c2514deafd55d5288c
 DIST verilog-0.9.7.tar.gz 1238088 BLAKE2B c0b173b4857abc0d35ad05d9f11d5265763c92e625aadb1b487978c40e0679725b8e6de0fc05cc8e4bc7a6db6e1d9abacf886942b05e27d8513b9586cca156f9 SHA512 1a81f132c667f5cd33a11156364a366806ef9b6ef59b86f69df852af79cc92db17df8db0bace4e3c14929b0110df0aa7d83f35f664057e715842acf7bd21c1f5
@@ -8,6 +7,6 @@ DIST verilog-10.2.tar.gz 1695227 BLAKE2B ea2488de55ef60a248e7f5ffd5e06c6d86d57f3
 EBUILD iverilog-0.9.6.ebuild 1123 BLAKE2B bd804cd0e062aad50ae3d13b86181431634a9ffc5e06f725bd3c3dba8e3cdcdcefe970ac5c5af9dd12bdcf6e6efe45158d8e262c445f155b51bc7289e8f84782 SHA512 b5bfe49d06522810054db72693e30220ceda8e0e1886a45a2094024b6e114cb3c8e943c333308fd0f17facdaa5bf7066aedc33120bed3fbb942ff0320733695a
 EBUILD iverilog-0.9.7.ebuild 1127 BLAKE2B 0df427e1b40eb81301e3ad5a783ba439d11e29f64bba8db1bae0b814807525367a1009b7dd3daad2c04e315c0899b32e6b83fa5c034dc821350151e234546616 SHA512 0166372b9aec56da2edce510783bdd9aece5610f418d0ceea081a72f0b7277b62133fcd866360fea449395a7e9bd6a7f24ae03c2373184bd14c1c951e81d4e33
 EBUILD iverilog-10.2.ebuild 645 BLAKE2B bfa32a5577961ef503b53654f1c076cfe8a1cb000a2986ca603404115502332f6c8be2ca10b925ce70f148ee394bed96c6e4f19c303664cde249de7e9dd8bc43 SHA512 de3c3cb13a45900e02cc90a9283a41f5d32e5a6fb6c9f8e261bd356fbcfafd98fd65e38c42324d246927360a6b1af17c0b9d110b38d6f2ce19921b350a19f905
-EBUILD iverilog-10.3.ebuild 1873 BLAKE2B f93db87c3b750dad0c608d31ea287b685edca71daf63f22d008e18e86b87d3dc001cebad35b2d40c7a513fa2388ca1da1ef615490e446b5ce3086689ad907d5a SHA512 870c4ea57c3839a8c65be0bbb11d1105f45b8a9167524c028620fd4dce9db960fe1517ee91897da1aadeb6aa1ff5e86afbf450e2af866ba722c522642ad42ff2
-EBUILD iverilog-9999.ebuild 1822 BLAKE2B ca8bdb4d3d3d0aeca38d634347f1120742feff5fecd017560743c6a5e540b00fd6b9b139a85984e95599935a2cd369c9086c31e8491c4510faeea0cd8bafcb86 SHA512 df9059da0d7df3374d0747d8d0ff5e73e554b1b7e01a8c97272cf13e69beac4ca2b87fcf53af885691aafd29e33ec0c638a922a01b5cfe5286d1156b2d5bd03e
+EBUILD iverilog-10.3.ebuild 1867 BLAKE2B d3ea7956d726455cb7e6f6afaac227c98d4024bd6e2a1cb5f99a12851048e0ac76c786ac1732da6d85fe887aab1347f7e2ce59980e879ad3c60bd9d3e1f7bbfe SHA512 f08c88003cbf34e86a6455bee1e98551c02a949a5da3645620dc4329615438cadaf6111ec919cc6869d2ee8f0c27e962eaf95b5d7b883505d8848239b1f19629
+EBUILD iverilog-9999.ebuild 1752 BLAKE2B fee75efc8f32d31baf9b455221be725f23261f94ba0a488bd41d99c4eae4ff019ce101862d48f6cb354482bf5e5ea15c75850f7573f883bb5a7aeba9da9d4379 SHA512 0d969a151c3c0d1773a96b20bf8543ac89a92c1f39ad02c204c2eddb6b63e38e5c9c6b3fbc76eeff5d95d890e0a72094705422529ad315af138732fdbdbc1810
 MISC metadata.xml 904 BLAKE2B 92e78cfceee82ffb4feaee92810d496bf78c3321a81c97fbcc0038244e2ea58e87fec57254ebd90852a4d308bd08d944659ce59b339b2762ba26843c8ad59cb3 SHA512 8c3633d7bea101dc771c26355b40d309eb5b0b3ea7bbf3538faaa9c7098253eb623aac3f9e312aed25a9262116d013784adf02d9f2a3943a5fbec3733dab250f
diff --git a/sci-electronics/iverilog/files/iverilog-9999-file-missing.patch b/sci-electronics/iverilog/files/iverilog-9999-file-missing.patch
deleted file mode 100644
index a8d809cef8e2..000000000000
--- a/sci-electronics/iverilog/files/iverilog-9999-file-missing.patch
+++ /dev/null
@@ -1,644 +0,0 @@
-https://bugs.gentoo.org/705412
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -308,67 +308,62 @@ version_tag.h version:
- 
- ifeq (@MINGW32@,yes)
- ifeq ($(MAN),none)
--INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
-+INSTALL_DOC = installman
- else
- ifeq ($(PS2PDF),none)
--INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
-+INSTALL_DOC = installman
- else
--INSTALL_DOC = $(prefix)/iverilog-vpi$(suffix).pdf $(mandir)/man1/iverilog-vpi$(suffix).1
-+INSTALL_DOC = installpdf installman
- all: dep iverilog-vpi.pdf
- endif
- endif
- INSTALL_DOCDIR = $(mandir)/man1
- else
--INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
-+INSTALL_DOC = installman
- INSTALL_DOCDIR = $(mandir)/man1
- endif
- 
- ifeq (@MINGW32@,yes)
- WIN32_INSTALL =
- else
--WIN32_INSTALL = $(bindir)/iverilog-vpi$(suffix)
-+WIN32_INSTALL = installwin32
- endif
- 
--install: all installdirs $(libdir)/ivl$(suffix)/ivl@EXEEXT@  $(libdir)/ivl$(suffix)/include/constants.vams $(libdir)/ivl$(suffix)/include/disciplines.vams $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/sv_vpi_user.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC)
-+install: all installdirs installfiles
- 	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
- 
--$(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi installdirs
-+F = ./ivl@EXEEXT@ \
-+	$(srcdir)/constants.vams \
-+	$(srcdir)/disciplines.vams \
-+	$(srcdir)/ivl_target.h \
-+	./_pli_types.h \
-+	$(srcdir)/sv_vpi_user.h \
-+	$(srcdir)/vpi_user.h \
-+	$(srcdir)/acc_user.h \
-+	$(srcdir)/veriuser.h \
-+	$(INSTALL_DOC) \
-+	$(WIN32_INSTALL)
-+
-+installwin32: ./iverilog-vpi installdirs
- 	$(INSTALL_SCRIPT) ./iverilog-vpi "$(DESTDIR)$(bindir)/iverilog-vpi$(suffix)"
- 
--$(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@ installdirs
--	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@"
-+installman: iverilog-vpi.man installdirs
-+	$(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1"
- 
--$(libdir)/ivl$(suffix)/include/constants.vams: $(srcdir)/constants.vams installdirs
--	$(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams"
-+installpdf: iverilog-vpi.pdf installdirs
-+	$(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
- 
--$(libdir)/ivl$(suffix)/include/disciplines.vams: $(srcdir)/disciplines.vams installdirs
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@"
-+	$(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams"
- 	$(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams"
--
--$(includedir)/ivl_target.h: $(srcdir)/ivl_target.h installdirs
- 	$(INSTALL_DATA) $(srcdir)/ivl_target.h "$(DESTDIR)$(includedir)/ivl_target.h"
--
--$(includedir)/_pli_types.h: _pli_types.h installdirs
--	$(INSTALL_DATA) $< "$(DESTDIR)$(includedir)/_pli_types.h"
--
--$(includedir)/sv_vpi_user.h: $(srcdir)/sv_vpi_user.h installdirs
-+	$(INSTALL_DATA) ./_pli_types.h "$(DESTDIR)$(includedir)/_pli_types.h"
- 	$(INSTALL_DATA) $(srcdir)/sv_vpi_user.h "$(DESTDIR)$(includedir)/sv_vpi_user.h"
--
--$(includedir)/vpi_user.h: $(srcdir)/vpi_user.h installdirs
- 	$(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h"
--
--$(includedir)/acc_user.h: $(srcdir)/acc_user.h installdirs
- 	$(INSTALL_DATA) $(srcdir)/acc_user.h "$(DESTDIR)$(includedir)/acc_user.h"
--
--$(includedir)/veriuser.h: $(srcdir)/veriuser.h installdirs
- 	$(INSTALL_DATA) $(srcdir)/veriuser.h "$(DESTDIR)$(includedir)/veriuser.h"
- 
--$(mandir)/man1/iverilog-vpi$(suffix).1: iverilog-vpi.man installdirs
--	$(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1"
--
--$(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf installdirs
--	$(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
--
--
- installdirs: $(srcdir)/mkinstalldirs
- 	$(srcdir)/mkinstalldirs "$(DESTDIR)$(bindir)" \
- 	    "$(DESTDIR)$(includedir)" \
---- a/cadpli/Makefile.in
-+++ b/cadpli/Makefile.in
-@@ -79,9 +79,11 @@ endif
- cadpli.vpl: $O ../vpi/libvpi.a ../libveriuser/libveriuser.o
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
- 
--install: all installdirs $(vpidir)/cadpli.vpl
-+install: all installdirs installfiles
- 
--$(vpidir)/cadpli.vpl: ./cadpli.vpl
-+F = ./cadpli.vpl
-+
-+installfiles: $(F) installdirs
- 	$(INSTALL_PROGRAM) ./cadpli.vpl "$(DESTDIR)$(vpidir)/cadpli.vpl"
- 
- installdirs: $(srcdir)/../mkinstalldirs
---- a/driver-vpi/Makefile.in
-+++ b/driver-vpi/Makefile.in
-@@ -94,9 +94,11 @@ res.o: res.rc
- 	$(WINDRES) -i res.rc -o res.o
- #
- 
--install: all installdirs $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
-+install: all installdirs installfiles
- 
--$(bindir)/iverilog-vpi$(suffix)@EXEEXT@: ./iverilog-vpi@EXEEXT@
-+F = ./iverilog-vpi@EXEEXT@
-+
-+installfiles: $(F) installdirs
- 	$(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ "$(bindir)/iverilog-vpi$(suffix)@EXEEXT@"
- ifeq (@WIN32@,yes)
- ifneq ($(HOSTCC),$(CC))
---- a/driver/Makefile.in
-+++ b/driver/Makefile.in
-@@ -112,32 +112,35 @@ iverilog.pdf: iverilog.ps
- 
- ifeq (@MINGW32@,yes)
- ifeq ($(MAN),none)
--INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
-+INSTALL_DOC = installman
- else
- ifeq ($(PS2PDF),none)
--INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
-+INSTALL_DOC = installman
- else
--INSTALL_DOC = $(prefix)/iverilog$(suffix).pdf $(mandir)/man1/iverilog$(suffix).1
-+INSTALL_DOC = installpdf installman
- all: iverilog.pdf
- endif
- endif
- INSTALL_DOCDIR = $(mandir)/man1
- else
--INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
-+INSTALL_DOC = installman
- INSTALL_DOCDIR = $(mandir)/man1
- endif
- 
--install: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC)
-+install: all installdirs installfiles
- 
--$(bindir)/iverilog$(suffix)@EXEEXT@: ./iverilog@EXEEXT@
--	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
-+F = ./iverilog@EXEEXT@ \
-+	$(INSTALL_DOC)
- 
--$(mandir)/man1/iverilog$(suffix).1: iverilog.man
-+installman: iverilog.man installdirs
- 	$(INSTALL_DATA) iverilog.man "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1"
- 
--$(prefix)/iverilog$(suffix).pdf: iverilog.pdf
-+installpdf: iverilog.pdf installdirs
- 	$(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
-+
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
- 
---- a/ivlpp/Makefile.in
-+++ b/ivlpp/Makefile.in
-@@ -71,9 +71,11 @@ ivlpp@EXEEXT@: $O
- lexor.c: $(srcdir)/lexor.lex
- 	$(LEX) -t $< > $@
- 
--install: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@: ivlpp@EXEEXT@
-+F = ivlpp@EXEEXT@
-+
-+installfiles: $(F) installdirs
- 	$(INSTALL_PROGRAM) ./ivlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@"
- 
- installdirs: $(srcdir)/../mkinstalldirs
---- a/libveriuser/Makefile.in
-+++ b/libveriuser/Makefile.in
-@@ -103,9 +103,11 @@ libveriuser.a: libveriuser.o
- 	$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
- 	mv $*.d dep
- 
--install:: all installdirs $(libdir)/libveriuser$(suffix).a $(INSTALL32)
-+install:: all installdirs installfiles
- 
--$(libdir)/libveriuser$(suffix).a: ./libveriuser.a
-+F = ./libveriuser.a
-+
-+installfiles: $(F) installdirs
- 	$(INSTALL_DATA) ./libveriuser.a "$(DESTDIR)$(libdir)/libveriuser$(suffix).a"
- 
- installdirs: $(srcdir)/../mkinstalldirs
---- a/tgt-blif/Makefile.in
-+++ b/tgt-blif/Makefile.in
-@@ -83,18 +83,17 @@ endif
- blif.tgt: $O $(TGTDEPLIBS)
- 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/blif.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/blif.conf $(libdir)/ivl$(suffix)/blif-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/blif.tgt: ./blif.tgt
--	$(INSTALL_PROGRAM) ./blif.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.tgt"
-+F = ./blif.tgt \
-+	$(srcdir)/blif.conf \
-+	$(srcdir)/blif-s.conf
- 
--$(libdir)/ivl$(suffix)/blif.conf: $(srcdir)/blif.conf
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./blif.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.tgt"
- 	$(INSTALL_DATA) $(srcdir)/blif.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.conf"
--
--$(libdir)/ivl$(suffix)/blif-s.conf: $(srcdir)/blif-s.conf
- 	$(INSTALL_DATA) $(srcdir)/blif-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/blif-s.conf"
- 
--
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
- 
---- a/tgt-fpga/Makefile.in
-+++ b/tgt-fpga/Makefile.in
-@@ -93,38 +93,38 @@ iverilog-fpga.pdf: iverilog-fpga.ps
- 	ps2pdf iverilog-fpga.ps iverilog-fpga.pdf
- 
- ifeq (@WIN32@,yes)
--INSTALL_DOC = $(prefix)/iverilog-fpga$(suffix).pdf $(mandir)/man1/iverilog-fpga$(suffix).1
-+INSTALL_DOC = installpdf installman
- INSTALL_DOCDIR = $(mandir)/man1
- all: iverilog-fpga.pdf
- else
--INSTALL_DOC = $(mandir)/man1/iverilog-fpga$(suffix).1
-+INSTALL_DOC = installman
- INSTALL_DOCDIR = $(mandir)/man1
- endif
- 
--install: all installdirs $(libdir)/ivl$(suffix)/fpga.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/fpga.conf $(libdir)/ivl$(suffix)/fpga-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/fpga.tgt: ./fpga.tgt
--	$(INSTALL_PROGRAM) ./fpga.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
--
--$(libdir)/ivl$(suffix)/fpga.conf: $(srcdir)/fpga.conf
--	$(INSTALL_DATA) $(srcdir)/fpga.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
--
--$(libdir)/ivl$(suffix)/fpga-s.conf: $(srcdir)/fpga-s.conf
--	$(INSTALL_DATA) $(srcdir)/fpga-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
-+F = ./fpga.tgt \
-+	$(srcdir)/fpga.conf \
-+	$(srcdir)/fpga-s.conf \
-+	$(INSTALL_DOC)
- 
--
--$(mandir)/man1/iverilog-fpga$(suffix).1: $(srcdir)/iverilog-fpga.man
-+installman: $(srcdir)/iverilog-fpga.man installdirs
- 	$(INSTALL_DATA) $(srcdir)/iverilog-fpga.man "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1"
- 
--$(prefix)/iverilog-fpga$(suffix).pdf: iverilog-fpga.pdf
-+installpdf: iverilog-fpga.pdf installdirs
- 	$(INSTALL_DATA) iverilog-fpga.pdf "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf"
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./fpga.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
-+	$(INSTALL_DATA) $(srcdir)/fpga.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
-+	$(INSTALL_DATA) $(srcdir)/fpga-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
-+
- installdirs: $(srcdir)/../mkinstalldirs
--	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
-+	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" "$(DESTDIR)$(INSTALL_DOCDIR)"
- 
- uninstall:
- 	rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt"
--	rm -f "$(DESTDIR)$(INSTALL_DOC)"
-+	rm -f "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf" "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1"
- 	rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf"
- 	rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf"
- 
---- a/tgt-null/Makefile.in
-+++ b/tgt-null/Makefile.in
-@@ -81,18 +81,17 @@ endif
- null.tgt: $O $(TGTDEPLIBS)
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/null.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/null.conf $(libdir)/ivl$(suffix)/null-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/null.tgt: ./null.tgt
--	$(INSTALL_PROGRAM) ./null.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt"
-+F = ./null.tgt \
-+	$(srcdir)/null.conf \
-+	$(srcdir)/null-s.conf
- 
--$(libdir)/ivl$(suffix)/null.conf: $(srcdir)/null.conf
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./null.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt"
- 	$(INSTALL_DATA) $(srcdir)/null.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null.conf"
--
--$(libdir)/ivl$(suffix)/null-s.conf: $(srcdir)/null-s.conf
- 	$(INSTALL_DATA) $(srcdir)/null-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null-s.conf"
- 
--
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
- 
---- a/tgt-pal/Makefile.in
-+++ b/tgt-pal/Makefile.in
-@@ -80,11 +80,12 @@ endif
- pal.tgt: $O $(TGTDEPLIBS)
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) -lipal
- 
--install: all installdirs $(libdir)/ivl/pal.tgt
-+install: all installdirs installfiles
- 
--$(libdir)/ivl/pal.tgt: ./pal.tgt
--	$(INSTALL_PROGRAM) ./pal.tgt "$(DESTDIR)$(libdir)/ivl/pal.tgt"
-+F = ./pal.tgt
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./pal.tgt "$(DESTDIR)$(libdir)/ivl/pal.tgt"
- 
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)/$(libdir)/ivl"
---- a/tgt-pcb/Makefile.in
-+++ b/tgt-pcb/Makefile.in
-@@ -105,18 +105,17 @@ endif
- pcb.tgt: $O $(TGTDEPLIBS)
- 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/pcb.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/pcb.conf $(libdir)/ivl$(suffix)/pcb-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/pcb.tgt: ./pcb.tgt
--	$(INSTALL_PROGRAM) ./pcb.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.tgt"
-+F = ./pcb.tgt \
-+	$(srcdir)/pcb.conf \
-+	$(srcdir)/pcb-s.conf
- 
--$(libdir)/ivl$(suffix)/pcb.conf: $(srcdir)/pcb.conf
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./pcb.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.tgt"
- 	$(INSTALL_DATA) $(srcdir)/pcb.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.conf"
--
--$(libdir)/ivl$(suffix)/pcb-s.conf: $(srcdir)/pcb-s.conf
- 	$(INSTALL_DATA) $(srcdir)/pcb-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb-s.conf"
- 
--
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
- 
---- a/tgt-sizer/Makefile.in
-+++ b/tgt-sizer/Makefile.in
-@@ -81,18 +81,17 @@ endif
- sizer.tgt: $O $(TGTDEPLIBS)
- 	$(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/sizer.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/sizer.conf $(libdir)/ivl$(suffix)/sizer-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/sizer.tgt: ./sizer.tgt
--	$(INSTALL_PROGRAM) ./sizer.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.tgt"
-+F = ./sizer.tgt \
-+	$(srcdir)/sizer.conf \
-+	$(srcdir)/sizer-s.conf
- 
--$(libdir)/ivl$(suffix)/sizer.conf: $(srcdir)/sizer.conf
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./sizer.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.tgt"
- 	$(INSTALL_DATA) $(srcdir)/sizer.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.conf"
--
--$(libdir)/ivl$(suffix)/sizer-s.conf: $(srcdir)/sizer-s.conf
- 	$(INSTALL_DATA) $(srcdir)/sizer-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer-s.conf"
- 
--
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
- 
---- a/tgt-stub/Makefile.in
-+++ b/tgt-stub/Makefile.in
-@@ -82,17 +82,16 @@ endif
- stub.tgt: $O $(TGTDEPLIBS)
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/stub.tgt \
--	$(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/stub.tgt: ./stub.tgt
--	$(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt"
--
--$(libdir)/ivl$(suffix)/stub.conf: stub.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf"
-+F = ./stub.tgt \
-+	./stub.conf \
-+	./stub-s.conf
- 
--$(libdir)/ivl$(suffix)/stub-s.conf: stub-s.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf"
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt"
-+	$(INSTALL_DATA) ./stub.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf"
-+	$(INSTALL_DATA) ./stub-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf"
- 
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
---- a/tgt-verilog/Makefile.in
-+++ b/tgt-verilog/Makefile.in
-@@ -80,12 +80,14 @@ endif
- verilog.tgt: $O $(TGTDEPLIBS)
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl/verilog.tgt \
--	$(includedir)/vpi_user.h
-+install: all installdirs installfiles
- 
--$(libdir)/ivl/verilog.tgt: ./verilog.tgt
--	$(INSTALL_PROGRAM) ./verilog.tgt "$(DESTDIR)$(libdir)/ivl/verilog.tgt"
-+F = ./verilog.tgt \
-+	$(srcdir)/vpi_user.h
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./verilog.tgt "$(DESTDIR)$(libdir)/ivl/verilog.tgt"
-+	$(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h"
- 
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl"
---- a/tgt-vhdl/Makefile.in
-+++ b/tgt-vhdl/Makefile.in
-@@ -90,17 +90,16 @@ stamp-vhdl_config-h: $(srcdir)/vhdl_config.h.in ../config.status
- 	cd ..; ./config.status --header=tgt-vhdl/vhdl_config.h
- vhdl_config.h: stamp-vhdl_config-h
- 
--install: all installdirs $(libdir)/ivl$(suffix)/vhdl.tgt $(libdir)/ivl$(suffix)/vhdl.conf \
--	$(libdir)/ivl$(suffix)/vhdl-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/vhdl.tgt: ./vhdl.tgt
--	$(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt"
--
--$(libdir)/ivl$(suffix)/vhdl.conf: vhdl.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf"
-+F = ./vhdl.tgt \
-+	./vhdl.conf \
-+	./vhdl-s.conf
- 
--$(libdir)/ivl$(suffix)/vhdl-s.conf: vhdl-s.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf"
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt"
-+	$(INSTALL_DATA) ./vhdl.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf"
-+	$(INSTALL_DATA) ./vhdl-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf"
- 
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
---- a/tgt-vlog95/Makefile.in
-+++ b/tgt-vlog95/Makefile.in
-@@ -81,18 +81,17 @@ endif
- vlog95.tgt: $O $(TGTDEPLIBS)
- 	$(CC) @shared@ $(LDFLAGS) -o $@ $O -lm $(TGTLDFLAGS)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/vlog95.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/vlog95.conf $(libdir)/ivl$(suffix)/vlog95-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/vlog95.tgt: ./vlog95.tgt
--	$(INSTALL_PROGRAM) ./vlog95.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.tgt"
-+F = ./vlog95.tgt \
-+	$(srcdir)/vlog95.conf \
-+	$(srcdir)/vlog95-s.conf
- 
--$(libdir)/ivl$(suffix)/vlog95.conf: $(srcdir)/vlog95.conf
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./vlog95.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.tgt"
- 	$(INSTALL_DATA) $(srcdir)/vlog95.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.conf"
--
--$(libdir)/ivl$(suffix)/vlog95-s.conf: $(srcdir)/vlog95-s.conf
- 	$(INSTALL_DATA) $(srcdir)/vlog95-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95-s.conf"
- 
--
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)"
- 
---- a/tgt-vvp/Makefile.in
-+++ b/tgt-vvp/Makefile.in
-@@ -104,17 +104,16 @@ stamp-vvp_config-h: $(srcdir)/vvp_config.h.in ../config.status
- 	cd ..; ./config.status --header=tgt-vvp/vvp_config.h
- vvp_config.h: stamp-vvp_config-h
- 
--install: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/vvp.tgt: ./vvp.tgt
--	$(INSTALL_PROGRAM) ./vvp.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt"
--
--$(libdir)/ivl$(suffix)/vvp.conf: vvp.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf"
--
--$(libdir)/ivl$(suffix)/vvp-s.conf: vvp-s.conf
--	$(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf"
-+F = ./vvp.tgt \
-+	./vvp.conf \
-+	./vvp-s.conf
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./vvp.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt"
-+	$(INSTALL_DATA) ./vvp.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf"
-+	$(INSTALL_DATA) ./vvp-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf"
- 
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"
---- a/vhdlpp/Makefile.in
-+++ b/vhdlpp/Makefile.in
-@@ -127,9 +127,11 @@ lexor_keyword.o: lexor_keyword.cc parse.h
- lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf
- 	gperf -o -i 7 --ignore-case -C -k 1-4,6,9,$$ -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
- 
--install: all installdirs $(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@
-+install: all installdirs installfiles
- 
--$(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@: vhdlpp@EXEEXT@
-+F = vhdlpp@EXEEXT@
-+
-+installfiles: $(F) installdirs
- 	$(INSTALL_PROGRAM) ./vhdlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@"
- 
- installdirs: $(srcdir)/../mkinstalldirs
---- a/vpi/Makefile.in
-+++ b/vpi/Makefile.in
-@@ -187,38 +187,25 @@ stamp-vpi_config-h: $(srcdir)/vpi_config.h.in ../config.status
- 	cd ..; ./config.status --header=vpi/vpi_config.h
- vpi_config.h: stamp-vpi_config-h
- 
--install: all installdirs \
--    $(libdir)/libvpi$(suffix).a \
--    $(vpidir)/system.vpi \
--    $(vpidir)/va_math.vpi \
--    $(vpidir)/v2005_math.vpi \
--    $(vpidir)/v2009.vpi \
--    $(vpidir)/vhdl_sys.vpi \
--    $(vpidir)/vhdl_textio.vpi \
--    $(vpidir)/vpi_debug.vpi
--
--$(libdir)/libvpi$(suffix).a : ./libvpi.a
--	$(INSTALL_DATA) libvpi.a "$(DESTDIR)$(libdir)/libvpi$(suffix).a"
--
--$(vpidir)/system.vpi: ./system.vpi
-+install: all installdirs installfiles
-+
-+F = ./libvpi.a \
-+	./system.vpi \
-+	./va_math.vpi \
-+	./v2005_math.vpi \
-+	./v2009.vpi \
-+	./vhdl_sys.vpi \
-+	./vhdl_textio.vpi \
-+	./vpi_debug.vpi
-+
-+installfiles: $(F) installdirs
-+	$(INSTALL_DATA) ./libvpi.a "$(DESTDIR)$(libdir)/libvpi$(suffix).a"
- 	$(INSTALL_PROGRAM) ./system.vpi "$(DESTDIR)$(vpidir)/system.vpi"
--
--$(vpidir)/va_math.vpi: ./va_math.vpi
- 	$(INSTALL_PROGRAM) ./va_math.vpi "$(DESTDIR)$(vpidir)/va_math.vpi"
--
--$(vpidir)/v2005_math.vpi: ./v2005_math.vpi
- 	$(INSTALL_PROGRAM) ./v2005_math.vpi "$(DESTDIR)$(vpidir)/v2005_math.vpi"
--
--$(vpidir)/v2009.vpi: ./v2009.vpi
- 	$(INSTALL_PROGRAM) ./v2009.vpi "$(DESTDIR)$(vpidir)/v2009.vpi"
--
--$(vpidir)/vhdl_sys.vpi: ./vhdl_sys.vpi
- 	$(INSTALL_PROGRAM) ./vhdl_sys.vpi "$(DESTDIR)$(vpidir)/vhdl_sys.vpi"
--
--$(vpidir)/vhdl_textio.vpi: ./vhdl_textio.vpi
- 	$(INSTALL_PROGRAM) ./vhdl_textio.vpi "$(DESTDIR)$(vpidir)/vhdl_textio.vpi"
--
--$(vpidir)/vpi_debug.vpi: ./vpi_debug.vpi
- 	$(INSTALL_PROGRAM) ./vpi_debug.vpi "$(DESTDIR)$(vpidir)/vpi_debug.vpi"
- 
- installdirs: $(srcdir)/../mkinstalldirs
---- a/vvp/Makefile.in
-+++ b/vvp/Makefile.in
-@@ -162,18 +162,18 @@ vvp.pdf: vvp.ps
- 
- ifeq (@MINGW32@,yes)
- ifeq ($(MAN),none)
--INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1
-+INSTALL_DOC = installman
- else
- ifeq ($(PS2PDF),none)
--INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1
-+INSTALL_DOC = installman
- else
--INSTALL_DOC = $(prefix)/vvp$(suffix).pdf $(mandir)/man1/vvp$(suffix).1
-+INSTALL_DOC = installpdf installman
- all: vvp.pdf
- endif
- endif
- INSTALL_DOCDIR = $(mandir)/man1
- else
--INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1
-+INSTALL_DOC = installman
- INSTALL_DOCDIR = $(mandir)/man1
- endif
- 
-@@ -182,17 +182,19 @@ stamp-config-h: $(srcdir)/config.h.in ../config.status
- 	cd ..; ./config.status --header=vvp/config.h
- config.h: stamp-config-h
- 
--install: all installdirs $(bindir)/vvp$(suffix)@EXEEXT@ $(INSTALL_DOC)
-+install: all installdirs installfiles
- 
--$(bindir)/vvp$(suffix)@EXEEXT@: ./vvp@EXEEXT@
--	$(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@"
-+F = ./vvp@EXEEXT@ $(INSTALL_DOC)
- 
--$(mandir)/man1/vvp$(suffix).1: vvp.man
-+installman: vvp.man installdirs
- 	$(INSTALL_DATA) vvp.man "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1"
- 
--$(prefix)/vvp$(suffix).pdf: vvp.pdf
-+installpdf: vvp.pdf installdirs
- 	$(INSTALL_DATA) vvp.pdf "$(DESTDIR)$(prefix)/vvp$(suffix).pdf"
- 
-+installfiles: $(F) installdirs
-+	$(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@"
-+
- installdirs: $(srcdir)/../mkinstalldirs
- 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
- 
diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
index cb0a5a2dca56..55e7f1e7c1c7 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
 else
 	SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 	S="${WORKDIR}/${PN}-${GITHUB_PV}"
 fi
 
diff --git a/sci-electronics/iverilog/iverilog-9999.ebuild b/sci-electronics/iverilog/iverilog-9999.ebuild
index 74c2574d0ab5..4592e8c4277d 100644
--- a/sci-electronics/iverilog/iverilog-9999.ebuild
+++ b/sci-electronics/iverilog/iverilog-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
 else
 	SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-${GITHUB_PV}"
 fi
 
@@ -40,10 +40,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-file-missing.patch #705412
-)
-
 src_prepare() {
 	default
 
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index eca6f4ec1309..c785bbcb90d1 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,5 +1,6 @@
 AUX klayout-0.25.6-gcc8.patch 527 BLAKE2B bd9d1ebac1a4f4679f076a3bedb67b3a4fe040338e0d63a7e25e5fb523707b7525ab7a9088122c75aa0a16e34e6e262efe097f5f96ff6db72b1d5add8f7192c5 SHA512 3280052ef3d9caf78d716c8cfb6e33205bbd2c9543f52bfe28e5c23749b3bbf8ed59edf7bbc8b8a96753f0e90484dcaacaad39c4ccbc2bebe979520589589f46
 DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00eeee650c SHA512 38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a
+EBUILD klayout-0.25.6-r1.ebuild 1720 BLAKE2B 2fd529e3218859fbebbda2c88020ab87aa9d075c319556cbf016ad4e1b379eb8d0fc0468d60efb0bb4708521430de6303bd5bd4dd4404e2c0ee254acd87e7589 SHA512 085e8da2cba98c4493a47eae35cbe7edefd38276f875f33f777c7650a4dff110ce80423673e2194b7be01d4b6fb8624c0f7938ea4fc4af9942b19aa718740d28
 EBUILD klayout-0.25.6.ebuild 1719 BLAKE2B 08c62d695cf828e0c224cc5c8076750d9bba96e21c43f6a130c3714ff4b36cc0a4980c5928aec7a278a1a3c6e226ad550854274db6905ab892fe05d7353cd92a SHA512 ea824d3b5a719542f9042173874e8992728996f9c92d1b3d715ea4d3ad669005f1f896c3d173fa306034eb3371e9dacd7a25eb485065c5a06f98ff058a2b387f
-EBUILD klayout-9999.ebuild 1676 BLAKE2B fbb977111607d11901982da7f3fadef7a5154ed2e97f8f25adbe89033030d04546ec1ed2820ca29c933ce6aaa25d513324c1737b20e5bd5e86664da8bd366f8f SHA512 47b1277066a06b60eeccc433953bc9b77e236693378af9600df11b65d36d0f5555b0ae25943ab7761a28ef8ddefc5669996869f81a1d4c5baaf35340099792cb
+EBUILD klayout-9999.ebuild 1676 BLAKE2B 330cf5736c6ce8d7889fbabf474d6939ec47358d0ce1ff96fb5960c5da5f2101475b719523961bbfc295ec2c50cd041111badfa973075776a326d96fbf43932d SHA512 ffa0aa4fda171b1e7f12df070d6a9d17b41d46ee2368ff168d7e407c96ab41c85e83312c0ce324d40df29a85d07146e39c1e189f02786fd3606026c682600f06
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.25.6-r1.ebuild b/sci-electronics/klayout/klayout-0.25.6-r1.ebuild
new file mode 100644
index 000000000000..8435a07aa8ce
--- /dev/null
+++ b/sci-electronics/klayout/klayout-0.25.6-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+RUBY_OPTIONAL=no
+USE_RUBY="ruby25"
+# note: define maximally ONE implementation here
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit toolchain-funcs python-single-r1 ruby-ng
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
+	inherit git-r3
+	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
+else
+	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
+HOMEPAGE="https://www.klayout.de/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	sys-libs/zlib
+	${PYTHON_DEPS}
+	$(ruby_implementations_depend)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc8.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ruby-ng_pkg_setup
+}
+
+each_ruby_configure() {
+	tc-export CC CXX AR LD RANLIB
+	export CFLAGS CXXFLAGS
+	./build.sh \
+		-expert \
+		-dry-run \
+		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
+		-ruby "${RUBY}" \
+		-python "${PYTHON}" \
+		-build . \
+		-bin "${T}/bin" \
+		-rpath "/usr/$(get_libdir)/klayout" \
+		-option "${MAKEOPTS}" \
+		-with-qtbinding \
+		-without-64bit-coord \
+		-qt5 || die "Configuration failed"
+}
+
+each_ruby_compile() {
+	emake all
+}
+
+each_ruby_install() {
+	emake install
+
+	cd "${T}/bin" || die
+
+	dodir "/usr/$(get_libdir)/klayout"
+	mv lib* "${ED}/usr/$(get_libdir)/klayout/" || die
+
+	dobin *
+}
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index 3419a02b2be3..127d36ffb70f 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 RUBY_OPTIONAL=no
-USE_RUBY="ruby24"
+USE_RUBY="ruby25"
 # note: define maximally ONE implementation here
 
 PYTHON_COMPAT=( python3_6 )