[proaudio] proaudio/proaudio: [3057] eapi 5

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]

To: proaudio@xxxxxxxxxxxxxxxxxxx
Subject: [proaudio] proaudio/proaudio: [3057] eapi 5
From: subversion@xxxxxxxxxxxxx
Date: Thu, 20 Jul 2017 11:55:29 +0200

Revision: 3057
Author:   dominique
Date:     2017-07-20 11:55:29 +0200 (Thu, 20 Jul 2017)
Log Message:
-----------
eapi 5

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/xwax/ChangeLog
    trunk/overlays/proaudio/media-sound/xwax/Manifest
    trunk/overlays/proaudio/media-sound/xwax/metadata.xml
    trunk/overlays/proaudio/media-sound/xwax/xwax-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/xwax/files/
    trunk/overlays/proaudio/media-sound/xwax/files/xwax-etc-security-limits.conf

Modified: trunk/overlays/proaudio/media-sound/xwax/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/ChangeLog	2017-07-19 23:26:08 UTC (rev 3056)
+++ trunk/overlays/proaudio/media-sound/xwax/ChangeLog	2017-07-20 09:55:29 UTC (rev 3057)
@@ -1,7 +1,10 @@
 # ChangeLog for media-sound/xwax
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Jul 2017; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  xwax-9999.ebuild: moved to eapi 5; various changes from portage version.
+
 *xwax-9999 (01 Sep 2010)
 
   01 Sep 2010; Viktor Lazarev <taurus101v@xxxxxxxxx> -xwax-0.2.ebuild,

Modified: trunk/overlays/proaudio/media-sound/xwax/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/Manifest	2017-07-19 23:26:08 UTC (rev 3056)
+++ trunk/overlays/proaudio/media-sound/xwax/Manifest	2017-07-20 09:55:29 UTC (rev 3057)
@@ -1,3 +1,4 @@
-EBUILD xwax-9999.ebuild 2618 SHA256 b8db05bc5c30dc5cd187d77196e20014f36d491a944ad7648d29b9ba424b03b6 SHA512 ddca9917bf0081e1dfc8125f341f51482c35acbbd5dda34c0fe472abdca79872ab886504557d68cd3228e5cac79a6fe960a2ca3cb784364b6b94d30186671494 WHIRLPOOL 3a9ca925cec9bc12cb1db5650fe0446e87c183fa059cfce342f8ed4c3c25b4c3d47767d64619ad85a79f7f58fdf3edf6a6803cee790ffbc4d01ead70eb2b1932
-MISC ChangeLog 573 SHA256 0020da23caa7e73bd1e5733d3aa41e1a211225d9a982772b2dfa3d050412936e SHA512 cde3c348b4143b3d1d991f6cb3d639ce36dba6c8f7a9e763ff4225f7773366092821c33727199a6dc92ad660a093f63bd9aa818b73a78f11db22053c5c365aab WHIRLPOOL d6d9c8df06313ff77b45d8bf24399f7ea67dbf82fd87077dc0d49e521de4d582c524a2cb29db6c838391c461c1594dcb0e678fe5e2befd195c94d93b7c51b76a
-MISC metadata.xml 969 SHA256 c51c81879a64aafd511ce83909518104aa9293a0af8b9b0dcf5aa378366d4131 SHA512 4deee8f84cacd0f8cb9f9b1e71908ebe0dfc5f96cc875ab8cc4d961fb9e6190e4694775cddaff24da9b2e43284071ec8983d3eb5a57707b5fbdbec70f5b2782a WHIRLPOOL de306bc3781f6f064b40dd1ff47dd017ca4c2e791fa3539c98566d58bffa37da901c958d2cd59f0ec8cbe6928ffb8edf758f09807663eb4300171e9724444c73
+AUX xwax-etc-security-limits.conf 18 SHA256 e24dde95f162428a991629aa19c6295b6a1746316cecb8811cc25fadbdcde3b5 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2 WHIRLPOOL e60972b3ed1fa32715905fd6e132306727349b8e61cf6c91e7d203bdb880a3abef106d1441891cf2d10e78d3afbbf84322b986832291ca35306fd0578dfefa03
+EBUILD xwax-9999.ebuild 2237 SHA256 fb933a5028de64243b1c4d3a8b2d50a6b23ab4117fe239d41a8cc6af4ac26eef SHA512 8ea759c2143b7d9b78de1b00356cfa8b235b7ee0d04f78ab88090c205462b1da6071b9ef9e63e01896e640941be5caae5f5af4a4340e84f70090c95b8f4e39fc WHIRLPOOL 452cf956156d0e3712ee0a0e5470ae35a59e235466bfde71d6de64f0a07aeb54364cfd7000dde1471ea8b8aecf9e4bb8c6674dbe7328a95786d60ed624b303b9
+MISC ChangeLog 715 SHA256 d9830935e27ae5c33b2a729b52d1644e5c42099482a013c23abd08f7ee78847e SHA512 584ed57a23367417fc1f6adb8b04cf473a1799d6b9eaaf40462cba34b332882c3521f72ae4a8a41b88b0d0177a751e209e99406bb6eae1b231320f9466f421ff WHIRLPOOL 95e0a48b132f9120cc10aee8b735af2c14f068f5df35ae27eeaf4ba1848de962c546719a4dc831e3a63fcc32866a23e4f5b819bdf021108438e93395de57ca78
+MISC metadata.xml 1020 SHA256 fa3c60c969c0e6550bf081d280876418d879fa928ebd7217fbf9c7747d3796a1 SHA512 b89a5fc83dc8ac5606e10c1963181dda903199e7c2eb95f27d50f77139d28905a75bdd246b8718a74d00e72634a3084817e9c3f4e86a65824329b565d79aa189 WHIRLPOOL 030d0b4c723d8526961007c0d6a92c626f5832f63087cbb7bf9addcc0502ac8c26f819a4b7eb939074d649d2734fa3006ef0062a00d8bfdf4ad4e597ebd4ddbd

