From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 82133139694 for ; Fri, 10 Mar 2017 11:08:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5F29E0C47; Fri, 10 Mar 2017 11:08:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6EDD7E0C47 for ; Fri, 10 Mar 2017 11:08:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D9B233D3CE for ; Fri, 10 Mar 2017 11:08:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15CD0633B for ; Fri, 10 Mar 2017 11:08:09 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1489144079.646f4349916b798eae254248d85ece070f66ef25.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/jack/, media-sound/jack/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/jack/files/jack-3.1.1-add-cddbserver-musicbrainz.patch media-sound/jack/files/jack-3.1.1-python26.patch media-sound/jack/files/jack-3.1.1-setup-and-cursesmodule.patch media-sound/jack/jack-3.1.1-r2.ebuild media-sound/jack/metadata.xml X-VCS-Directories: media-sound/jack/files/ media-sound/jack/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 646f4349916b798eae254248d85ece070f66ef25 X-VCS-Branch: master Date: Fri, 10 Mar 2017 11:08:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f01ebcd4-1a66-4ec6-8e90-bd6ebedefe6b X-Archives-Hash: a78b91c1fe38f4084c78c8a26d2f0604 commit: 646f4349916b798eae254248d85ece070f66ef25 Author: Martin Dummer gmx net> AuthorDate: Sat Feb 18 14:42:40 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Mar 10 11:07:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=646f4349 media-sound/jack: fix #298850, new EAPI and eclass - EAPI 6 - replace eclass distutils with distutils-r1 - fix ebuild python module dependencies - add proxy maintaintership - add functional enhancement: add cddb server freedb.musicbrainz.org Bug: https://bugs.gentoo.org/show_bug.cgi?id=298850 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/4156 .../jack-3.1.1-add-cddbserver-musicbrainz.patch | 15 +++++++ media-sound/jack/files/jack-3.1.1-python26.patch | 12 ++++++ .../files/jack-3.1.1-setup-and-cursesmodule.patch | 47 ++++++++++++++++++++++ media-sound/jack/jack-3.1.1-r2.ebuild | 45 +++++++++++++++++++++ media-sound/jack/metadata.xml | 16 ++++++-- 5 files changed, 131 insertions(+), 4 deletions(-) diff --git a/media-sound/jack/files/jack-3.1.1-add-cddbserver-musicbrainz.patch b/media-sound/jack/files/jack-3.1.1-add-cddbserver-musicbrainz.patch new file mode 100644 index 00000000000..150c4409064 --- /dev/null +++ b/media-sound/jack/files/jack-3.1.1-add-cddbserver-musicbrainz.patch @@ -0,0 +1,15 @@ +--- a/jack_freedb.py ++++ b/jack_freedb.py +@@ -46,6 +46,12 @@ + 'mail': "freedb-submit@freedb.org", + 'my_mail': "default" + }, ++ 'musicbrainz': { ++ 'host': "freedb.musicbrainz.org", ++ 'id': prog_name + " " + prog_version, ++ 'mail': "", ++ 'my_mail': "default" ++ }, + } + + def interpret_db_file(all_tracks, freedb_form_file, verb, dirs = 0, warn = None): diff --git a/media-sound/jack/files/jack-3.1.1-python26.patch b/media-sound/jack/files/jack-3.1.1-python26.patch new file mode 100644 index 00000000000..c3e0a0c9f85 --- /dev/null +++ b/media-sound/jack/files/jack-3.1.1-python26.patch @@ -0,0 +1,12 @@ +--- a/jack_functions.py ++++ b/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/files/jack-3.1.1-setup-and-cursesmodule.patch b/media-sound/jack/files/jack-3.1.1-setup-and-cursesmodule.patch new file mode 100644 index 00000000000..d3e016289a8 --- /dev/null +++ b/media-sound/jack/files/jack-3.1.1-setup-and-cursesmodule.patch @@ -0,0 +1,47 @@ +--- a/jack_t_curses.py ++++ b/jack_t_curses.py +@@ -35,11 +35,9 @@ + try: + from jack_curses import endwin, resizeterm, A_REVERSE, newwin, newpad, initscr, noecho, cbreak, echo, nocbreak + except ImportError: +- warning("jack_curses module not found, trying normal curses...") ++ info("jack_curses module not found, using normal curses...") + try: +- from curses import endwin, A_REVERSE, newwin, newpad, initscr, noecho, cbreak, echo, nocbreak +- def resizeterm(y, x): +- pass ++ from curses import endwin, resizeterm, A_REVERSE, newwin, newpad, initscr, noecho, cbreak, echo, nocbreak + except ImportError: + print "curses module not found or too old, please install it (see README)" + +--- a/setup.py ++++ b/setup.py +@@ -2,7 +2,7 @@ + + """Setup script for the jack module distribution.""" + +-from distutils.core import setup, Extension ++from distutils.core import setup + + setup( # Distribution meta-data + name = "jack", +@@ -11,11 +11,7 @@ + author = "Arne Zellentin", + author_email = "zarne@users.sf.net", + url = "http://www.home.unix-ag.org/arne/jack/", +- +- # Description of the modules and packages in the distribution +- ext_modules = [ Extension('jack_cursesmodule', +- ['cursesmodule/jack_cursesmodule.c'], libraries=["ncurses"], +- extra_compile_args=["-Wno-strict-prototypes"]) ], ++ scripts=['jack'], + + py_modules = [ 'jack_CDTime', 'jack_TOC', 'jack_TOCentry', 'jack_argv', + 'jack_checkopts', 'jack_children', 'jack_config', 'jack_constants', +@@ -26,6 +22,3 @@ + 'jack_ripstuff', 'jack_status', 'jack_t_curses', 'jack_t_dumb', 'jack_tag', + 'jack_targets', 'jack_term', 'jack_utils', 'jack_version', 'jack_workers'] + ) +- +-print "If you have installed the modules, copy jack to some place in your $PATH," +-print "like /usr/local/bin/." diff --git a/media-sound/jack/jack-3.1.1-r2.ebuild b/media-sound/jack/jack-3.1.1-r2.ebuild new file mode 100644 index 00000000000..59c46f78ae9 --- /dev/null +++ b/media-sound/jack/jack-3.1.1-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="ncurses" +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 + +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="" + +RDEPEND=" + dev-python/cddb-py[${PYTHON_USEDEP}] + dev-python/id3-py[${PYTHON_USEDEP}] + dev-python/pyid3lib[${PYTHON_USEDEP}] + dev-python/pyvorbis[${PYTHON_USEDEP}] + media-libs/flac + media-sound/lame + media-sound/cdparanoia" + +PATCHES=( + "${FILESDIR}/${PN}-3.1.1-python26.patch" + "${FILESDIR}/${PN}-3.1.1-setup-and-cursesmodule.patch" + "${FILESDIR}/${PN}-3.1.1-add-cddbserver-musicbrainz.patch" +) + +python_install_all() { + insinto /etc + newins example.etc.jackrc jackrc + + newman jack.man jack.1 + + local DOCS=( README doc/ChangeLog doc/TODO ) + local HTML_DOCS=( doc/*.{html,css,gif} ) + distutils-r1_python_install_all +} diff --git a/media-sound/jack/metadata.xml b/media-sound/jack/metadata.xml index c870d0eef0a..e89252b7a39 100644 --- a/media-sound/jack/metadata.xml +++ b/media-sound/jack/metadata.xml @@ -1,8 +1,16 @@ - - sound@gentoo.org - Gentoo Sound project - + + martin.dummer@gmx.net + Martin Dummer + + + proxy-maint@gentoo.org + Proxy Maintainers + + + sound@gentoo.org + Gentoo Sound project +