gentoo resync : 30.05.2020

3 files changed, 2 insertions, 66 deletions

diff --git a/app-emulation/simh/Manifest b/app-emulation/simh/Manifest
index 59109be88b58..4af3cf19c243 100644
--- a/app-emulation/simh/Manifest
+++ b/app-emulation/simh/Manifest
@@ -2,7 +2,5 @@ AUX simh-3.11.0-fcommon.patch 1218 BLAKE2B e791f49dfa42f0bd0a36d8c04405ed74bf4bf
 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
 DIST simh-3.11.1.tar.gz 2576391 BLAKE2B bebaba75d4264c47202cc0daca2023c03d2e87722798f1ab37c9e3b2cec0b80cd180fccc0077347b2cb5255d26e1ce35f99a908deaf252c1e60e22e0a381e66d SHA512 7c2f81a64d3016b9a44409fc336c804c0da836317745d47594cc48c64cb57dc8f22084d9086e3f86868ec485ee56ac63301f350cee6d275e705b7c5fc82875db
-DIST simhv311-0.zip 2790607 BLAKE2B f9399977093f07d7f58067ed40e22f60e43228bbb1e0fdaa6b04408956962d9ea14b6dc57d758b819cee59f3bade9505a6802d42804df49622990402c0f22600 SHA512 e5fb6915c050e7402363cd9c1f99feb00874c3693905067ce901ffa86fc29a0cd2648684f111216b09a3c847f75812e2db2e2f2fa9f9d0db5dc932d53ec832fa
-EBUILD simh-3.11.0.ebuild 1252 BLAKE2B 7b25129df1e3da425081a73146ed08dd57a349315ad6c0d2de004f586c9d42c68dd2d2a51c8df2d716f190a17d4fd0cdcac9b4174dbf32a9dadd75d9766674e2 SHA512 71ae8835be89bdaab5dcfc6642a23f6f70d1c97531b61a7222914f279b7238667480fe9f7332436f6448f2ab6bf2ced393291d5d5baf2e051bc80abaf4c480fe
-EBUILD simh-3.11.1.ebuild 1258 BLAKE2B 55595ceff65666c3daacaf278beb2b22ad912bc635c047a215a63c89b80531efb605b09bb7c319d5e45153dfe4020ea06b1b2c9e5a8e2930d14b9616b26ac3b1 SHA512 1d7551eadd462747aeefe4f6a4fd80f0e08c83b5c855392d24748ec162d2420601cc45b6d533cca6ef2392606914949355e47b06f972086fe2dc92cbb38d52de
+EBUILD simh-3.11.1.ebuild 1256 BLAKE2B 6334794360bb6a9201d94e49305f2b7eb3335c9e844977a09388bfd5d18565ef5cf302d50d8c785b225caae8feeeffaf8686b553651d2971f62f08709d77a41f SHA512 90525d3b1bb6fe3e3e347bfb8b947eeb5bef38fe948568a8cb0c0175612ac602cd3174c5e24dd68e1ffd014a5515de8097b450325edc2b412e880ff420798666
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/app-emulation/simh/simh-3.11.0.ebuild b/app-emulation/simh/simh-3.11.0.ebuild
deleted file mode 100644
index 350a2779b276..000000000000
--- a/app-emulation/simh/simh-3.11.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.11.1.ebuild b/app-emulation/simh/simh-3.11.1.ebuild
index 04f83cc758d5..b0bc38984ccf 100644
--- a/app-emulation/simh/simh-3.11.1.ebuild
+++ b/app-emulation/simh/simh-3.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/simh/simh/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="net-libs/libpcap"