ebuild cleanup. Readded missing archs to KEYWORDS.

4 files changed, 17 insertions, 53 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 92c3af34e8e3..fd70611acedd 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.40 2004/09/22 18:19:34 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.41 2004/09/22 21:09:36 eradicator Exp $
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/jack-audio-connection-kit-configure.patch,
+  jack-audio-connection-kit-0.99.0.ebuild:
+  ebuild cleanup.  Readded missing archs to KEYWORDS.
 
 *jack-audio-connection-kit-0.99.0 (22 Sep 2004)
 
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-configure.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-configure.patch
deleted file mode 100644
index 69974111076c..000000000000
--- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-configure.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- configure.in.orig	2004-04-20 16:28:13.000000000 -0700
-+++ configure.in	2004-05-04 20:21:45.418353000 -0700
-@@ -149,8 +149,7 @@
- 
- JACK_CORE_CFLAGS="-I\$(top_builddir)/config -I\$(top_srcdir) \
- -I\$(top_builddir) -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall"
--JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS -g -march=pentium2 -mcpu=pentium4 -O3 \
---ffast-math -funroll-loops -fprefetch-loop-arrays"
-+JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS -g -O3 -ffast-math -funroll-loops -fprefetch-loop-arrays"
- JACK_CFLAGS="$JACK_CORE_CFLAGS $CFLAGS"
- 
- dnl
-@@ -514,10 +513,26 @@
- fi
- AC_SUBST(READLINE_DEPS)
- 
--# you need doxygen to make dist.
--AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
--if test $HAVE_DOXYGEN = "false"; then
--             AC_MSG_WARN([*** doxygen not found, docs will not be built])
-+AC_ARG_ENABLE(html-docs,
-+	[  --enable-html-docs    build the html documentation (default yes)],
-+        [ if test "x$enable_html_docs" != "xno" ; then
-+                ENABLE_HTML_DOCS="yes"
-+		AC_MSG_RESULT([JACK will build html docs])
-+	else
-+		AC_MSG_RESULT([JACK will not build html docs])
-+	fi;
-+        ], 
-+	[ ENABLE_HTML_DOCS="yes"; ]
-+)
-+
-+if test "$ENABLE_HTML_DOCS" == "yes" ; then
-+	# you need doxygen to make dist.
-+	AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
-+	if test $HAVE_DOXYGEN == "false"; then
-+		AC_MSG_ERROR([*** doxygen not found, unable to build docs.])
-+	fi
-+else
-+	HAVE_DOXYGEN="false"
- fi
- 
- AM_CONDITIONAL(HAVE_SNDFILE, $HAVE_SNDFILE)
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild
index 64b6e6c69ce4..fe003cbf790f 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.98.1-r1.ebuild,v 1.7 2004/09/02 13:41:12 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1-r1.ebuild,v 1.8 2004/09/22 21:09:36 eradicator Exp $
 
 IUSE="doc debug jack-tmpfs caps"
 
@@ -9,7 +9,6 @@ inherit flag-o-matic eutils
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://jackit.sourceforge.net/"
 SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0.ebuild
index 1524cae20866..eb42fa3c78b5 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.99.0.ebuild,v 1.1 2004/09/22 18:19:34 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0.ebuild,v 1.2 2004/09/22 21:09:36 eradicator Exp $
 
 IUSE="doc debug jack-tmpfs caps"
 
@@ -9,29 +9,32 @@ inherit flag-o-matic eutils
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://jackit.sourceforge.net/"
 SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* ~ppc-macos"
+
+#-sparc: 0.98.1-r1: config/sysdeps/cycles.h:27:2: warning: #warning You are compiling JACK on a platform for which jack/cycles.h needs work
+KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~ia64 ~ppc64 -sparc ~ppc-macos"
 
 RDEPEND=">=media-libs/libsndfile-1.0.0
 	dev-libs/glib
 	dev-util/pkgconfig
 	sys-libs/ncurses
-	!ppc-macos? ( alsa? (media-libs/alsa-lib-0.9.1) )
+	!ppc-macos? ( !sparc? ( alsa? ( >=media-libs/alsa-lib-0.9.1 ) ) )
 	!ppc-macos? ( caps? ( sys-libs/libcap ) )
 	!media-sound/jack-cvs"
 
 DEPEND="${RDEPEND}
+	sys-devel/autoconf
 	doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	# Add doc option and fix --march=pentium2 in caps test
-	epatch ${FILESDIR}/${PN}-configure.patch \
-		|| die "Couldn't patch configure file, failing"
+	epatch ${FILESDIR}/${PN}-0.98.1-configure.patch
+	WANT_AUTOCONF=2.5 autoconf || die
 }
 
 src_compile() {
@@ -77,4 +80,4 @@ src_install() {
 	fi
 
 	rm -rf ${D}/usr/share/doc/${PF}/reference
-}
\ No newline at end of file
+}