[proaudio] [2275] jack-audio-connection-kit-2.9999: fixed the doc, added opus support, added missing files and USE descriptions

[subversion@xxxxxxxxxxxxx]

Revision: 2275
Author:   dominique
Date:     2012-11-09 19:25:22 +0100 (Fri, 09 Nov 2012)
Log Message:
-----------
jack-audio-connection-kit-2.9999: fixed the doc, added opus support, added missing files and USE descriptions

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2012-11-09 00:01:36 UTC (rev 2274)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2012-11-09 18:25:22 UTC (rev 2275)
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  jack-audio-connection-kit-2.9999.ebuild: fix for the doxygen documenation;
+  added opus support in netjack, will be enabled if media-libs/opus is present;
+  added installation of the missing doc files (README, ...)
+
+  metadata.xml: added the missing USE descriptions for 2-9999
+
   08 Nov 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
   jack-audio-connection-kit-1.9.8.ebuild: changed SRC_URI (thanks to Jannis Achstetter
   jack-audio-connection-kit-1.9999.ebuild: changed to GIT (Jannis)

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2012-11-09 00:01:36 UTC (rev 2274)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2012-11-09 18:25:22 UTC (rev 2275)
@@ -7,6 +7,6 @@
 EBUILD jack-audio-connection-kit-0.121.3.ebuild 2192 SHA256 b3ee7ca66d9d49f0bbbfac825c9b049beff363686c7ac794e680a5a348087efc SHA512 395a8599bd1997afc8c00f1b81f6bc8d4fcd85ae7cdde0bcff5c249c72f43b4e541f20beb8c4528dcb8547ef2d4d5bcc18c57ee1443399804559eb6851dee38a WHIRLPOOL e67c06959b0eab286827e4b6963718bf7d1ffbf166c38f293599eac1ac048d95a6535a871ff7007e453ba50a5aa43545cc7cff639b0544b494acd925471cbe89
 EBUILD jack-audio-connection-kit-1.9.8.ebuild 1757 SHA256 58241604a5b16cb041882facc04ccc6b4bede3078ba1363f5f535ecf4f0f1f36 SHA512 b40d4664d007bc86a03fcc1e81e873bf611fddb6479ec8ec84c45c5a0ec282e10808c9a86162379bc6a5e622309d18bc1ec23ea63000e9be127e16d80f9a58cf WHIRLPOOL 8bd070ea30d333883e8e0eda404bb3911ebd9e8a79f58d5123a59dbc059366446632ca2584a3a21b55459eabdf3f1d70bb1b2ac2b59b15d65dc41c0a732d602e
 EBUILD jack-audio-connection-kit-1.9999.ebuild 2653 SHA256 879bd96e2eccb0692092709b3b98b64ae49bf6ff82ebd02ae80a2ed8574f1459 SHA512 1f14e384fd3d1f1a07a02f9c983311abce4335d53219523d7c3c2433eb949d0817b713034889412abf8f66beaf3edb032bc3fe3ecb64e986d1b5304b87c09fe7 WHIRLPOOL 9c278d44f41e54a5f0911844f3e694cca3138a110cf1e56da921d5446239feeb58614476c022fdc9c3c8f88bd0c786e4a2f80e106343ca2d2551d43b786c5f8f
-EBUILD jack-audio-connection-kit-2.9999.ebuild 1658 SHA256 a4e1aac71ddd88f34ec976644cba4c5e8281f34a816661359ee83aed6c19978b SHA512 8484f25b1a7b575252df679200a630c7b6766e5c48ff927a21eb01fde9bccc46baf1459859779d4f6006034723046e8c7ab402605a1d43e423de22556beff334 WHIRLPOOL 35e21b50df95622eaf7b5115d0cf14927104f62299f9249e72d0c653a82c5db046215080432e699364bd673457c574024f4a037f5a544a6fc76475c4f02e7754
-MISC ChangeLog 8917 SHA256 6ada8da1031560efc90917512d722e76d38d1ff9b4c42977ddb90964353c9c73 SHA512 e701f5de41dd6ddda8f6996f3894c8fdcbc1474f70c8d7780640f9a3e0dcc5c637b3d4f004a7174df6691d1033159616054c076a1f3cf68b7633a6652bc3264c WHIRLPOOL 98bb3906b5cac57d9e6dcbc521c5af442b3f1f409f9ad8d666a83c1a048935b4cf834f0b3f608f1ff1ae1a9d2b4ae40eaa353aee48e4026929428bdab06701b0
-MISC metadata.xml 701 SHA256 d9ae8956f71661ed30417bd1a2d5e21d7002dfdf0ec08b68c0c9dafef41e93a9 SHA512 3126b01791f3480eaa4addfc016f54c9f78ccad20c6176ae85308e635ae196d06f6e16f92de962998e8e4ce0870c6dd8a7591cfd0a1917f9d7deb25dcc4f8108 WHIRLPOOL a265382bcd1edc1ae9d5ab19a63f6b973189314b00dc1e0e0bc98ca338d6c69d9ec2dd67a7334344733fabda4ec31e05b7be8a8041541c7b6359a5b156b212c3
+EBUILD jack-audio-connection-kit-2.9999.ebuild 1828 SHA256 af7cc52de90831419c90bebf7966575959519f3e165e711abc0fc76beb44e5a1 SHA512 661357271dacac6365534503339f8bb05eac7fd56e53a9d1dd4c1544fa5e0bb283ef8b06155fde799898e175d9cacca57186125e009f8928f108dbb46690f307 WHIRLPOOL 081fcbad0ca326b33a3d1a324993c718da2701cc67124bcc9b928cca809488d58c90351c7d54da0e40f01db6960262f642b799a27750361d33507b79120f6500
+MISC ChangeLog 9264 SHA256 56e4c4099e9accd36b1211f71d1ba4e2f3f060374db82fb7e63c7e6427db0fc9 SHA512 6cd3590f91660bd26ecacd472a8ac1bdca52e5855139032035ee899172d0f2cf7ba46be2319813b7fd85bfc372cc1e033d51e17c1e9d826e92db5988b0fd6a2b WHIRLPOOL 9c0b84321f76c83e016ba7fb12270355fe1826400995ac20a9743a8b1cc693c2e29c297175da288e0808a053f1d6d0ff2c5a7f9d149a5e6dbfeb8312b9275944
+MISC metadata.xml 876 SHA256 b2c226737c92a2a6db4522b34ff4083b83bf80e7dd0b00eb0a6ae5f51caa6491 SHA512 8d9128dbaee85f8c87048b5677e6797b22e242babaa505dab461468fad11ef0d30b13d5dc4f1d6d88b4e4b63eba8f2038c09e242b01d6480aa81c09f5467fb76 WHIRLPOOL 8dac192f7d9e5643e1afa0191281c999c8d21a3144f59ab4627873ed20da1e6c34076ba65a3a3401de6cef681196789d5668619bcb9adfa4f6c403551cbae866

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild	2012-11-09 00:01:36 UTC (rev 2274)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild	2012-11-09 18:25:22 UTC (rev 2275)
@@ -16,10 +16,12 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa classic doc debug freebob dbus ieee1394 mixed pam"
+# celt has been merged into opus and is obsolate -> no celt support
+IUSE="alsa classic debug doc dbus freebob ieee1394 mixed opus pam"
 
 RDEPEND="dev-util/pkgconfig
 	>=media-libs/alsa-lib-1.0.24
+	opus? ( media-libs/opus )
 	pam? ( sys-auth/realtime-base )"
 DEPEND="${RDEPEND}
 	freebob? ( sys-libs/libfreebob !media-libs/libffado )
@@ -33,10 +35,6 @@
 }
 
 pkg_setup() {
-	if use doc; then
-		ewarn "${PN} will fail to compile with USE=doc"
-		die "Please merge ${PN} with USE=\"-doc\""
-	fi
 	python_set_active_version 2
 	python_pkg_setup
 }
