gentoo resync : 09.07.2022

3 files changed, 2 insertions, 95 deletions

diff --git a/media-sound/audiotools/Manifest b/media-sound/audiotools/Manifest
index 3ab4b54a955c..66df98489d2f 100644
--- a/media-sound/audiotools/Manifest
+++ b/media-sound/audiotools/Manifest
@@ -1,5 +1,4 @@
 AUX audiotools-3.1.1-libcdio-paranoia.patch 1337 BLAKE2B 2594bf98a09df1064009dfa27764f64aeda7d92e43c82aaff3e44f6742db28f6fa2e87bd19d1f7eba8b82ac8ab338c9d7e7e7817817d49985809b927383d218d SHA512 cabc5f86e2977171c6616722640fa271d3c339bb223e229ec31697c81bd2c06c620a4b3d7a9057d7a90e05a2db7e2c7ca4d26403d60612ceebaaca0370845e10
 DIST audiotools-3.1.1.tar.gz 6325408 BLAKE2B 065b5dc23796ea8d1dc72dc581a8929fe26e08180af2f0719470d80d5c82be2455ffda28fe8fd5ca63ae078f7fa5c6b5153e8fae496736da8f97a4eae38c4876 SHA512 dfba0dab8ef1573a12366bb4d46552eeb6c23c4abde34d9df51238fc97f573135b564cc3e5dbcaf7691c4502d8173dc926d8eb5ecd169fe619278ae89ff24c3a
-EBUILD audiotools-3.1.1-r1.ebuild 1895 BLAKE2B 8ae3a8f94e4b4fdee94d8a27a90f7377cbe7a1b1f2a26cd7dacbdfa19585a01058d0251b737a392e0f724d4accc50a90172122d95d78fbcf1628824495cda135 SHA512 c534e3be945d237272f6113ad24fb2ffd05670a1f415f75b569f5381347779f584276697a621a3358a2f6f3170535815abc5e7c45862a88ef107d7bc1e098c1c
-EBUILD audiotools-3.1.1.ebuild 1895 BLAKE2B 424ac509d1e5bf0140ecd828930e78776b69da181b2ac0806194178b5cc83f0768820584d49e6e27c5b206e1d7678ed643240828e2e0a8859912991bc33ebd40 SHA512 a3a8b877c4cb9383bf340d7fe361c072c457a1459d0f215a180e12c8e8f7ce5b28a564a2eda50ba38898c5e511b534fa5cdc7deb804e266634423cc604279970
+EBUILD audiotools-3.1.1-r1.ebuild 1894 BLAKE2B ccf25e8a14b2b83f37cf9f799170aad36e0a97b801155ddb05570c733ca2500aede6cbf7db088758ce88e5010012a5b4a31000213589c27c6eee644707eabe01 SHA512 26d7ff763b9261c5c2d6ecbf4cbf2536ffc6676aab35816c49cff58842c35bc7d3d4bc74d4b28c2ae601b43229bc50351e76cd6b8786421d9328beaefdc82c2d
 MISC metadata.xml 534 BLAKE2B b6b669f321a1091210f4abb7935bae1c2101f9ec2dfbf45150b61d3b9b98c966c45da7230f7a2cdf5b634ecdbfc6c5c1c3ae2dcf7eca755face9d47d2301d9e8 SHA512 5b21b6527a7a134fbce106ff8948e834cadd0286e4ef2b3d56921799fa2cfac69666b74498d9ad64564c20d3ba2e90b610e1ede30f85b0362155bfb582657d5b
diff --git a/media-sound/audiotools/audiotools-3.1.1-r1.ebuild b/media-sound/audiotools/audiotools-3.1.1-r1.ebuild
index e564fa51638b..82bedd956825 100644
--- a/media-sound/audiotools/audiotools-3.1.1-r1.ebuild
+++ b/media-sound/audiotools/audiotools-3.1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="aac alsa cdda cdr cue dvda flac gui twolame mp3 opus pulseaudio vorbis wavpack"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/audiotools/audiotools-3.1.1.ebuild b/media-sound/audiotools/audiotools-3.1.1.ebuild
deleted file mode 100644
index b63f0e4b37a6..000000000000
--- a/media-sound/audiotools/audiotools-3.1.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of command line audio tools"
-HOMEPAGE="http://audiotools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac alsa cdda cdr cue dvda flac gui twolame mp3 opus pulseaudio vorbis wavpack"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio-paranoia:0= )
-	dvda? ( media-libs/libdvd-audio )
-	twolame? ( media-sound/twolame )
-	mp3? ( || ( media-sound/mpg123 media-sound/lame ) )
-	opus? (
-		media-libs/opus
-		media-libs/opusfile
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-"
-RDEPEND="${DEPEND}
-	aac? (
-		media-libs/faad2
-		media-libs/faac
-	)
-	cdr? ( app-cdr/cdrtools )
-	cue? ( app-cdr/cdrdao )
-	flac? ( media-libs/flac )
-	gui? (
-		$(python_gen_impl_dep 'tk(+)')
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/urwid[${PYTHON_USEDEP}]
-	)
-"
-
-# lots of random failures
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-libcdio-paranoia.patch )
-
-src_prepare() {
-	default
-
-	local USEFLAG_LIBS=(
-		cdda:libcdio_paranoia
-		dvda:libdvd-audio
-		pulseaudio:libpulse
-		alsa:alsa
-		mp3:libmpg123
-		mp3:mp3lame
-		vorbis:vorbisfile
-		vorbis:vorbisenc
-		opus:opusfile
-		opus:opus
-		twolame:twolame
-	)
-
-	# enable/disable deps based on USE flags
-	local flag_lib flag lib
-	for flag_lib in "${USEFLAG_LIBS[@]}"; do
-		flag=${flag_lib/:*}
-		lib=${flag_lib/*:}
-		use ${flag} || { sed -i "/^${lib}:/s/probe/no/" setup.cfg || die; }
-	done
-}
-
-python_compile_all() {
-	emake -C docs
-}
-
-python_test() {
-	cd test || die
-	"${PYTHON}" test.py || die
-}
-
-python_install_all() {
-	doman docs/*.{1,5}
-	distutils-r1_python_install_all
-}