gentoo resync : 19.04.2018

15 files changed, 63 insertions, 207 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 3df1991e567f..74e03c5b0e4f 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/electric/Manifest b/sci-electronics/electric/Manifest
index b1b0770fdd25..dd9a728c294e 100644
--- a/sci-electronics/electric/Manifest
+++ b/sci-electronics/electric/Manifest
@@ -1,9 +1,3 @@
-DIST electricBinary-8.09.jar 11102701 BLAKE2B 657e1ccd4625687da85d7a5489167a33a52dd84b2360a8a7eb526fe6b63c92f48c0a88a5c1dcfd104185767277b53a24f08ad4c287483275ac4a0f0215cdf692 SHA512 9c042b168bf4da177418af6e0ca9543a2c57ddfa9fb22c8be84038b6e3e36302b028f1685c65f765f3506c24081da249ed35be3480254108f955f55bf14b179b
-DIST electricBinary-8.11.jar 12144732 BLAKE2B 66a03db8b6a0444e079649e421dfdaed3d5c9231f875912e113c2f9c9a58953afa168a7e1b95250d4fbb9a0f7f0a9988e7e7e45e40a82aed0d8b1eefd4ea948b SHA512 960355b580f9137c6fe9e5ba00c31ab1f61eacbf5689a51f88f12a48fb0742e702258bf6de4a6349c938f28d16294948cecd0eae261f82898e859f06361669e2
-DIST electricBinary-9.02.jar 23429359 BLAKE2B 8b93db3a9a6cba76708ff9416ae4fc2ac84706ec4d2bbc0f2e95a4ccafbbf65dd5c22e50eaa2a56536f8a1564fbd69af714a6a3bb7a4279ae259d0e27b12b33a SHA512 3c4eab21865bfabb744ab227fb0344552fae7291fbf3c043903ee919fd80238ec9674e3535ac80caab9bf3fa962ec45ca21378629d5d68d470c53849e8ded471
 DIST electricBinary-9.03.jar 23591444 BLAKE2B f5185917821855eed90dbd39dc8f6a390c9b117c06d960a01ef7061ec7650d13b549950e53c43c4bd0864c0adebc32c1c2e5c68a32dd09f2f46d0111aa8a7fe0 SHA512 e4430c87e1c0d335341057950b887988f46bd222ab6c2d989312036592f16db0b51169f3affc01fe0dbd8077674ed934d4896de46a0f9ee00e71453b2a6b18f2
-EBUILD electric-8.09.ebuild 756 BLAKE2B 2e1a536c5a64d58903572e058bc3e829191f3cb17373a9b95649ef68202f91d5eafd12b92277dcaa70ae9dec3b70118552d39c65738276243ef91e97cb6a0482 SHA512 08f0faad39992c4397fdc7c236d27f250e07095364f044a23beabc902c889329bcf296f8b2d307e33f41be4b93ab2ad97941644f1bfae2f8ddb77707cdda3c5b
-EBUILD electric-8.11.ebuild 758 BLAKE2B e8cef88cec59ae547ee1f00e943c6df25aa82ad4da8c280bab61da4ebf6c623e11a754b7aadddef6b90e93df5f7b72114d05eaa92bfaf83d3e679431ca4c66ed SHA512 b4a6a5f114d9b37c5f4189b0910330f765e8b7029a14e8d85ff3faccc6ef6357a82e5d29e3736a7ba0308981e84909f775dcaf0f508fd1a074e263073b4c40dd
-EBUILD electric-9.02.ebuild 756 BLAKE2B 2e1a536c5a64d58903572e058bc3e829191f3cb17373a9b95649ef68202f91d5eafd12b92277dcaa70ae9dec3b70118552d39c65738276243ef91e97cb6a0482 SHA512 08f0faad39992c4397fdc7c236d27f250e07095364f044a23beabc902c889329bcf296f8b2d307e33f41be4b93ab2ad97941644f1bfae2f8ddb77707cdda3c5b
-EBUILD electric-9.03.ebuild 758 BLAKE2B e8cef88cec59ae547ee1f00e943c6df25aa82ad4da8c280bab61da4ebf6c623e11a754b7aadddef6b90e93df5f7b72114d05eaa92bfaf83d3e679431ca4c66ed SHA512 b4a6a5f114d9b37c5f4189b0910330f765e8b7029a14e8d85ff3faccc6ef6357a82e5d29e3736a7ba0308981e84909f775dcaf0f508fd1a074e263073b4c40dd
+EBUILD electric-9.03.ebuild 770 BLAKE2B 178c80f28275df4b0ce02d6b66df0f038d35fa1bae924783e46ae682943c8e32db715d7ce6e6caa6b87b469f0ba41e06c2f7fd0a501ee2ebb2df7a98e4c296a4 SHA512 db206a790fdd1e2384c03b700b93da9e5fc7418d24b62eb2cb4c1d319c8220fd74025c21a82b42b050863e9371ff30cd43e911594e47ea2ed567400f19e433a3
 MISC metadata.xml 639 BLAKE2B df8422e39990021ac0e976721795e5bea9aaebeaf2e064dc930d57809a69388fdcf69418d1057e98f91ec8b1dde1bd6b7ffbe317d92bfe9bbed61f1881b2f5ed SHA512 856409ad27b7e3cc812c369e0ca8d362d8d71d9ba66ac189b68680a62da1501e019d7344a52a4f8c48b4cb6c5e8dec399cf1eca47751131336cd9355a9846973
