[proaudio] [2349] jack-audio-connection-kit: fixed dependencies, fixed python shebangs , cleanup

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


Revision: 2349
Author:   lilrc
Date:     2012-12-09 17:22:54 +0100 (Sun, 09 Dec 2012)
Log Message:
-----------
jack-audio-connection-kit: fixed dependencies, fixed python shebangs, cleanup

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-12-09 09:04:53 UTC (rev 2348)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2012-12-09 16:22:54 UTC (rev 2349)
@@ -2,6 +2,21 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Dec 2012; Karl Lindén <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  jack-audio-connection-kit-1.9.8:
+    Fixed dependencies
+    Use python_convert_shebangs instead of hack
+  jack-audio-connection-kit-1.9999:
+    Fixed dependencies
+    Added missing EAPI
+    Minor cleanup
+    Updated copyright header
+  jack-audio-connection-kit-2.9999:
+    Fixed dependencies
+    Updated EAPI
+    Minor cleanup
+    Use python_convert_shebangs
+
   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;

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2012-12-09 09:04:53 UTC (rev 2348)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2012-12-09 16:22:54 UTC (rev 2349)
@@ -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 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 1828 SHA256 af7cc52de90831419c90bebf7966575959519f3e165e711abc0fc76beb44e5a1 SHA512 661357271dacac6365534503339f8bb05eac7fd56e53a9d1dd4c1544fa5e0bb283ef8b06155fde799898e175d9cacca57186125e009f8928f108dbb46690f307 WHIRLPOOL 081fcbad0ca326b33a3d1a324993c718da2701cc67124bcc9b928cca809488d58c90351c7d54da0e40f01db6960262f642b799a27750361d33507b79120f6500
-MISC ChangeLog 9264 SHA256 56e4c4099e9accd36b1211f71d1ba4e2f3f060374db82fb7e63c7e6427db0fc9 SHA512 6cd3590f91660bd26ecacd472a8ac1bdca52e5855139032035ee899172d0f2cf7ba46be2319813b7fd85bfc372cc1e033d51e17c1e9d826e92db5988b0fd6a2b WHIRLPOOL 9c0b84321f76c83e016ba7fb12270355fe1826400995ac20a9743a8b1cc693c2e29c297175da288e0808a053f1d6d0ff2c5a7f9d149a5e6dbfeb8312b9275944
+EBUILD jack-audio-connection-kit-1.9.8.ebuild 1526 SHA256 e4b691f04d57ab3dd16532d698659d8c888eacc7468f8e4f7a3234252ce97085 SHA512 400e9b728f94cac3cfc0bfddef03ccf6ed3753577e559c92880b6c193ee703c467e9b7fb5464a7afa6077bdfa8e94332f6fc3373a7bceaf305070bbca2c0d085 WHIRLPOOL bf23b241b79fc8709792e9ccaaea549937c2003cf98cbb585ada5b25945fbcb0b54d95c58d93667a371561b47ac279f3ea4501f99aba8ea214871d3638aee704
+EBUILD jack-audio-connection-kit-1.9999.ebuild 2669 SHA256 495c77b8caa4ce39b245733ffee63d0be5dcc861315fb0c920b9c0f9a1177f2e SHA512 9f044711dad115e35db38bb5b1cd115c932be383e1822239da6fe0a63609e946fee1ea25d16e81267487a0dc354b7b1c20c12b1e6bccd21b3a6ab9b2bbabf363 WHIRLPOOL de63ad794c33bee7a8710018171c21a3da04cc608a4aad0629a81476838b2b2fd423c51094f5f522aba34a3f2466174f9f35461c16f294e19ec8c85ff4063f77
+EBUILD jack-audio-connection-kit-2.9999.ebuild 1696 SHA256 702b0d451319255ba5320ef076604b3c0cc20ad24c024730849471e16ebbe079 SHA512 fff9979e18b40e30cc3707d362a53940e1ff6ea30e6bde673b0ffa3059f4d5cf0789d2eca1c1d3cd8d32e73fc53ecb23352fb77b4e5b7e6980513f448247bb46 WHIRLPOOL a97480d5418e7c39d27717f00caec31734a7c18a6d198eb6df539a3aa5dd44be3d099b3ca57a147a2162b5e5aeca118c728bf41065b6f748a6c9beee0ed3435c
+MISC ChangeLog 9684 SHA256 4958840e5074939fdff9482097aa1905ea8cb7e0081cc9de2865db136a0a7a9f SHA512 174aaae7d08238b8e736d106fca1a3ddf5ac081895ff11bf500ac29685c23663b4def85850ff8143f90c56a5519654827bbe43b3a9b2a3e74feae776175b1631 WHIRLPOOL 3ff1ee658f924d8d06b3fd70500c69e3fd1d2b59bb1a5152a980ab3eabc0451407912fe834cc99dd42188a40325b7d30f146c385295cea1ca7196037ff9cf35a
 MISC metadata.xml 876 SHA256 b2c226737c92a2a6db4522b34ff4083b83bf80e7dd0b00eb0a6ae5f51caa6491 SHA512 8d9128dbaee85f8c87048b5677e6797b22e242babaa505dab461468fad11ef0d30b13d5dc4f1d6d88b4e4b63eba8f2038c09e242b01d6480aa81c09f5467fb76 WHIRLPOOL 8dac192f7d9e5643e1afa0191281c999c8d21a3144f59ab4627873ed20da1e6c34076ba65a3a3401de6cef681196789d5668619bcb9adfa4f6c403551cbae866

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-12-09 09:04:53 UTC (rev 2348)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.8.ebuild	2012-12-09 16:22:54 UTC (rev 2349)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI="4"
 
 PYTHON_DEPEND="2"
 