@@ -59,7 +57,6 @@
 	fi
 	use dbus && myconf="${myconf} --dbus"
 	use debug && myconf="${myconf} --debug"
-	use doc && myconf="${myconf} --doxygen"
 	use freebob && myconf="${myconf} --freebob"
 	use ieee1394 && myconf="${myconf} --firewire"
 
@@ -67,7 +64,17 @@
 	waf-utils_src_configure  ${myconf}
 }
 
-src_compile()
-{
+src_compile() {
 	waf-utils_src_compile
+	if use doc ; then
+		doxygen || die "doxygen failed"
+	fi
 }
+
+src_install() {
+	waf-utils_src_install
+	dodoc ChangeLog README README_NETJACK2 TODO || die "dodoc failed"
+	if use doc ; then
+		dohtml html/* || die "dohtml failed"
+	fi
+}

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml	2012-11-09 00:01:36 UTC (rev 2274)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml	2012-11-09 18:25:22 UTC (rev 2275)
@@ -6,11 +6,14 @@
 		<name>pro-audio overlay team</name>
 	</maintainer>
 	<use>
+		<flag name="classic">Build jackd</flag>
 		<flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
 		<flag name="cpudetection">Enables runtime cpudetection</flag>
+		<flag name="dbus">Build jackdbus</flag>
 		<flag name="freebob">enables support for older 'BeBoB' ieee1394</flag>
 		<flag name="ieee1394">enables support for FFADO - 'BeBoB'</flag>
 		<flag name="mixed">build with 32/64 bits mixed mode</flag>
+		<flag name="opus">build with compression support using media-libs/opus in netjack</flag>
 		<flag name="pam">Add basic realime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
 	</use>
 </pkgmetadata>