[proaudio] [1298] cleanup and fixup jack-audio-connection-kit ebuilds

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


Revision: 1298
Author:   evermind
Date:     2008-08-12 15:02:35 +0200 (Tue, 12 Aug 2008)

Log Message:
-----------
cleanup and fixup jack-audio-connection-kit ebuilds

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-0.101.1.ebuild
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-ppc64fix.patch
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-riceitdown.patch
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r2.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r2.ebuild
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r3.ebuild
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.0.ebuild
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2.ebuild


Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2008-08-11 17:21:42 UTC (rev 1297)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2008-08-12 13:02:35 UTC (rev 1298)
@@ -2,6 +2,22 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Aug 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
+  -jack-audio-connection-kit-0.100.7-r2.ebuild,
+  -jack-audio-connection-kit-0.100.7-r3.ebuild,
+  jack-audio-connection-kit-0.101.1.ebuild,
+  jack-audio-connection-kit-0.102.20.ebuild,
+  -jack-audio-connection-kit-0.103.0.ebuild,
+  +files/jack-audio-connection-kit-0.103.0-ppc64fix.patch,
+  +files/jack-audio-connection-kit-0.103.0-riceitdown.patch,
+  -jack-audio-connection-kit-0.109.0.ebuild,
+  -jack-audio-connection-kit-0.109.2.ebuild,
+  +jack-audio-connection-kit-0.109.2-r2.ebuild,
+  jack-audio-connection-kit-9999.ebuild:
+  respin against portage -- deleted old ebuilds
+  using unipatch and 
+  http://download.tuxfamily.org/proaudio/distfiles/ for dbus-patches
+
   23 Mar 2008; Marc-Olivier Barre <marco@xxxxxxxxxxxxxxxx> jack-audio-connection-kit-9999.ebuild:
   * Reactivated dbus. jackpatches version 0.12.
 

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2008-08-11 17:21:42 UTC (rev 1297)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2008-08-12 13:02:35 UTC (rev 1298)
@@ -1,3 +1,5 @@
+AUX jack-audio-connection-kit-0.103.0-ppc64fix.patch 2688 RMD160 f5e56bf524078be13f5b9114e1629c5bc4d2d0ac SHA1 bd4b823c54e06debec3b93b3bf850af06b69f045 SHA256 80e12c89348728ad9dc3022d00322b030102dbe7c5bd2b300a2b45dd696afb68
+AUX jack-audio-connection-kit-0.103.0-riceitdown.patch 1588 RMD160 9a4c86b480b580e16d407f88fc30b23fcd339efb SHA1 2e082c75e0927525f225e58e73f1a59811eb238c SHA256 4b26b1528cc9ec17bad3968af81ded11d378a5a2379a553f401c1ff2ec03a3c4
 AUX jack-audio-connection-kit-mmap_complex.patch 7078 RMD160 fcad1fe24412d58326a12bd26a3c123f17150178 SHA1 a0cb7b8616f03c5cc26eb325d6f243d4b4228a8b SHA256 69327de22eead1768609cc130449685bc9d519e8da4578d8227482ed3bcc66e5
 AUX jack-audio-connection-kit-transport.patch 309 RMD160 7b7130dd922ed14988eb591059d643ece39f6757 SHA1 ed8f9d90ec62476643f41ff60735d4aaaee84886 SHA256 74f1d155f365deb1461d070b37ccd7836c32c521d31960a3f4e6c3f2e528bada
 AUX jack-transport-start-at-zero-fix.diff 1613 RMD160 aa2e1492841c4299647af812d68e9585ebd53b10 SHA1 9e18d8ed0fa755fcd4aa53e82693e03d71a94b7b SHA256 f836d29c3ee71624968e8befb3f9972c1906b926d4737e02499a6bec646b5a1f
@@ -2,21 +4,13 @@
 AUX jackmidi_01dec05.patch 34782 RMD160 151415df3439c7d7b6f4109559ed3b212316e6bb SHA1 60d8a3064f349fa0897c78ded0e7d14a64f0f533 SHA256 3c0d5097f7b2fda5c35c963224dd7a59b097181415956317cf6f161d5e48048a
-DIST jack-audio-connection-kit-0.100.7.tar.gz 2119224 RMD160 f445d8c40fa88e21500082ad2b5c60aafb925bd6 SHA1 55b7444058de0be3c647782f359b02a8f618b39b SHA256 fd8e5ce630002a08200fdb0e7ca098c4a25b9052b4ed8219845b22091db50fa8
 DIST jack-audio-connection-kit-0.101.1.tar.gz 724598 RMD160 54bcb565419f032715a90ff79b056003e2fe7fef SHA1 0cd4c82402c944df83bad7110128020dad4772bc SHA256 4f0e89a83aaaf5b125389135ee4f321b22ffef19003749c138eb54974e2f5533
 DIST jack-audio-connection-kit-0.102.20.tar.gz 761792 RMD160 5a343fa8c54f629418f3e21165870d7e8a75a4a6 SHA1 97255192331f1189a9879d78b1aecbb42468dcf2 SHA256 e4506a9f46cd6fa4896e76482f17b7bddeeda3eb35add176d6db479e5c4f8530
-DIST jack-audio-connection-kit-0.103.0.tar.gz 763244 RMD160 72e47ada90b3d2c391c2e712316a975ae2a13ece SHA1 e804189f3dc024dad37da4afb66a30fd9c92b2bf SHA256 a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
-DIST jack-audio-connection-kit-0.109.0.tar.gz 830475 RMD160 a3aa1b0f2d92f6d8099c82725f844482f61e92b9 SHA1 dec4067ecafbb679d424fa8105560aff89afb99a SHA256 7068d67de58211271e0f61b2caa0a46b68fed885fef69076d0bedd5978013d34
 DIST jack-audio-connection-kit-0.109.2.tar.gz 831141 RMD160 1e382cf6751b4df3d5d4ea75be7ee94adbc7746a SHA1 5a23c9817fb72858d5bc7b3077224575140b7f55 SHA256 27a7a70e5be0dbcdd98ee1a505399e006e06b4f58fcd3b8cd25763aa7e43bfd4
-DIST jackpatches-0.11.tar.bz2 37522 RMD160 0293bc31c6a72c9256a0410d7b0775b32dae7c0c SHA1 85c5c7513b8f87b517ae0108a65e45642881088d SHA256 979b489bfc5b4a74bd3e9c0f28bb310a211f3f874fc8418babbd9b73dfd9ca94
-DIST jackpatches-0.9.tar.bz2 39494 RMD160 64b1070daf082cd7d18f94f86d8e8b54eb8b9a7c SHA1 23c2cd23430cdb9b5923084f0a0ecc56add1f0c0 SHA256 7f79816a50509b526c70e127adb703ffbd0d6e6a76d0e6f940451c6d7b25e123
-DIST netjack-0.11rc5.tar.bz2 23698 RMD160 528dc7d88452b920da55da5fa5caf675a17603c4 SHA1 5f73fab160e9e5e4bfa67152bdaaae3223e0777f SHA256 0cb2dd50b300bb6d5ba8c64901801f8a9ebf0b4430b8c58ef5d5e3f350c79dc7
+DIST jackdbus-patches-0.12.tar.bz2 36383 RMD160 73a045573da6722578ece429c2bac05eae8c74ac SHA1 51e50605fcd076089069011ae2a7462b270412b9 SHA256 02e3b2e1c5ca584dffa41695ba6b2d8c56feb48f7959ff9672f3a8d7e4d093b0
+DIST jackdbus-patches-0.9.tar.bz2 39305 RMD160 0e9c348211684fa6b52261adca2c43ad1b5200db SHA1 342137f9763da9a2aebd818434515cf3cc41682d SHA256 c37fe0811b49da0dbaeb5fbc8ed7eddc47f514eda6b9dc662cff8f80847526f2
 DIST netjack-0.12.tar.bz2 28044 RMD160 13d13f2a66c891da243f9a286833554f680937ff SHA1 f850ed654d0f115065d96bee34d9f7c05e8c5725 SHA256 c443bcb6ec2b477c52cab2fca75aef80fe2c2c91499e45ffdbb1c28ffaa7ee60
