remove old

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

6 files changed, 8 insertions, 274 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 63e727d1678e..80e7819c8814 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.148 2013/02/14 16:05:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.149 2013/02/14 16:08:32 aballier Exp $
+
+  14 Feb 2013; Alexis Ballier <aballier@gentoo.org>
+  -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.2-r1.ebuild,
+  -files/jack-audio-connection-kit-transport.patch:
+  remove old
 
   14 Feb 2013; Alexis Ballier <aballier@gentoo.org>
   jack-audio-connection-kit-0.121.3.ebuild:
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-ppc64fix.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-ppc64fix.patch
deleted file mode 100644
index f0d148413518..000000000000
--- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-ppc64fix.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- 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;
- }
- 
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-riceitdown.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-riceitdown.patch
deleted file mode 100644
index 35d6de51d532..000000000000
--- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.103.0-riceitdown.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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"
- 
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-transport.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-transport.patch
deleted file mode 100644
index 74860d76b933..000000000000
--- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-transport.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- example-clients/transport.c	2005-06-02 13:31:18 -0500
-+++ example-clients/transport.c-new	2005-08-05 11:24:11 -0500
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <readline/readline.h>
- #include <readline/history.h>
-+#include <readline/chardefs.h>
- #include <jack/jack.h>
- #include <jack/transport.h>
- 
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r1.ebuild
deleted file mode 100644
index 54d582a4a6db..000000000000
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r1.ebuild,v 1.11 2012/05/05 08:31:44 mgorny Exp $
-
-inherit flag-o-matic eutils multilib linux-info autotools 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 ppc ppc64 sh sparc x86"
-IUSE="altivec alsa caps coreaudio doc debug mmx oss sse netjack cpudetection"
-
-RDEPEND=">=media-libs/libsndfile-1.0.0
-	sys-libs/ncurses
-	caps? ( sys-libs/libcap )
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )
-	netjack? ( media-libs/libsamplerate )
-	!media-sound/jack-cvs"
-DEPEND="${RDEPEND}
-	virtual/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"
-	epatch "${FILESDIR}/${PN}-0.103.0-riceitdown.patch"
-	epatch "${FILESDIR}/${PN}-0.103.0-ppc64fix.patch"
-	epatch "${FILESDIR}/${PN}-sparc-cpuinfo.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	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
-
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
-	econf \
-		$(use_enable altivec) \
-		$(use_enable alsa) \
-		$(use_enable caps capabilities) \
-		$(use_enable coreaudio) \
-		$(use_enable debug) \
-		$(use_enable mmx) \
-		$(use_enable oss) \
-		--disable-portaudio \
-		$(use_enable sse) \
-		--with-html-dir=/usr/share/doc/${PF} \
-		--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() {
-	make DESTDIR="${D}" install || die
-
-	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
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/example-clients"
-	fi
-
-	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
-}
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index 7d8d867dca58..63276d7c70ea 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -5,7 +5,6 @@
   <use>
     <flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
     <flag name="cpudetection">Enables runtime cpudetection</flag>
-    <flag name="netjack">Build with support for Realtime Audio Transport over generic IP</flag>
 	<flag name="pam">Add basic realime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
   </use>
 </pkgmetadata>