@@ -17,14 +17,13 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa dbus debug doc freebob ieee1394 32bit"
 
-RDEPEND="dev-util/pkgconfig"
-
-DEPEND="${RDEPEND}
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )
+RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.1 )
 	freebob? ( sys-libs/libfreebob !media-libs/libffado )
-	doc? ( app-doc/doxygen )
 	dbus? ( sys-apps/dbus )
 	ieee1394? ( media-libs/libffado !sys-libs/libfreebob )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}/jack-${PV}/jack-${PV}"
 
@@ -33,15 +32,6 @@
 	python_pkg_setup
 }
 
-src_prepare() {
-# Fix for waf to use python2, since waf is not compatible with phyton3
-cd ${S}
-	for x in $(grep -r "/usr/bin/env python" * | cut -f1 -d":" ); do
-		einfo "Tweaking $x for python2..."
-		sed -e "s:/usr/bin/env python:/usr/bin/env python2:g" -i $x
-	done
-}
-
 src_configure() {
 	local myconf="--prefix=/usr --destdir=${D}"
 	use alsa && myconf="${myconf} --alsa"
@@ -64,4 +54,5 @@
 src_install() {
 	ln -s ../../html build/default/html
 	./waf --destdir="${D}" install || die "waf install failed"
+	python_convert_shebangs -r 2 "${ED}"
 }

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-12-09 09:04:53 UTC (rev 2348)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999.ebuild	2012-12-09 16:22:54 UTC (rev 2349)
@@ -1,7 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="5"
+
 inherit flag-o-matic eutils multilib git-2 linux-info autotools
 
 RESTRICT="nostrip mirror"
@@ -16,7 +18,7 @@
 KEYWORDS=""
 IUSE="3dnow altivec alsa celt coreaudio cpudetection doc debug examples mmx oss sse netjack freebob ieee1394 jackdmp"
 
-RDEPEND="!jackdmp? ( 
+RDEPEND="!jackdmp? (
 	>=media-libs/libsndfile-1.0.0
 	sys-libs/ncurses
 	celt? ( >=media-libs/celt-0.5.0 )
@@ -24,13 +26,14 @@
 	freebob? ( sys-libs/libfreebob !media-libs/libffado )
 	ieee1394? ( media-libs/libffado !sys-libs/libfreebob )
 	netjack? ( media-libs/libsamplerate )
-	!media-sound/jackdmp )"
+	!media-sound/jackdmp
+)"
 
 DEPEND="${RDEPEND}
-	!jackdmp? ( 
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )
-	netjack? ( dev-util/scons )
+	!jackdmp? (
+		virtual/pkgconfig
+		doc? ( app-doc/doxygen )
+		netjack? ( dev-util/scons )
 	)"
 PDEPEND="jackdmp? ( >=media-sound/jackdmp-9999-r1 )"
 
@@ -49,9 +52,9 @@
 		return # no more to do
 	fi
 	git-2_src_unpack
+}
 
-	cd "${S}"
-	
+src_configure() {
 	eautoreconf
 }
 
@@ -69,7 +72,7 @@
 		myconf="${myconf} --enable-dynsimd"
 		append-flags -mmmx -msse -m3dnow -O2
 	fi
-	
+
 	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
 
 	econf \

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-12-09 09:04:53 UTC (rev 2348)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild	2012-12-09 16:22:54 UTC (rev 2349)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI="5"
 
 PYTHON_DEPEND="2"
 
@@ -16,19 +16,18 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-# 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
+RDEPEND="media-libs/libsamplerate
 	>=media-libs/alsa-lib-1.0.24
+	dbus? ( sys-apps/dbus )
+	freebob? ( sys-libs/libfreebob !media-libs/libffado )
+	ieee1394? ( media-libs/libffado !sys-libs/libfreebob )
 	opus? ( media-libs/opus )
 	pam? ( sys-auth/realtime-base )"
 DEPEND="${RDEPEND}
-	freebob? ( sys-libs/libfreebob !media-libs/libffado )
-	doc? ( app-doc/doxygen )
-	dbus? ( sys-apps/dbus )
-	ieee1394? ( media-libs/libffado !sys-libs/libfreebob )
-	media-libs/libsamplerate"
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	git-2_src_unpack
@@ -39,14 +38,7 @@
 	python_pkg_setup
 }
 
-#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
@@ -77,4 +69,5 @@
 	if use doc ; then
 		dohtml html/* || die "dohtml failed"
 	fi
+	python_convert_shebangs -r 2 "${ED}"
 }


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