Don't assume optimized... let users set CFLAGS... --enable-optimize breaks sometimes. Closes bug #73406.

4 files changed, 105 insertions, 7 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 9f163f248e50..d5360b9077d6 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,14 @@
 # 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.48 2004/12/04 21:09:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.49 2004/12/06 07:33:24 eradicator Exp $
+
+*jack-audio-connection-kit-0.99.0-r1 (05 Dec 2004)
+
+  05 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +jack-audio-connection-kit-0.99.0-r1.ebuild,
+  -jack-audio-connection-kit-0.99.0.ebuild:
+  Don't assume optimized... let users set CFLAGS... --enable-optimize breaks
+  sometimes. Closes bug #73406.
 
   04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   jack-audio-connection-kit-0.99.0.ebuild:
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 76845e79faf0..3a09973b1f35 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0fb1698146f79955d4d0eb2e219bec24 ChangeLog 10374
+MD5 701d6fe42896b7f64356f6e40ca2c7d3 ChangeLog 10471
 MD5 365f9493d00d9412d572b6a392bfbc51 jack-audio-connection-kit-0.80.0.ebuild 1775
-MD5 cc0c962dd750fd28d216e2ad14e4bff5 jack-audio-connection-kit-0.99.0.ebuild 2491
+MD5 710c7cededde4775b22336b26d53fe0f jack-audio-connection-kit-0.99.0-r1.ebuild 2405
 MD5 66bb10414721c40dd93bebd1d3f7e9b9 jack-audio-connection-kit-0.98.1-r1.ebuild 2120
 MD5 bf663ce8a92c2873735ff360edf99f5a metadata.xml 220
-MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0 84
 MD5 9068d5fd09d15355ad0ff859b82f5038 files/digest-jack-audio-connection-kit-0.80.0 84
+MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r1 84
 MD5 1081e2f37f20874fb10b5a9c183df0b4 files/digest-jack-audio-connection-kit-0.98.1-r1 84
 MD5 b029501b88782a0cca9e2f3d64812e63 files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch 575
 MD5 b5dc5c728b1bdc6c5ebf5e54dc3ca246 files/jack-audio-connection-kit-0.98.1-configure.patch 1459
@@ -15,7 +15,7 @@ MD5 0ad8a4c606e807460bce497d044044ef files/jack-audio-connection-kit-doc-option.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBsieXArHZZzCEUG0RAlLXAJ9uZu4e45dby9o6K8yh9k2JLox/EwCfS5hc
-N4O/7+Y+6WMFL3D2dh8aQ+A=
-=dl4J
+iD8DBQFBtAt4ArHZZzCEUG0RAoIkAJ9/4BBu7dbvMyYD9xza0J1DJOWwCQCfbrsN
+1LYWygdMg2ZSX5cSAjV3xWY=
+=UqRy
 -----END PGP SIGNATURE-----
diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r1
index f88826337eed..f88826337eed 100644
--- a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0
+++ b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r1
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild
new file mode 100644
index 000000000000..53e8dad9ceba
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild
@@ -0,0 +1,90 @@
+# 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-r1.ebuild,v 1.1 2004/12/06 07:33:24 eradicator Exp $
+
+IUSE="altivec alsa caps doc debug jack-tmpfs oss portaudio"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://jackit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos sparc x86"
+
+RDEPEND=">=media-libs/libsndfile-1.0.0
+	dev-libs/glib
+	dev-util/pkgconfig
+	sys-libs/ncurses
+	!ppc64? ( !alpha? ( !ia64? ( portaudio? ( media-libs/portaudio ) ) ) )
+	!sparc? ( alsa? ( >=media-libs/alsa-lib-0.9.1 ) )
+	caps? ( sys-libs/libcap )
+	!media-sound/jack-cvs"
+
+DEPEND="${RDEPEND}
+	!ppc-macos? ( sys-devel/autoconf )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if use !ppc-macos ; then
+		# Add doc option and fix --march=pentium2 in caps test
+		epatch ${FILESDIR}/${PN}-0.98.1-configure.patch && WANT_AUTOCONF=2.5 autoconf \
+			|| die
+	fi
+}
+
+src_compile() {
+	local myconf
+	local myarch
+
+	myarch=`get-flag -march`
+
+	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $myarch\"/" configure
+	use doc \
+		&& myconf="--enable-html-docs --with-html-dir=/usr/share/doc/${PF}" \
+		|| myconf="--disable-html-docs"
+
+	if use jack-tmpfs; then
+		myconf="${myconf} --with-default-tmpdir=/dev/shm"
+	else
+		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
+	fi
+
+	use caps && myconf="${myconf} --enable-capabilities --enable-stripped-jackd"
+	use debug && myconf="${myconf} --enable-debug"
+
+	myconf="${myconf} `use_enable altivec` `use_enable alsa` `use_enable oss` `use_enable portaudio`"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "compilation failed"
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		datadir=${D}/usr/share \
+		program_transform_name="s,x,x," \
+		install || die
+
+	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}/
+	fi
+
+	rm -rf ${D}/usr/share/doc/${PF}/reference
+}
+
+#pkg_postinst() {
+#	einfo "Because of some ABI changes in jack, you may need to re-emerge."
+#	einfo "packages that use jack by running the following:"
+#	einfo "  revdep-rebuild --soname libjack.so.0"
+#}