Migrate to multilib and fix the ncurses dep when readline gets picked up by default.

Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 95 insertions, 16 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 5a19d2c11670..bc3909aa803e 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.150 2013/05/13 03:40:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.151 2013/07/29 23:39:25 aballier Exp $
+
+*jack-audio-connection-kit-0.121.3-r1 (29 Jul 2013)
+
+  29 Jul 2013; Alexis Ballier <aballier@gentoo.org>
+  +jack-audio-connection-kit-0.121.3-r1.ebuild:
+  Migrate to multilib and fix the ncurses dep when readline gets picked up by
+  default.
 
   13 May 2013; Anthony G. Basile <blueness@gentoo.org>
   jack-audio-connection-kit-0.121.3.ebuild:
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 1b172e0c46bc..4a405789966a 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -4,23 +4,14 @@ Hash: SHA256
 AUX jack-audio-connection-kit-freebsd.patch 496 SHA256 7834f5ec198f8e69e2ac119fc2c4ee349ed7e38d003e473fcb41257e7b605df8 SHA512 7c0cf60ddd3d07e12e036082ab10299308d1e112c6190d008a739ab0374c8ecf9e2dcb703055a58f8098e5187044e2351a1786271cecdeae23cbed72e6d68cd6 WHIRLPOOL 3d11baf0f4ebe0613c378d79efcb6b81f94c28e9070471b9a496dda5f0ba90a2eac1e789a621d7ec5d109f018a7f67b0adbd53bbce9e059f3e18b04ca4fb7cd1
 AUX jack-audio-connection-kit-sparc-cpuinfo.patch 659 SHA256 256d48109d32ce8af89042401508392fbb90c499d4cf8b056104dc1a47522fe5 SHA512 c5964413c99fb1dd20dfe52dd40f857dab1cef123b26f74500e2f5607eda870b563595d39c4e4e0684428971e7295c847253d045b2d9ba0183f358630cfa9888 WHIRLPOOL 01d88bfce0394628fab10c48a4b80f0a025b741c5785f05bd22658fd95594e472439f569a450043cf7cc53700149d0d8b785bb7adc74711474fd3f6bcbc6d66f
 DIST jack-audio-connection-kit-0.121.3.tar.gz 1083545 SHA256 b7095d3deabeecd19772b37241e89c6c79de6afd6c031ba7567513cfe51beafa SHA512 57323393d5209baefe73cc0cd9a0e818b1cfd260cf9aa36cd6ad800252e22e3ddb7fc46649c54b8e840696878147c2d06c8d39fd7300b5bb92aeb69f44ed710f WHIRLPOOL a256cfb7c3546cb06d6003313802b02812d8da9c13671be9b0341a10442cd348a8b3f7fe65e8d27cc47b4e29ded799fa6cc0efa51d81d01f342c7c8eefbc9c55
+EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2430 SHA256 6d4d4ae2d35a386ed76fef5c686a6588d1f6454da5cb5a9bbfc3a7960d17d22d SHA512 b5b8f1a284e0f18a58d09e15ec86a7f70d17482acd6b621359baf410badcf7ea307db8b56d3a9bdf2d96025e9c573cf1d85cb160fbca3e660cc6e0af8407a564 WHIRLPOOL 20d6bae7d2593ed65e6387de79ee1bd413b010eec74c63a215b74299cb353bd0ff4c3720f9fab2c2e785930e5f75fb89decbaad9515a557822f3f71fee4a441f
 EBUILD jack-audio-connection-kit-0.121.3.ebuild 1982 SHA256 1ed513a508d4605dc554c6c02756e78658446e2263782b0e8e4d8ae66e8f1f6a SHA512 d9eb6a3cc1f341842ebfbe0052f71fc3bac23da6cfbbf04b6da62cc66984b2d40dabd66a698162806d2357837933f64b95d8fa305b009909963283833963e6e7 WHIRLPOOL 6a8c50df585c7b198bcb19ac3a9000b4fe930beb9016c4d92184a1282cb4ca22f91c2080b71704aeebef9a9089b2f7e93e6a2bfd99e061ba1afb2d6c0642d497
