[proaudio] [2272] Various fixex for jack-audio-connection-kit from Jannis Achstetter; 2-9999: fixed compilation with USE=doc

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 2272
Author:   dominique
Date:     2012-11-08 23:05:24 +0100 (Thu, 08 Nov 2012)
Log Message:
-----------
Various fixex for jack-audio-connection-kit from Jannis Achstetter; 2-9999: fixed compilation with USE=doc

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-1.9.8.ebuild
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999.ebuild
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2012-11-08 13:36:03 UTC (rev 2271)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2012-11-08 22:05:24 UTC (rev 2272)
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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)
+  jack-audio-connection-kit-2.9999.ebuild: fix building with python3 (Jannis);
+  removed outdated test for sandbox-1.6 (Jannis); make the ebuild to fail and issue
+  a warning with USE=doc as it fail to compile with it (reported upstream)
+
   30 Sep 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
   jack-audio-connection-kit-0.121.3.ebuild:
   add back support for freebob and ffado. drop keywords as repoman payment.

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2012-11-08 13:36:03 UTC (rev 2271)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2012-11-08 22:05:24 UTC (rev 2272)
@@ -5,8 +5,8 @@
 DIST jack-audio-connection-kit-0.121.3-dbus.patch 337061 SHA256 da12003ed4528a09d8109ecc7e75f539f0173b23832a1d993800473f1f1d25fd SHA512 9be280a24d59d35bab07da75be407f0790fd36657bfb54d24522337f2a2bc15d6e8a9f88347ff3215ed3e6b32ab827c4e203f5435fefe30c456d638169524192 WHIRLPOOL 37b6a58c5103ff23e606e3dfd0b5ec2630b86f88ddb964635050555e64aa4ab687205e8e29add29659f36866d036098bb7d6128e230349adfd096c06cc641709
 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.ebuild 2192 SHA256 b3ee7ca66d9d49f0bbbfac825c9b049beff363686c7ac794e680a5a348087efc SHA512 395a8599bd1997afc8c00f1b81f6bc8d4fcd85ae7cdde0bcff5c249c72f43b4e541f20beb8c4528dcb8547ef2d4d5bcc18c57ee1443399804559eb6851dee38a WHIRLPOOL e67c06959b0eab286827e4b6963718bf7d1ffbf166c38f293599eac1ac048d95a6535a871ff7007e453ba50a5aa43545cc7cff639b0544b494acd925471cbe89
-EBUILD jack-audio-connection-kit-1.9.8.ebuild 2285 SHA256 061f4d878baf2d5374048c25a52c1b5092457ae224d1bab5241446b854f52519 SHA512 d591454e23a23094f1762c5a939f33348ce43df1690f843850fa00ac725754d439824bc025c5619c5d48f765c539d8fcf5d363a359f34dd79a89901ed712f7d7 WHIRLPOOL 579276f230870aa7a698e0e0896c7c5d5abdeb9016702e34308f6c9639cea348bdf9d5019fae2c3d82ca84d2b3d08c79c7225ae6d2fedae152f641b35e8d9026
-EBUILD jack-audio-connection-kit-1.9999.ebuild 2636 SHA256 7bfb3eecabbb999d7697040e7d16177d969587ba643701765ed336fd1665fbe0 SHA512 bdf4352d067955dc012e1fb0db8499e6b97bf435f7b251a6940e1acbbe0a38017c09fbd03acf25ca347c10f1d113fc39e9b153d2cb0ef3fa24d45b820f13bdb0 WHIRLPOOL 2aba09eefb92af77ba4b56f52374ac7585e1ccfd4f8edae2cdc4a791dc1b1e2fb3b1cdc1b489decefde638acaab8b73711269406ecb3b90d3b76dc065351af5c
-EBUILD jack-audio-connection-kit-2.9999.ebuild 2049 SHA256 00e563cc528b7f37306a386cbab1473393520704fbf39068a0a17db5ca059cc9 SHA512 f5b7a9cbc505a82182ebcb37f2f86a0cc7945b081f4e9c221305432917d3ce7e11794e0dd2668bef34b93a2840cbc880b0b0438c800fbd12c39da3bd19a71b1b WHIRLPOOL 88faa3219dcdd93c8384bde546b95aa1608f8cd58fd83bbbce6373c64b2062b14d4131e4c68b04ca540455f2eafddef2dfa922404f359a6b2646f8d7408a172e
-MISC ChangeLog 8458 SHA256 cdcb374a6749eec04b9e19c15c7c1aeafe651c1b9977f5848fb7d226b96454ad SHA512 d15123557ce32539544a05a0c3432366f5f551dfab81194125d40f64f6a11f01a2feb4f2a4437cd82f0064f382bc4933d7d1754a78806583b1e8e316162d5306 WHIRLPOOL 5dcd1add37766291ef5580db82cb86a5175b31d6741f227129a6ba937b4e85e759da24afe0c9f9b646bb83d704b1ba530e3b075c972103cb397b730b0273f266
+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

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.8.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.8.ebuild	2012-11-08 13:36:03 UTC (rev 2271)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.8.ebuild	2012-11-08 22:05:24 UTC (rev 2272)
@@ -4,11 +4,13 @@
 
 EAPI=4
 
