media-sound/jack: Fix Python 2.6 issue on keyword "with"

Package-Manager: portage-2.2_rc62/cvs/Linux i686

5 files changed, 134 insertions, 2 deletions

diff --git a/media-sound/jack/ChangeLog b/media-sound/jack/ChangeLog
index e67c647696d6..c8e9df97b087 100644
--- a/media-sound/jack/ChangeLog
+++ b/media-sound/jack/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/jack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/ChangeLog,v 1.19 2010/05/28 21:08:01 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/ChangeLog,v 1.20 2010/06/17 22:10:24 sping Exp $
+
+*jack-3.1.1-r1 (17 Jun 2010)
+*jack-3.0.0-r1 (17 Jun 2010)
+
+  17 Jun 2010; Sebastian Pipping <sping@gentoo.org> +jack-3.0.0-r1.ebuild,
+  +files/jack-3.0.0-python26.patch, +jack-3.1.1-r1.ebuild:
+  Fix Python 2.6 issue on keyword "with". Thanks for the patch to Martin
+  Dummer
 
   28 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   jack-3.0.0.ebuild, jack-3.1.1.ebuild:
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
index f8c9835305f4..f4ada7d3239f 100644
--- a/media-sound/jack/Manifest
+++ b/media-sound/jack/Manifest
@@ -1,6 +1,9 @@
+AUX jack-3.0.0-python26.patch 368 RMD160 43d0d42ee210d6f601813ad8aa6f641ba61ee2b8 SHA1 38cc5fbd7b405b5cb045c79f171195ad5d523643 SHA256 d58ad8bcc5373177470fa59d30b82818cf7938855f04db61ab6f2a945662658b
 DIST jack-3.0.0.tar.gz 311556 RMD160 fc9de2a431b94b9abd0bb06fdab52dda4f279ec7 SHA1 192c5389a2051ae0dbffdb13323c5aed1c0ec7c1 SHA256 ce324369cbc323cce23ff5a2dd95e20a7257ec08eb30e2508f6ef6d78f4aa88f
 DIST jack-3.1.1.tar.gz 318119 RMD160 16e9f5a8e0228b0fe6d1c742ffa1f8117a7268f5 SHA1 b529e2d53f8b626ea962e4d8c7b1ad9457e20401 SHA256 fef030c4ba68a747d11e04c8ec4ca545563dbef519a6b23a3ebd6bb9bcb038cc
+EBUILD jack-3.0.0-r1.ebuild 1258 RMD160 000cdc8992b36c5a8551c15f8495a8ba30ba829d SHA1 b2806a90d6be4cc93b16dfb4fc79bf8f441cff85 SHA256 4e0a07d0ff1d38f8baa7e6289f37b811652f1aa18156173507d325732148ee9b
 EBUILD jack-3.0.0.ebuild 1186 RMD160 009d360114138552eaa195b4c48f00a375a3abfd SHA1 83a498124ff779233907998fbcd102880d2471ff SHA256 857de2e58d146e572cef6b17ea8b75f73db96fb050404d6eff7ab5df917f9b6d
+EBUILD jack-3.1.1-r1.ebuild 1111 RMD160 5801b1b2d20dc67d87dca9205f16b1040866e1c0 SHA1 e186aa63243776db935e3f6517cf14d5937e06ee SHA256 1222dcd182ac07efbdd1743cca2b5b9450d9189bdc967bc615dd4b894520fa33
 EBUILD jack-3.1.1.ebuild 1031 RMD160 816c6af79afc78bb5ed0f3b2d3ac36f431b13a9e SHA1 a08c64c7f93e50ef42c6aff024de572d99281682 SHA256 e9783c9cdff51249817a916f89ca672cb968f616cb410c5a56e3ee7d78abbc48
-MISC ChangeLog 2121 RMD160 e892bb4ae341a90f8aa2d0eeb4fed0ba6f5ccdf6 SHA1 9f428b7eb953e480d9256b4c5117ff6840e1c505 SHA256 b8efc818ca06d63b094f9b22b0630ba7460589417a79c98b344306d8a8817c9c
+MISC ChangeLog 2394 RMD160 20705fc2c431a112e18c126f53225faf4255657b SHA1 947056ddee06e4e438d1958a67689874bb213e45 SHA256 5080901fe67d3779ae10a22572f386684d9edbbc05cd82789c7339bd518b1a85
 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e
diff --git a/media-sound/jack/files/jack-3.0.0-python26.patch b/media-sound/jack/files/jack-3.0.0-python26.patch
new file mode 100644
index 000000000000..98701345f3b3
--- /dev/null
+++ b/media-sound/jack/files/jack-3.0.0-python26.patch
@@ -0,0 +1,12 @@
+--- jack_functions.py
++++ jack_functions.py
+@@ -219,9 +219,9 @@
+     ff = blocks % CDDA_BLOCKS_PER_SECOND
+     return mm, ss, ff, blocks
+
+-def starts_with(str, with):
+-    "checks whether str starts with with"
+-    return str[0:len(with)] == with
++def starts_with(str, withstr):
++    "checks whether str starts with withstr"
++    return str[0:len(withstr)] == withstr
diff --git a/media-sound/jack/jack-3.0.0-r1.ebuild b/media-sound/jack/jack-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..a5675c019ebd
--- /dev/null
+++ b/media-sound/jack/jack-3.0.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.0.0-r1.ebuild,v 1.1 2010/06/17 22:10:24 sping Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils
+
+DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
+HOMEPAGE="http://www.home.unix-ag.org/arne/jack/"
+SRC_URI="http://www.home.unix-ag.org/arne/jack/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	dev-python/cddb-py
+	dev-python/id3-py
+	dev-python/pyid3lib
+	dev-python/pyvorbis
+	media-libs/flac
+	media-sound/lame
+	media-sound/cdparanoia"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-python26.patch
+}
+
+src_compile() {
+	python setup-cursesmodule.py build || die "compilation failed"
+}
+
+src_install() {
+	python setup-cursesmodule.py install --root="${D}" \
+		|| die "curses module install failed"
+
+	dobin jack || die "dobin failed"
+
+	insinto $(python_get_sitedir)
+	PYTHON_MODNAME="$(ls jack_*.py)"
+	doins ${PYTHON_MODNAME}
+
+	newman jack.man jack.1
+
+	dodoc README doc/ChangeLog doc/TODO
+
+	dohtml doc/*html doc/*css doc/*gif
+}
diff --git a/media-sound/jack/jack-3.1.1-r1.ebuild b/media-sound/jack/jack-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..1fa4a6955251
--- /dev/null
+++ b/media-sound/jack/jack-3.1.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.1.1-r1.ebuild,v 1.1 2010/06/17 22:10:24 sping Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils
+
+DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
+HOMEPAGE="http://www.home.unix-ag.org/arne/jack/"
+SRC_URI="http://www.home.unix-ag.org/arne/jack/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	dev-python/cddb-py
+	dev-python/id3-py
+	dev-python/pyid3lib
+	dev-python/pyvorbis
+	media-libs/flac
+	media-sound/lame
+	media-sound/cdparanoia"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.0-python26.patch
+}
+
+src_install() {
+	distutils_src_install
+
+	dobin jack || die "dobin failed"
+
+	insinto $(python_get_sitedir)
+	PYTHON_MODNAME="$(ls jack_*.py)"
+	doins ${PYTHON_MODNAME}
+
+	newman jack.man jack.1
+
+	dodoc README doc/ChangeLog doc/TODO
+
+	dohtml doc/*html doc/*css doc/*gif
+}