gentoo resync : 05.02.2020

7 files changed, 136 insertions, 5 deletions

diff --git a/app-emulation/simh/Manifest b/app-emulation/simh/Manifest
index e87c64c7c87d..ca503e49e507 100644
--- a/app-emulation/simh/Manifest
+++ b/app-emulation/simh/Manifest
@@ -1,5 +1,10 @@
+AUX simh-3.11.0-fcommon.patch 1218 BLAKE2B e791f49dfa42f0bd0a36d8c04405ed74bf4bf56fddf285cbac306f7c5188da52ab37f7a16bb55a4e9e5d6aa7f4d2ceb716cea823f2430cc19b53580f4eb5d044 SHA512 12eefe8c535b813ba55c7fb16929915d7c2715980d4e778ad357b4f8e5cfe73c3b00530252551bd22765f2b893a4f9d5d8404bed714c2dd4b5173029e7f70e58
+AUX simh-3.11.0-fix-mkdir-race.patch 333 BLAKE2B 2b50d8997d5a782391c6a0174c4c4471a98e6388d9a135068caf864531d075529e7dd8b264c096102ac18266c3c05691e5c723d1ef02c0cd93fdf49b45e5c3f1 SHA512 5ca8022e0c6521627c5d6075e04a10c42bfe61d6ac860b0f2dfde2cb70fb3df5e2f77d1a12e35ea75c3357effc3f5bc26e76e3ecb0a1461f7366297bd0e784e5
+AUX simh-3.11.0-respect-FLAGS.patch 265 BLAKE2B ba4134c8e3b0aafc71bbccb2e036d6532532816f30d1ac2a1759eb998479233c5e52a65fea77adf67c28a2e374b9edb998f91b30df9ea6e00f6f77723fdab61f SHA512 0e3c69ce2a7960c872933e60b0a8f043e0b0ae5563c4c5110045d53c34276a04cc110a0831057029ac84b21d818e1698514438d4f890bf4cd8d8e613af2cd9ef
 AUX simh-3.9.0-fix-mkdir-race.patch 324 BLAKE2B 03cbbbfaf958cb43769a0e2935dfb5f3e9148e5092b7726f2ea570afc34018459692e2c28721e698fc9f158b23176bd1623d99a6b1a15e0fe81bb6c7da370ade SHA512 3ca847ea6c34370c88788c4c3d8997dfe3e7740a201c531731425bc17375b405cef9f1db28d1eb66548add7953aef1d4cdc1b8c7212ab56d0c5f43fa4caea18a
 AUX simh-3.9.0-respect-FLAGS.patch 336 BLAKE2B 990f49c6da04f6f0e8a8f7c8170a6013376f12271063dab4c01345d98fe406981e3de49cf421017a902732755900d905d13c3a23d03091fa854dedff9bdabfaf SHA512 438386edcca386da7ed3f3a2247584e9aed708d5c54164d736e1dd26b565c065a0f6b62d0dab6e0ed4fc2dd211fa656b5e15388c2a2f18bf0393bf7c902616b2
+DIST simhv311-0.zip 2790607 BLAKE2B f9399977093f07d7f58067ed40e22f60e43228bbb1e0fdaa6b04408956962d9ea14b6dc57d758b819cee59f3bade9505a6802d42804df49622990402c0f22600 SHA512 e5fb6915c050e7402363cd9c1f99feb00874c3693905067ce901ffa86fc29a0cd2648684f111216b09a3c847f75812e2db2e2f2fa9f9d0db5dc932d53ec832fa
 DIST simhv39-0.zip 3103657 BLAKE2B 3b5fcaa7f1aa24bd5afa78452fb2d5e2822654bcaa3caa478dbdf939770c13f7f1d3f95859674fc02e2cc35a4cfff239bb9ee6a726fb9e31586f639cdf40ca10 SHA512 5e8cbf92e980b7cb40d68ff60a266f70c0bef0eecdc169a8077ae72a6a71fe12a7be5c62bd033ca36727e2cb8f266a5a6f8a5ed6dd509afbf0a9d7b618f1a4f6
-EBUILD simh-3.9.0-r1.ebuild 1366 BLAKE2B cdde54f6521df02777ba365e3a319b4879c980452c945055884f8f4908e98797905b761ce151ae6a636ee4eda4fcb45c0f3e69a01fb431341942efc285e94d69 SHA512 fe3c7786fa10bca0a7078167300e6e9fad6762628e8cea07deab21c8a4a286d4609949cce5af59062982e2d78cc59a810c3096ed8ea748ceb62400a8ac387205
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD simh-3.11.0.ebuild 1254 BLAKE2B 917af8c28b3cdac086ef979e8bb455f8f8c4ad546198df947321d9ec8c9fa09c82c2626898454a08b9dbd91597887c7c1036db2e9e009ceaae618fe2ee8d8755 SHA512 75b260ded39c4d9892419d1b2b9d73db06108f439580f0664da6f7430fc3870f30497f4d02573bbd94fa72a774452803a236818f5900b18c49c84cc5871c7370
+EBUILD simh-3.9.0-r1.ebuild 1350 BLAKE2B 75d5a6222ba6eb8204553582d4230fe953a37ab651c4169d743ca3523c51b9cc76aa109ff986757e4ceeb179e5a0f97b000d7474313df225b44372c47f9975ad SHA512 59645f44f783bf032ba622aaea4c31e8d0ca384959ea7b37e4d7b73cb15a057320dfceea493ef3a69916f9e18e317cc5afdbaa7a7ad0977d32c5138cff5bfd16
+MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/app-emulation/simh/files/simh-3.11.0-fcommon.patch b/app-emulation/simh/files/simh-3.11.0-fcommon.patch
new file mode 100644
index 000000000000..b23866aaab49
--- /dev/null
+++ b/app-emulation/simh/files/simh-3.11.0-fcommon.patch
@@ -0,0 +1,37 @@
+From ca4b7338836edb7325c82f86dccdeb4808cb4a89 Mon Sep 17 00:00:00 2001
+From: Mark Pizzolato <mark@infocomm.com>
+Date: Wed, 29 Jan 2020 11:39:36 -0800
+Subject: [PATCH] makefile: Force gcc/clang -fcommon to address future gcc
+ -fno-common default
+
+as reported and discussed in #794
+---
+ makefile | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/makefile
++++ b/makefile
+@@ -506,9 +506,13 @@ else

+   ifneq (3,$(GCC_MAJOR_VERSION))

+     ifeq (,$(GCC_OPTIMIZERS_CMD))

+       GCC_OPTIMIZERS_CMD = $(GCC) --help=optimizers

++      GCC_COMMON_CMD = $(GCC) --help=common

+     endif

+     GCC_OPTIMIZERS = $(shell $(GCC_OPTIMIZERS_CMD))

+   endif

++  ifneq (,$(GCC_COMMON_CMD))

++    GCC_OPTIMIZERS += $(shell $(GCC_COMMON_CMD))

++  endif

+   ifneq (,$(findstring $(GCC_VERSION),$(LTO_EXCLUDE_VERSIONS)))

+     NO_LTO = 1

+   endif

+@@ -530,6 +534,9 @@ else

+   ifneq (,$(findstring -fstrict-overflow,$(GCC_OPTIMIZERS)))

+     CFLAGS_O += -fno-strict-overflow

+   endif

++  ifneq (,$(findstring -fcommon,$(GCC_OPTIMIZERS))$(findstring -fno-common,$(GCC_OPTIMIZERS)))

++    CFLAGS_O += -fcommon

++  endif

+   ifeq (,$(NO_LTO))

+     ifneq (,$(findstring -flto,$(GCC_OPTIMIZERS)))

+       CFLAGS_O += -flto -fwhole-program

diff --git a/app-emulation/simh/files/simh-3.11.0-fix-mkdir-race.patch b/app-emulation/simh/files/simh-3.11.0-fix-mkdir-race.patch
new file mode 100644
index 000000000000..e2b1b5547efb
--- /dev/null
+++ b/app-emulation/simh/files/simh-3.11.0-fix-mkdir-race.patch
@@ -0,0 +1,11 @@
+--- simh-3.9.0/makefile
++++ simh-3.9.0/makefile
+@@ -249,7 +249,7 @@