-EBUILD jack-audio-connection-kit-0.100.7-r2.ebuild 3838 RMD160 b82d4f9ad124d1267950c48ccecba95e49a940fe SHA1 305ddf2c7b334a255dac2d7e0d2809f679fb71ac SHA256 904c2ee08771e45b75e9bfd39ed68bcab8eb9211e5797d95dc8af50be05fb765
-EBUILD jack-audio-connection-kit-0.100.7-r3.ebuild 3923 RMD160 6cebf0ba722cfac3adb8dd3bc203140a5962728e SHA1 98280f95513607c0da676ca439718e1f2969cb73 SHA256 90fb023d1ca4efbf5c3da134cf2e520cca75dd38783b0894f93ffd4c1f166fc0
-EBUILD jack-audio-connection-kit-0.101.1.ebuild 3944 RMD160 b2214d44f9c6fa5b93ba545d9b13903ca3e83c3b SHA1 75c5861488b5539d28d3259034e8fbe240a057eb SHA256 266b366bf5650410796ad6ffd67039fcf9fb4d10bc63e1c85f8f475d3905ad4b
-EBUILD jack-audio-connection-kit-0.102.20.ebuild 3948 RMD160 c3ca87c9d928a32ddce46a0afcda15a5eb76675d SHA1 6d1fbe8a1c557a22eeb55989f4baccbf0209d90a SHA256 2e29a9a9adbe06fddfc2f0d3d6b10d89f5e08218c988e846028a56ccd78f20ca
-EBUILD jack-audio-connection-kit-0.103.0.ebuild 4016 RMD160 e8e807988fb0ecc419ed51bedbcad17a51d43e13 SHA1 d625e691c61ea1e849d0c8dbe2c768324bc529d0 SHA256 8786bc424e9ffe2e2f6d7a7af9ee86e267a05c4b74364b28a483268e7bb69456
-EBUILD jack-audio-connection-kit-0.109.0.ebuild 4381 RMD160 b2d95df3ef485a113825770644646eb46d318456 SHA1 67e22a333e70046b2292a207f6a824045a936ae6 SHA256 ac7d94848ac2d3c84e2159096ba7b0a3044a93157ad5089b67cc4d0a9a37b0b2
-EBUILD jack-audio-connection-kit-0.109.2.ebuild 4350 RMD160 57d796dea6c3de68733dda6743cfc71ef582e79a SHA1 ec336ca357d312ec06ba0bafa031fcfc60eda12f SHA256 469ed13600d80b9155b9a72f18261a73ca4a44db5fcb3901fd164b658e7d3e6f
-EBUILD jack-audio-connection-kit-9999.ebuild 4239 RMD160 5dfcb64a313fbc5770915108b772112716988f26 SHA1 4c37f1146d82ec5b15cc20ca5a929150f087bc52 SHA256 c0316a918e23282ce4f6aafbc4c2e632f43af54ae34e49f6f3869dd0972b08da
-MISC ChangeLog 2696 RMD160 0428981e9ff843ec8aed2418dddc512317fa02d9 SHA1 2266929e2c25859355d946c602e061de514c810b SHA256 e4c613fdb4db033616bf254cf8f2629202bd42d2a6213d78674dc151a9865a60
+EBUILD jack-audio-connection-kit-0.101.1.ebuild 3918 RMD160 d3681a610e4df228d8b9b49f8603d48d7546e99e SHA1 525499a53d01a8abd341735430dd33ec5d113a8c SHA256 782cf56e5b4d64e7e630075e32a1d726b9fa54bb0d0507d0c19b744988229964
+EBUILD jack-audio-connection-kit-0.102.20.ebuild 3922 RMD160 bf4f8285bf04df57e294d9912fb89ba076629846 SHA1 a89a307dd4562bd0647feb5424c6516be0117c92 SHA256 af8ba1b48c6cac09e0e5da8b8544f45aaf76be831b457aea75d8300d711b9e17
+EBUILD jack-audio-connection-kit-0.109.2-r2.ebuild 4769 RMD160 0da7e08bf67145fc6f3b3379c463e32dc75eb04b SHA1 65f27fc56207e67716a57b566daf3d6184ba1a52 SHA256 d2cfa38406eb3ed863232c565abf6127984b59520ad1d9e00b4e0ca72aa1d972
+EBUILD jack-audio-connection-kit-9999.ebuild 5289 RMD160 4a1718f4555b717d4645a3e5cd62df24668f9eec SHA1 9f6ce5fb26eed6c56706a2db5c2fd121a0460d64 SHA256 e4c316e9acd03cdf938e54132a0d7dc64e114184407d99e606c7eecbc2221147
+MISC ChangeLog 3423 RMD160 2c5ea72de2649a28f68b0ef8abd8c99da641b194 SHA1 5f64004855fd625db84684754d41d4e50a98df95 SHA256 0ca0032297bd559145323abcbef356baf75567f0dc1d52a75e9e289225017960
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Added: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-ppc64fix.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-ppc64fix.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-ppc64fix.patch	2008-08-12 13:02:35 UTC (rev 1298)
@@ -0,0 +1,83 @@
+--- configure.ac.orig	2007-10-08 00:19:25.000000000 -0500
++++ configure.ac	2007-10-08 00:42:19.000000000 -0500
+@@ -219,8 +219,20 @@
+ 
+ dnl ----------------------------------------------------------------------
+ 
+-                                                                                
+-if test "$target_cpu" = "powerpc"; then
++
++if test "$target_cpu" = "powerpc64" ; then
++
++    AC_ARG_ENABLE(cell,
++       [  --enable-cell           enable Cell BE support (default=no)],,
++       [ enable_cell=no ])
++
++    if test "x$enable_cell" = xyes; then
++       AC_DEFINE(ENABLE_CELLBE, 1, [Define to 1 if you need support for the Cell BE.])
++    fi
++
++fi
++
++if test "$target_cpu" = "powerpc" -o "$target_cpu" = "powerpc64" ; then
+ 
+     AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
+     
+@@ -252,6 +262,9 @@
+     dnl -mcpu=7450 does not reliably work with gcc 3.*
+     
+     JACK_OPT_CFLAGS="-D_REENTRANT -mcpu=7400 $ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
++    if test "$target_cpu" = "powerpc64"; then
++        JACK_OPT_CFLAGS="-D_REENTRANT -O2 -mcpu=powerpc64 $ALTIVEC_OPT_FLAGS -mhard-float"
++    fi
+ 
+ elif echo $target_cpu | egrep '(i.86|x86_64)' >/dev/null; then
+ 
+--- config/cpu/powerpc/cycles.h.orig	2006-05-25 21:45:16.000000000 -0500
++++ config/cpu/powerpc/cycles.h	2007-10-08 00:49:03.000000000 -0500
+@@ -25,6 +25,9 @@
+ /* PowerPC */
+ 
+ #define CPU_FTR_601			0x00000100
++#ifdef __powerpc64__
++#define CPU_FTR_CELL_TB_BUG            0x0000800000000000UL
++#endif /* __powerpc64__ */
+ 
+ typedef unsigned long cycles_t;
+ 
+@@ -36,6 +39,27 @@
+ {
+ 	cycles_t ret = 0;
+ 
++#ifdef __powerpc64__
++#ifdef ENABLE_CELLBE
++	__asm__ __volatile__(                            \
++	         "90:    mftb %0;\n"                     \
++	         "97:    cmpwi %0,0;\n"                  \
++	         "       beq- 90b;\n"                    \
++	         "99:\n"                                 \
++	         ".section __ftr_fixup,\"a\"\n"          \
++	         ".align 3\n"                            \
++	         "98:\n"                                 \
++	         "       .llong %1\n"                    \
++	         "       .llong %1\n"                    \
++	         "       .llong 97b-98b\n"               \
++	         "       .llong 99b-98b\n"               \
++	         ".previous"                             \
++	         : "=r" (ret) : "i" (CPU_FTR_CELL_TB_BUG));
++
++#else /* !ENABLE_CELLBE */
++	__asm__ __volatile__("mftb %0" : "=r" (ret));
++#endif /* !ENABLE_CELLBE */
++#else
+ 	__asm__ __volatile__(
+ 		"98:	mftb %0\n"
+ 		"99:\n"
+@@ -46,6 +70,7 @@
+ 		"	.long 99b\n"
+ 		".previous"
+ 		: "=r" (ret) : "i" (CPU_FTR_601));
++#endif /* !__powerpc64__ */
+ 	return ret;
+ }
+ 