diff --git a/sci-electronics/electric/electric-8.09.ebuild b/sci-electronics/electric/electric-8.09.ebuild
deleted file mode 100644
index 5c969c996b04..000000000000
--- a/sci-electronics/electric/electric-8.09.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
-HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
-SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6
-	sci-electronics/electronics-menu"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}"/${PN}Binary-${PV}.jar
-	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
-	java-pkg_dolauncher ${PN}
-	make_desktop_entry electric "Electric VLSI Design System" electric "Electronics"
-}
diff --git a/sci-electronics/electric/electric-8.11.ebuild b/sci-electronics/electric/electric-8.11.ebuild
deleted file mode 100644
index e7c190691c95..000000000000
--- a/sci-electronics/electric/electric-8.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
-HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
-SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6
-	sci-electronics/electronics-menu"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}"/${PN}Binary-${PV}.jar
-	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
-	java-pkg_dolauncher ${PN}
-	make_desktop_entry electric "Electric VLSI Design System" electric "Electronics"
-}
diff --git a/sci-electronics/electric/electric-9.02.ebuild b/sci-electronics/electric/electric-9.02.ebuild
deleted file mode 100644
index 5c969c996b04..000000000000
--- a/sci-electronics/electric/electric-9.02.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
-HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
-SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6
-	sci-electronics/electronics-menu"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}"/${PN}Binary-${PV}.jar
-	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
-	java-pkg_dolauncher ${PN}
-	make_desktop_entry electric "Electric VLSI Design System" electric "Electronics"
-}
diff --git a/sci-electronics/electric/electric-9.03.ebuild b/sci-electronics/electric/electric-9.03.ebuild
index e7c190691c95..eddba70359cf 100644
--- a/sci-electronics/electric/electric-9.03.ebuild
+++ b/sci-electronics/electric/electric-9.03.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils java-pkg-2
+EAPI=6
+
+inherit desktop java-pkg-2
 
 DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
 HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
@@ -12,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.6
+RDEPEND="
+	>=virtual/jre-1.6
 	sci-electronics/electronics-menu"
 DEPEND="app-arch/unzip"
 
@@ -20,7 +23,8 @@ S=${WORKDIR}
 
 src_install() {
 	java-pkg_newjar "${DISTDIR}"/${PN}Binary-${PV}.jar
-	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
 	java-pkg_dolauncher ${PN}
+
+	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
 	make_desktop_entry electric "Electric VLSI Design System" electric "Electronics"
 }
