gentoo resync : 07.10.2018

3 files changed, 3 insertions, 53 deletions

diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index a090ffb7c326..7db9f15dcb0e 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,3 @@
-DIST schismtracker-20120105.tar.bz2 1097124 BLAKE2B 978e4b3e81b5c9ed93132aeb12febc2add281060f41d74a52da25799d7ae291d2cbc2401619fd01bc7bba342049d4aef6ac0fbf326443b790c4704301a78a511 SHA512 5b92603af3b6add0e8bd6d0b140b0ddedbaf8e2b434f651ab887e3211ccc8bcfa94be281aabc3b28dbd84e3d91f539eb0939d6d4e0596529133db7ce10aeafd8
 DIST schismtracker-20180810.tar.gz 1064821 BLAKE2B d8016437db7cf6e0087150755090621ba15661753ebcfb8081f0c137a93389d04aa7a5e1ac09fb1366d1d3b3f76c22cb497171a74fb226347eb194c58c1f0f18 SHA512 d131cec7e4749941f0e5806bff14e0782a01f14f8a68605270d09ff40af1d20fffd4c7caf2926c5a63d3e0c0bb1ed24ce4a5e4cccc280ac045a22cfb8544c498
-EBUILD schismtracker-20120105.ebuild 1365 BLAKE2B 8386318c84c7cc74cd744dc8d64ac739e9d109c60626e27400eafce87147c99a7d706a5bfbf5c756ca777f30b3489678764d959380b7f9a5ab577a37460073f7 SHA512 aa012b9e698edfd9a460c80101e573ddc627efeaa2d5a8c65e2bf41600212f0c1dfb44da2f55a57ae7c4e940e187a98c8464ce8092f4de0b1c0bd4cfa827076d
-EBUILD schismtracker-20180810.ebuild 1566 BLAKE2B 790cc5f10cf37da4dd672b0ecd2aa92771898ff8547e912b161e17ed569d9b57f89919dd0af4012ba1c6c520e3748533c6c123b4926ef954784674758eb9ffe4 SHA512 5fac164d9ae0681379f0880d6506a66edb98b7383c0d6d1180247eac5df287d445b1d4895177da60f027868326adbe7c57f60e579ad9617bffcb4929a5a5a3f8
+EBUILD schismtracker-20180810.ebuild 1561 BLAKE2B 1e8699600df0cecc68537ac7d8f55ab8b853ca60c1e50639e7489b35a39e5714947e5e25b41016cf68ca40761128d2865a5d6fa7f6a661bb95cfa48a2726f3d6 SHA512 0cc68fa66cbfeab295863b2637706ef1e6ecdbfa1c438bb3d77f44c58e91eaad24aa6da16a2fcaaa0069c73cbc9c41772aa2fe0adc5b6ebde2877819860f6521
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/schismtracker/schismtracker-20120105.ebuild b/media-sound/schismtracker/schismtracker-20120105.ebuild
deleted file mode 100644
index 14de37e0dfb3..000000000000
--- a/media-sound/schismtracker/schismtracker-20120105.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://eval.sovietrussia.org//wiki/Schism_Tracker"
-SRC_URI="http://${PN}.org/dl/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
-	>=media-libs/libsdl-1.2[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-	x11-libs/libXxf86misc"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto"
-
-DOCS="AUTHORS NEWS README TODO"
-
-src_prepare() {
-	default
-
-	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
-	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
-
-	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
-	#   wine provides /usr/bin/windres
-	# and schismtracker fails to use it properly:
-	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
-	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
-}
-
-src_install() {
-	default
-
-	domenu sys/fd.org/*.desktop
-	doicon icons/schism{,-itf}-icon-128.png
-}
diff --git a/media-sound/schismtracker/schismtracker-20180810.ebuild b/media-sound/schismtracker/schismtracker-20180810.ebuild
index 55398fb6ab34..4744ab0d1e18 100644
--- a/media-sound/schismtracker/schismtracker-20180810.ebuild
+++ b/media-sound/schismtracker/schismtracker-20180810.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="