[proaudio] [2729] media-sound/jack-audio-connection-kit: python-single-r1, usex and array in src_configure, changed and added warning message, remove classic use flag, fix dependencies, use doxygen manually

[subversion@xxxxxxxxxxxxx]

Revision: 2729
Author:   lilrc
Date:     2013-05-10 10:57:47 +0200 (Fri, 10 May 2013)
Log Message:
-----------
media-sound/jack-audio-connection-kit: python-single-r1, usex and array in src_configure, changed and added warning message, remove classic use flag, fix dependencies, use doxygen manually

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r1.ebuild

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2013-05-09 08:28:07 UTC (rev 2728)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2013-05-10 08:57:47 UTC (rev 2729)
@@ -2,6 +2,24 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*jack-audio-connection-kit-1.9.9.5-r1 (10 May 2013)
+
+  10 May 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  +jack-audio-connection-kit-1.9.9.5-r1.ebuild,
+  jack-audio-connection-kit-2.9999.ebuild, metadata.xml:
+  Move to python-single-r1 eclass.
+  Make src_configure more readable by using usex and a bash array.
+  Use DOCS and HTML_DOCS variable.
+  Changed warning message. The problem will be fixed when we can use a 
+  multilib eclass to build 32-bit libraries in a clean way.
+  Added warning message to version 2.9999.
+  No hard dependency on alsa-lib in version 2.9999.
+  Removded the classic USE flag from version 2.9999. Mixing dbus and 
+  classic is discouraged by upstream. Assume classic build if dbus is 
+  unset, which is the same behaviour as in 1.9.9.5-r1.
+  Build docs manually in 1.9.9.5-r1.
+  Added missing dependencies to 1.9.9.5-r1.
+
   23 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
   jack-audio-connection-kit-1.9.9.5.ebuild:
   Move EAPI 5 and waf-utils eclass.

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2013-05-09 08:28:07 UTC (rev 2728)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2013-05-10 08:57:47 UTC (rev 2729)
@@ -8,8 +8,9 @@
 DIST jack-audio-connection-kit-0.121.3-dbus.patch 337061 SHA256 da12003ed4528a09d8109ecc7e75f539f0173b23832a1d993800473f1f1d25fd SHA512 9be280a24d59d35bab07da75be407f0790fd36657bfb54d24522337f2a2bc15d6e8a9f88347ff3215ed3e6b32ab827c4e203f5435fefe30c456d638169524192 WHIRLPOOL 37b6a58c5103ff23e606e3dfd0b5ec2630b86f88ddb964635050555e64aa4ab687205e8e29add29659f36866d036098bb7d6128e230349adfd096c06cc641709
 DIST jack-audio-connection-kit-0.121.3.tar.gz 1083545 SHA256 b7095d3deabeecd19772b37241e89c6c79de6afd6c031ba7567513cfe51beafa SHA512 57323393d5209baefe73cc0cd9a0e818b1cfd260cf9aa36cd6ad800252e22e3ddb7fc46649c54b8e840696878147c2d06c8d39fd7300b5bb92aeb69f44ed710f WHIRLPOOL a256cfb7c3546cb06d6003313802b02812d8da9c13671be9b0341a10442cd348a8b3f7fe65e8d27cc47b4e29ded799fa6cc0efa51d81d01f342c7c8eefbc9c55
 EBUILD jack-audio-connection-kit-0.121.3.ebuild 2331 SHA256 5d31c09ab47b2b7b586710ce1165140f7683de9e75de30dd55388820529cf120 SHA512 e1614995b9a126ac4e576a128de164167d739f8e85eecb1e9908a575725f801b887b2803deb3d5ead3c959527f7bce3442d67a606da06f3a4bcc24a7d43974aa WHIRLPOOL bcf5e671b21106a56f2b18652f4986be40d3039f09f0cc03236f6aa5ca3967ecdd0b0098581271fbea754b8af8e057de4b1e0da89cb86a06ea1e26c31e9bf6c8
+EBUILD jack-audio-connection-kit-1.9.9.5-r1.ebuild 1711 SHA256 189a4439f9a9a4cd768c8c161bae7fcde64c4ef800bd6a242f19f13f752eaba0 SHA512 74dd56b3c22330c6a7ae08ae3a05df64b6ae2d093cdacfb303769736853338e6f5401ac2ebe4b925e02fb6c4164c4f6ed0daf6a5732588be7e728636fab937de WHIRLPOOL 5f6c758dfff15cebf708b471d4cf59637e7bb50209c296b0f8b46200baefe29fbb2591244254b8d141d7a376fcdad62d3e15c2c8f9d7adf76a89eb38b0e96087
 EBUILD jack-audio-connection-kit-1.9.9.5.ebuild 1768 SHA256 63f4fa5da558b2f002011d95f2204d21da492ec03e4688c33c6dfb564a4950f0 SHA512 2a1478b18edeccf01a3cb3e717c87ecdc6107b7aa182f89d535260c6a0ff454845180b3c3bb0126a52593a127e1202b81778bd32da1061f4c1516c05c700ca0d WHIRLPOOL 0a0da1b746c300a62653103e3aae44622d5c7fd387b6c3e9a7defe623949f2eed25a2857de5ee9f8e35ccf46b75954ae8218d33cd770009b6025854032004b15
 EBUILD jack-audio-connection-kit-1.9999.ebuild 1919 SHA256 84c209409988902c7d405d0554dfe4d5392661085db34fc56f4c6a640a237be8 SHA512 32e5a8f7fbfa57bd7637d0643d32792a0dbe5a3debd61d746cf29649c5b1348c9ccbe5864dff59183ea1fdb8bae185a201c593834776c731c26a68ab31942d95 WHIRLPOOL 0e97cc31f9d0c33014c4f0b2dab9a32777b2adb24aa50e76630b09d82083e8960241ca061b973e171b86177165f460d15cedbe17095d372062c38e4e05d809c1