Added: trunk/overlays/proaudio/media-sound/xwax/files/xwax-etc-security-limits.conf
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/files/xwax-etc-security-limits.conf	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/xwax/files/xwax-etc-security-limits.conf	2017-07-20 09:55:29 UTC (rev 3057)
@@ -0,0 +1 @@
+@xwax - rtprio 80

Modified: trunk/overlays/proaudio/media-sound/xwax/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/metadata.xml	2017-07-19 23:26:08 UTC (rev 3056)
+++ trunk/overlays/proaudio/media-sound/xwax/metadata.xml	2017-07-20 09:55:29 UTC (rev 3057)
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
+	<maintainer type="project">
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>
 	</maintainer>
 	<use>
 		<flag name='alsa'>Adds support for ALSA audio input/output.</flag>
-		<flag name='xwax_decoders_aac'>Sets runtime dependencies to support decoding AAC audio.</flag>
-		<flag name='xwax_decoders_cd'>Sets runtime dependencies to support decoding audio from a compact disc.</flag>
-		<flag name='xwax_decoders_flac'>Sets runtime dependencies to support decoding FLAC audio.</flag>
-		<flag name='xwax_decoders_mp3'>Sets runtime dependencies to support decoding MP3 audio.</flag>
-		<flag name='xwax_decoders_ogg'>Sets runtime dependencies to support decoding Ogg Vorbis audio.</flag>
-		<flag name='xwax_decoders_misc'>Sets runtime dependencies to support decoding "other" audio files.</flag>
+		<flag name='jack'>Adds support for JACK audio input/output.</flag>
+		<flag name='oss'>Adds support for OSS audio input/output.</flag>
+		<flag name='aac'>Sets runtime dependencies to support decoding AAC audio.</flag>
+		<flag name='cdda'>Sets runtime dependencies to support decoding audio from a compact disc.</flag>
+		<flag name='flac'>Sets runtime dependencies to support decoding FLAC audio.</flag>
+		<flag name='mp3'>Sets runtime dependencies to support decoding MP3 audio.</flag>
+		<flag name='ogg'>Sets runtime dependencies to support decoding Ogg Vorbis audio.</flag>
+		<flag name='fallback'>Sets runtime dependencies to support decoding "other" audio files.</flag>
 	</use>
 </pkgmetadata>

