[proaudio] [2565] media-sound/jack-audio-connection-kit-1.9.9.5: Move to EAPI 5 and waf-utils eclass.

[subversion@xxxxxxxxxxxxx]

Revision: 2565
Author:   lilrc
Date:     2013-03-23 11:35:00 +0100 (Sat, 23 Mar 2013)
Log Message:
-----------
media-sound/jack-audio-connection-kit-1.9.9.5: Move to EAPI 5 and waf-utils eclass.

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-1.9.9.5.ebuild

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2013-03-23 09:37:34 UTC (rev 2564)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2013-03-23 10:35:00 UTC (rev 2565)
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  jack-audio-connection-kit-1.9.9.5.ebuild:
+  Move EAPI 5 and waf-utils eclass.
+
   17 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
   jack-audio-connection-kit-1.9.9.5.ebuild,
   jack-audio-connection-kit-2.9999.ebuild:

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2013-03-23 09:37:34 UTC (rev 2564)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2013-03-23 10:35:00 UTC (rev 2565)
@@ -8,8 +8,8 @@
 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.ebuild 1986 SHA256 ae4a707cf440ead400a2f060a21099ec785c2424013b6aaa8272499c9dc29a92 SHA512 5b8c613eeb0d5b47cf89f7b83ab65c920373b5cdfb61be2638240e46f235d31e5befeda48e28ee3217c0029e1f99c6ad8f14b2a61502829fdf60ac6a4f537577 WHIRLPOOL e885796f51078ad6a07e7abddfe68883141229abd97c3ac908d74dc755ee1e2ee8b052b56647f54d8a41418db4b1766712f7c565203fa34b11c951114d1323cd
+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 12294 SHA256 b8c4d8c81ae79e616763b33f065f965685ab8f5d06cba87eb678c2321121f1bd SHA512 96a1cba9bbc0ac49f7d920ce2c8b16235f55c4152efe7cdf9d6d56a0e45a528bc667dd484a720b950b6e3fe9f20255b94fbc927ed8b76273c91d54b20ce1dcf6 WHIRLPOOL 26f242a7b4d5faf44ab305ffed5af06535936c2692f6f7b2a07b50789bb394b1c8ef7d09f75719ad7bbad4a98e11c9b3ac1d6aca20fc928a3678ab467554b950
+MISC ChangeLog 12440 SHA256 9f79fabbb5751c9ffba683c1cd9e9cd3ebb677f655b69f48dec2fbe6652067f9 SHA512 5b4b041f54a81a0659e48b16e64762d33cfcb20d7a3cff90b9a3833e857f5cc1b2d98ddaab4c339894733d760e68c61b6a4a5e3fc4ab74ccd9ed66d374407c5e WHIRLPOOL d870c217580e7cbd7cde5cb0aa51632c600fd3e6738be616e99b5e2b01867367aa74f150625c23bcb149d579c1155491f19b5aa6336ef233f7571490dea426f5
 MISC metadata.xml 978 SHA256 a6a79173ae82e74d4a7f88a28c9475cf61bbb334d1b67ec192fab035d0b89cda SHA512 62eb193b331e2587f4e206516061d7f49eef973366608949c1676a7f43d3eca8e555730cfdc3e803a51e458c6381f56634fe3461e41316df9b7c24f320f9b3ec WHIRLPOOL 3db907774d53f724948661d9794404055d00aa27a8bc23e61c28a7261338023832e363990251dc3e30b5154f23f23050d8db986d621e0ff0beeb790ba9210ef2

Modified: 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.ebuild	2013-03-23 09:37:34 UTC (rev 2564)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5.ebuild	2013-03-23 10:35:00 UTC (rev 2565)
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
 PYTHON_DEPEND="2"
 
-inherit multilib python eutils
+inherit eutils multilib python waf-utils
 
 RESTRICT="mirror"
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
@@ -30,6 +30,11 @@
 
 S="${WORKDIR}/jack-${PV}"
 
+PATCHES=(
+	"${FILESDIR}/jack2-no-self-connect-1.9.9.5.patch"
+	"${FILESDIR}/jack-1.9.9.5-opus_custom.patch"
+)
+
 pkg_pretend() {
 	if use mixed; then
 		ewarn 'You are about to build with "mixed" use flag.'
@@ -44,13 +49,8 @@
 	python_pkg_setup
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/jack2-no-self-connect-1.9.9.5.patch"
-	epatch "${FILESDIR}/jack-1.9.9.5-opus_custom.patch"
-}
-
 src_configure() {
-	local myconf="--prefix=/usr --destdir=${D}"
+	local myconf=""
 	use alsa && myconf="${myconf} --alsa"
 	use dbus && myconf="${myconf} --dbus"
 	! use dbus && myconf="${myconf} --classic"
@@ -60,16 +60,11 @@
 	use ieee1394 && myconf="${myconf} --firewire"
 	use mixed && myconf="${myconf} --mixed"
 
-	einfo "Running \"./waf configure ${myconf}\" ..."
-	./waf configure ${myconf} || die "waf configure failed"
+	waf-utils_src_configure ${myconf}
 }
 
-src_compile() {
-	./waf build ${MAKEOPTS} || die "waf build failed"
-}
-
 src_install() {
 	ln -s ../../html build/default/html
-	./waf --destdir="${D}" install || die "waf install failed"
+	waf-utils_src_install
 	python_convert_shebangs -r 2 "${ED}"
 }