gentoo resync : 25.08.2020

3 files changed, 88 insertions, 2 deletions

diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 1a093fe03dc3..7eeb4657f97a 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,4 +1,6 @@
 AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364ac191af87185e99d5ecaa951c125938b66d4f1928d3b13794e5f1be4446b0b8ee8eed1e2a0c92e25edc0582b38264 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2
 DIST xwax-1.6.tar.gz 79452 BLAKE2B 3cefded6fd39435d92ca07458048910e5e95169562c9dec17cd1411c992ca864124f3155b1a8a9313c86cfee01fe79d72a5c5bed9963b1740a1d4e89e9e249e9 SHA512 710a53a1b056bf6850a668a1f267b91664d5629998e6ee2d4853aa57d1ab351dd782716272ed4a4858168c0ac9f5c7d2e1fe0a8b330e26775677e1eb54249015
+DIST xwax-1.7.tar.gz 80745 BLAKE2B b431951651b66899b5bcceadfadc546c564123e47632aa9b395c26d706fc37cda4b5bf4f8695538e1a5e2bb0a690f125ca89705259d11df580f6a833e5d114b6 SHA512 ab0fcaf32f1fd1d6b38323095524f1932a067a3d04d40e4b043993e360411fed0c4b78bb71662581b438cb1e3005bc21659db4521a6ec704994b2e8e1b7e62d4
 EBUILD xwax-1.6-r1.ebuild 2017 BLAKE2B a1f9f5f24da4ea048258726735124962e479fe049e33156657a9a29674d7416e1ad495f3b211522a5c6032d14a2b9519c2a74654f88fb23bc00e4544e539d49a SHA512 dfdb53177359f6f5a02c5a6ee1f776ce6f7cdcbc8f2bafb60cc552fcccefc3c7c6083af0982ab19113b4981c2995c29763847ece04490d68c3f6dc0c366b75ac
-MISC metadata.xml 803 BLAKE2B fe59d8229f2f7189451f99e0f4da36fbc0f2b39f04d152f927b7f6822fdb9160c570daa82c6d7d8e85dd0c9bac44e50f759334e9c5a547b224f52ea0cdb2bb84 SHA512 9d15deede88ee114e0ade78665996cfaf09443f8629b08415ae0bd1c486ff6a239567056aacde2d49883066d4d8dc3690a397d170effbfe5e4aa5cf7d24cbca8
+EBUILD xwax-1.7.ebuild 1996 BLAKE2B b73c4e2ef6ff8a5d791b6bfe740dd6cd18f0ad17e67c458759f702b56ec9d7f3c2baa113cc2daf29decaca29907d8ec84b9d8a5ca8e5304b0efc2ccf00790960 SHA512 053addad8cdbd8177349c999635c1796d7ff1430d9758f5851acd8007eee78136a7d2a97836789bdd2e30d46d16f583e99ccb5954a90f5cf3d054e1bd6798965
+MISC metadata.xml 705 BLAKE2B 0c5c6a1538fbe0faef37eac4c62ac8e806041e1dc2883b4341981e75e8829da8af4588f371215794e40a452b7178a538489abd4a1b211233370b85cdded4d9eb SHA512 39e87e361947199009b2b9c0d722418d21181d330f503e9fae493c6b7300e5ef287b78a2ef609e3084719c51de57cfe536e7ae726eae257b967871422639c54c
diff --git a/media-sound/xwax/metadata.xml b/media-sound/xwax/metadata.xml
index 762283d3c0c5..aa4bd1f8dd50 100644
--- a/media-sound/xwax/metadata.xml
+++ b/media-sound/xwax/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="alsa">Adds support for ALSA audio input/output.</flag>
-		<flag name="jack">Adds support for audio input/output via the JACK Audio Connection Kit.</flag>
 		<flag name="oss">Adds support for OSS (open sound system) audio input/output.</flag>
 		<flag name="cdda">Sets runtime dependencies to support decoding audio from a compact disc.</flag>
 		<flag name="mp3">Sets runtime dependencies to support decoding MP3 audio.</flag>
diff --git a/media-sound/xwax/xwax-1.7.ebuild b/media-sound/xwax/xwax-1.7.ebuild
new file mode 100644
index 000000000000..edf6f44c7c6d
--- /dev/null
+++ b/media-sound/xwax/xwax-1.7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs user
+
+DESCRIPTION="Digital vinyl emulation software"
+HOMEPAGE="https://xwax.org/"
+SRC_URI="https://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 )"
+
+DEPEND="
+	media-fonts/dejavu
+	media-libs/libsdl
+	media-libs/sdl-ttf
+	sys-libs/glibc
+	sys-libs/pam
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( media-sound/cdparanoia )
+	fallback? ( media-video/ffmpeg )
+	jack? ( virtual/jack )
+	mp3? ( media-sound/mpg123 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README CHANGES )
+
+src_prepare() {
+	default
+	# 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
+	newbin scan xwax-scan
+	newbin import xwax-import
+	doman xwax.1
+
+	dodoc ${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."
+}