gentoo resync : 04.05.2019

3 files changed, 2 insertions, 84 deletions

diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index a2444ad52aa0..8cde974f380f 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,6 +1,4 @@
 AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364ac191af87185e99d5ecaa951c125938b66d4f1928d3b13794e5f1be4446b0b8ee8eed1e2a0c92e25edc0582b38264 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2
-DIST xwax-1.5.tar.gz 77582 BLAKE2B 5d02dbf1b4ee30f333b6df2ca63b657683aa15d5790fc474f54a6571314f5e506b4403e983889fc8afcca77489b3b15285907d61e33f080123d94ac4c20bd5ed SHA512 b5fb66c35dd5174277417b8973bab63232bdf471fe190ab3df1c37e386a9cdc9e2b5cbdc4f5715bf69d146846c13ce2acd5db6a0881412dabdcd234d6d199b61
 DIST xwax-1.6.tar.gz 79452 BLAKE2B 3cefded6fd39435d92ca07458048910e5e95169562c9dec17cd1411c992ca864124f3155b1a8a9313c86cfee01fe79d72a5c5bed9963b1740a1d4e89e9e249e9 SHA512 710a53a1b056bf6850a668a1f267b91664d5629998e6ee2d4853aa57d1ab351dd782716272ed4a4858168c0ac9f5c7d2e1fe0a8b330e26775677e1eb54249015
-EBUILD xwax-1.5.ebuild 2174 BLAKE2B 33f6a0373b5605036879f87e06064f48d870f6175d61d62f88d6ed536092bc72f8e725851b22f0b24801e685ca6a55e9ad70a874803403ce85d746db4f467cc4 SHA512 02324db41aad3424fcc9b8fa2f221ba95d74ecdae659fc84ea425ff262e6ed97f3c77f41a1f45268966cd83c5c9075ba73a9e0e299a49bafbf496343f969e04e
-EBUILD xwax-1.6.ebuild 2190 BLAKE2B 98205cb84e53dae453a09f528e490d0d2da752327c52e49ff30ff1a531a86f13fadcd504d2a1615e899dd7e86d75e94fd176e0744f633427a933931730c5b6bb SHA512 4d2e4630ed1a33129e8e6f1c5cb417a08a26f60ab165ee8da3bb16386a906ea48625d26167ab884a6fd1cae5781372fb2e332ad804d7aa86600e4bf1a79ac7c4
+EBUILD xwax-1.6.ebuild 2189 BLAKE2B 571d6d7dad37324bebadb7b3ec25d526b2dd1bb18d161a5b9de08450cc07373a4b330be77659538ae7fb627945729d5706fd23069f1844d9d75600a7084c4d8b SHA512 3f67a616c8ef5e392b55e180429e520fb8ec7cdd7967f3640bbc9c8e55f981f2c6e7c7b4531510ba23998b9f328ba2f2a8396b234fca4adcd53902ab980ee614
 MISC metadata.xml 803 BLAKE2B fe59d8229f2f7189451f99e0f4da36fbc0f2b39f04d152f927b7f6822fdb9160c570daa82c6d7d8e85dd0c9bac44e50f759334e9c5a547b224f52ea0cdb2bb84 SHA512 9d15deede88ee114e0ade78665996cfaf09443f8629b08415ae0bd1c486ff6a239567056aacde2d49883066d4d8dc3690a397d170effbfe5e4aa5cf7d24cbca8
diff --git a/media-sound/xwax/xwax-1.5.ebuild b/media-sound/xwax/xwax-1.5.ebuild
deleted file mode 100644
index 677a355aceb5..000000000000
--- a/media-sound/xwax/xwax-1.5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs user
-
-DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="http://xwax.org/"
-SRC_URI="http://xwax.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa jack oss cdda mp3 +fallback"
-REQUIRED_USE="|| ( cdda mp3 fallback )
-	|| ( alsa jack oss )"
-
-RDEPEND="sys-libs/glibc
-	sys-libs/pam
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	media-fonts/dejavu
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	cdda? ( media-sound/cdparanoia )
-	mp3? ( media-sound/mpg123 )
-	fallback? ( virtual/ffmpeg )"
-DEPEND="${RDEPEND}"
-
-DOCS="README CHANGES"
-
-src_prepare() {
-	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
-	# the Makefile
-	# Also remove the dependency on the .version target so we don't need
-	# git just to build
-	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
-		-e 's/^xwax\.o:.*\.version//' \
-		Makefile || die "sed failed"
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--prefix "${EROOT}usr" \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable oss)
-}
-
-src_compile() {
-	# EXECDIR is the default directory in which xwax will look for
-	# the 'xwax-import' and 'xwax-scan' scripts
-	emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-}
-
-src_install() {
-	# This is easier than setting all the environment variables
-	# needed, running the sed script required to get the man directory
-	# correct, and removing the GPL-2 after a 'make install' run
-	dobin xwax || die "failed to install xwax"
-	newbin scan xwax-scan || die "failed to install xwax-scan"
-	newbin import xwax-import || die "failed to install xwax-import"
-	doman xwax.1 || die "failed to install man page"
-
-	dodoc ${DOCS} || die "failed to install docs"
-
-	insinto "/etc/security/limits.d"
-	newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf
-}
-
-pkg_postinst() {
-	elog "Be sure to add any users that will be using ${PN} to the"
-	elog "\"${PN}\" group. Doing so will allow processes that user"
-	elog "runs to request realtime priority."
-}
diff --git a/media-sound/xwax/xwax-1.6.ebuild b/media-sound/xwax/xwax-1.6.ebuild
index 273bd31cd5cc..9565610d9290 100644
--- a/media-sound/xwax/xwax-1.6.ebuild
+++ b/media-sound/xwax/xwax-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xwax.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa jack oss cdda mp3 +fallback"
 
 REQUIRED_USE="|| ( cdda mp3 fallback )