-EBUILD jack-audio-connection-kit-2.9999.ebuild 1782 SHA256 f96b3121477be42d6e508d18ab3b748c51c008c8408c7dd5495f2e63341bfdfb SHA512 85a9a21a04b8622696d970c3bfcebc4d420311fc5d83de0f2185ab9c7e3b5539b5722a0d7c63e7e1e48bc7f829b49ee7d64a126fa1a35e7fd1cac761895e47ac WHIRLPOOL 482f1d0353d2c8d293cfb219b9aca7826dbd503dd22f3bfca12a98c0f55e279fe69802d5d57f640992a261224825ac41a14087ba188f00caf0ea1825fd208be3
-MISC ChangeLog 12440 SHA256 9f79fabbb5751c9ffba683c1cd9e9cd3ebb677f655b69f48dec2fbe6652067f9 SHA512 5b4b041f54a81a0659e48b16e64762d33cfcb20d7a3cff90b9a3833e857f5cc1b2d98ddaab4c339894733d760e68c61b6a4a5e3fc4ab74ccd9ed66d374407c5e WHIRLPOOL d870c217580e7cbd7cde5cb0aa51632c600fd3e6738be616e99b5e2b01867367aa74f150625c23bcb149d579c1155491f19b5aa6336ef233f7571490dea426f5
-MISC metadata.xml 978 SHA256 a6a79173ae82e74d4a7f88a28c9475cf61bbb334d1b67ec192fab035d0b89cda SHA512 62eb193b331e2587f4e206516061d7f49eef973366608949c1676a7f43d3eca8e555730cfdc3e803a51e458c6381f56634fe3461e41316df9b7c24f320f9b3ec WHIRLPOOL 3db907774d53f724948661d9794404055d00aa27a8bc23e61c28a7261338023832e363990251dc3e30b5154f23f23050d8db986d621e0ff0beeb790ba9210ef2
+EBUILD jack-audio-connection-kit-2.9999.ebuild 1654 SHA256 038607120050fdab02458accc0ea407a0aeaafcc50de679e0467feb711fbb822 SHA512 e09a376b912748231c8dd5e88d20ea81aa7af4fdd6f1ec86529c0a44e1ee21b3e804ab51bfaaa2326fb4a2d14a10252af940374ef603a78c10b1f709adfce564 WHIRLPOOL 0f3abf3e8015707e417e93bcbe6adecd04fafef3bf0e471fd4f83403ec379b9e35f7c1bac059c2c60f979a9825e44a69114d50b175c874a391746e3d1331146f
+MISC ChangeLog 13305 SHA256 23521f44722bc1f5cc4a337504be0ca23ae7a88cdc4ae2bce522fff21fa8b58a SHA512 9ee3fc40d98795fb46e20f8a3b6970df29b020e426150818362fa3bfb11cfb56ee562dd8ec38420fc3b6c9910428cf12ab8911ed1d6cfdf9139784927604b698 WHIRLPOOL 97d67496e15deda5276d3a6316f2a21a97b40fe6d98dc66a1d19274c5dbb5cbe97a8952f039bfee93bc3c472f7335f6ed62e43f48d9d4888dd91deff4d012db3
+MISC metadata.xml 936 SHA256 4451b4a0ee0e6b04e3da3a568eae48f4b3f2fe2abd8b7d423e7cdd5ace9a2006 SHA512 f3054f9e563f3234088d4302bca0d525e67c28d0cf0597fb13529c497ffa5e66abfb4c2f09f1157f8289d2695df6fd39cff4e5501af5a6c52d99ace3cde1ffc7 WHIRLPOOL 53a36456744f0f7a90831ac1c6d7309e00d14de491bc48f3530bf5ce04ceb89c9e71f1f14103e9bfb6abed0b0cc381ed6d60d93a012efa5a3dce97a6f7f3f28d