Added: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-riceitdown.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-riceitdown.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-riceitdown.patch	2008-08-12 13:02:35 UTC (rev 1298)
@@ -0,0 +1,41 @@
+Index: jack-audio-connection-kit-0.103.0/configure.ac
+===================================================================
+--- jack-audio-connection-kit-0.103.0.orig/configure.ac
++++ jack-audio-connection-kit-0.103.0/configure.ac
+@@ -210,8 +210,6 @@ AM_CONDITIONAL(USE_POSIX_SHM, $USE_POSIX
+ 
+ JACK_CORE_CFLAGS="-I\$(top_srcdir)/config -I\$(top_srcdir) \
+ -I\$(top_srcdir) -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall -g"
+-JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS -march=pentium2 -mcpu=pentium4 -O3 \
+--ffast-math -funroll-loops -fprefetch-loop-arrays"
+ JACK_CFLAGS="$JACK_CORE_CFLAGS $CFLAGS"
+ 
+ dnl
+@@ -253,7 +251,7 @@ if test "$target_cpu" = "powerpc"; then
+ 
+     dnl -mcpu=7450 does not reliably work with gcc 3.*
+     
+-    JACK_OPT_CFLAGS="-D_REENTRANT -O2 -mcpu=7400 $ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
++    JACK_OPT_CFLAGS="-D_REENTRANT -mcpu=7400 $ALTIVEC_OPT_FLAGS_FLAGS -mhard-float -mpowerpc-gfxopt"
+ 
+ elif echo $target_cpu | egrep '(i.86|x86_64)' >/dev/null; then
+ 
+@@ -339,17 +337,7 @@ elif echo $target_cpu | egrep '(i.86|x86
+     fi
+ 
+     AC_DEFINE(x86, 1, "Nope it's intel")
+-    COMMON_X86_OPT_FLAGS="-DREENTRANT -O3 -fomit-frame-pointer -ffast-math -funroll-loops"
+-    
+-    if test "$target_cpu" = "i586"; then
+-	JACK_OPT_CFLAGS="-march=i586 "
+-    elif test "$target_cpu" = "i686"; then
+-	JACK_OPT_CFLAGS="-march=i686"
+-    elif test "$target_cpu" = "x86_64"; then
+-	JACK_OPT_CFLAGS="-march=k8"
+-    else
+-	:
+-    fi
++    COMMON_X86_OPT_FLAGS="-DREENTRANT"
+     
+     JACK_OPT_CFLAGS="$COMMON_X86_OPT_FLAGS $JACK_OPT_CFLAGS $MMX_FLAGS $SSE_FLAGS"
+ 

Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r2.ebuild	2008-08-11 17:21:42 UTC (rev 1297)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r2.ebuild	2008-08-12 13:02:35 UTC (rev 1298)
@@ -1,162 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit flag-o-matic eutils multilib
-
-NETJACK=netjack-0.11rc5
-
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz http://netjack.sourceforge.net/${NETJACK}.tar.bz2";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 -mips ~ppc ~ppc-macos -ppc64 ~sh -sparc x86"
-IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack jackmidi"
-
-RDEPEND="dev-util/pkgconfig
-	jackmidi? ( media-libs/alsa-lib )
-	netjack? ( !media-sound/netjack )
-	sndfile? ( >=media-libs/libsndfile-1.0.0 )
-	sys-libs/ncurses
-	caps? ( sys-libs/libcap )
-	portaudio? ( =media-libs/portaudio-18* )
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )
-	!media-sound/jack-audio-connection-kit-svn"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	if ! use sndfile ; then
-		ewarn "sndfile not in USE flags. jack_rec will not be installed!"
-	fi
-
-	if use caps; then
-		if [[ "${KV:0:3}" == "2.4" ]]; then
-			einfo "will build jackstart for 2.4 kernel"
-		else
-			einfo "using compatibility symlink for jackstart"
-		fi
-	fi
-
-}
-
-src_unpack() {
-	unpack ${A}
-	use netjack && unpack ${NETJACK}.tar.bz2
-	cd ${S}
-
-	# the docs option is in upstream, I'll leave the pentium2 foobage
-	# for the x86 folks...... kito@xxxxxxxxxx
-
-	# Add doc option and fix --march=pentium2 in caps test
-	#epatch ${FILESDIR}/${PN}-doc-option.patch
-
-	# compile and install jackstart, see #92895, #94887
-	#if use caps ; then
-	#	epatch ${FILESDIR}/${PN}-0.99.0-jackstart.patch
-	#fi
-
-	epatch ${FILESDIR}/${PN}-transport.patch
-	if use jackmidi; then
-		epatch ${FILESDIR}/jackmidi_01dec05.patch || die
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
-
-	use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
-
-	if use jack-tmpfs; then
-		myconf="${myconf} --with-default-tmpdir=/dev/shm"
-	else
-		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
-	fi
-
-	if use userland_Darwin ; then
-		append-flags -fno-common
-		use altivec && append-flags -force_cpusubtype_ALL \
-			-maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
-	fi
-
-	if use jackmidi; then
-		aclocal
-		automake
-	fi
-
-
-	use sndfile && \
-		export SNDFILE_CFLAGS="-I/usr/include" \
-		export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile"
-
-	econf \
-		$(use_enable altivec) \
-		$(use_enable alsa) \
-		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
-		$(use_enable coreaudio) \
-		$(use_enable debug) \
-		$(use_enable doc html-docs) \
-		$(use_enable mmx) \
-		$(use_enable oss) \
-		$(use_enable portaudio) \
-		$(use_enable sse)  \
-		$(use_enable 3dnow dynsimd) \
-		--with-pic \
-		${myconf} || die "configure failed"
-	emake || die "compilation failed"
-
-	if use caps && [[ "${KV:0:3}" == "2.4" ]]; then
-		einfo "Building jackstart for 2.4 kernel"
-		cd ${S}/jackd
-		emake jackstart || die "jackstart build failed."
-	fi
-
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		scons jack_source_dir=${S}
-	fi
-
-}
-
-src_install() {
-	make DESTDIR=${D} datadir=/usr/share/doc install || die
-
-	if use caps; then
-		if [[ "${KV:0:3}" == "2.4" ]]; then
-			cd ${S}/jackd
-			dobin jackstart
-		else
-			dosym /usr/bin/jackd /usr/bin/jackstart
-		fi
-	fi
-
-	if ! use jack-tmpfs; then
-		keepdir /var/run/jack
-		chmod 4777 ${D}/var/run/jack
-	fi
-
-	if use doc; then
-		mv ${D}/usr/share/doc/${PF}/reference/html \
-		   ${D}/usr/share/doc/${PF}/
-
-		insinto /usr/share/doc/${PF}
-		doins -r ${S}/example-clients
-	else
-		rm -rf ${D}/usr/share/doc
-	fi
-
-	rm -rf ${D}/usr/share/doc/${PF}/reference
-
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		dobin alsa_in
-		dobin alsa_out
-		dobin jacknet_client
-		insinto /usr/lib/jack
-		doins jack_net.so
-	fi
-}

Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r3.ebuild	2008-08-11 17:21:42 UTC (rev 1297)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.100.7-r3.ebuild	2008-08-12 13:02:35 UTC (rev 1298)
@@ -1,165 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit flag-o-matic eutils multilib
-
-NETJACK="netjack-0.12"
-
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz
-	netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 -mips ~ppc ~ppc-macos -ppc64 ~sh -sparc x86"
-IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack jackmidi"
-
-RDEPEND="dev-util/pkgconfig
-	jackmidi? ( media-libs/alsa-lib )
-	netjack? ( !media-sound/netjack )
-	sndfile? ( >=media-libs/libsndfile-1.0.0 )
-	sys-libs/ncurses
-	caps? ( sys-libs/libcap )
-	portaudio? ( =media-libs/portaudio-18* )
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )
-	netjack? ( dev-util/scons )
-	!media-sound/jack-audio-connection-kit-svn"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	if ! use sndfile ; then
-		ewarn "sndfile not in USE flags. jack_rec will not be installed!"
-	fi
-
-	if use caps; then
-		if [[ "${KV:0:3}" == "2.4" ]]; then
-			einfo "will build jackstart for 2.4 kernel"
-		else
-			einfo "using compatibility symlink for jackstart"
-		fi
-	fi
-
-}
-
-src_unpack() {
-	unpack ${A}
-	use netjack && unpack ${NETJACK}.tar.bz2
-	cd ${S}
-
-	# the docs option is in upstream, I'll leave the pentium2 foobage
-	# for the x86 folks...... kito@xxxxxxxxxx
-
-	# Add doc option and fix --march=pentium2 in caps test
-	#epatch ${FILESDIR}/${PN}-doc-option.patch
-
-	# compile and install jackstart, see #92895, #94887
-	#if use caps ; then
-	#	epatch ${FILESDIR}/${PN}-0.99.0-jackstart.patch
-	#fi
-
-	epatch ${FILESDIR}/${PN}-transport.patch
-	epatch ${FILESDIR}/${PN}-mmap_complex.patch
-	if use jackmidi; then
-		epatch ${FILESDIR}/jackmidi_01dec05.patch || die
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
-
-	use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
-
-	if use jack-tmpfs; then
-		myconf="${myconf} --with-default-tmpdir=/dev/shm"
-	else
-		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
-	fi
-
-	if use userland_Darwin ; then
-		append-flags -fno-common
-		use altivec && append-flags -force_cpusubtype_ALL \
-			-maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
-	fi
-
-	if use jackmidi; then
-		aclocal
-		automake
-	fi
-
-
-	use sndfile && \
-		export SNDFILE_CFLAGS="-I/usr/include" \
-		export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile"
-
-	econf \
-		$(use_enable altivec) \
-		$(use_enable alsa) \
-		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
-		$(use_enable coreaudio) \
-		$(use_enable debug) \
-		$(use_enable doc html-docs) \
-		$(use_enable mmx) \
-		$(use_enable oss) \
-		$(use_enable portaudio) \
-		$(use_enable sse)  \
-		$(use_enable 3dnow dynsimd) \
-		--with-pic \
-		${myconf} || die "configure failed"
-	emake || die "compilation failed"
-
-	if use caps && [[ "${KV:0:3}" == "2.4" ]]; then
-		einfo "Building jackstart for 2.4 kernel"
-		cd ${S}/jackd
-		emake jackstart || die "jackstart build failed."
-	fi
-
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		scons jack_source_dir=${S}
-	fi
-
-}
-
-src_install() {
-	make DESTDIR=${D} datadir=/usr/share/doc install || die
-
-	if use caps; then
-		if [[ "${KV:0:3}" == "2.4" ]]; then
-			cd ${S}/jackd
-			dobin jackstart
-		else
-			dosym /usr/bin/jackd /usr/bin/jackstart
-		fi
-	fi
-
-	if ! use jack-tmpfs; then
-		keepdir /var/run/jack
-		chmod 4777 ${D}/var/run/jack
-	fi
-
-	if use doc; then
-		mv ${D}/usr/share/doc/${PF}/reference/html \
-		   ${D}/usr/share/doc/${PF}/
-
-		insinto /usr/share/doc/${PF}
-		doins -r ${S}/example-clients
-	else
-		rm -rf ${D}/usr/share/doc
-	fi
-
-	rm -rf ${D}/usr/share/doc/${PF}/reference
-
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		dobin alsa_in
-		dobin alsa_out
-		dobin jacknet_client
-		insinto /usr/lib/jack
-		doins jack_net.so
-	fi
-}

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1.ebuild	2008-08-11 17:21:42 UTC (rev 1297)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1.ebuild	2008-08-12 13:02:35 UTC (rev 1298)
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,8 +14,8 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 -mips ~ppc ~ppc-macos -ppc64 ~sh -sparc
-~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+
 IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack jackmidi"
 
 RDEPEND="dev-util/pkgconfig

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild	2008-08-11 17:21:42 UTC (rev 1297)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild	2008-08-12 13:02:35 UTC (rev 1298)
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,8 +14,8 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 -mips ~ppc ~ppc-macos -ppc64 ~sh -sparc
-~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+
 IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack jackmidi"
 
 RDEPEND="dev-util/pkgconfig

Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild	2008-08-11 17:21:42 UTC (rev 1297)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.103.0.ebuild	2008-08-12 13:02:35 UTC (rev 1298)
@@ -1,169 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit flag-o-matic eutils multilib
-
-RESTRICT="nomirror"
-NETJACK="netjack-0.12"
-
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz
-	netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 -mips ~ppc ~ppc-macos -ppc64 ~sh -sparc
-~x86"
-IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack jackmidi freebob"
-
-RDEPEND="dev-util/pkgconfig
-	jackmidi? ( media-libs/alsa-lib )
-	netjack? ( !media-sound/netjack )
-	sndfile? ( >=media-libs/libsndfile-1.0.0 )
-	sys-libs/ncurses
-	caps? ( sys-libs/libcap )
-	portaudio? ( =media-libs/portaudio-18* )
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )
-	netjack? ( dev-util/scons )
-	!media-sound/jack-audio-connection-kit-svn
-	freebob? ( sys-libs/libfreebob )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	if ! use sndfile ; then
-		ewarn "sndfile not in USE flags. jack_rec will not be installed!"
-	fi
-
-	if use caps; then
-		if [[ "${KV:0:3}" == "2.4" ]]; then
-			einfo "will build jackstart for 2.4 kernel"
-		else
-			einfo "using compatibility symlink for jackstart"
-		fi
-	fi
-
-}
-
-src_unpack() {
-	unpack ${A}
-	use netjack && unpack ${NETJACK}.tar.bz2
-	cd ${S}
-
-	# the docs option is in upstream, I'll leave the pentium2 foobage
-	# for the x86 folks...... kito@xxxxxxxxxx
-
-	# Add doc option and fix --march=pentium2 in caps test
-	#epatch ${FILESDIR}/${PN}-doc-option.patch
-
-	# compile and install jackstart, see #92895, #94887
-	#if use caps ; then
-	#	epatch ${FILESDIR}/${PN}-0.99.0-jackstart.patch
-	#fi
-
-	epatch ${FILESDIR}/${PN}-transport.patch
-	#epatch ${FILESDIR}/${PN}-mmap_complex.patch
-	#if use jackmidi; then
-	#	epatch ${FILESDIR}/jackmidi_01dec05.patch || die
-	#fi
-}
-
-src_compile() {
-	local myconf
-
-	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
-
-	use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
-
-	if use jack-tmpfs; then
-		myconf="${myconf} --with-default-tmpdir=/dev/shm"
-	else
-		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
-	fi
-
-	if use userland_Darwin ; then
-		append-flags -fno-common
-		use altivec && append-flags -force_cpusubtype_ALL \
-			-maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
-	fi
-
-	if use jackmidi; then
-		aclocal
-		automake
-	fi
-
-
-	use sndfile && \
-		export SNDFILE_CFLAGS="-I/usr/include" \
-		export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile"
-
-	econf \
-		$(use_enable freebob) \
-		$(use_enable altivec) \
-		$(use_enable alsa) \
-		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
-		$(use_enable coreaudio) \
-		$(use_enable debug) \
-		$(use_enable doc html-docs) \
-		$(use_enable mmx) \
-		$(use_enable oss) \
-		$(use_enable portaudio) \
-		$(use_enable sse)  \
-		$(use_enable 3dnow dynsimd) \
-		--with-pic \
-		${myconf} || die "configure failed"
-	emake || die "compilation failed"
-
-	if use caps && [[ "${KV:0:3}" == "2.4" ]]; then
-		einfo "Building jackstart for 2.4 kernel"
-		cd ${S}/jackd
-		emake jackstart || die "jackstart build failed."
-	fi
-
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		scons jack_source_dir=${S}
-	fi
-
-}
-
-src_install() {
-	make DESTDIR=${D} datadir=/usr/share/doc install || die
-
-	if use caps; then
-		if [[ "${KV:0:3}" == "2.4" ]]; then
-			cd ${S}/jackd
-			dobin jackstart
-		else
-			dosym /usr/bin/jackd /usr/bin/jackstart
-		fi
-	fi
-
-	if ! use jack-tmpfs; then
-		keepdir /var/run/jack
-		chmod 4777 ${D}/var/run/jack
-	fi
-
-	if use doc; then
-		mv ${D}/usr/share/doc/${PF}/reference/html \
-		   ${D}/usr/share/doc/${PF}/
-
-		insinto /usr/share/doc/${PF}
-		doins -r ${S}/example-clients
-	else
-		rm -rf ${D}/usr/share/doc
-	fi
-
-	rm -rf ${D}/usr/share/doc/${PF}/reference
-
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		dobin alsa_in
-		dobin alsa_out
-		dobin jacknet_client
-		insinto /usr/lib/jack
-		doins jack_net.so
-	fi
-}

Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.0.ebuild	2008-08-11 17:21:42 UTC (rev 1297)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.0.ebuild	2008-08-12 13:02:35 UTC (rev 1298)
@@ -1,179 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit flag-o-matic eutils multilib autotools
-
-RESTRICT="nomirror"
-NETJACK="netjack-0.12"
-JACKDBUS="jackpatches-0.9"
-
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org";
-#SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz
-#	netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )"
-
-SRC_URI="http://www.ffado.org/download/jack-audio-connection-kit-0.109.0.tar.gz
-    netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )
-	dbus? ( http://dl.sharesource.org/jack/${JACKDBUS}.tar.bz2 )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 -mips ~ppc ~ppc-macos -ppc64 ~sh -sparc
-~x86"
-IUSE="altivec alsa caps coreaudio dbus doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack jackmidi freebob"
-
-RDEPEND="dev-util/pkgconfig
-	jackmidi? ( media-libs/alsa-lib )
-	netjack? ( !media-sound/netjack )
-	sndfile? ( >=media-libs/libsndfile-1.0.0 )
-	sys-libs/ncurses
-	caps? ( sys-libs/libcap )
-	portaudio? ( =media-libs/portaudio-18* )
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )
-    dbus? ( sys-apps/dbus
-		dev-python/dbus-python )
-	netjack? ( dev-util/scons )
-	!media-sound/jack-audio-connection-kit-svn
-	freebob? ( sys-libs/libfreebob )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	if ! use sndfile ; then
-		ewarn "sndfile not in USE flags. jack_rec will not be installed!"
-	fi
-
-	if use caps; then
-		if [[ "${KV:0:3}" == "2.4" ]]; then
-			einfo "will build jackstart for 2.4 kernel"
-		else
-			einfo "using compatibility symlink for jackstart"
-		fi
-	fi
-
-}
-
-src_unpack() {
-	unpack ${A}
-	use netjack && unpack ${NETJACK}.tar.bz2
-	use dbus && cd ${WORKDIR} && unpack ${JACKDBUS}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-transport.patch
-
-	# jack transport patch from Torben Hohn
-	epatch "${FILESDIR}/jack-transport-start-at-zero-fix.diff"
-	
-	# dbus patches from Nedko Arnaudov
-	if use dbus; then
-		epatch "../${JACKDBUS}/logs.patch"
-		epatch "../${JACKDBUS}/dbus.patch"
-		epatch "../${JACKDBUS}/watchdog-fix-on-driver-load-fail.patch"
-	fi
-
-	sed -i -e "s:include/nptl/:include/:g" configure.ac || die
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
-
-	use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
-
-	if use jack-tmpfs; then
-		myconf="${myconf} --with-default-tmpdir=/dev/shm"
-	else
-		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
-	fi
-
-	if use dbus; then
-		myconf="${myconf} --enable-dbus --enable-pkg-config-dbus-service-dir"
-	fi
-
-	if use userland_Darwin ; then
-		append-flags -fno-common
-		use altivec && append-flags -force_cpusubtype_ALL \
-			-maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
-	fi
-
-	if use jackmidi; then
-		aclocal
-		automake
-	fi
-
-
-	use sndfile && \
-		export SNDFILE_CFLAGS="-I/usr/include" \
-		export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile"
-
-	econf \
-		$(use_enable freebob) \
-		$(use_enable altivec) \
-		$(use_enable alsa) \
-		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
-		$(use_enable coreaudio) \
-		$(use_enable debug) \
-		$(use_enable doc html-docs) \
-		$(use_enable mmx) \
-		$(use_enable oss) \
-		$(use_enable portaudio) \
-		$(use_enable sse)  \
-		$(use_enable 3dnow dynsimd) \
-		--with-pic \
-		${myconf} || die "configure failed"
-	emake || die "compilation failed"
-
-	if use caps && [[ "${KV:0:3}" == "2.4" ]]; then
-		einfo "Building jackstart for 2.4 kernel"
-		cd ${S}/jackd
-		emake jackstart || die "jackstart build failed."
-	fi
-
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		scons jack_source_dir=${S}
-	fi
-
-}
-
-src_install() {
-	make DESTDIR=${D} datadir=/usr/share/doc install || die
-
-	if use caps; then
-		if [[ "${KV:0:3}" == "2.4" ]]; then
-			cd ${S}/jackd
-			dobin jackstart
-		else
-			dosym /usr/bin/jackd /usr/bin/jackstart
-		fi
-	fi
-
-	if ! use jack-tmpfs; then
-		keepdir /var/run/jack
-		chmod 4777 ${D}/var/run/jack
-	fi
-
-	if use doc; then
-		mv ${D}/usr/share/doc/${PF}/reference/html \
-		   ${D}/usr/share/doc/${PF}/
-
-		insinto /usr/share/doc/${PF}
-		doins -r ${S}/example-clients
-	else
-		rm -rf ${D}/usr/share/doc
-	fi
-
-	rm -rf ${D}/usr/share/doc/${PF}/reference
-
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		dobin alsa_in
-		dobin alsa_out
-		dobin jacknet_client
-		insinto /usr/lib/jack
-		doins jack_net.so
-	fi
-}

