gentoo resync : 24.12.2018

3 files changed, 2 insertions, 93 deletions

diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 8c51cae798b4..0f47fe5d5df4 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -3,6 +3,5 @@ AUX libtheora-1.1.1-fix-UB.patch 1499 BLAKE2B b2336cac99a2810d1ba5733e09dde80d42
 AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b42ef39f0f83d306666caf80808de023e2c4c77de51009c5dd668e230b169e5073539ee11e69e3e0201d6def1a4c7401d SHA512 5ed8c35eee6fb533fbbfc835fe62eddea18ddc956b453b1062a4d1534b6d69db2e70a03bdf3300a8b1a5832feef2c7536bfad4274e8e89769e07a8a3f635b1b5
 AUX libtheora-1.1.1-underlinking.patch 481 BLAKE2B 0939e1789eee97d999d229bb37620fe787b0da17253e15e6fbdf3109dd2c11cf201c6d77133529a779730acdd23806a52bb033d909509a6065ff6ac08db4b4d5 SHA512 9e8219ab32993470a4566b59b544eb04175577f4c82174924aa53b2ef61f0b94496a0de5afa630da291322fc6fbc640978152de8b61edd50231818838a330b0b
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
-EBUILD libtheora-1.1.1-r1.ebuild 2281 BLAKE2B 07dddc9f1faf461c15a81ce1fb8d6026c0de6d103589e7f1baa61370e890b5a5fa5b467667e8e53c87eefbb865e4cf4b09ebdca843e61b1b57e82e5d32e40597 SHA512 931f75c09195a979b830a824b053db327ae5e52bd5bc5da2b23d3b1ed0acd1ec1a862b9a68d0582143e2ef0d4a4b72848454ca365b59f780f6e8bc59f16de1b5
-EBUILD libtheora-1.1.1-r2.ebuild 2373 BLAKE2B bb8dc1b6f75bb03cddc2851191faaa6c8bd8a9d1bd828d132f0aee4b2cefba82cf6cab568f26bd22176ba6d6c973935ed60d2a4e4575c2627c3a7a7345706ca9 SHA512 1cf38a45eaccf7e9d2150429a7ab8adeb89586496ceb64b8270fb8fac86eb0b40b5e04a8d10b1b3c15635c1b661076adf57bfd8054850590243fe1b86b86078c
+EBUILD libtheora-1.1.1-r2.ebuild 2371 BLAKE2B 9ca277e4d8e14abeb864172ac3e3e938d4ff3d4536c38465249c5309aaf2ae5d78c2da1b5f9e171ba7402c979231a8bf706842d10678099d312c754776feb7e3 SHA512 949233d84bda2a912a9efb715e76489f67c2a83840e522fc13ebc49d4e2737c09b2e25f8012e3acab9fc0c796e67c85de723532bd3e6b18b9f17d2f7f6221eb4
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
deleted file mode 100644
index 58995ddb75e8..000000000000
--- a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="The Theora Video Compression Codec"
-HOMEPAGE="https://www.theora.org"
-SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc +encode examples static-libs"
-
-RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]
-	encode? ( >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}] )
-	examples? (
-		media-libs/libpng:0=
-		>=media-libs/libsdl-0.11.0
-		media-libs/libvorbis:=
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-REQUIRED_USE="examples? ( encode )" #285895
-
-S=${WORKDIR}/${P/_}
-
-VARTEXFONTS=${T}/fonts
-
-DOCS=( AUTHORS CHANGES README )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.0_beta2-flags.patch \
-		"${FILESDIR}"/${P}-underlinking.patch \
-		"${FILESDIR}"/${P}-libpng16.patch #465450
-
-	# bug 467006
-	sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.ac || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-multilib_src_configure() {
-	use x86 && filter-flags -fforce-addr -frename-registers #200549
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
-	local myconf
-	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
-		myconf=" $(use_enable examples)"
-	else
-		# those will be overwritten anyway
-		myconf=" --disable-examples"
-	fi
-
-	# --disable-spec because LaTeX documentation has been prebuilt
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--disable-spec \
-		$(use_enable encode) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	if use examples && [ "${ABI}" = "${DEFAULT_ABI}" ]; then
-		dobin examples/.libs/png2theora
-		for bin in dump_{psnr,video} {encoder,player}_example; do
-			newbin examples/.libs/${bin} theora_${bin}
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-
-	if use examples && use doc; then
-		docinto examples
-		dodoc examples/*.[ch]
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto .
-	fi
-}
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
index c3c7980cada9..629ecb22591f 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +encode examples static-libs"
 
 REQUIRED_USE="examples? ( encode )" #285895