gentoo resync : 03.03.2021

3 files changed, 2 insertions, 53 deletions

diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 660ecbbab322..368187e020bd 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,5 +1,4 @@
 AUX 1.4.0-x32.diff 759 BLAKE2B f122756759da4cb2a122ff702b688c63bf878801e75080d0482bd8583a935448bee42fe00f50bbd99679e5cc5a3e96b01854dad2882a12a64432782b368750c6 SHA512 4c4408ec7d42e81f4e5913ec4d97cc88290a3729d5990910f0c7d2a86da511cd496bd20574f340ff8786e533f09687c0788ba790746cba56a43403e11b638a3f
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
-EBUILD gavl-1.4.0-r1.ebuild 1090 BLAKE2B 09ecaa97c26e2fd046c6cb35eabcffa67f768977409e57c13103e452964afaaf20125689006a766f507af0ca3fd7d57624492de492a7a531624ca5236608d5f7 SHA512 33408ccd8f78d4e2c4d6dfbfda3fbd350bdc65ad5ab5836feb7cad9453ce51fd20b4c5ce8669bb5c040f5951eb7fd9157012dccd8ee853414f7859896fb979ba
-EBUILD gavl-1.4.0-r2.ebuild 1364 BLAKE2B e167b7d76166a6b54eb1c4a2fea97cd16d772022402328a4741f91b62b267a742524568455507ad70ad467096e9ad550bdf482cde0a5650d3f275b9cfbc4e657 SHA512 bb115b2b88ab3245556380af677b92503f73d74f6d2ce09e7b6dd1f2247467c3deae3edfe179daac788f9b0faff8550293a3217ed08ed50278f6f22aa11de827
+EBUILD gavl-1.4.0-r2.ebuild 1361 BLAKE2B 795f27739120d2b886af44959b0340ac983278a9407ad4579f840dd32c9829a6694a7c7a908f6c9db81bbe255e419fbdd574a50b588941f037905d7f59d2ae3a SHA512 e7af92925ce929a0e88422671f8e1085242856371f9f31140541e6c9c429e5531799dbaff3c2188e008f83552e8935453e56293f990835d3e1df3e6a1cc30d1d
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/gavl-1.4.0-r1.ebuild b/media-libs/gavl/gavl-1.4.0-r1.ebuild
deleted file mode 100644
index 1fff889bcf13..000000000000
--- a/media-libs/gavl/gavl-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-multilib
-
-DESCRIPTION="library for handling uncompressed audio and video data"
-HOMEPAGE="http://gmerlin.sourceforge.net"
-SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-x32.diff"
-
-	# AC_CONFIG_HEADERS, bug #467736
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:-mfpmath=387::g' \
-		-e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::g' \
-		-e '/LDFLAGS=/d' \
-		configure.ac || die
-
-	export AT_M4DIR="m4"
-
-	autotools-multilib_src_prepare
-}
-
-src_configure() {
-	# --disable-libpng because it's only used for tests
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-libpng
-		$(use_with doc doxygen)
-		--without-cpuflags
-		)
-
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/gavl/gavl-1.4.0-r2.ebuild b/media-libs/gavl/gavl-1.4.0-r2.ebuild
index ccd9c0e8c0f1..71259eefe9a6 100644
--- a/media-libs/gavl/gavl-1.4.0-r2.ebuild
+++ b/media-libs/gavl/gavl-1.4.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"