-inherit multilib
+PYTHON_DEPEND="2"
 
+inherit multilib python
+
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="http://www.grame.fr/~letz/jack-${PV}.tgz";
+SRC_URI="https://dl.dropbox.com/u/28869550/jack-${PV}.tgz";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,24 +29,8 @@
 S="${WORKDIR}/jack-${PV}/jack-${PV}"
 
 pkg_setup() {
-	# sandbox-1.6 breaks, on amd64 at least
-
-	# paludis...
-	if has_version "=sys-apps/sandbox-1.6" && [[ -n $(echo `ps -fp $$`|grep paludis) ]]; then
-		eerror "The compile will hang with =sandbox-1.6. Either downgrade to sandbox-1.4, or use"
-		eerror "PALUDIS_DO_NOTHING_SANDBOXY=1 paludis -i ${PN}"
-		die
-	fi
-
-	# portage
-	if has "sandbox" ${FEATURES} && ! has "-sandbox" ${FEATURES} && has_version "=sys-apps/sandbox-1.6"; then
-		eerror "The compile will hang with =sandbox-1.6. Please use:"
-		echo
-		eerror "FEATURES=\"-sandbox\" emerge ${PN}"
-		echo
-		eerror "OR downgrade sandbox to 1.4 at least."
-		die
-	fi
+	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999.ebuild	2012-11-08 13:36:03 UTC (rev 2271)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999.ebuild	2012-11-08 22:05:24 UTC (rev 2272)
@@ -2,13 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit flag-o-matic eutils multilib subversion linux-info autotools
+inherit flag-o-matic eutils multilib git-2 linux-info autotools
 
 RESTRICT="nostrip mirror"
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://www.jackaudio.org";
 
-ESVN_REPO_URI="http://subversion.jackaudio.org/jack/trunk/jack";
+EGIT_REPO_URI="git://github.com/jackaudio/jack1.git"
+EGIT_HAS_SUBMODULES="example-clients"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -47,7 +48,7 @@
 		einfo "You requested to install jackdmp. Nothing to do"
 		return # no more to do
 	fi
-	subversion_src_unpack
+	git-2_src_unpack
 
 	cd "${S}"
 	

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-08 13:36:03 UTC (rev 2271)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild	2012-11-08 22:05:24 UTC (rev 2272)
@@ -4,8 +4,10 @@
 
 EAPI=4
 
-inherit git-2 waf-utils
+PYTHON_DEPEND="2"
 
+inherit git-2 waf-utils python
+
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://www.grame.fr/~letz/jackdmp.html";
 
@@ -31,32 +33,22 @@
 }
 
 pkg_setup() {
-	# sandbox-1.6 breaks, on amd64 at least
-
-	# paludis...
-	if has_version "=sys-apps/sandbox-1.6" && [[ -n $(echo `ps -fp $$`|grep paludis) ]]; then
-		eerror "The compile will hang with =sandbox-1.6. You are using paludis,"
-		eerror "so you'll have to downgrade sandbox."
-		die
+	if use doc; then
+		ewarn "${PN} will fail to compile with USE=doc"
+		die "Please merge ${PN} with USE=\"-doc\""
 	fi
-
-	# portage
-	if use amd64 && has "sandbox" ${FEATURES} && ! has "-sandbox" ${FEATURES} && has_version "=sys-apps/sandbox-1.6"; then
-		eerror "The compile will hang with =sandbox-1.6. Please use:"
-		echo
-		eerror "FEATURES=\"-sandbox\" emerge ${PN}"
-		echo
-		eerror "OR downgrade sandbox to 1.4 at least."
-		die
-	fi
+	python_set_active_version 2
+	python_pkg_setup
 }
 
-src_prepare()
-{
-	epatch "${FILESDIR}"/jack-audio-connection-kit-2.9999-link-fix.patch
-}
+#src_prepare()
+#{
+#	epatch "${FILESDIR}"/jack-audio-connection-kit-2.9999-link-fix.patch
+#}
 
 src_configure() {
+	cd ${S}
+
 	local myconf="--prefix=/usr --destdir=${D}"
 	use alsa && myconf="${myconf} --alsa"
 	if use classic && use dbus ; then


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/