gentoo resync : 20.03.2022

3 files changed, 2 insertions, 45 deletions

diff --git a/media-libs/phat/Manifest b/media-libs/phat/Manifest
index 9c41a433c17b..e03a893528e2 100644
--- a/media-libs/phat/Manifest
+++ b/media-libs/phat/Manifest
@@ -1,6 +1,5 @@
 AUX phat-0.4.1-libm-underlinking.patch 431 BLAKE2B 6407d04d95c966667905da12c35fada6f69c69fccc528bd4a3b8782843f3452f6b63ca582fbbfca4b30dc0f606fa09a7872b8f15836ae3f29f4c0e5036b96650 SHA512 28b63cd3b96c9ac076daa63909aad310c8c3d14f18cb500de0207b67c5cd94423dff20d259f151ef3effce0f5d5743d32b012b9d82f9457a6a4cefd260758705
 AUX phat-0.4.1-underlinking.patch 859 BLAKE2B cd3f794f3dec133d493d295f3986f22bc4ca4c3af8393e5d405e18bd2a2cc22692fa6891bc9c59e9aab55135ba72539407d078815b5eef8765d8c0a2765af4eb SHA512 814cf8d980d61e4729db095c2b440a5811dff626f28963d24fa6e37316fc13716da2d63861f796ba2b8e4d5c2141be2bd919f01d5d6fb4cb4cd445ace9f5d0a6
 DIST phat-0.4.1.tar.gz 550910 BLAKE2B ab95b5ed5c0d9d37ff9e12b733368b3b1c3ad90fecec07ca4ae2a803094b2c1b2b743986e9983a95a5be30b8fe3a0e2080e201e6ce6d9567bc02f1c303031332 SHA512 c2d25d4cf2f291a447229ab3c1c779e5a8872d8b0c88a759b7dee437b8ad355eea6211b7d257af96cd3e719098a0da3cff7ffc916281af29bf55eb9c077ff333
-EBUILD phat-0.4.1-r1.ebuild 760 BLAKE2B 9292934b4f85b5d9af8a963d3f492ed876f961a8875dc261bf0226afae4d909a66b9c592283601429a08fa1b736ab48204bb9a6ce6c2c6811b6ba2049fb5227e SHA512 5994d5edd43e4f5b893e3d89e8f1d00d4337bc7657d8e3afee492e9d8f1bb8aa34edc27d2dd4473e3dbc5cf8919e436c206b4566da324fbd829e8d160887e9bb
-EBUILD phat-0.4.1-r2.ebuild 794 BLAKE2B efad3cba50fd4ebba3191a3e411a9e6b0a3a2a3a39440761da20849d252bab1f354ac86ec3f83c8c64a2730e4da98685dad134833e8acb2d4c8868abe014aa72 SHA512 1a9612f84be1f76691699034c8ea821600b5822488f7968993deaea369c3a8c06f16a2bd087c3d0e406cca2dd239cb32750b4965923053cc2993ab7d96f4bb6b
+EBUILD phat-0.4.1-r2.ebuild 790 BLAKE2B b2259c3cf61891fda525b9f29f9b73adf44088e5a6b7dd64602e499cd2504b2d63da1d9f5e7e9147e1c20df32f679e6d27d688564714f6158bf638efb3a7e7d8 SHA512 95902dfe6fa31d142fdb93cee798adb9dddb77617669bce9b8f230d424a576945b98983bccb07786897f197c4a154e97048e1530be3d6d437e2bebfd2fe8fcd8
 MISC metadata.xml 336 BLAKE2B 1f574686d96616e8b59cb6bbc0efb7285866a3a2c37ef1989f20e164d821df99067d4241395c0c47ae3c0b7d681735acb77912aea25697af185f3d1dc4bfd428 SHA512 0be3906d05fcc120ada83070f44204cfc47bd786c55fbfeb48921c4e46c0b397697b0625a6cd018ca596499c3e58574eb6f1e0f776abe82f77c6e915c6b75c65
diff --git a/media-libs/phat/phat-0.4.1-r1.ebuild b/media-libs/phat/phat-0.4.1-r1.ebuild
deleted file mode 100644
index b7854f4f01a6..000000000000
--- a/media-libs/phat/phat-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="PHAT is a collection of GTK+ widgets geared toward pro-audio apps"
-HOMEPAGE="https://sourceforge.net/projects/phat.berlios/"
-SRC_URI="mirror://sourceforge/phat.berlios/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="debug"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libX11
-	gnome-base/libgnomecanvas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gtk-doc"
-
-PATCHES=(
-	"${FILESDIR}/${P}-underlinking.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/phat/phat-0.4.1-r2.ebuild b/media-libs/phat/phat-0.4.1-r2.ebuild
index 206b47e5d396..23aa2055155a 100644
--- a/media-libs/phat/phat-0.4.1-r2.ebuild
+++ b/media-libs/phat/phat-0.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/phat.berlios/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="debug"
 
 RDEPEND="gnome-base/libgnomecanvas