gentoo resync : 19.04.2018

5 files changed, 54 insertions, 49 deletions

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/.
 }