Copied: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r2.ebuild (from rev 1287, trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r2.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r2.ebuild	2008-08-12 13:02:35 UTC (rev 1298)
@@ -0,0 +1,179 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit flag-o-matic eutils multilib linux-info autotools unipatch-001
+
+NETJACK="netjack-0.12"
+JACKDBUS="jackdbus-patches-0.9.tar.bz2"
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org";
+SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz
+    netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )
+	dbus? ( http://download.tuxfamily.org/proaudio/distfiles/${JACKDBUS} )"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="3dnow altivec alsa caps coreaudio cpudetection dbus doc debug jack-tmpfs mmx oss portaudio sse netjack freebob"
+
+RDEPEND="
+	>=media-libs/libsndfile-1.0.0
+	sys-libs/ncurses
+	caps? ( sys-libs/libcap )
+	portaudio? ( =media-libs/portaudio-18* )
+	alsa? ( >=media-libs/alsa-lib-0.9.1 )
+    dbus? ( sys-apps/dbus
+		dev-python/dbus-python )
+	freebob? ( sys-libs/libfreebob )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+	netjack? ( dev-util/scons )"
+
+pkg_setup() {
+	if use caps; then
+		if kernel_is 2 4 ; then
+			einfo "will build jackstart for 2.4 kernel"
+		else
+			einfo "using compatibility symlink for jackstart"
+		fi
+	fi
+
+	if use netjack; then
+		einfo "including support for experimental netjack, see http://netjack.sourceforge.net/";
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch ${FILESDIR}/${PN}-transport.patch
+	# jack transport patch from Torben Hohn
+	epatch "${FILESDIR}/jack-transport-start-at-zero-fix.diff"
+	# more fixes
+	epatch "${FILESDIR}/${PN}-0.103.0-riceitdown.patch"
+	epatch "${FILESDIR}/${PN}-0.103.0-ppc64fix.patch"
+	
+	# dbus patches from Nedko Arnaudov
+	if use dbus; then
+		UNIPATCH_LIST="${DISTDIR}/${JACKDBUS}"
+		unipatch
+	fi
+
+	sed -i -e "s:include/nptl/:include/:g" configure.ac || die
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
+
+	use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
+
+	if use jack-tmpfs; then
+		myconf="${myconf} --with-default-tmpdir=/dev/shm"
+	else
+		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
+	fi
+
+	if use dbus; then
+		myconf="${myconf} --enable-dbus --enable-pkg-config-dbus-service-dir"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-flags -fno-common
+		use altivec && append-flags -force_cpusubtype_ALL \
+			-maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
+	fi
+
+	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
+	# Also, without -O2 it will not compile as well.
+	# we test if it is present before enabling the configure flag.
+	if use cpudetection ; then
+		if (! grep 3dnow /proc/cpuinfo >/dev/null) ; then
+			ewarn "Can't build cpudetection (dynsimd) without cpu 3dnow support. see bug #136565."
+		elif (! grep sse /proc/cpuinfo >/dev/null) ; then
+			ewarn "Can't build cpudetection (dynsimd) without cpu sse support. see bug #136565."
+		elif (! grep mmx /proc/cpuinfo >/dev/null) ; then
+			ewarn "Can't build cpudetection (dynsimd) without cpu mmx support. see bug #136565."
+		else
+			einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
+			myconf="${myconf} --enable-dynsimd"
+
+			filter-flags -O*
+			append-flags -mmmx -msse -m3dnow -O2
+		fi
+	fi
+
+	econf \
+		$(use_enable freebob) \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable doc html-docs) \
+		$(use_enable mmx) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		$(use_enable sse)  \
+		$(use_enable 3dnow dynsimd) \
+		--disable-dependency-tracking \
+		${myconf} || die "configure failed"
+	emake || die "compilation failed"
+
+	if use caps && kernel_is 2 4 ; then
+		einfo "Building jackstart for 2.4 kernel"
+		cd "${S}"/jackd
+		emake jackstart || die "jackstart build failed."
+	fi
+
+	if use netjack; then
+		cd "${WORKDIR}/${NETJACK}"
+		scons jack_source_dir="${S}"
+	fi
+
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	if use caps; then
+		if kernel_is 2 4 ; then
+			cd "${S}/jackd"
+			dobin jackstart
+		else
+			dosym /usr/bin/jackd /usr/bin/jackstart
+		fi
+	fi
+
+	if ! use jack-tmpfs; then
+		keepdir /var/run/jack
+		chmod 4777 ${D}/var/run/jack
+	fi
+
+	if use doc; then
+		mv ${D}/usr/share/doc/${PF}/reference/html \
+		   ${D}/usr/share/doc/${PF}/
+
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/example-clients"
+	else
+		rm -rf ${D}/usr/share/doc
+	fi
+
+	rm -rf ${D}/usr/share/doc/${PF}/reference
+
+	if use netjack; then
+		cd "${WORKDIR}/${NETJACK}"
+		dobin alsa_in
+		dobin alsa_out
+		dobin jacknet_client
+		insinto /usr/$(get_libdir)/jack
+		doins jack_net.so
+	fi
+}

Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2.ebuild	2008-08-11 17:21:42 UTC (rev 1297)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2.ebuild	2008-08-12 13:02:35 UTC (rev 1298)
@@ -1,179 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit flag-o-matic eutils multilib autotools
-
-RESTRICT="nomirror"
-NETJACK="netjack-0.12"
-JACKDBUS="jackpatches-0.9"
-
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org";
-#SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz
-#	netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )"
-
-SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz
-    netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )
-	dbus? ( http://dl.sharesource.org/jack/${JACKDBUS}.tar.bz2 )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 -mips ~ppc ~ppc-macos -ppc64 ~sh -sparc
-~x86"
-IUSE="altivec alsa caps coreaudio dbus doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack jackmidi freebob"
-
-RDEPEND="dev-util/pkgconfig
-	jackmidi? ( media-libs/alsa-lib )
-	netjack? ( !media-sound/netjack )
-	sndfile? ( >=media-libs/libsndfile-1.0.0 )
-	sys-libs/ncurses
-	caps? ( sys-libs/libcap )
-	portaudio? ( =media-libs/portaudio-18* )
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )
-    dbus? ( sys-apps/dbus
-		dev-python/dbus-python )
-	netjack? ( dev-util/scons )
-	!media-sound/jack-audio-connection-kit-svn
-	freebob? ( sys-libs/libfreebob )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	if ! use sndfile ; then
-		ewarn "sndfile not in USE flags. jack_rec will not be installed!"
-	fi
-
-	if use caps; then
-		if [[ "${KV:0:3}" == "2.4" ]]; then
-			einfo "will build jackstart for 2.4 kernel"
-		else
-			einfo "using compatibility symlink for jackstart"
-		fi
-	fi
-
-}
-
-src_unpack() {
-	unpack ${A}
-	use netjack && unpack ${NETJACK}.tar.bz2
-	use dbus && cd ${WORKDIR} && unpack ${JACKDBUS}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-transport.patch
-
-	# jack transport patch from Torben Hohn
-	epatch "${FILESDIR}/jack-transport-start-at-zero-fix.diff"
-	
-	# dbus patches from Nedko Arnaudov
-	if use dbus; then
-		epatch "../${JACKDBUS}/logs.patch"
-		epatch "../${JACKDBUS}/dbus.patch"
-		epatch "../${JACKDBUS}/watchdog-fix-on-driver-load-fail.patch"
-	fi
-
-	sed -i -e "s:include/nptl/:include/:g" configure.ac || die
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
-
-	use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
-
-	if use jack-tmpfs; then
-		myconf="${myconf} --with-default-tmpdir=/dev/shm"
-	else
-		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
-	fi
-
-	if use dbus; then
-		myconf="${myconf} --enable-dbus --enable-pkg-config-dbus-service-dir"
-	fi
-
-	if use userland_Darwin ; then
-		append-flags -fno-common
-		use altivec && append-flags -force_cpusubtype_ALL \
-			-maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
-	fi
-
-	if use jackmidi; then
-		aclocal
-		automake
-	fi
-
-
-	use sndfile && \
-		export SNDFILE_CFLAGS="-I/usr/include" \
-		export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile"
-
-	econf \
-		$(use_enable freebob) \
-		$(use_enable altivec) \
-		$(use_enable alsa) \
-		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
-		$(use_enable coreaudio) \
-		$(use_enable debug) \
-		$(use_enable doc html-docs) \
-		$(use_enable mmx) \
-		$(use_enable oss) \
-		$(use_enable portaudio) \
-		$(use_enable sse)  \
-		$(use_enable 3dnow dynsimd) \
-		--with-pic \
-		${myconf} || die "configure failed"
-	emake || die "compilation failed"
-
-	if use caps && [[ "${KV:0:3}" == "2.4" ]]; then
-		einfo "Building jackstart for 2.4 kernel"
-		cd ${S}/jackd
-		emake jackstart || die "jackstart build failed."
-	fi
-
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		scons jack_source_dir=${S}
-	fi
-
-}
-
-src_install() {
-	make DESTDIR=${D} datadir=/usr/share/doc install || die
-
-	if use caps; then
-		if [[ "${KV:0:3}" == "2.4" ]]; then
-			cd ${S}/jackd
-			dobin jackstart
-		else
-			dosym /usr/bin/jackd /usr/bin/jackstart
-		fi
-	fi
-
-	if ! use jack-tmpfs; then
-		keepdir /var/run/jack
-		chmod 4777 ${D}/var/run/jack
-	fi
-
-	if use doc; then
-		mv ${D}/usr/share/doc/${PF}/reference/html \
-		   ${D}/usr/share/doc/${PF}/
-
-		insinto /usr/share/doc/${PF}
-		doins -r ${S}/example-clients
-	else
-		rm -rf ${D}/usr/share/doc
-	fi
-
-	rm -rf ${D}/usr/share/doc/${PF}/reference
-
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		dobin alsa_in
-		dobin alsa_out
-		dobin jacknet_client
-		insinto /usr/lib/jack
-		doins jack_net.so
-	fi
-}

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild	2008-08-11 17:21:42 UTC (rev 1297)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild	2008-08-12 13:02:35 UTC (rev 1298)
@@ -2,169 +2,206 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit flag-o-matic eutils multilib subversion autotools
+inherit flag-o-matic eutils multilib subversion linux-info autotools unipatch-001
 
