cleaned up the 0.99.0-r2 ebuild, added a patch to install the jackstart command (again). fixes #92895

(Portage version: 2.0.51.22-r1)

4 files changed, 47 insertions, 33 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 3ba9feac6a0b..3af1c631d65d 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.54 2005/05/09 13:21:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.55 2005/05/21 15:42:58 luckyduck Exp $
+
+  21 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/jack-audio-connection-kit-0.99.0-jackstart.patch,
+  jack-audio-connection-kit-0.99.0-r2.ebuild:
+  cleaned up the 0.99.0-r2 ebuild, added a patch to install the jackstart
+  command (again). fixes #92895
 
   09 May 2005; Aron Griffis <agriffis@gentoo.org>
   jack-audio-connection-kit-0.99.0-r2.ebuild:
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index e72c1cae725d..e5fe9a223293 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,12 +1,13 @@
 MD5 f0827e76ff76f7f81eb8b263f1f7908b jack-audio-connection-kit-0.99.0-r1.ebuild 2403
 MD5 0d56eae2a04a15dbe5e7ca024a87a097 jack-audio-connection-kit-0.80.0.ebuild 1771
 MD5 4ee3c27feb88ab9f33c934e0262fbc45 jack-audio-connection-kit-0.98.1-r1.ebuild 2116
-MD5 8002654dc4b5fb7d501dcec11ee3f5db jack-audio-connection-kit-0.99.0-r2.ebuild 2470
-MD5 b4bbd9a182f7e4dbf1307a904b19f1c1 ChangeLog 11035
+MD5 8aaefefba20c42adef4a6ed97bba4451 jack-audio-connection-kit-0.99.0-r2.ebuild 2285
+MD5 740d80b74cd61cfc528fd17073be2e28 ChangeLog 11299
 MD5 bf663ce8a92c2873735ff360edf99f5a metadata.xml 220
 MD5 1081e2f37f20874fb10b5a9c183df0b4 files/digest-jack-audio-connection-kit-0.98.1-r1 84
 MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r1 84
 MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r2 84
+MD5 cb8756e396d8d311dbcd4440fd483fc9 files/jack-audio-connection-kit-0.99.0-jackstart.patch 515
 MD5 b5dc5c728b1bdc6c5ebf5e54dc3ca246 files/jack-audio-connection-kit-0.98.1-configure.patch 1459
 MD5 0ad8a4c606e807460bce497d044044ef files/jack-audio-connection-kit-doc-option.patch 1103
 MD5 b029501b88782a0cca9e2f3d64812e63 files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch 575
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.99.0-jackstart.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.99.0-jackstart.patch
new file mode 100644
index 000000000000..c9c1df5f8b12
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.99.0-jackstart.patch
@@ -0,0 +1,12 @@
+diff -uprN jackd.orig/Makefile.in jackd/Makefile.in
+--- jackd.orig/Makefile.in	2005-05-21 17:24:19.000000000 +0200
++++ jackd/Makefile.in	2005-05-21 17:24:48.000000000 +0200
+@@ -38,7 +38,7 @@ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-bin_PROGRAMS = jackd$(EXEEXT) $(am__EXEEXT_1)
++bin_PROGRAMS = jackstart$(EXEEXT) jackd$(EXEEXT) $(am__EXEEXT_1)
+ subdir = jackd
+ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/jackd.1.in ChangeLog
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild
index 24d87e0325d1..e7ed423af06a 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 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-r2.ebuild,v 1.2 2005/05/09 13:21:42 agriffis Exp $
-
-IUSE="altivec alsa caps doc debug jack-tmpfs oss portaudio"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild,v 1.3 2005/05/21 15:42:58 luckyduck Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,16 +11,16 @@ SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~ppc-macos ppc64 ~sparc ~x86"
+IUSE="altivec alsa caps doc debug jack-tmpfs oss portaudio"
 
-RDEPEND=">=media-libs/libsndfile-1.0.0
-	dev-libs/glib
+RDEPEND="dev-libs/glib
 	dev-util/pkgconfig
+	>=media-libs/libsndfile-1.0.0
 	sys-libs/ncurses
+	caps? ( sys-libs/libcap )
 	!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 )"
@@ -33,21 +31,24 @@ src_unpack() {
 
 	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
+		epatch ${FILESDIR}/${PN}-0.98.1-configure.patch && \
+		WANT_AUTOCONF=2.5 autoconf
 	fi
+
+	# compile and install jackstart, see #92895
+	epatch ${FILESDIR}/${P}-jackstart.patch
 }
 
 src_compile() {
 	local myconf
-	local myarch
 
-	myarch=`get-flag -march`
+	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
 
-	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 doc; then
+		myconf="--enable-html-docs --with-html-dir=/usr/share/doc/${PF}"
+	else
+		myconf="--disable-html-docs"
+	fi
 
 	if use jack-tmpfs; then
 		myconf="${myconf} --with-default-tmpdir=/dev/shm"
@@ -55,19 +56,19 @@ src_compile() {
 		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"
+	econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
+		$(use_enable debug) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		${myconf} || die "configure failed"
 	emake || die "compilation failed"
 }
 
 src_install() {
-	make DESTDIR=${D} \
-		datadir=${D}/usr/share \
-		install || die
+	make DESTDIR=${D} datadir=${D}/usr/share install || die
 
 	if ! use jack-tmpfs; then
 		keepdir /var/run/jack
@@ -84,9 +85,3 @@ src_install() {
 
 	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"
-#}