From e922a1a81ee0b2277d837d8ffb0034d438b13335 Mon Sep 17 00:00:00 2001 From: odrling Date: Thu, 11 Jun 2020 01:13:26 +0200 Subject: [PATCH] remove media-sound/whipper --- media-sound/whipper/Manifest | 1 - .../whipper-0.7.2-cdparanoia-name-fix.patch | 52 -------------- ...er-0.7.2-src-Makefile-respect-CFLAGS.patch | 69 ------------------- media-sound/whipper/metadata.xml | 9 --- media-sound/whipper/whipper-0.7.2.ebuild | 64 ----------------- 5 files changed, 195 deletions(-) delete mode 100644 media-sound/whipper/Manifest delete mode 100644 media-sound/whipper/files/whipper-0.7.2-cdparanoia-name-fix.patch delete mode 100644 media-sound/whipper/files/whipper-0.7.2-src-Makefile-respect-CFLAGS.patch delete mode 100644 media-sound/whipper/metadata.xml delete mode 100644 media-sound/whipper/whipper-0.7.2.ebuild diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest deleted file mode 100644 index 070ef8d..0000000 --- a/media-sound/whipper/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST whipper-0.7.2.tar.gz 164940 BLAKE2B 525f12bea0a3483f335407aa98291ed94b6bcb2880a87a84c57cd069697205f1de08dffed5c4ee91a7ec39083fad6319ed9ca5775877406c7b8d269d4ef27ec8 SHA512 8be3c02e00d1a00878862d7e2bbd35e56b815cc30861f9cff980b14fea77f208680f1f76ecc135ccce0c3649b30ef88a383042ef377ca9e62993ace276be4365 diff --git a/media-sound/whipper/files/whipper-0.7.2-cdparanoia-name-fix.patch b/media-sound/whipper/files/whipper-0.7.2-cdparanoia-name-fix.patch deleted file mode 100644 index 5eb4c96..0000000 --- a/media-sound/whipper/files/whipper-0.7.2-cdparanoia-name-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/whipper/program/cdparanoia.py b/whipper/program/cdparanoia.py -index 07f2e69..cef39cb 100644 ---- a/whipper/program/cdparanoia.py -+++ b/whipper/program/cdparanoia.py -@@ -280,10 +280,10 @@ class ReadTrackTask(task.Task): - - bufsize = 1024 - if self._overread: -- argv = ["cd-paranoia", "--stderr-progress", -+ argv = ["libcdio-paranoia", "--stderr-progress", - "--sample-offset=%d" % self._offset, "--force-overread", ] - else: -- argv = ["cd-paranoia", "--stderr-progress", -+ argv = ["libcdio-paranoia", "--stderr-progress", - "--sample-offset=%d" % self._offset, ] - if self._device: - argv.extend(["--force-cdrom-device", self._device, ]) -@@ -302,7 +302,7 @@ class ReadTrackTask(task.Task): - except OSError as e: - import errno - if e.errno == errno.ENOENT: -- raise common.MissingDependencyException('cd-paranoia') -+ raise common.MissingDependencyException('libcdio-paranoia') - - raise - -@@ -559,8 +559,8 @@ _VERSION_RE = re.compile( - - - def getCdParanoiaVersion(): -- getter = common.VersionGetter('cd-paranoia', -- ["cd-paranoia", "-V"], -+ getter = common.VersionGetter('libcdio-paranoia', -+ ["libcdio-paranoia", "-V"], - _VERSION_RE, - "%(version)s %(release)s") - -@@ -585,12 +585,12 @@ class AnalyzeTask(ctask.PopenTask): - def __init__(self, device=None): - # cdparanoia -A *always* writes cdparanoia.log - self.cwd = tempfile.mkdtemp(suffix='.whipper.cache') -- self.command = ['cd-paranoia', '-A'] -+ self.command = ['libcdio-paranoia', '-A'] - if device: - self.command += ['-d', device] - - def commandMissing(self): -- raise common.MissingDependencyException('cd-paranoia') -+ raise common.MissingDependencyException('libcdio-paranoia') - - def readbyteserr(self, bytes): - self._output.append(bytes) diff --git a/media-sound/whipper/files/whipper-0.7.2-src-Makefile-respect-CFLAGS.patch b/media-sound/whipper/files/whipper-0.7.2-src-Makefile-respect-CFLAGS.patch deleted file mode 100644 index 71ba1f5..0000000 --- a/media-sound/whipper/files/whipper-0.7.2-src-Makefile-respect-CFLAGS.patch +++ /dev/null @@ -1,69 +0,0 @@ -From a3f090d8ed55e5e2c0c595b9bf0e244a81ce1464 Mon Sep 17 00:00:00 2001 -From: Merlijn Wajer -Date: Wed, 22 Aug 2018 11:41:16 +0200 -Subject: [PATCH] src/Makefile: respect CFLAGS - ---- - src/Makefile | 19 +++++-------------- - src/config.mk | 6 +++--- - 2 files changed, 8 insertions(+), 17 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index f1c6d4a..ee8845d 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -5,25 +5,16 @@ include config.mk - SRC = accuraterip-checksum.c - OBJ = ${SRC:.c=.o} - --all: options accuraterip-checksum -- --options: -- @echo accuraterip-checksum build options: -- @echo "CFLAGS = ${CFLAGS}" -- @echo "LDFLAGS = ${LDFLAGS}" -- @echo "CC = ${CC}" -+all: accuraterip-checksum - - .c.o: -- @echo CC $< -- @${CC} -c ${CFLAGS} $< -+ ${CC} -c ${OURCFLAGS} $< - - accuraterip-checksum: ${OBJ} -- @echo CC -o $@ -- @${CC} -o $@ ${OBJ} ${LDFLAGS} -+ ${CC} -std=c99 -lsndfile -o $@ ${OBJ} ${OURCFLAGS} ${OURLDFLAGS} - - clean: -- @echo cleaning -- @rm -f accuraterip-checksum ${OBJ} accuraterip-checksum-${VERSION}.tar.gz -+ rm -f accuraterip-checksum ${OBJ} accuraterip-checksum-${VERSION}.tar.gz - - dist: clean - @echo creating dist tarball -@@ -44,4 +35,4 @@ uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin - @rm -f ${DESTDIR}${PREFIX}/bin/accuraterip-checksum - --.PHONY: all options clean dist install uninstall -+.PHONY: all clean dist install uninstall -diff --git a/src/config.mk b/src/config.mk -index 283d745..87fe219 100644 ---- a/src/config.mk -+++ b/src/config.mk -@@ -4,8 +4,8 @@ VERSION = 1.4 - PREFIX = /usr/local - - # flags --CFLAGS = -std=c99 --LDFLAGS = -lsndfile -+OURCFLAGS = ${CFLAGS} -std=c99 -+OURLDFLAGS = ${LDFLAGS} -lsndfile - - # compiler and linker --CC = cc -+CC ?= cc --- -2.16.4 - diff --git a/media-sound/whipper/metadata.xml b/media-sound/whipper/metadata.xml deleted file mode 100644 index 8acbc91..0000000 --- a/media-sound/whipper/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - florianbadie@odrling.xyz - odrling - -Python CD-DA ripper preferring accuracy over speed - diff --git a/media-sound/whipper/whipper-0.7.2.ebuild b/media-sound/whipper/whipper-0.7.2.ebuild deleted file mode 100644 index cf58c45..0000000 --- a/media-sound/whipper/whipper-0.7.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)" -HOMEPAGE="https://github.com/JoeLametta/whipper" -SRC_URI="https://github.com/JoeLametta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - media-libs/libsndfile - test? ( dev-python/twisted[${PYTHON_USEDEP}] ) -" -RDEPEND=" - app-cdr/cdrdao - dev-libs/gobject-introspection[${PYTHON_USEDEP}] - >=dev-libs/libcdio-paranoia-0.94_p2 - dev-python/cddb-py[${PYTHON_USEDEP}] - dev-python/pycdio[${PYTHON_USEDEP}] - dev-python/pygobject:2=[${PYTHON_USEDEP}] - dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - media-libs/flac - media-libs/libsndfile - media-libs/mutagen[${PYTHON_USEDEP}] - media-sound/sox[flac] -" - -PATCHES=( - "${FILESDIR}/${P}-cdparanoia-name-fix.patch" - "${FILESDIR}/${P}-src-Makefile-respect-CFLAGS.patch" -) - -src_prepare() { - # accurip test totally depends on network access - rm "${PN}"/test/test_common_accurip.py || die - - distutils-r1_src_prepare -} - -src_compile() { - distutils-r1_src_compile - emake -C src CC="$(tc-getCC)" -} - -python_test() { - "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}" -} - -src_install() { - distutils-r1_src_install - emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" -C src install -}