[proaudio] proaudio/proaudio: [3121] cleanup

[subversion@xxxxxxxxxxxxx]

Revision: 3121
Author:   dominique
Date:     2017-09-15 10:12:56 +0200 (Fri, 15 Sep 2017)
Log Message:
-----------
cleanup

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jack2/Manifest
    trunk/overlays/proaudio/media-sound/jack2/jack2-9999.ebuild

Modified: trunk/overlays/proaudio/media-sound/jack2/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack2/Manifest	2017-09-14 13:33:24 UTC (rev 3120)
+++ trunk/overlays/proaudio/media-sound/jack2/Manifest	2017-09-15 08:12:56 UTC (rev 3121)
@@ -1,3 +1,3 @@
-EBUILD jack2-9999.ebuild 2697 SHA256 4b7c418cf4cac63e379413f29415f45ef6bbe283716cff501585496df8d98f96 SHA512 e6c89593054d9650610dde6dc1559cc3298e0b3272f45cbf155ed360db1c6e14caee7b78acfadc0f6a2c53f4c1f8cba24124c9d78eb7899c2c25395d98572285 WHIRLPOOL 3ed9c73c609211dd8d6cf138bccca8f2cca44fd6067a96a560f2770b87001b9f8d61f95946462a16a00faea03f6e5e2232db647624035d26bfaad140dde554d0
+EBUILD jack2-9999.ebuild 2027 SHA256 ec9b726e23dcc03cda072f31423b208c4ec2896928d9f8bfe2c679774d80b70d SHA512 bc6f1b2c2593c421af2fd051e4fa01e90cbcfdeaaba092768a960e53d7ca09c1e540314204cb616e726e1de903cdbf5e0943370b434cca033b433bc28b3d36f2 WHIRLPOOL f8ad8080b606f6ffaf7499eb3e9f94f7bec1b3d9c0ac815f74cc39d06dc95219d4202e29e0d9f0bfc8ce499bb7b9a983834c5c314a8c3865685211d833a64a5d
 MISC ChangeLog 253 SHA256 6834d25f7ad7db46e0c66019efd22206ed2d6dca4a19d698fa611f73d60e5414 SHA512 a2f178f1092184e25d8ac78daf11736cc74c49c620962c7ad442d4c615118c1f6c8cb810e9992b2349e44518308564acefef100fa411da3e798b639c4881e393 WHIRLPOOL 174508ee087e33052a303178e2af87638f9b3ec96c253615e1330b5d8eb24a3de03001de3e97534f12592764364cd0f8b7050af21e1a1186fb3c080a049b9d9e
 MISC metadata.xml 908 SHA256 5dbfc68b4d54f02db0fb674c802f471677c6d2f8f9e5e7cf46291ea8e813910d SHA512 af3aff0c79ba3f99406791266f35ea4bd69de4a2db1d72e2626728a5de0c9649f13d64af9c08d6e736a34f55d14eee1b5b80feced6e66789b3996061907e0a5b WHIRLPOOL 44ee8137713947327cec8c09e1362880e15fbc9e88de82fa403bfafa225a6039b14a414fca0750c47df1838d68735f538fc46d06868a21ad8d131bf41e8342f6

Modified: trunk/overlays/proaudio/media-sound/jack2/jack2-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack2/jack2-9999.ebuild	2017-09-14 13:33:24 UTC (rev 3120)
+++ trunk/overlays/proaudio/media-sound/jack2/jack2-9999.ebuild	2017-09-15 08:12:56 UTC (rev 3121)
@@ -5,28 +5,26 @@
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads(+)"
-[[ "${PV}" = "2.9999" ]] && inherit git-r3
-inherit eutils python-single-r1 waf-utils multilib-minimal
+inherit git-r3 eutils python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://jackaudio.org/";
 
 RESTRICT="mirror"
-if [[ "${PV}" = "9999" ]]; then
-	EGIT_REPO_URI="git://github.com/jackaudio/jack2.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://dl.dropbox.com/u/28869550/jack-${PV}.tar.bz2";
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
+EGIT_REPO_URI="git://github.com/jackaudio/jack2.git"
+KEYWORDS=""
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa celt dbus doc ieee1394 libsamplerate opus pam readline sndfile"
+IUSE="alsa classic celt dbus doc ieee1394 libsamplerate opus pam readline sndfile"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-CDEPEND="${PYTHON_DEPS}
+CDEPEND="ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	${PYTHON_DEPS}
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
 	dbus? (
@@ -33,12 +31,7 @@
 		dev-libs/expat[${MULTILIB_USEDEP}]
 		sys-apps/dbus[${MULTILIB_USEDEP}]
 	)
-	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
-	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0 )
-	sndfile? ( media-libs/libsndfile )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
@@ -46,32 +39,8 @@
 	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
 	pam? ( sys-auth/realtime-base )"
 
-[[ "${PV}" = "2.9999" ]] || S="${WORKDIR}/jack-${PV}"
-
 DOCS=( ChangeLog README README_NETJACK2 TODO )
 
-# USAGE: jack2_use <flag> [feature]
-jack2_use() {
-	echo "--${2:-${1}}=$(usex ${1})"
-}
-
-# USAGE: jack2_multilib_native_use <flag> [feature]
-jack2_multilib_native_use() {
-	if multilib_is_native_abi; then
-		jack2_use "${@}"
-	else
-		echo "--${2:-${1}}=no"
-	fi
-}
-
-src_unpack() {
-	if [[ "${PV}" = "2.9999" ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
 src_prepare() {
 	default
 	multilib_copy_sources
@@ -79,23 +48,24 @@
 
 multilib_src_configure() {
 	local mywafconfargs=(
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=$(usex celt yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=no
 		--freebob=no
 		--iio=no
+		--opus=$(usex opus yes no)
 		--portaudio=no
+		..readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex samplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
 		--winmme=no
-		$(jack2_use alsa)
-		$(jack2_use celt)
-		$(usex dbus --dbus --classic)
-		$(jack2_multilib_native_use doc doxygen)
-		$(jack2_use ieee1394 firewire)
-		$(jack2_use libsamplerate samplerate)
-		$(jack2_use opus)
-		$(jack2_multilib_native_use readline)
-		$(jack2_multilib_native_use sndfile)
 	)
 
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_configure ${mywafconfargs[@]}
+	waf-utils_src_configure ${mywafconfargs[@]}
 }
 
 multilib_src_compile() {