-MISC ChangeLog 28548 SHA256 b0849b155632bd7b908deb3e76ba9701e5f154d73f24cb9e6982ccaca3818736 SHA512 e033a82a0c246bbf25955c0060adcc84116d346af0dd0cc6d9be9b6622a5bcd2e8331470b5fbf258f5cc66cce1b1eb7e29ce1911db66d38dbe878d921d70ecbd WHIRLPOOL 3b03def9bef75ac4ed65c1f6e61ba413ab17d33d54b546f037fc86f564474706b3893224fb869702f082bdd299b43a66b08af2176b0454cc2e3f7c1965802358
+MISC ChangeLog 28791 SHA256 bf86c42adb49823a30677fc620483229712b534c3aaf86e9f839b4b22405aae8 SHA512 be831f11e610260f47d38e89c038091465039a7b487bcf8947451737829135767816a72789bc3d172ea439d1795c9bd1e6eb2980a0f610fc3ec5af8d782b9100 WHIRLPOOL 258ba452055e93dd9725a35c4e8a36fc8583084947c8a735dbbd946a2e602d98a0f9e9e5dff921e6858e8e77219aec06ef51bb71bdda00b721f7e78fe26f2aa0
 MISC metadata.xml 422 SHA256 5a942b307034ee9603ae709e346c2d3ebabcfb79644ec0fbd2b61ca443a3f041 SHA512 c24ed7fae069cd355ba4e6fac0936c86b9712969d9d6861b35ceedea59216c1dc1015adc36b369680bc98a0bdce98b24d3d17707e3968d0beea8364a6deb5319 WHIRLPOOL 59fd0d8275a0d48ba56f91e783311ee4c445bb4d6cc69f099f7c7ff34f811daf5879845e0207b80e78560bb5404b40e9a29d05ae03b4b03c7770a477518bc02d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRkGCsAAoJEJOE+m71LUu67xoP/3M+vwZV5YWC/qVJNnJJg3Nq
-etjVsEhIWbgp5tN/rtW1/VXTivmfjhQiKSPThIikiYSntBXmmmKaFA6CEx3qVQ4C
-cWR8qZ9WLOXJS69FLO5EvwcPUTcJstnzLH7KkpShsEaeBEavOr6yLSlmOTBbd8Qt
-eehUSpbA3XCEjHhVvh8HNXFZFonrz4VTDOIb0bTqi/n/EGe2yqvolBzkH/yvruQl
-GkniDwXmpIq0GSnxUPsR8X+ZSpEIEid452pm0ZQQ8Qq4pJ2YQoviEFpD4hmCqly6
-rkXLQlSm2Dzg8AIpA749p3Z8ht9Gxh8rAiGsK6ZxHOfF5ImHOXx+3T6TYlRfJoBH
-TKYh6Eq3DH4ouE/Jwt2QKL+b93TZ7lzKeOyoWTNpnVkMvqh3mWn5FOjilS9A2ms6
-JEM9sP08I8Dft1bDL1uld41KBUwPauI63iEcGk161rpmBLCJBcWVb5j4lbfNsUTA
-3WBCjlP9+0Bs4wOkSXo8yX1TwoIHH12jLzXNviEw3O5rG3W+52PTVvNdZjRfbcGg
-hwSc53OkKi84WJcwKaUjIdXGz6qTtIJnC8T+BeNEQwFY8PcwyjnnBawW0KtlmmUf
-MS+1wi2Qvk2qpYl5kp3R2B2e2giDwVp04V3jjlvtmZLcs/1kJAcoidv2y6QorVVW
-C/F2i+6cBifidsmDjTAm
-=zAuU
+iEYEAREIAAYFAlH2/S8ACgkQvFcC4BYPU0p0zwCgtQ+AazbcNkmhglsY8B9LFh0t
+TVEAnj3DgAYFtKJ0v2fRAKVLGKqOXNvl
+=iCnZ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
new file mode 100644
index 000000000000..2f6c2cd242ae
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 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.121.3-r1.ebuild,v 1.1 2013/07/29 23:39:25 aballier Exp $
+
+EAPI=5
+
+inherit flag-o-matic eutils multilib multilib-minimal
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org"
+SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="3dnow altivec alsa coreaudio doc debug examples mmx oss sse cpudetection pam"
+
+# readline: only used for jack_transport -> useless for non native ABIs
+# libsndfile: ditto for jackrec
+RDEPEND="
+	sys-libs/readline
+	>=media-libs/libsndfile-1.0.0
+	alsa? ( >=media-libs/alsa-lib-1.0.18[${MULTILIB_USEDEP}] )
+	media-libs/libsamplerate[${MULTILIB_USEDEP}]
+	!media-sound/jack-cvs
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${RDEPEND}
+	alsa? ( sys-process/lsof )
+	pam? ( sys-auth/realtime-base )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-sparc-cpuinfo.patch"
+	epatch "${FILESDIR}/${PN}-freebsd.patch"
+}
+
+DOCS=( AUTHORS TODO README )
+
+multilib_src_configure() {
+	local myconf=""
+
+	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
+	if use cpudetection && use 3dnow && use mmx && use sse ; then
+		einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
+		myconf="${myconf} --enable-dynsimd"
+		append-flags -mmmx -msse -m3dnow -O2
+	fi
+
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable mmx) \
+		$(use_enable oss) \
+		--disable-portaudio \
+		$(use_enable sse) \
+		--with-html-dir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--libdir=/usr/$(get_libdir) \
+		${myconf}
+
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		for i in tools man ; do
+			sed -i -e "s/ ${i}//" Makefile || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/example-clients"
+		docompress -x /usr/share/doc/${PF}/example-clients
+	fi
+}