diff --git a/sci-electronics/plcedit/Manifest b/sci-electronics/plcedit/Manifest
deleted file mode 100644
index 13eb60ccdb49..000000000000
--- a/sci-electronics/plcedit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX plcedit-2.2.1-gcc47.patch 365 BLAKE2B 550c3fd7a306a72cc42f341e7ff82b4213b70214fcf42fd81f980539538e61e64f12e350e0766c03c8e5ced45469fbacaa3c518be232b8bb05953d8726d2c2da SHA512 90bbd362e59251bf6fba6052ac0ee7948fb0483af774d94ccab0303782022a6cba98bda89bb1392099e2e1e35cac472257ba9b4535d7ef362aee7e9da82411e7
-DIST plcedit-2.2.1.tar.gz 2855243 BLAKE2B 8470c587afc647d765fac304b32f1ae3e1ac69005bfa144004f4c861f65d66caac1b7f669da430ceddd73538176c8f061217a77e893dbc108fe563432eceaf5d SHA512 dee6dedd6b7fcd979311fa25e694b53eb9588bf713b9638a3e1355a155c467974c5cc41c4375d4f9f104e9c850024ba51a643011a107e21abbfbfc38c2dae7c2
-EBUILD plcedit-2.2.1.ebuild 1100 BLAKE2B 55483311efe1671007096131751168604998383455d7030ff19bdaec9e58d6d06b4b822fd35b7a4bb9edac72892ee5b3d9a13407c3809a4783863573417e6ba3 SHA512 c8ef8cd1cb7f7768fca30fa46c37fdb1419282b71c14162c1908831b1f61a489b65f3fb1ab71a5b0da6420f0361ff92b619bf2cfad3ba81e1be5c29ee9ef18e6
-MISC metadata.xml 250 BLAKE2B 923ba29298f48b552a4e9659a0a7aaed2ad5e95749b4f5043f8c7a6fca5b973762577072789007eb6f047717189be9e6aa5b6b5964a6bf13d52da6f85399b042 SHA512 c1832990e49282daac7d60cef0249c7b287d4957dc820079efacf988ffee53463ec5a63fc0dd5551793808793fe14c5e5cfd4cd75701eb07dacae7c414a4a2c3
diff --git a/sci-electronics/plcedit/files/plcedit-2.2.1-gcc47.patch b/sci-electronics/plcedit/files/plcedit-2.2.1-gcc47.patch
deleted file mode 100644
index 046a27cbac8c..000000000000
--- a/sci-electronics/plcedit/files/plcedit-2.2.1-gcc47.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- https://bugs.gentoo.org/450856
- 
- src/singleapp/qtlocalpeer.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/singleapp/qtlocalpeer.cpp
-+++ b/src/singleapp/qtlocalpeer.cpp
-@@ -57,6 +57,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
- #endif

- #if defined(Q_OS_UNIX)

- #include <time.h>

-+#include <unistd.h>

- #endif

- 

