gentoo resync : 13.06.2020

3 files changed, 2 insertions, 52 deletions

diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 52bbbf188db4..a445d85c572d 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,5 +1,3 @@
-DIST grip-4.0.1.tar.gz 1004917 BLAKE2B 0102d21570c5716283354cda65c694b3be708e7718535f2f3c806187edcd5ebceb834fec9f73908780d23e33f973b60e223a8d7d60e0f61f2bbe0e5340792f16 SHA512 3c5d13e83ae5b0ac03f887fd96b254700f25850ec8794daf4ff454efea0bd59e6a201e0104ffb72c5cc07fee67efe13d0891354faf09452a667131e04d9e1ac3
 DIST grip-4.1.1.tar.gz 1211196 BLAKE2B 677ace9ef740db150a2cfc9b597b148b50015dda79cb41b53cd656451b038ff71d6efdf3e17bea65accc071ec0116c6025a7c9619cb09a3782eeb94904e431a9 SHA512 c6af48b0fa89fb342c73614c6193973811ccf72837a46eb1a3971ffcfa9a20bb4fb8705ba674b093e2c4f6f78f9ded323cf5453cdecf53c467238430f98ba267
-EBUILD grip-4.0.1-r1.ebuild 1141 BLAKE2B ec212c5bdcfabdafa9205f8880c01c50a8404c864243dd54474333a7c479b6eafb3e27e17afc9093a46efd5c8127185c01f30e62c4a11cb2ca9481b17188f872 SHA512 fd45655be378d498cc16ad51c2ab141d72dbf5924bcef19f3d8ee0a9088629cfae10427ffad6356f4c7509df5a3176633f1c0d99edcd42482f7e2b26871b4f9c
-EBUILD grip-4.1.1.ebuild 1077 BLAKE2B a6f56d13e778378eae796dc090b04152d148db998a0ee1416ca8d680e57a618298a8a2428d80d9d029fee64962fdf74230f9ed84cbce82ab57a1a5ee0b5a3edd SHA512 136db8127b80a40c0e19abd3ba59a597b190c1e81337e1aae4e304c83a4dc8f243c1eea3c96e60a647d321d497a21acd43be8090cbe8d14ec02943af1bb5e73d
+EBUILD grip-4.1.1.ebuild 1072 BLAKE2B 1b7d04469b4266a000a6b079f93fac4c0a3107d226fd051d1dc651abe54a07b55b1087f143dc5ea6914d326d4d58c5eabebbb3e2e0762bfd3a25c0da15d29f3c SHA512 b1999167ec68c632d214a899fd1b1078c8bbe4b9d2636d10a93f95dd7a8b5973613f5212d9baacbb81a4346161a18b914bd4fab363a9c4cdd671d7b024c3a92d
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-4.0.1-r1.ebuild b/media-sound/grip/grip-4.0.1-r1.ebuild
deleted file mode 100644
index 992f5cdd3e13..000000000000
--- a/media-sound/grip/grip-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf --disable-werror
-}
diff --git a/media-sound/grip/grip-4.1.1.ebuild b/media-sound/grip/grip-4.1.1.ebuild
index ea1d05e4b634..de4b4a0ec027 100644
--- a/media-sound/grip/grip-4.1.1.ebuild
+++ b/media-sound/grip/grip-4.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them