gentoo resync : 02.04.2018

3 files changed, 2 insertions, 80 deletions

diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index 1029fbcea0be..92aad3d484b4 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,6 +1,5 @@
 AUX spim-8.0-r1-respect_env.patch 5058 BLAKE2B dabd459ef87e3c9db6304703d2067297f4be53af269ab9b1335dc38302c2e828ab6e9b357e45619fbe4dbdb375abb2dd91795e728a25e9772b3bdaf0a7e3e846 SHA512 adc8bb7815f15a0dfbd67e14875d7f5773c3b0153e9f031a957a9b6deeb0cf2dfd1983b835d7446467433c044a1caea0c13ba43ee5e4f77d5096cd62e2c27948
 AUX xspim.svg 8364 BLAKE2B 0a2f13b78c87e821b6d669a750ea1be0003442f75c20c5387954c1e6c11f99f80b9e1a42ea88bc4e894011ff08cb8b40450674ec415d1be18eb63d5e2a9b0188 SHA512 1860705ef2677b5bd84b7cdf4daf3143033050e5ed014e22d63fc3bec48a0a296a9767fa7cbf7ab71f31c5cc712e40be0799a9c43b96c789273de7604d57c0d5
 DIST spim-8.0.tar.gz 355204 BLAKE2B c7da952df552c5e070c601e7c3d251f15988d377e1c9943730f6cf8eee1e3b64ec4a05b56d4bdbc181b811aa349e3b08fccf0b9ccfc3efe2c0e410580e70dd7f SHA512 c4eb66863a931b74d6c6ecd92860d16fd6369c85caecba1e71a1149e73e708502d1070f17a9beb6d0af1368db1ee5a85c040b596866a1236275cdd410a661adf
-EBUILD spim-8.0-r2.ebuild 1570 BLAKE2B 6a03d3b73d84f3a7bbf2b97d31f24465e23762fcb43b30239b5448ed9effce184d7bd6fc5e2ffd0714e3c5be44f0051f219b69a940d443d466bf7e76cd2d1fda SHA512 743da7bb89dcadb1be9bdbdebc86b64594d8b37d666230809f3440fb2df2f547ba25c78cfd43f6cc0d828e4071905f4f7915d2d78f8f98fa9be3e3145051888f
-EBUILD spim-8.0-r3.ebuild 1545 BLAKE2B 8ee89cd9e6ed068034adbb048d3c85bb4513113ca57b9402b87bc6487d7055455ef4f095911a26b450e1a9c1224c2abe4d21336ae01607958153dd8c462263f9 SHA512 21de18c91b8d1dcdfda5363b66fff47a42a117286697b7931c16f1a03790a7298bea59c5112d3a3bae3ace1e5ff3cc303219f7e895819c5ebb295b406263df13
+EBUILD spim-8.0-r3.ebuild 1543 BLAKE2B 7e7f694046fbfafabd5bf74976a1b662ac886c69ad6aa6999b93370493955cfdced07aed29c9818ea6a3dfb2f49dc7558d0cbaf81edfe3fd980d9d47bb2dd5ca SHA512 0640e6d45ff599138ade6204c464fa35d9cdd1d017949e895d138d31705f25cea17532d80fd4f512fafb669632576bf5db041a5a0d3f5bfdd6344ac8ed6d0779
 MISC metadata.xml 465 BLAKE2B a26e388f7a6a0610e0fb4d4c59b0d1a60c3934927f41e0d953dfab8cef1c9fc5da06902263ba29d984db1f0d1d3f636d503b8fe605571f4976e9bbd3e28cf4be SHA512 624df1312b5a85232c892f18eb39a62877c085d79461cf875b46a107eeaf5b99a9062e8f175a62c80565d42b26144ab2227d2f97b2d67fe16e66890e2843fe6c
diff --git a/app-emulation/spim/spim-8.0-r2.ebuild b/app-emulation/spim/spim-8.0-r2.ebuild
deleted file mode 100644
index c50eac72bf8a..000000000000
--- a/app-emulation/spim/spim-8.0-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://spimsimulator.sourceforge.net/"
-SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc X"
-
-RDEPEND="X? ( media-fonts/font-adobe-100dpi
-	x11-libs/libXaw
-	x11-libs/libXp )"
-DEPEND="${RDEPEND}
-	X? ( x11-misc/imake
-		x11-proto/xproto )
-	>=sys-apps/sed-4
-	sys-devel/bison"
-# test hangs forever, disabling it
-RESTRICT="test"
-
-src_prepare() {
-	# fix bugs 240005 and 243588
-	eapply "${FILESDIR}/${P}-r1-respect_env.patch"
-
-	#fix bug 330389
-	sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-	emake -C spim configuration
-
-	if use X; then
-		emake -C xspim configuration
-	fi
-}
-
-src_compile() {
-	emake DESTDIR="${EPREFIX}" -C spim
-
-	if use X; then
-		emake DESTDIR="${EPREFIX}" EXCEPTION_DIR=/var/lib/spim \
-			-C xspim -j1 xspim
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C spim install
-	newman Documentation/spim.man spim.1
-
-	if use X; then
-		emake DESTDIR="${ED}" -C xspim install
-		newman Documentation/xspim.man xspim.1
-	fi
-
-	doicon "${FILESDIR}"/xspim.svg
-	make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education"
-
-	dodoc Documentation/SPIM.html
-	dodoc ChangeLog Documentation/BLURB README VERSION
-	if use doc ; then
-		dodoc Documentation/TeX/{cycle,spim}.ps
-	fi
-}
-
-src_test() {
-	emake -C spim test
-}
diff --git a/app-emulation/spim/spim-8.0-r3.ebuild b/app-emulation/spim/spim-8.0-r3.ebuild
index 9fe7e6643e19..00776564c323 100644
--- a/app-emulation/spim/spim-8.0-r3.ebuild
+++ b/app-emulation/spim/spim-8.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc X"
 
 RDEPEND="