gentoo resync : 25.08.2020

3 files changed, 52 insertions, 2 deletions

diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index a445d85c572d..0fb9b34c6930 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,3 +1,5 @@
 DIST grip-4.1.1.tar.gz 1211196 BLAKE2B 677ace9ef740db150a2cfc9b597b148b50015dda79cb41b53cd656451b038ff71d6efdf3e17bea65accc071ec0116c6025a7c9619cb09a3782eeb94904e431a9 SHA512 c6af48b0fa89fb342c73614c6193973811ccf72837a46eb1a3971ffcfa9a20bb4fb8705ba674b093e2c4f6f78f9ded323cf5453cdecf53c467238430f98ba267
-EBUILD grip-4.1.1.ebuild 1072 BLAKE2B 1b7d04469b4266a000a6b079f93fac4c0a3107d226fd051d1dc651abe54a07b55b1087f143dc5ea6914d326d4d58c5eabebbb3e2e0762bfd3a25c0da15d29f3c SHA512 b1999167ec68c632d214a899fd1b1078c8bbe4b9d2636d10a93f95dd7a8b5973613f5212d9baacbb81a4346161a18b914bd4fab363a9c4cdd671d7b024c3a92d
+DIST grip-4.2.0.tar.gz 1209972 BLAKE2B 087118b0871b149745fa083f3eeaa79ac8c00c2b094a486cb9c5188e215dd7ce4cb06d13fb362914d7b688c89989e3b6b86ee889b4027e38b727876a06f06dd1 SHA512 26cb32064019da1d1683c44caa3c52ae513cec5b1fb435930e8e4c62433a70f14145d92f2215bf54a5bface96945d3e5e879302e2824029650d2a34218528e94
+EBUILD grip-4.1.1.ebuild 1092 BLAKE2B 0aad496a74a6c26ede57ef992ea9f7c92248a2dfd9119a483f7ddccad40b8a5f389f0e7ad08c0717f8a8f348a1442873e556c9b3c879febfdb043a7c7873a720 SHA512 44e878b2c2a4ac29ff0c541f822b18a475eae791363e387f2408acbc621d6d351a127ef3ce898a9f4ef45d73527145b29ac203b0c973d83df9451a5b2452d5ea
+EBUILD grip-4.2.0.ebuild 1083 BLAKE2B 2c69f86558ee41b36781f4493c20848a79e8a2fda7253ae7f307643357569baaf8220d541dba881dda7eddc1909a2a1b0d30a2f4326fb0e2d3cfd7baef14f25f SHA512 a07dc5d888d61c67f8583aafec87b0afd699a5723642a7e557f7c7bc32f8585c91b1aea44514553ab3854929d4b69f5898ff5564763736d64d236661b73687a0
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-4.1.1.ebuild b/media-sound/grip/grip-4.1.1.ebuild
index de4b4a0ec027..684d42ec3f07 100644
--- a/media-sound/grip/grip-4.1.1.ebuild
+++ b/media-sound/grip/grip-4.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic toolchain-funcs libtool
+inherit eutils flag-o-matic toolchain-funcs libtool xdg
 
 DESCRIPTION="GTK+ based Audio CD Player/Ripper"
 HOMEPAGE="https://sourceforge.net/projects/grip/"
@@ -17,6 +17,7 @@ IUSE="vorbis"
 # grip cannot convert ripped files to any format. So use them as
 # a sane default.
 RDEPEND="
+	!app-text/grip
 	dev-libs/glib:2
 	>=media-libs/id3lib-3.8.3
 	media-sound/cdparanoia
diff --git a/media-sound/grip/grip-4.2.0.ebuild b/media-sound/grip/grip-4.2.0.ebuild
new file mode 100644
index 000000000000..c3d4c46b1204
--- /dev/null
+++ b/media-sound/grip/grip-4.2.0.ebuild
@@ -0,0 +1,47 @@
+# 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 xdg
+
+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="
+	!app-text/grip
+	dev-libs/glib:2
+	media-libs/id3lib
+	media-sound/cdparanoia
+	media-sound/lame
+	net-misc/curl
+	x11-libs/gtk+: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
+}