4 files changed, 130 insertions, 1 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/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
+}