* [gentoo-commits] repo/gentoo:master commit in: media-sound/jack/, media-sound/jack/files/
@ 2017-03-10 11:08 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-03-10 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 646f4349916b798eae254248d85ece070f66ef25
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sat Feb 18 14:42:40 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> 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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>sound@gentoo.org</email>
- <name>Gentoo Sound project</name>
-</maintainer>
+ <maintainer type="person">
+ <email>martin.dummer@gmx.net</email>
+ <name>Martin Dummer</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/jack/, media-sound/jack/files/
@ 2020-09-02 7:52 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2020-09-02 7:52 UTC (permalink / raw
To: gentoo-commits
commit: dedf81771fd7952c600669874174103c3d6d4759
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 07:48:33 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 07:52:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedf8177
media-sound/jack: remove last-rited pkg
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
media-sound/jack/Manifest | 1 -
.../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-r3.ebuild | 47 ----------------------
media-sound/jack/metadata.xml | 16 --------
6 files changed, 138 deletions(-)
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
deleted file mode 100644
index 86efcb0b52f..00000000000
--- a/media-sound/jack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jack-3.1.1.tar.gz 318119 BLAKE2B 20ab3aa16cf9f52e23fa9e11d0aea2c31d97afe546e7c199758363d579b99f39c5c864156e8727e04ef4d573ed5398c96916a19e69103bb0998e94526f475a1b SHA512 e34bec0ae89a7619e1f446d1259be06415f57697d1b925799d00554940b4cb6cb40eba9e6e7cf9f2f9eacddbed9fe7a9a48e395530c8a701be3979162a9379d7
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
deleted file mode 100644
index 150c4409064..00000000000
--- a/media-sound/jack/files/jack-3.1.1-add-cddbserver-musicbrainz.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index c3e0a0c9f85..00000000000
--- a/media-sound/jack/files/jack-3.1.1-python26.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index d3e016289a8..00000000000
--- a/media-sound/jack/files/jack-3.1.1-setup-and-cursesmodule.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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-r3.ebuild b/media-sound/jack/jack-3.1.1-r3.ebuild
deleted file mode 100644
index f1953b5662e..00000000000
--- a/media-sound/jack/jack-3.1.1-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="
- $(python_gen_cond_dep '
- dev-python/cddb-py[${PYTHON_MULTI_USEDEP}]
- dev-python/id3-py[${PYTHON_MULTI_USEDEP}]
- dev-python/pyid3lib[${PYTHON_MULTI_USEDEP}]
- dev-python/pyvorbis[${PYTHON_MULTI_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
deleted file mode 100644
index e89252b7a39..00000000000
--- a/media-sound/jack/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin.dummer@gmx.net</email>
- <name>Martin Dummer</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <maintainer type="project">
- <email>sound@gentoo.org</email>
- <name>Gentoo Sound project</name>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-02 7:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-02 7:52 [gentoo-commits] repo/gentoo:master commit in: media-sound/jack/, media-sound/jack/files/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2017-03-10 11:08 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox