diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
new file mode 100644
index 0000000..ab7b2f9
--- /dev/null
+++ b/media-sound/whipper/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
+DIST whipper-1.0.0_pre20200530.tar.gz 255476 BLAKE2B 4fc0277637e440681b0932e0dc957e6b3ebbbf3b2697ed7d010ce49d094ac36fb2bcd49bef46a2c65c05f3fa419fe5d066c1fec0b9d5d15eeddda9d7652df9ec SHA512 a2b3362cd7e549990065f7db2b8ad6c7370b61ee725d4d7a5f0dd97ecc4ae06eb0ed124d6267552a2895321e16682d3d147d54180d9c9bd85512cf00dc7cad5c
+EBUILD whipper-1.0.0_pre20200530.ebuild 1546 BLAKE2B ad4e48c1f60c4395f7bdd649757a00201f0f1dc8171f18d5699c8243324b98770c390a00c2fa2ae0e8f01c3eb9d73274a9008b2bf5ac1b8f60cf762e91821fe1 SHA512 821e37fd2ba17cfeb3ca612ada1baa4424635545600aee272ac76fa17e28c30aca88a3cbf7695b3ebef7bd4028cd9fb3b002aee8a95b75e7160ef573f14d8253
+MISC metadata.xml 312 BLAKE2B 69526d8d1f710744c6c0fdab684e39ab3df8baff3873d905d1bf8f590586f0039f9e7f72d0fa4d5079dd0f07eed6f8c6fa166969414f906ba9c7df74af87fab6 SHA512 fc6ed9ee552355ba5bf7e1f75bb9e62a35f3deff0ad1d1526384a7443e70518d092b64e0c333476857df5ab9e9f5e5c8048bd31ac1dbfadca9d6fd01b59d68c9
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXw2KRwAKCRDPw5SX8bJu
+B12RAP0RXWeI2Y0o7neb0NBdiejQeKw44wIDjl8kwp8wLpCLVgD/RAqc+hYEekOL
+0CmZFzWBJaqMQm99P15sxCHcaYK0dww=
+=cfHj
+-----END PGP SIGNATURE-----
diff --git a/media-sound/whipper/files/whipper-0.7.0-cdparanoia-name-fix.patch b/media-sound/whipper/files/whipper-0.7.0-cdparanoia-name-fix.patch
new file mode 100644
index 0000000..fdd7b9e
--- /dev/null
+++ b/media-sound/whipper/files/whipper-0.7.0-cdparanoia-name-fix.patch
@@ -0,0 +1,51 @@
+diff -ur a/whipper/program/cdparanoia.py b/whipper/program/cdparanoia.py
+--- a/whipper/program/cdparanoia.py	2018-04-09 10:05:00.000000000 +0200
++++ b/whipper/program/cdparanoia.py	2018-08-03 11:59:22.582106444 +0200
+@@ -280,10 +280,10 @@
+ 
+         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 @@
+         except OSError, e:
+             import errno
+             if e.errno == errno.ENOENT:
+-                raise common.MissingDependencyException('cd-paranoia')
++                raise common.MissingDependencyException('libcdio-paranoia')
+ 
+             raise
+ 
+@@ -559,8 +559,8 @@
+ 
+ 
+ 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 @@
+     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/metadata.xml b/media-sound/whipper/metadata.xml
new file mode 100644
index 0000000..2fbf159
--- /dev/null
+++ b/media-sound/whipper/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>tastytea</name>
+	</maintainer>
+	<use>
+		<flag name="cover">Enable cover art embedding</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/whipper/whipper-1.0.0_pre20200530.ebuild b/media-sound/whipper/whipper-1.0.0_pre20200530.ebuild
new file mode 100644
index 0000000..cf0193d
--- /dev/null
+++ b/media-sound/whipper/whipper-1.0.0_pre20200530.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_COMMIT="0ffa34bc98e4c4f985fd6b2699809b0e7a48c023"
+
+DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
+HOMEPAGE="https://github.com/whipper-team/whipper"
+SRC_URI="https://github.com/whipper-team/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cover"
+
+DEPEND="media-libs/libsndfile:="
+RDEPEND="
+	${DEPEND}
+	app-cdr/cdrdao
+	>=dev-libs/libcdio-paranoia-0.94_p2
+	>=dev-python/pycdio-2.1.0[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-sound/sox[flac]
+	cover? ( dev-python/pillow[jpeg,${PYTHON_USEDEP}] )
+	dev-python/python-discid[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+RESTRICT="test"					# FIXME: Investigate why tests fail.
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch" )
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+python_prepare_all() {
+	# accurip test totally depends on network access
+	rm "${PN}"/test/test_common_accurip.py || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	distutils-r1_python_prepare_all
+}