-#NETJACK="netjack-0.12"
-JACKDBUS="jackpatches-0.11"
+NETJACK="netjack-0.12"
+JACKDBUS="jackdbus-patches-0.12.tar.bz2"
 
 RESTRICT="nostrip nomirror"
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://www.jackaudio.org";
 SRC_URI="
-!jackdmp? ( dbus? ( http://dl.sharesource.org/jack/${JACKDBUS}.tar.bz2 ) )"
+    netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )
+	!jackdmp? (
+	dbus? ( http://download.tuxfamily.org/proaudio/distfiles/${JACKDBUS} )
+	)"
 
 ESVN_REPO_URI="http://subversion.jackaudio.org/jack/trunk/jack";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="3dnow altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss sndfile sse
-jackmidi freebob dbus jackdmp"
+IUSE="3dnow altivec alsa caps coreaudio cpudetection dbus doc debug jack-tmpfs mmx oss portaudio sse netjack freebob jackdmp"
 
 RDEPEND="jackdmp? ( >=media-sound/jackdmp-9999-r1 )
 	!jackdmp? ( 
-		dev-util/pkgconfig
-		netjack? ( !media-sound/netjack )
-		sndfile? ( >=media-libs/libsndfile-1.0.0 )
-		sys-libs/ncurses
-		caps? ( sys-libs/libcap )
-		alsa? ( >=media-libs/alsa-lib-0.9.1 )
-		jackmidi? ( media-libs/alsa-lib )
-		freebob? ( sys-libs/libfreebob )
-		!media-sound/jackdmp )"
+	>=media-libs/libsndfile-1.0.0
+	sys-libs/ncurses
+	caps? ( sys-libs/libcap )
+	portaudio? ( =media-libs/portaudio-18* )
+	alsa? ( >=media-libs/alsa-lib-0.9.1 )
+    dbus? ( sys-apps/dbus
+		dev-python/dbus-python )
+	freebob? ( sys-libs/libfreebob )
+	!media-sound/jackdmp )"
+
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+	!jackdmp? ( 
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+	netjack? ( dev-util/scons )
+	)"
 
 pkg_setup() {
 	if use jackdmp; then
 		ewarn "You have enabled the jackdmp useflag. This ebuild will just pull"
 		ewarn "in jackdmp and will NOT compile and install ${PN}!"
 		sleep 3
-	else
+		return # no more to do
+	fi
 
-		if ! use sndfile; then
-			ewarn "sndfile not in USE flags. jack_rec will not be installed!"
+	if use caps; then
+		if kernel_is 2 4 ; then
+			einfo "will build jackstart for 2.4 kernel"
+		else
+			einfo "using compatibility symlink for jackstart"
 		fi
+	fi
 
-		if use caps; then
-			if [[ "${KV:0:3}" == "2.4" ]]; then
-				einfo "will build jackstart for 2.4 kernel"
-			else
-				einfo "using compatibility symlink for jackstart"
-			fi
-		fi
-
+	if use netjack; then
+		einfo "including support for experimental netjack, see http://netjack.sourceforge.net/";
 	fi
 }
 
 src_unpack() {
 	if use jackdmp; then
 		einfo "You requested to install jackdmp. Nothing to do"
-	else
-		subversion_src_unpack
-		use dbus && cd ${WORKDIR} && unpack ${JACKDBUS}.tar.bz2
-		cd ${S}
+		return # no more to do
+	fi
+	unpack ${A}
+	subversion_src_unpack
 
-		#epatch ${FILESDIR}/${PN}-transport.patch
+	cd "${S}"
+	# jack transport patch from Torben Hohn
+	epatch "${FILESDIR}/jack-transport-start-at-zero-fix.diff"
+	
+	# dbus patches from Nedko Arnaudov
+	if use dbus; then
+		UNIPATCH_LIST="${DISTDIR}/${JACKDBUS}"
+		unipatch
+	fi
 
-		# jack transport patch from Torben Hohn
-		epatch "${FILESDIR}/jack-transport-start-at-zero-fix.diff"
-
-		# dbus patches from Nedko Arnaudov
-		if use dbus; then
-			epatch "../${JACKDBUS}/dbus.patch"
-			epatch "../${JACKDBUS}/watchdog-fix-on-driver-load-fail.patch"
-		fi
-		sed -i -e "s:include/nptl/:include/:g" configure.ac || die
-		eautoreconf
-		sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure || die
-	fi
+	sed -i -e "s:include/nptl/:include/:g" configure.ac || die
+	eautoreconf
 }
 
 src_compile() {
 	if use jackdmp; then
 		einfo "You requested to install jackdmp. Nothing to do"
+		return # no more to do
+	fi
+
+	local myconf
+
+	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
+
+	use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
+
+	if use jack-tmpfs; then
+		myconf="${myconf} --with-default-tmpdir=/dev/shm"
 	else
-		local myconf
+		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
+	fi
 
-		use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
+	if use dbus; then
+		myconf="${myconf} --enable-dbus --enable-pkg-config-dbus-service-dir"
+	fi
 
-		if use jack-tmpfs; then
-			myconf="${myconf} --with-default-tmpdir=/dev/shm"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-flags -fno-common
+		use altivec && append-flags -force_cpusubtype_ALL \
+			-maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
+	fi
+
+	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
+	# Also, without -O2 it will not compile as well.
+	# we test if it is present before enabling the configure flag.
+	if use cpudetection ; then
+		if (! grep 3dnow /proc/cpuinfo >/dev/null) ; then
+			ewarn "Can't build cpudetection (dynsimd) without cpu 3dnow support. see bug #136565."
+		elif (! grep sse /proc/cpuinfo >/dev/null) ; then
+			ewarn "Can't build cpudetection (dynsimd) without cpu sse support. see bug #136565."
+		elif (! grep mmx /proc/cpuinfo >/dev/null) ; then
+			ewarn "Can't build cpudetection (dynsimd) without cpu mmx support. see bug #136565."
 		else
-			myconf="${myconf} --with-default-tmpdir=/var/run/jack"
-		fi
+			einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
+			myconf="${myconf} --enable-dynsimd"
 
-		if use dbus; then
-			myconf="${myconf} --enable-dbus --enable-pkg-config-dbus-service-dir"
+			filter-flags -O*
+			append-flags -mmmx -msse -m3dnow -O2
 		fi
+	fi
 
-		if use userland_Darwin ; then
-			append-flags -fno-common
-			use altivec && append-flags -force_cpusubtype_ALL \
-				-maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
-		fi
+	econf \
+		$(use_enable freebob) \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable doc html-docs) \
+		$(use_enable mmx) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		$(use_enable sse)  \
+		$(use_enable 3dnow dynsimd) \
+		--disable-dependency-tracking \
+		${myconf} || die "configure failed"
+	emake || die "compilation failed"
 
-		use sndfile && \
-			export SNDFILE_CFLAGS="-I/usr/include" \
-			export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile"
+	if use caps && kernel_is 2 4 ; then
+		einfo "Building jackstart for 2.4 kernel"
+		cd "${S}"/jackd
+		emake jackstart || die "jackstart build failed."
+	fi
 
-		econf \
-			$(use_enable altivec) \
-			$(use_enable alsa) \
-			$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
-			$(use_enable coreaudio) \
-			$(use_enable debug) \
-			$(use_enable doc html-docs) \
-			$(use_enable mmx) \
-			$(use_enable oss) \
-			$(use_enable sse)  \
-			$(use_enable 3dnow dynsimd) \
-			$(use_enable jackmidi) \
-			--disable-portaudio \
-			${myconf} || die "configure failed"
-		emake || die "compilation failed"
+	if use netjack; then
+		cd "${WORKDIR}/${NETJACK}"
+		scons jack_source_dir="${S}"
+	fi
 
-		if use caps && [[ "${KV:0:3}" == "2.4" ]]; then
-			einfo "Building jackstart for 2.4 kernel"
-			cd ${S}/jackd
-			emake jackstart || die "jackstart build failed."
-		fi
-
-	fi
 }
 
 src_install() {
 	if use jackdmp; then
 		einfo "You requested to install jackdmp. Nothing to do"
-	else
-		make DESTDIR=${D} datadir=/usr/share/doc install || die
+		return # no more to do
+	fi
 
-		if use caps; then
-			if [[ "${KV:0:3}" == "2.4" ]]; then
-				cd ${S}/jackd
-				dobin jackstart
-			else
-				dosym /usr/bin/jackd /usr/bin/jackstart
-			fi
-		fi
+	emake DESTDIR="${D}" install || die "install failed"
 
-		if ! use jack-tmpfs; then
-			keepdir /var/run/jack
-			chmod 4777 ${D}/var/run/jack
+	if use caps; then
+		if kernel_is 2 4 ; then
+			cd "${S}/jackd"
+			dobin jackstart
+		else
+			dosym /usr/bin/jackd /usr/bin/jackstart
 		fi
+	fi
 
-		if use doc; then
-			mv ${D}/usr/share/doc/${PF}/reference/html \
-		   		${D}/usr/share/doc/${PF}/
+	if ! use jack-tmpfs; then
+		keepdir /var/run/jack
+		chmod 4777 ${D}/var/run/jack
+	fi
 
-			insinto /usr/share/doc/${PF}
-			doins -r ${S}/example-clients
-		else
-			rm -rf ${D}/usr/share/doc
-		fi
+	if use doc; then
+		mv ${D}/usr/share/doc/${PF}/reference/html \
+		   ${D}/usr/share/doc/${PF}/
 
-		rm -rf ${D}/usr/share/doc/${PF}/reference
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/example-clients"
+	else
+		rm -rf ${D}/usr/share/doc
+	fi
 
+	rm -rf ${D}/usr/share/doc/${PF}/reference
+
+	if use netjack; then
+		cd "${WORKDIR}/${NETJACK}"
+		dobin alsa_in
+		dobin alsa_out
+		dobin jacknet_client
+		insinto /usr/$(get_libdir)/jack
+		doins jack_net.so
 	fi
 }


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/