gentoo resync : 08.01.2021

5 files changed, 6 insertions, 139 deletions

diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 2bc2a8be3cb6..a627ba03479e 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,8 +1,5 @@
 AUX x264-0.0.20190903-STRINGS.patch 1531 BLAKE2B 293a9efebca3914e9f03f5e6a9e8c22efc30e47a71e0ad2abb1206df937e989398a9426d772daa73a852383e1eee5c6a31dd76583e4571e2636a26be2bd85735 SHA512 7ff25afade4e1a47bb4cc17bd7a2da902eac554b3af29dbc50706ac876ae846665cb1d06a1293c0359e515f1b9cd08a0971ab197f06eb3eac4309893014aaceb
-DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
-EBUILD x264-0.0.20190214.ebuild 1884 BLAKE2B fe190deda34255198c87b57d9a76e31f17ae16c0ee335b1e44932ace7621241ee32f9a6e80396d33d4eb338abbb9af3f9bda8666226198cef043d8de86173721 SHA512 3a3ed08326895cf6440046b4c6c657f68b58e8ef74db5af01d9a11c28cdd29640371e52f5f6c752b9f61480d05a2389f90248e8fc65877418afb28b9c6deec62
-EBUILD x264-0.0.20190903-r1.ebuild 1994 BLAKE2B c85b99cbac31e266ffdc113ad15881de429c4f52509c37cddb1537e7c3cbc4a3d9b56f0377db1be5957b72357de85dad207c36e65845e6c9d72e5b0d8d0de629 SHA512 544dd345416341ba1da893ce38abe96a6940bf6f14c5ae9c73badedab46f2dcd033cbb24afe0ecb3b2948b2b4686e89f15b28c9a0e6d1933315ebb7212595869
-EBUILD x264-0.0.20190903.ebuild 1919 BLAKE2B b1a45067ddc6e6398f71a34a67063e0fa6a9570342b13345689575eef976a774385b3e32fdce0ecb0e04db45f233bf035419becb19883bfb68ba01fa1d551b53 SHA512 2016f61381b48f31c100eae9b1b76553e084f513b2f95b27eebad839850af7d8efe363dbd5a8fa1cb54800a9e0c2f8db86fa90bdf9ef1ec4a6b2df3601d79d71
-EBUILD x264-9999.ebuild 1950 BLAKE2B 92e966552fcd1b4f93a78e4d4f277d78cf5fa8110f88cecdcf6a13f07184e658e4a73f0f6de81f09f29d667e3da32dcab52cdbbf8f6cbd25672aecf7d2dae28c SHA512 ba759fa7ac7b3b44b5d75f9ce4970934d2817b3a3e7af6b10390388926816de0144b43cb320330cf49bcd8f39fc8ba1ed41fdb8c09a9d0edb16f6ad8082fcd04
+EBUILD x264-0.0.20190903-r1.ebuild 1976 BLAKE2B 670edd905818b87f93771a7cb937c114043d82f173bc652c5b4ccc3ef84c896ef5d7b95208e87fedd62a2386a386ac02bfb9cb419154d289b98e4908f4d52221 SHA512 c8aa7ded99d57af9f1d1e128b7a76e14198961cf93b6093b6dea9815f2d564a4b66e8d1f3c9b7d65ce8a39f8c91906b947550fb3413b59cc2a3e248d77e32899
+EBUILD x264-9999.ebuild 1939 BLAKE2B 62087c6fde37550720193888c3e2772318eebeb46d93943b04300aa53a0c283bc24fa339e69ab1e1f2816950efa4b9ce1ebafc5bba53d2d11c98b1c03ac99652 SHA512 2429fc13b78e1c283ff5b9f7505f5890c4fc109aee4fb064324a41095e086ab753901fa1294a1de345814c42cc87154f573a6ab7a17cf2b3b3f2d6861510e37d
 MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/x264-0.0.20190214.ebuild b/media-libs/x264/x264-0.0.20190214.ebuild
deleted file mode 100644
index 7868773a08dc..000000000000
--- a/media-libs/x264/x264-0.0.20190214.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
-else
-	MY_P="x264-snapshot-$(ver_cut 3)-2245"
-	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0/157" # SONAME
-
-LICENSE="GPL-2"
-IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
-	abi_x86_64? ( ${ASM_DEP} )
-	opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
-
-DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
-
-multilib_src_configure() {
-	tc-export CC
-
-	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
-		export AS="nasm"
-	else
-		export AS="${CC}"
-	fi
-
-	local asm_conf=""
-
-	if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !altivec ; }; then
-		asm_conf=" --disable-asm"
-	fi
-
-	"${S}/configure" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-cli \
-		--disable-avs \
-		--disable-lavf \
-		--disable-swscale \
-		--disable-ffms \
-		--disable-gpac \
-		--enable-pic \
-		--enable-shared \
-		--host="${CHOST}" \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex opencl "" "--disable-opencl") \
-		$(usex static-libs "--enable-static" "") \
-		$(usex threads "" "--disable-thread") \
-		${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-0.0.20190903-r1.ebuild b/media-libs/x264/x264-0.0.20190903-r1.ebuild
index 453ed7982ff2..61fae4057df8 100644
--- a/media-libs/x264/x264-0.0.20190903-r1.ebuild
+++ b/media-libs/x264/x264-0.0.20190903-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-libs/x264/x264-0.0.20190903.ebuild b/media-libs/x264/x264-0.0.20190903.ebuild
deleted file mode 100644
index 1a64a1a46129..000000000000
--- a/media-libs/x264/x264-0.0.20190903.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
-else
-	MY_P="x264-snapshot-$(ver_cut 3)-2245"
-	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0/157" # SONAME
-
-LICENSE="GPL-2"
-IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
-	abi_x86_64? ( ${ASM_DEP} )
-	opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
-
-DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
-
-multilib_src_configure() {
-	tc-export CC
-
-	if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
-		export AS="nasm"
-	else
-		export AS="${CC}"
-	fi
-
-	local asm_conf=""
-
-	if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; }; then
-		asm_conf=" --disable-asm"
-	fi
-
-	"${S}/configure" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-cli \
-		--disable-avs \
-		--disable-lavf \
-		--disable-swscale \
-		--disable-ffms \
-		--disable-gpac \
-		--enable-pic \
-		--enable-shared \
-		--host="${CHOST}" \
-		$(usex interlaced "" "--disable-interlaced") \
-		$(usex opencl "" "--disable-opencl") \
-		$(usex static-libs "--enable-static" "") \
-		$(usex threads "" "--disable-thread") \
-		${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 98ce78b4c8e5..b2963fe3f360 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${MY_P}"
 fi