Copied: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r1.ebuild (from rev 2728, trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r1.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r1.ebuild	2013-05-10 08:57:47 UTC (rev 2729)
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1 waf-utils
+
+RESTRICT="mirror"
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://www.jackaudio.org";
+SRC_URI="https://dl.dropbox.com/u/28869550/jack-${PV}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dbus debug doc freebob ieee1394 mixed"
+
+RDEPEND="media-libs/libsamplerate
+	>=media-libs/libsndfile-1.0.0
+	alsa? ( >=media-libs/alsa-lib-0.9.1 )
+	dbus? ( sys-apps/dbus )
+	freebob? ( sys-libs/libfreebob !media-libs/libffado )
+	ieee1394? ( media-libs/libffado !sys-libs/libfreebob )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${RDEPEND}
+	dbus? ( dev-python/dbus-python )"
+
+S="${WORKDIR}/jack-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/jack2-no-self-connect-1.9.9.5.patch"
+	"${FILESDIR}/jack-1.9.9.5-opus_custom.patch"
+)
+
+DOCS=( ChangeLog README README_NETJACK2 TODO )
+
+pkg_pretend() {
+	if use mixed; then
+		ewarn 'You are about to build with "mixed" use flag.'
+		ewarn 'The build will probably fail.'
+		ewarn 'This is a known issue and a fix is coming eventually.'
+	fi
+}
+
+src_configure() {
+	local mywafconfargs=(
+		$(usex alsa --alsa "")
+		$(usex dbus --dbus --classic)
+		$(usex debug --debug "")
+		$(usex freebob --freebob "")
+		$(usex ieee1394 --firewire "")
+		$(usex mixed --mixed "")
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+src_compile() {
+	waf-utils_src_compile
+
+	if use doc; then
+		doxygen || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( html/ )
+	waf-utils_src_install
+
+	python_fix_shebang "${ED}"
+}

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild	2013-05-09 08:28:07 UTC (rev 2728)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild	2013-05-10 08:57:47 UTC (rev 2729)
@@ -4,27 +4,26 @@
 
 EAPI="5"
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils git-2 python-single-r1 waf-utils
 
-inherit git-2 waf-utils python
-
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://www.grame.fr/~letz/jackdmp.html";
+HOMEPAGE="http://jackaudio.org/";
 
 EGIT_REPO_URI="git://github.com/jackaudio/jack2.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa classic debug doc dbus freebob ieee1394 mixed opus pam"
+IUSE="alsa debug doc dbus freebob ieee1394 mixed opus pam"
 
 RDEPEND="media-libs/libsamplerate
 	>=media-libs/libsndfile-1.0.0
-	>=media-libs/alsa-lib-1.0.24
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
 	dbus? ( sys-apps/dbus )
 	freebob? ( sys-libs/libfreebob !media-libs/libffado )
 	ieee1394? ( media-libs/libffado !sys-libs/libfreebob )
-	opus? ( media-libs/opus )"
+	opus? ( media-libs/opus[custom-modes] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
@@ -32,45 +31,44 @@
 	dbus? ( dev-python/dbus-python )
 	pam? ( sys-auth/realtime-base )"
 
+DOCS=( ChangeLog README README_NETJACK2 TODO )
+
+pkg_pretend() {
+	if use mixed; then
+		ewarn 'You are about to build with "mixed" use flag.'
+		ewarn 'The build will probably fail.'
+		ewarn 'This is a known issue and a fix is coming eventually.'
+	fi
+}
+
 src_unpack() {
 	git-2_src_unpack
 }
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_configure() {
-	local myconf="--prefix=/usr --destdir=${D}"
-	use alsa && myconf="${myconf} --alsa"
-	if use classic && use dbus ; then
-		myconf="${myconf} --classic"
-	fi
-	if use mixed && use amd64 ; then
-		myconf="${myconf} --mixed"
-	fi
-	use dbus && myconf="${myconf} --dbus"
-	use debug && myconf="${myconf} --debug"
-	use freebob && myconf="${myconf} --freebob"
-	use ieee1394 && myconf="${myconf} --firewire"
+	local mywafconfargs=(
+		$(usex alsa --alsa "")
+		$(usex dbus --dbus --classic)
+		$(usex debug --debug "")
+		$(usex freebob --freebob "")
+		$(usex ieee1394 --firewire "")
+		$(usex mixed --mixed "")
+	)
 
-	einfo "Running \"./waf configure ${myconf}\" ..."
-	waf-utils_src_configure  ${myconf}
+	waf-utils_src_configure ${mywafconfargs[@]}
 }
 
 src_compile() {
 	waf-utils_src_compile
-	if use doc ; then
+
+	if use doc; then
 		doxygen || die "doxygen failed"
 	fi
 }
 
 src_install() {
+	use doc && HTML_DOCS=( html/ )
 	waf-utils_src_install
-	dodoc ChangeLog README README_NETJACK2 TODO || die "dodoc failed"
-	if use doc ; then
-		dohtml html/* || die "dohtml failed"
-	fi
-	python_convert_shebangs -r 2 "${ED}"
+
+	python_fix_shebang "${ED}"
 }

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml	2013-05-09 08:28:07 UTC (rev 2728)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml	2013-05-10 08:57:47 UTC (rev 2729)
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="celt">Use <pkg>media-libs/celt</pkg></flag>
-		<flag name="classic">Build jackd</flag>
 		<flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
 		<flag name="cpudetection">Enables runtime cpudetection</flag>
 		<flag name="dbus">Build jackdbus</flag>