5 files changed, 4 insertions, 125 deletions
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 4f7393359485..14d12ea967b7 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,9 +1,5 @@
-DIST grip-3.10.2.tar.gz 980804 BLAKE2B d7dd2585d379733a60215705b5d91ffb3ba292bf78b6728c0ce4ccd98eeb79a5c26131b1023e884d51810857c25a18066e89e726d6d08e2b8b125840b0c30016 SHA512 ee17d5842ff4d13b812e5863ce5d0c516d6bf6bffc8131c685056e1f4bb003ebbc9cad99d48d0dc9d3657d0b13d63c2bf09a67db0d37ea47c8ce715c70cfd3fa
 DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
-DIST grip-4.0.0.tar.gz 1004651 BLAKE2B c6f4e5be8a3635be9445b9ad215e0629697ac31f71e92fa68ceffe5396acd6a1fc19597ed6f6f8ced4d350e30484f6cc12ceb6e35fc15ec3e905c5bd2ec81877 SHA512 1e17cc81b2fc9063edacbcbb1cd23ea2c55ac013a3dc57f754e267ef7a3a62f44b4e11561f05ec8534f02ae6543aafecd8882d25bf6b843d01f5cddf05618319
 DIST grip-4.0.1.tar.gz 1004917 BLAKE2B 0102d21570c5716283354cda65c694b3be708e7718535f2f3c806187edcd5ebceb834fec9f73908780d23e33f973b60e223a8d7d60e0f61f2bbe0e5340792f16 SHA512 3c5d13e83ae5b0ac03f887fd96b254700f25850ec8794daf4ff454efea0bd59e6a201e0104ffb72c5cc07fee67efe13d0891354faf09452a667131e04d9e1ac3
-EBUILD grip-3.10.2.ebuild 1222 BLAKE2B df43a95a06e053381848e36234eba2c8f7436c0db415ae88ca389c59a80aa37ccc15a496ee02d9845565446b4caabe4fbde6f7363c493fd01b5c178da71a30f3 SHA512 539dd6555803d76a6ea9e805ae883956de001001af699405ff9d70d774548e68513006a42131e9242f7249dbb057eb69790e4db48ab051e61a2f3791c414edde
-EBUILD grip-3.9.0.ebuild 1208 BLAKE2B 4b0840d67f852edead6ed6e52e7290df4cbfcef116ea7f6a9473d6eb49f80498d0c9e004e468a97cbf7c5572987049795e312b69eeaca3f8cf3e307888a5aaa7 SHA512 4ca022cb15eda867d1efcfa476d782894094d401a26a98469b27739ca9d5a9778a9bed61f970f8270951915d3fd73bfc76bb29053cd65991fa1f17288ed826fe
-EBUILD grip-4.0.0.ebuild 1223 BLAKE2B 03a279603807bc00bcd7a23688ca3f8fd0a66ac1a062212e7527887a74d12dc709de5029eb04a82a968ecf9ae75c62d03e34e28893d2e240cdc3f86a05bd51ff SHA512 d7c5ed2b6804818c849854e97a11e5089fcf618fc8f3ef6af9e41e62ad2f70d4bf092e43ba819dd42b47559c4837670f873c56a3e3a6a5f8583901a236bea65e
-EBUILD grip-4.0.1.ebuild 1223 BLAKE2B 03a279603807bc00bcd7a23688ca3f8fd0a66ac1a062212e7527887a74d12dc709de5029eb04a82a968ecf9ae75c62d03e34e28893d2e240cdc3f86a05bd51ff SHA512 d7c5ed2b6804818c849854e97a11e5089fcf618fc8f3ef6af9e41e62ad2f70d4bf092e43ba819dd42b47559c4837670f873c56a3e3a6a5f8583901a236bea65e
+EBUILD grip-3.9.0-r1.ebuild 1123 BLAKE2B 2ad0f72c98b3fa5a1502d0e3cc2d2a9df3f27b8ac4717fe4d611ecc7885f41d77d9fa38b0549660250898aefa0395e96e7cc76f56f6b6e52d076f75089f11bb5 SHA512 ca61062df0ebc206a5ecf9ac8fde50d9a6b884b709d221f6448055452c94c2b6f2149fc2df52becfe99a1044852a320a92a48c17c3065545bdd46f25b962d0dd
+EBUILD grip-4.0.1-r1.ebuild 1139 BLAKE2B 56d000454b17a2f3f67cd1213055eaa22e0a147be5655fcf2ca1a46a51a53759a2c607ff726150d0e0eafaf15c9d194ff7e2b2616363adc71c899094d6c10139 SHA512 beeb53ea39155fc7e1426e731b67bbcde7dd516b1e7e8625d1cacee7b1c8914ff4343b1fa613f29cf8a97eae30b17563861e25d23a1c79d84974e17deb64275c
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.10.2.ebuild b/media-sound/grip/grip-3.10.2.ebuild
deleted file mode 100644
index 5ebbbe73084f..000000000000
--- a/media-sound/grip/grip-3.10.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit 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="
-	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
-	x11-libs/vte:0
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-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-3.9.0.ebuild b/media-sound/grip/grip-3.9.0-r1.ebuild
index 21ff65596542..07771797ceba 100644
--- a/media-sound/grip/grip-3.9.0.ebuild
+++ b/media-sound/grip/grip-3.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,12 +36,6 @@ DEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
 src_configure() {
 	# Bug #69536
 	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
diff --git a/media-sound/grip/grip-4.0.0.ebuild b/media-sound/grip/grip-4.0.1-r1.ebuild
index 1c4858f20805..e5b048598f1c 100644
--- a/media-sound/grip/grip-4.0.0.ebuild
+++ b/media-sound/grip/grip-4.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,11 +38,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	default
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
 src_configure() {
 	# Bug #69536
 	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
diff --git a/media-sound/grip/grip-4.0.1.ebuild b/media-sound/grip/grip-4.0.1.ebuild
deleted file mode 100644
index 1c4858f20805..000000000000
--- a/media-sound/grip/grip-4.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit 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_prepare() {
-	default
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-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
-}