+     NETWORK_OPT = $(NETWORK_CCDEFS)

+   endif

+   ifneq (binexists,$(shell if $(TEST) -e BIN; then echo binexists; fi))

+-    MKDIRBIN = if $(TEST) ! -e BIN; then mkdir BIN; fi

++    MKDIRBIN = mkdir -p BIN

+   endif

+ else

+   #Win32 Environments (via MinGW32)

diff --git a/app-emulation/simh/files/simh-3.11.0-respect-FLAGS.patch b/app-emulation/simh/files/simh-3.11.0-respect-FLAGS.patch
new file mode 100644
index 000000000000..0ceca7b0abf8
--- /dev/null
+++ b/app-emulation/simh/files/simh-3.11.0-respect-FLAGS.patch
@@ -0,0 +1,13 @@
+--- a/makefile
++++ b/makefile
+@@ -497,8 +497,8 @@ ifneq ($(DEBUG),)

+   CFLAGS_O = -O0

+   BUILD_FEATURES = - debugging support

+ else

+-  CFLAGS_O = -O2

+-  LDFLAGS_O = 

++  CFLAGS_O ?= -O2

++  LDFLAGS_O ?= 

+   ifeq (Darwin,$(OSTYPE))

+     NO_LTO = 1

+   endif

diff --git a/app-emulation/simh/metadata.xml b/app-emulation/simh/metadata.xml
index 7a38bb900964..c5298995d2d4 100644
--- a/app-emulation/simh/metadata.xml
+++ b/app-emulation/simh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-emulation/simh/simh-3.11.0.ebuild b/app-emulation/simh/simh-3.11.0.ebuild
new file mode 100644
index 000000000000..3be97ccd83eb
--- /dev/null
+++ b/app-emulation/simh/simh-3.11.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN}v$(ver_rs 1 '' 2 '-')" # 'a.b.c' -> 'ab-c'
+DESCRIPTION="a simulator for historical computers such as Vax, PDP-11 etc.)"
+HOMEPAGE="http://simh.trailing-edge.com/"
+SRC_URI="http://simh.trailing-edge.com/sources/${MY_P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/sim
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.11.0-respect-FLAGS.patch
+	"${FILESDIR}"/${PN}-3.11.0-fix-mkdir-race.patch
+	"${FILESDIR}"/${PN}-3.11.0-fcommon.patch
+)
+
+src_prepare() {
+	default
+
+	# fix linking on Darwin
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -e 's/-lrt//g' \
+			-i makefile || die
+	fi
+}
+
+src_compile() {
+	export GCC="$(tc-getCC)"
+	export LDFLAGS_O="${LDFLAGS}"
+	export CFLAGS_O="${CFLAGS}"
+
+	local my_makeopts=""
+	if tc-is-gcc && ver_test $(gcc-version) -lt 4.6 ; then
+		my_makeopts+=" NO_LTO=1"
+	fi
+
+	emake ${my_makeopts}
+}
+
+src_install() {
+	for BINFILE in BIN/* ; do
+		newbin ${BINFILE} "simh-$(basename ${BINFILE})"
+	done
+
+	insinto /usr/share/simh
+	doins VAX/*.bin
+
+	dodoc *.txt */*.txt
+}
diff --git a/app-emulation/simh/simh-3.9.0-r1.ebuild b/app-emulation/simh/simh-3.9.0-r1.ebuild
index ee884176530e..dcf25c3cb9cd 100644
--- a/app-emulation/simh/simh-3.9.0-r1.ebuild
+++ b/app-emulation/simh/simh-3.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -40,7 +40,7 @@ src_compile() {
 	export LDFLAGS_O="${LDFLAGS}"
 	export CFLAGS_O="${CFLAGS}"
 
-	local my_makeopts="USE_NETWORK=1"
+	local my_makeopts=""
 	if [ "$(gcc-major-version)" -le "4" -a "$(gcc-minor-version)" -lt "6" ] ; then
 		my_makeopts+=" NO_LTO=1"
 	fi