gentoo resync : 16.09.2020

3 files changed, 2 insertions, 53 deletions

diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index 9f3d8064e129..701e4b57da44 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -7,6 +7,5 @@ AUX libmp4v2-2.0.0-gcc7.patch 747 BLAKE2B 5bed55f8c9e9593261d9738871de162fdfaec6
 AUX libmp4v2-2.0.0-mp4tags-corruption.patch 642 BLAKE2B 86a1b614dfc2e4dbcee97ebe9b029feac2078eb3d6c25793f291f625ad1e0dc1df85d028813fe96e980e2d8fef4a5eb821da8622f3ce3f8b28835dd020812d7f SHA512 565959560941ec0503b17a1e6a9cae85a03d6f97e4f4ea66cf457c941de96148606f23471525bf786bd95f78097b3376020a40d53fc7a4675c1db9819e7e8593
 AUX libmp4v2-2.0.0-unsigned-int-cast.patch 2922 BLAKE2B 660ee262d6a21540b9646aa87f911373042c1f1f879b18a913d07fd267fa2275556f8a0e18e86c28ce4a737f136d53c2dbd21602635b12b490535f3e8d8e0ef7 SHA512 89cb78624096e4182056c4e9099cc13cb6251330d741ccaabe557eeb21c2df77d71367da21c16d2c33b1a7dde49429f57c7673d49be0e9a459af491a00305f37
 DIST mp4v2-2.0.0.tar.bz2 495672 BLAKE2B 966c90b443bd6f7a81c96fd12f95b00c3ec89cd476aa0fff3e0450b315d54543578ef953c5e3f28d52ca800a0768c601dddc8e99a32ff512767cd65c12832bd5 SHA512 15eb882f33d72d4209053b54c883b67715f539c33096705a0e7bc79015b93f6f3ac80ae29c65a0ffe9eab1bf0dedf07198bdee23fa6eafcd6ccb34f984484be0
-EBUILD libmp4v2-2.0.0-r1.ebuild 1100 BLAKE2B cf62899ba1af8904780a9c8189425fb01262772d399f6ad0392e9eb7cd93debd2e6e08efda58cda604b8f741789cf135a56e41a5b4e3bf6e65b40ccb254ce0f8 SHA512 d6f894b90ef4638bf66ebb9e19b0c65bc8fbbd40b08973cb5e524f7828b6b02b4d02f787c390a9555b14f44725a12311410ee5be027c3c61aaea89ee3a24f9c9
-EBUILD libmp4v2-2.0.0-r2.ebuild 1320 BLAKE2B 6a6d3c09f4f1c82cc5ca62b721cfd5e7bf58447013b3ba9781882d95feeaa8bbfd6c0dc40d64c20f6a03bb700304512e5b6d3262fe33b96b7cfa73f4fc3b4df7 SHA512 737b4831a10902f4add3e81a92fb1dcb954cdb26ea90d29ed9d81dce8c21afc84fe0e4d1c7a256e5ae04838d81f6d070fb7cfcdc83147612377545d346098e5d
+EBUILD libmp4v2-2.0.0-r2.ebuild 1318 BLAKE2B eed852a942178767e833f91e257adb72b4ad058d0fe2628dd3398a51384e6f0a60ab4a8ad1b162999f415e0f8838fe8beaa0de895b529738bf1071e72e665998 SHA512 e1a541178103a8fca2c40b6e19ae84f8f272009090b854fae0abbdfb14155cd137ef3b682c25a186028bd8c430a8a3f6dc71480822532d03e4de10f3d585339e
 MISC metadata.xml 402 BLAKE2B ed37dabc480f00cf0f23df37f1e1f9203d81415f9c030f307f1265f9550f5e6a2466de8387b0f16eb7c40dd6e3705bff031df7b264594a7319751ba83c1c7d6b SHA512 63643195e04ecdb3a79a862991760894a4fc52aa073ee1aba1efba4babdd926002fe271d04f82e4e40dbf4cad2fa77fd7853620fe11badb14cc83d27c342ad70
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
deleted file mode 100644
index 58d839ef5f38..000000000000
--- a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${P/lib}
-inherit libtool
-
-DESCRIPTION="Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard"
-HOMEPAGE="https://code.google.com/p/mp4v2/"
-SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs test utils"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	sys-apps/sed
-	test? ( dev-util/dejagnu )
-	utils? ( sys-apps/help2man )
-"
-
-DOCS=( doc/{Authors,BuildSource,Documentation,ReleaseNotes,ToolGuide}.txt README )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc7.patch"
-	"${FILESDIR}/${P}-mp4tags-corruption.patch"
-	"${FILESDIR}/${P}-clang.patch"
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-gch \
-		$(use_enable utils util) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
index 481057b2b593..a4b0e6492b9a 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs utils"
 # Tests need DejaGnu but are non-existent (just an empty framework)
 RESTRICT="test"