Closing documentation bug 35749, essentially USE='-doc' not being abided by currectly. patch is being sent upstream, so sys-devel/autoconf as a dep won't be needed if it's accepted.

1 files changed, 16 insertions, 12 deletions

diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.94.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.94.0.ebuild
index 233b93fa2490..fe023fbf6163 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.94.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.94.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.94.0.ebuild,v 1.1 2004/01/19 07:48:09 torbenh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.94.0.ebuild,v 1.2 2004/02/04 21:45:53 ferringb Exp $
 
 inherit flag-o-matic
 
@@ -21,24 +21,30 @@ DEPEND=">=media-libs/alsa-lib-0.9.1
 	sys-libs/ncurses
 	jack-caps? ( sys-libs/libcap )
 	doc? ( app-doc/doxygen )
+	sys-devel/autoconf
 	!media-sound/jack-cvs"
 
 PROVIDE="virtual/jack"
 
-
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-doc-option.patch || \
+		die "Documentation configure option patch failed"
+	autoconf || die "Couldn't regenerate configure file, failing"
+}
 
 src_compile() {
 	local myconf
 	local myarch
 
-
 	myarch=`get-flag -march`
 
 	cd $S
 	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $myarch\"/" configure
 	use doc \
-		&& myconf="--with-html-dir=/usr/share/doc/${PF}/html" \
-		|| myconf="--without-html-dir"
+		&& myconf="--enable-html-docs --with-html-dir=/usr/share/doc/${PF}" \
+		|| myconf="--disable-html-docs"
 
 	use jack-tmpfs && myconf="${myconf} --with-default-tmpdir=/dev/shm"
 	use jack-caps && myconf="${myconf} --enable-capabilities --enable-stripped-jackd"
@@ -51,15 +57,13 @@ src_compile() {
 }
 
 src_install() {
-
-	use doc && dodir /usr/share/doc/${PF}/html
-
 	make DESTDIR=${D} \
 		datadir=${D}/usr/share \
 		install || die
 
-	use doc && mv \
-		${D}/usr/share/jack-audio-connection-kit/reference/html/* \
-		${D}/usr/share/doc/${PF}/html
-	use doc && rm -rf ${D}/usr/share/jack-audio-connection-kit
+	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
+	fi
 }