Modified: trunk/overlays/proaudio/media-sound/xwax/xwax-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/xwax/xwax-9999.ebuild	2017-07-19 23:26:08 UTC (rev 3056)
+++ trunk/overlays/proaudio/media-sound/xwax/xwax-9999.ebuild	2017-07-20 09:55:29 UTC (rev 3057)
@@ -1,35 +1,33 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="2"
-inherit toolchain-funcs git-r3
+EAPI=5
+inherit toolchain-funcs user git-r3
 
 DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="http://www.xwax.co.uk/";
-EGIT_REPO_URI="http://www.xwax.co.uk/devel/${PN}.git";
+HOMEPAGE="http://www.xwax.org/";
+EGIT_REPO_URI="http://xwax.org/devel/${PN}.git";
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-# These make sure the user can decode the files he or she cares about by
-# setting appropriate runtime depends and (perhaps) configuring the import
-# script
-IUSE_XWAX_DECODERS="xwax_decoders_aac xwax_decoders_cd xwax_decoders_flac \
-	+xwax_decoders_mp3 xwax_decoders_ogg xwax_decoders_misc"
-IUSE="alsa jack ${IUSE_XWAX_DECODERS}"
+IUSE="aac alsa cdda +fallback flac jack mp3 ogg oss"
+REQUIRED_USE="|| ( cdda mp3 fallback )
+	|| ( alsa jack oss )"
 
-RDEPEND="media-libs/libsdl
+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 )
-	xwax_decoders_aac? ( media-libs/faad2 )
-	xwax_decoders_cd? ( media-sound/cdparanoia )
-	xwax_decoders_flac? ( media-libs/flac )
-	xwax_decoders_mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) )
-	xwax_decoders_ogg? ( media-sound/vorbis-tools )
-	xwax_decoders_misc? ( media-video/ffmpeg )"
+	aac? ( media-libs/faad2 )
+	cdda? ( media-sound/cdparanoia )
+	flac? ( media-libs/flac )
+	mp3? ( media-sound/mpg123 )
+	ogg? ( media-sound/vorbis-tools )
+	fallback? ( media-video/ffmpeg )"
 DEPEND="${RDEPEND}"
 
 DOCS="README CHANGES"
@@ -37,8 +35,10 @@
 src_prepare() {
 	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
 	# the Makefile
-	sed -i -e 's:\(^CFLAGS.*\)-O[0-9]\(.*\):\1\2:' \
-		-e 's:\(^LDFLAGS.*\)-O[0-9]\(.*\):\1\2:' \
+	# 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"
 }
 
@@ -45,14 +45,16 @@
 src_configure() {
 	tc-export CC
 	econf \
+		--prefix "${EROOT}usr" \
 		$(use_enable alsa) \
-		$(use_enable jack)
+		$(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 PREFIX="${EROOT}usr" EXECDIR="${EROOT}usr/bin"
+	emake EXECDIR="${BINDIR}" VERSION="${PV}" xwax
 }
 
 src_install() {
@@ -60,24 +62,18 @@
 	# 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"
-	newbin scan xwax-scan || die "failed to install xwax-scan"
 	doman xwax.1 || die "failed to install man page"
 
-	# Replace any decoder commands in the import script, if necessary
-	if use xwax_decoders_mp3; then
-		# mpg123 is upstream's default
-		if has_version media-sound/mpg123; then
-			debug-print "found mpg123"
-			dosed "s:mpg321:mpg123:g" /usr/bin/xwax-import || \
-				die "problem converting xwax-import to use mpg123"
-		# Otherwise, use mpg321
-		else
-			debug-print "found mpg321"
-			dosed "s:mpg123:mpg321:g" /usr/bin/xwax-import || \
-				die "problem converting xwax-import to use mpg321"
-		fi
-	fi
+	dodoc ${DOCS} || die "failed to install docs"
 
-	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."
+}

Messages sorted by: [ date | thread ]
Prev by Date: Re: [proaudio] proaudio/proaudio: [3056] dead project
Next by Date: [proaudio] proaudio/proaudio: [3058] More recent versions are in portage
Previous by thread: Re: [proaudio] proaudio/proaudio: [3056] dead project
Next by thread: [proaudio] proaudio/proaudio: [3058] More recent versions are in portage

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/