- namespace QtLP_Private {

diff --git a/sci-electronics/plcedit/metadata.xml b/sci-electronics/plcedit/metadata.xml
deleted file mode 100644
index 18e140956483..000000000000
--- a/sci-electronics/plcedit/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 type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-electronics/plcedit/plcedit-2.2.1.ebuild b/sci-electronics/plcedit/plcedit-2.2.1.ebuild
deleted file mode 100644
index 7fbbd69f7560..000000000000
--- a/sci-electronics/plcedit/plcedit-2.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils versionator qt4-r2
-MY_PN="PLCEdit"
-
-DESCRIPTION="Qt4 notepad for PLC programming"
-HOMEPAGE="http://www.qt-apps.org/content/show.php/PLCEdit?content=78380"
-#upstreams default tarball is quite messy. Better repack it myself :/
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc"
-
-RDEPEND="dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-
-	if use doc; then
-	sed -i -e "/helpDir =/s:Help:html:" \
-		-e "s:(QApplication\:\:applicationDirPath():\"/usr/share/doc/${PF}\":g" \
-		-e "/ + helpDir/s:helpDir):helpDir:" \
-		src/helpwidget.cpp
-	fi
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	newbin release/${MY_PN} ${PN} || die "dobin failed"
-	newicon src/ressources/images/icon.png ${PN}.png
-	make_desktop_entry ${PN} ${MY_PN} ${PN} 'Qt;Electronics'
-	dodoc readme.txt || die "dodoc failed"
-	if use doc; then
-		dohtml -r Docs/html/* || die "dohtml failed"
-	fi
-}
diff --git a/sci-electronics/vbs/Manifest b/sci-electronics/vbs/Manifest
index 5272b19f9792..c2a0a7543225 100644
--- a/sci-electronics/vbs/Manifest
+++ b/sci-electronics/vbs/Manifest
@@ -1,5 +1,6 @@
-AUX vbs-1.4.0-gcc-4.1.patch 3640 BLAKE2B 79b63ef992d16ae8c6b3f8e1a0f9394c1942dc346c0a52c54ff09336bdf89a219a2055238e14483392213af4723644eb6a5d7e2ee336839c8347b908484dbbb3 SHA512 5e3cf84543881a20f0900fc7b2b04cd0f5adf9a4ab7c836bf4da8827de7aa7af7f23f992af9d08316817a093dcfb06c93926d9e8b65861180eb0647f8050e2d9
-AUX vbs-1.4.0-gcc-4.3.patch 803 BLAKE2B 8fba14bd13942d567730d951a13025603f7185931c8468d51bf17af5d2ac54a7428e0a3b05f18bf60d8c46fd27b6fb46c2f98b841ae9a0d74bf38b1ffb0cfe05 SHA512 de807344e6bdf4f94cce92ed8674a2665a38c50731c3dc3a7ae7fe0de94fa2e7e11fa4b86d7472caa77ca1f84874df7288560c5cabbf60a4246f25e8eae48000
+AUX vbs-1.4.0-const_cast.patch 295 BLAKE2B 446553c415a05df0d4fc94fd50145d47fd56af215f4dd6b00175e260ee12e854c7f0c272e052ad1ab6cfd63fc511e52f6b7cd2ce808c2ae58659ab98c1b23c59 SHA512 4ea4545d1e6c19c0648f9cff426c8af7aed22af59998c47e8bd4d23cbfdc09534b017ad996143ee079ca34c712afcecc2fc7b2ad706e684b017d6737175905e9
+AUX vbs-1.4.0-gcc-4.1.patch 2606 BLAKE2B f5bf38ba6a943011847cedc9a6a5f1a36c12839f9e29648052066380e796a92585122fb88552d120bea1e6645b1adbffda2ae31f24a67244c622da1f0f1b6f60 SHA512 e6c59f855b88a2f2057c4409824ba6febd58473f1ddf7a9390b030dabbab53f8ce67d3c8e8b1f551a6cc219634649f542a740b7c5bafeaa7c46a92feef1e254b
+AUX vbs-1.4.0-gcc-4.3.patch 512 BLAKE2B d5b6a7123446db98cf3b31bc49b2e567e8c0a4804add662f87f68d84d15fd85031144cf536c33f6dcd628e3bd16eab137cee84efbe0d1f4eaf7db6948124cf3c SHA512 49e76e1cccbbe2171f0b821aa2c8a45666388331c5a8df378a255556bd534654e3c6135b77237ec734ab0a130c2db754166a367dd538860dd9ecf1ca8a057cfd
 DIST vbs-1.4.0.tar.gz 275974 BLAKE2B a2a3b9654edefb52e22be166650b17959a72e2b1b6c1bb25708b52c33b3f33476f10b542b553959ae2310a7adcb328d5fa129ac34c6c6b6e62ca0a8880b3ff68 SHA512 78320f650d8f9f558143d0c13fd47697a738f540fa5f6e8718e6e9fdef67f794189b18c214be68d19a9a745527b57abb54e94fadfc8e83289a95e1ae48e41384
-EBUILD vbs-1.4.0.ebuild 907 BLAKE2B c61e8020fd18aac52daf1e62de45fcc3360288a218646eededfcda709d26d40125fff19d3628bd6e52e3e8a58819d6f566e9575941bb303d8c2aa858c8e9b63b SHA512 2f3088d31515918cf279d9e9c7ed7706f4d39e7347826afdc454c28e97cf20862fdd45632331ee745372f97f58910c567c7ee1edd0042f88f931a16e9deeac99
+EBUILD vbs-1.4.0.ebuild 725 BLAKE2B 0e3437a8c76ce055991eaffe1007035c8fbd99d650d15519894849910ed0ce6a11fa515b14b2180ae57adce96f8807652ae8172f155665e42b3b7be748e29dcd SHA512 62c9859dee322bde3b76090d0070fbfe59ec9cb15c7c3ec058c5a75af8dcce49c6577f67b3d0d24c540a4497c70f105689e865dd3aed968fd910a0ebd200db59
 MISC metadata.xml 527 BLAKE2B 7f27862906c83c4c2f5f18d538b778417430161d6a256ccd38b432ebba40497f4650637162e971da0be294703b67aff3afc3531a41881deaa8c2e7c2b852a5b4 SHA512 8e747b4cbe36e0f8739da7b3adfb46584540075b5c6ba366c0be85d57352312bca287288d328bcddd6c7fa0fa434595b7b32fb3de650b4490799bfa6c5fd79c4
diff --git a/sci-electronics/vbs/files/vbs-1.4.0-const_cast.patch b/sci-electronics/vbs/files/vbs-1.4.0-const_cast.patch
new file mode 100644
index 000000000000..796aba52bb76
--- /dev/null
+++ b/sci-electronics/vbs/files/vbs-1.4.0-const_cast.patch
@@ -0,0 +1,11 @@
+--- a/common/scp_tab.cc
++++ b/common/scp_tab.cc
+@@ -148,7 +148,7 @@
+ 		nm.replace(0,top.length()+1,"");
+ 	const char * n = nm.c_str();
+ 	size_t full, sub,diff;
+-	char * last_dot = strrchr(n,'.');
++	char * last_dot = const_cast<char*>(strrchr(n,'.'));
+ 	char * ret = 0;
+ 	if (last_dot != 0)
+ 		{
diff --git a/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch b/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch
index 20f2aadb7e6e..b017e9e05dcf 100644
--- a/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch
+++ b/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch
@@ -1,6 +1,5 @@
-diff -ur vbs-1.4.0.orig/src/common/bvector.h vbs-1.4.0/src/common/bvector.h
---- vbs-1.4.0.orig/src/common/bvector.h	2003-01-12 05:40:59.000000000 +0100
-+++ vbs-1.4.0/src/common/bvector.h	2007-03-09 22:40:02.000000000 +0100
+--- a/common/bvector.h
++++ b/common/bvector.h
 @@ -90,9 +90,9 @@
  		size_type _size; // Size of this sub-bit vector.
  
@@ -22,9 +21,8 @@ diff -ur vbs-1.4.0.orig/src/common/bvector.h vbs-1.4.0/src/common/bvector.h
  		size_type size() const
  			{ return _size; }
  		ostream_type &info(ostream_type &) const;
-diff -ur vbs-1.4.0.orig/src/common/logic.h vbs-1.4.0/src/common/logic.h
---- vbs-1.4.0.orig/src/common/logic.h	2002-10-21 11:01:02.000000000 +0200
-+++ vbs-1.4.0/src/common/logic.h	2007-03-09 22:40:02.000000000 +0100
+--- a/common/logic.h
++++ b/common/logic.h
 @@ -44,6 +44,10 @@
  		{ return (_state == HI) ? true : false; }
  	operator int() const
@@ -36,9 +34,8 @@ diff -ur vbs-1.4.0.orig/src/common/logic.h vbs-1.4.0/src/common/logic.h
  	operator char() const
  		{
  		switch (_state)
-diff -ur vbs-1.4.0.orig/src/common/st_net.h vbs-1.4.0/src/common/st_net.h
---- vbs-1.4.0.orig/src/common/st_net.h	2002-11-24 03:07:00.000000000 +0100
-+++ vbs-1.4.0/src/common/st_net.h	2007-03-09 22:40:02.000000000 +0100
+--- a/common/st_net.h
++++ b/common/st_net.h
 @@ -133,4 +133,7 @@
  	const st_net &_net;
  	};
@@ -47,9 +44,8 @@ diff -ur vbs-1.4.0.orig/src/common/st_net.h vbs-1.4.0/src/common/st_net.h
 +void exit_iovars(st_net::io_list &, st_net::arg_list &);
 +
  #endif // _ST_NET_H
-diff -ur vbs-1.4.0.orig/src/expr/erdwr.cc vbs-1.4.0/src/expr/erdwr.cc
---- vbs-1.4.0.orig/src/expr/erdwr.cc	2002-05-28 08:22:46.000000000 +0200
-+++ vbs-1.4.0/src/expr/erdwr.cc	2007-03-09 22:40:02.000000000 +0100
+--- a/expr/erdwr.cc
++++ b/expr/erdwr.cc
 @@ -25,8 +25,9 @@
  expr_base *
  read_expr::operator()() const
@@ -62,9 +58,8 @@ diff -ur vbs-1.4.0.orig/src/expr/erdwr.cc vbs-1.4.0/src/expr/erdwr.cc
  	long ln;
  	_in >> ln;
  	expr_base *expr = 0;
-diff -ur vbs-1.4.0.orig/src/Makefile.in vbs-1.4.0/src/Makefile.in
---- vbs-1.4.0.orig/src/Makefile.in	2003-06-08 00:38:24.000000000 +0200
-+++ vbs-1.4.0/src/Makefile.in	2007-03-09 22:40:02.000000000 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -329,13 +329,15 @@
  	rm -f *.o
  	rm -f *.a
@@ -82,9 +77,8 @@ diff -ur vbs-1.4.0.orig/src/Makefile.in vbs-1.4.0/src/Makefile.in
  
  tarball:
  	@echo "===== Tar ball ======"
-diff -ur vbs-1.4.0.orig/src/misc/mrdwr.cc vbs-1.4.0/src/misc/mrdwr.cc
---- vbs-1.4.0.orig/src/misc/mrdwr.cc	2002-05-28 11:42:00.000000000 +0200
-+++ vbs-1.4.0/src/misc/mrdwr.cc	2007-03-09 22:40:02.000000000 +0100
+--- a/misc/mrdwr.cc
++++ b/misc/mrdwr.cc
 @@ -21,8 +21,9 @@
  module *
  read_module::operator()() const
diff --git a/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.3.patch b/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.3.patch
index c0a62e1d0e22..1bb55d824e7a 100644
--- a/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.3.patch
+++ b/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.3.patch
@@ -1,5 +1,5 @@
---- vbs-1.4.0b/src/common/dumpstrm.cc	2009-01-21 02:42:43.000000000 -0400
-+++ vbs-1.4.0/src/common/dumpstrm.cc	2009-01-21 02:48:57.000000000 -0400
+--- a/common/dumpstrm.cc
++++ b/common/dumpstrm.cc
 @@ -13,6 +13,7 @@
  
  #include <cstdio> // sprintf
@@ -8,8 +8,8 @@
  #include "dumpstrm.h"
  
  using std::cerr;
---- vbs-1.4.0b/src/common/logic.h	2009-01-21 02:42:43.000000000 -0400
-+++ vbs-1.4.0/src/common/logic.h	2009-01-21 02:48:05.000000000 -0400
+--- a/common/logic.h
++++ b/common/logic.h
 @@ -18,6 +18,7 @@
  
  #ifndef _LOGIC_H
@@ -18,8 +18,8 @@
  
  class logic
  	{
---- vbs-1.4.0b/src/common/bvector.h	2009-01-21 02:42:43.000000000 -0400
-+++ vbs-1.4.0/src/common/bvector.h	2009-01-21 02:46:31.000000000 -0400
+--- a/common/bvector.h
++++ b/common/bvector.h
 @@ -30,6 +30,7 @@
  #include <string>
  #include <utility>
diff --git a/sci-electronics/vbs/vbs-1.4.0.ebuild b/sci-electronics/vbs/vbs-1.4.0.ebuild
index 3dab479eec55..0c3b4dcf54c8 100644
--- a/sci-electronics/vbs/vbs-1.4.0.ebuild
+++ b/sci-electronics/vbs/vbs-1.4.0.ebuild
@@ -1,41 +1,40 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils
-
-HOMEPAGE="http://www.geda.seul.org/tools/vbs/index.html"
 DESCRIPTION="vbs - the Verilog Behavioral Simulator"
+HOMEPAGE="http://www.geda.seul.org/tools/vbs/index.html"
 SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-IUSE="examples"
+SLOT="0"
 KEYWORDS="~amd64 ppc ~x86"
+IUSE=""
 
-DEPEND=">=sys-devel/flex-2.3
-	>=sys-devel/bison-1.22"
+DEPEND="
+	sys-devel/flex
+	sys-devel/bison"
 RDEPEND=""
 
 S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc-4.1.patch"
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
-	sed -i -e "s/strrchr(n,'.')/const_cast<char*>(strrchr(n,'.'))/" common/scp_tab.cc || die "sed failed"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-4.1.patch
+	"${FILESDIR}"/${P}-gcc-4.3.patch
+	"${FILESDIR}"/${P}-const_cast.patch
+)
 
 src_compile() {
-	emake -j1 vbs || die "Compilation failed"
+	emake -j1 vbs
 }
 
 src_install() {
 	dobin vbs
-	cd ..
-	dodoc BUGS CHANGELOG* CONTRIBUTORS COPYRIGHT FAQ README vbs.txt
-	if use examples ; then
-		insinto /usr/share/${PF}/examples
-		doins EXAMPLES/*
-	fi
+	cd .. || die
+
+	einstalldocs
+	dodoc CHANGELOG* CONTRIBUTORS vbs.txt
+
+	insinto /usr/share/${PF}/examples
+	doins -r EXAMPLES/.
 }