gentoo resync : 16.09.2020

3 files changed, 2 insertions, 33 deletions

diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 438f0106c6c9..50d4bd50a9e5 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,5 +1,3 @@
-DIST libogg-1.3.3.tar.xz 417636 BLAKE2B 2fc69580ed94be520c8e6b764e6271ec60e9d83d4265ca0408df4b2e6233a0f1d68e79400bc3871cc130034697ba97cedc453a574b9c6f618c9b819a93a2d3e8 SHA512 37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b
 DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
-EBUILD libogg-1.3.3.ebuild 760 BLAKE2B d869220511795180688fc5fd684cb89aaee262addb66c06b5c3dc5c61a2cedbb15cf44e4fb34d894f029757ee9eb21aa8b3dece232a8f670084d75d61e3f80e8 SHA512 1b502070b577f2b5b0febacaf00a0fc14f1842100bc87187c61a374aa46c19ca01e932c959a9a180ca30bf9edbceb1916ab3b490fa3def48c052b0497a9403a0
-EBUILD libogg-1.3.4.ebuild 776 BLAKE2B 627851ae52065ca39c27041cae5e5cf7406a3776478a7ebe7c66e517ca89d0eebcfe0ac29903a76dc9afd87541f28a423e4c13b5d90408a59834b3831bb4149b SHA512 411a2020edf2e2f60c5a6f7895ef0b8896abafcc6a444f74062c8ff160d606cd2d34ce8b4ade8fbf2259ba5efb72966aa6044ba76c0ed98fbda3b792626548cd
+EBUILD libogg-1.3.4.ebuild 768 BLAKE2B f63d0df73de4e297216279e35cf8eee80b91fceb240dfb6cae2036872a92e3a36253d3b440bbabe6bc0114373e4a4130aa863e7f41df9f0fabf46dbce86538f3 SHA512 0f09703446fad72e4f5c534dbeb5b2cf8433e48159bb44cfaebc8d30f5249ca18be2fe9217aaeffcf58ea2e3a5bbf5f8121455d553de7d34dfaba6509371294f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.3.ebuild b/media-libs/libogg/libogg-1.3.3.ebuild
deleted file mode 100644
index 3a73e891c26b..000000000000
--- a/media-libs/libogg/libogg-1.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS CHANGES )
-
-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}" -name "*.la" -delete || die
-}
diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4.ebuild
index c5b5550a63df..bf5e5c860249 100644
--- a/media-libs/libogg/libogg-1.3.4.ebuild
+++ b/media-libs/libogg/libogg-1.3.4.ebuild
@@ -10,7 +10,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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-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 ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES )