gentoo resync : 17.07.2021

3 files changed, 2 insertions, 36 deletions

diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 28fb95fc21cc..da1bacf0d7cb 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,6 +1,4 @@
 AUX libogg-1.3.4-libdir-m4.patch 409 BLAKE2B 68ff8990afa20d42cd527ef9b46ddf0861f167648bba14661e00fc453d8b9df33e4feb94050c13d33bd6da38e68b44e0e179e4c7049582765b3d1e4b3bbf8c84 SHA512 f285cea745d8eb5c2f3356b007b9bd686a9a0331e1a0c96f85da48b258e6544de0c3cf8ba9cd8f0caaf7c0cccc9ea033162c7b4e9fa18c93463bc43d176e8316
-DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
 DIST libogg-1.3.5.tar.xz 429076 BLAKE2B 464cf767902bd8bd463d3faaae01fecbe33d4cc87dabf38388ac961bfbe24e6d113f4ee88542e6bed6fd7eaaf0709c7f5cb7a306ee910527f79810054ccdbae7 SHA512 5d1cbc2a3a1fcf5543f5729bd5eb560cfc740c5d17a2492ead137970c45e6203ec1f5de536d77c4b73ece9e3b0046eaa9181c02a09de72ac7ae51b1fca1e1ee7
-EBUILD libogg-1.3.4-r1.ebuild 796 BLAKE2B 08a72998e40a302156f66999b90e2677834b50c9ed289453fdeb33c95ecaa15056d9171e93b177811e989a0449049ea15a9d1be7d8f8187c1c0dec1999717132 SHA512 1e06f19cbb3d33d1ea9abc7632e9ba6dff1df2d2c9b4269841932075f58896fad1e39cb1f96c4eff0440a6491c74ef61af778ca6cf5829baa6b1d355c0af3ebd
-EBUILD libogg-1.3.5.ebuild 797 BLAKE2B fe69e740292c2098e78321c186df2f36df5025cc28cc7c245f4877f0cf8646da20b89e535a0a59d3f52224e581a88074fba0442c29f77bbb3853ea36cfb245ce SHA512 4d23206edd824e3002feaf27386ba764e38088e1d1436cc619a1d5e0baf51672aa20fceaf3526f722360d198f02701019efced04e09e610730b2e7fc6aa23054
+EBUILD libogg-1.3.5.ebuild 796 BLAKE2B ce81c206143129383e9e6a3c4946db95c891a5f3c3cbbe994b7aecb65b9f602a510ba075b52f90a71d5c9a31765901e34904a74d1216a68787e6d4ecddb7925a SHA512 a416fc465a99d81987438a136aad423a701397834db8e5024553c2a3b29896ef76647dcd29bad529f641a860f07f0054b6c2c13efafede95bb33912ecb6470e2
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.4-r1.ebuild b/media-libs/libogg/libogg-1.3.4-r1.ebuild
deleted file mode 100644
index 0814202d3a0f..000000000000
--- a/media-libs/libogg/libogg-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="the Ogg media file format library"
-HOMEPAGE="https://xiph.org/ogg/"
-SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ogg/config_types.h
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/libogg/libogg-1.3.5.ebuild b/media-libs/libogg/libogg-1.3.5.ebuild
index e410ca255528..960eea10c8d6 100644
--- a/media-libs/libogg/libogg-1.3.5.ebuild
+++ b/media-libs/libogg/libogg-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=(