gentoo resync : 03.07.2021

3 files changed, 2 insertions, 56 deletions

diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 3736cfb98b02..679af352db6e 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,3 @@
-DIST schismtracker-20200412.tar.gz 1308056 BLAKE2B 8c104d92889982310d895b9d432ee8bf6da75f583d38490d6796718411298aa0627cc268e070f8c679de4341c910507f78e394b5ba8aeb5b71b3410f2919aa35 SHA512 f4c55ad7d47c9e90aecd8fbe9be399e0b82cd8a815ba1df9c1e23141b0c8a8bb80c9256ce5530327f52b3a34bf84b918d4e1f093ab19d47c180435a63ee6f23b
 DIST schismtracker-20210525.tar.gz 1309489 BLAKE2B acc295bed4236d3161fd67a8c97ddadaa07d6d6319a0ad75710fb4d3c7ea251edd2648932533e9181b512fd78b54db929b07e3472ff754220f16cca2bd610932 SHA512 1f20535e4e3b5175ceea803a45b7286a99cab248829c39d11bc85780bc63e0e26c49ad78997a13e290fb4ad2c292d15eeb494a975d53fbe25dec80499e675b16
-EBUILD schismtracker-20200412.ebuild 1430 BLAKE2B f183a48a46eac6350da059dbdfe7231de6c8e3fb0b261f6d2fc2ef27d4c0cfd8da4dd528523fc41e453c2065b21ef432fdc65a339bac529966609f2a8a5d8ffe SHA512 2376ef542792a18e8b80e1429992226c5a709a28e174de759dbf81d220eb7ad2975b74c49e66cbd76e8b74c79b927fd10afad450f8f14ce9cffed25380cd3bae
-EBUILD schismtracker-20210525.ebuild 1432 BLAKE2B d529ac8fa07d6936c58679da0ffff537684dc7119a2305dadb9bd80d7e10f22c3eed3b5be5a2aa0e63450a7f354a2cc773814ddba76d7b6d17a9e02c449d3cb9 SHA512 66dc02371d2b792d0783dfa926d86345397ad7326cabec423422327620daeb81984a28e7e446992c344742c1b375c85de90c981fb4123f38369d8f7c4937a698
+EBUILD schismtracker-20210525.ebuild 1430 BLAKE2B f183a48a46eac6350da059dbdfe7231de6c8e3fb0b261f6d2fc2ef27d4c0cfd8da4dd528523fc41e453c2065b21ef432fdc65a339bac529966609f2a8a5d8ffe SHA512 2376ef542792a18e8b80e1429992226c5a709a28e174de759dbf81d220eb7ad2975b74c49e66cbd76e8b74c79b927fd10afad450f8f14ce9cffed25380cd3bae
 MISC metadata.xml 355 BLAKE2B 90bb7342fbf7defe952aaaa3a65ad1e1144455314d8a2af7219805450a9e3a3df9b0fb9b334c8eec07af7f4f1296e49cf2c9fd3ae750b77f4a5325efa5524337 SHA512 98760ffd7921d91711f3293f3650270ee8de44f7d143066e9d6861b020dd4fe06fa4083ec1a4022846aaa47187151dab2847cd2fe9c571a5c251fa917effea9d
diff --git a/media-sound/schismtracker/schismtracker-20200412.ebuild b/media-sound/schismtracker/schismtracker-20200412.ebuild
deleted file mode 100644
index 1c2988cf91b2..000000000000
--- a/media-sound/schismtracker/schismtracker-20200412.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://schismtracker.org/"
-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"
-IUSE=""
-
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/libsdl[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXv
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -e "/^Categories/ s/Audio/AudioVideo;Audio/" -i sys/fd.org/schism.desktop || die
-
-	# 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-20210525.ebuild b/media-sound/schismtracker/schismtracker-20210525.ebuild
index 68df087a73c5..1c2988cf91b2 100644
--- a/media-sound/schismtracker/schismtracker-20210525.ebuild
+++ b/media-sound/schismtracker/schismtracker-20210525.ebuild
@@ -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="