[gentoo-commits] repo/gentoo:master commit in: media-sound/grip/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     5d71472b29d9afd3e65ad6a0fa4f9b6f44866a56
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 08:50:49 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 08:51:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d71472b

media-sound/grip: Revbumps to fix icon issue. Removed old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/grip/Manifest                          |  2 -
 media-sound/grip/grip-3.10.2.ebuild                | 53 ----------------------
 .../{grip-3.9.0.ebuild => grip-3.9.0-r1.ebuild}    |  8 +---
 media-sound/grip/grip-4.0.0.ebuild                 | 53 ----------------------
 .../{grip-4.0.1.ebuild => grip-4.0.1-r1.ebuild}    |  7 +--
 5 files changed, 2 insertions(+), 121 deletions(-)

diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 3fcf2c37d12..d3a1153d888 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,4 +1,2 @@
-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

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 5ebbbe73084..00000000000
--- 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
similarity index 89%
rename from media-sound/grip/grip-3.9.0.ebuild
rename to media-sound/grip/grip-3.9.0-r1.ebuild
index 21ff6559654..07771797ceb 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.0.ebuild
deleted file mode 100644
index 1c4858f2080..00000000000
--- a/media-sound/grip/grip-4.0.0.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
-}

diff --git a/media-sound/grip/grip-4.0.1.ebuild b/media-sound/grip/grip-4.0.1-r1.ebuild
similarity index 90%
rename from media-sound/grip/grip-4.0.1.ebuild
rename to media-sound/grip/grip-4.0.1-r1.ebuild
index 1c4858f2080..e5b048598f1 100644
--- a/media-sound/grip/grip-4.0.1.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"