gentoo auto-resync : 12:11:2022 - 21:32:47

4 files changed, 5 insertions, 75 deletions

diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index cb361c6e04f6..689dc99e8af9 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,7 +1,5 @@
 AUX x264-0.0.20190903-STRINGS.patch 1531 BLAKE2B 293a9efebca3914e9f03f5e6a9e8c22efc30e47a71e0ad2abb1206df937e989398a9426d772daa73a852383e1eee5c6a31dd76583e4571e2636a26be2bd85735 SHA512 7ff25afade4e1a47bb4cc17bd7a2da902eac554b3af29dbc50706ac876ae846665cb1d06a1293c0359e515f1b9cd08a0971ab197f06eb3eac4309893014aaceb
 DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
-DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
-EBUILD x264-0.0.20190903-r1.ebuild 1983 BLAKE2B dfb3da21ebb5bfb045deb86815c589978a05197fb3de3c7f8cd2580a6a10c6856b061aaa8288c62e69149b67e9073b972842008c9edbfe87860c3ab0fc0a7469 SHA512 74a660838e027c3128784c7a5c7e74cc267910f20290c487aaaee88089e2b908cbc41946db374b9f236dafb352011981c242e52d94e907439f0a430b24507c1f
-EBUILD x264-0.0.20220222.ebuild 1986 BLAKE2B 507e122ef17b6c7673a53ea194dffbbec896efe74b4a15c822ca08ad0a060336c602c3f240bcaba59ecaa6bf2adda67ff90094ee84ab9496698733c0a273f36d SHA512 86d9ac68878cdf45f84b637c19967888dff4c3767ba07730707a5835fd185cd52dcc5bd98b2c1ce1893c415e8ce4ea0ebbc3bbeffe6ed5b902ff8006084e0de5
-EBUILD x264-9999.ebuild 1982 BLAKE2B 337e0971e364d86cc9cd07fce36679f8d634bfecbd52c17a3fd0ed03f64bbe5ce04ade018e3d467883043bfa0e6a2ddd61f3878c4ddca5db44b3b6fa5214db55 SHA512 f7ff8f77f7b2ebae6743b5a5faf7e90b4640a3d3b2e2b2c09226149331527e4b7b92393f36e2e210a7feaa4c11217dcb131dc27465e016e1b17786ee22124c6b
+EBUILD x264-0.0.20220222.ebuild 1969 BLAKE2B 2ea20ba34de5aa797bf91833475f34fa629ff5c85db9875fddd06c2cf9950bad0026498487d5990b5eac3428cddd4661294523f11f17125db82a0a9b0921666a SHA512 f33af51d57fc59f51ee1283fe9a5e86a4d7a3f258fc13d9b990dcbfbc8f79e458dc7945db71ad75d455b0083ca1eee19dc1471eee7fd2ec087012227cca4b856
+EBUILD x264-9999.ebuild 1969 BLAKE2B 165f4692b66b88bbbc98a4ea961572a937357238c9c878e59ec540dc73cb1c1ba4dd030a8f4000fdc653252852f54eb8166c73069d2523b355913c13261b7e1d SHA512 7b48b1aa918776a613e0f63ced5f47e92a18ef548d7c0704e9a9bac72a6b78d2d464e85cf05e28f9ab912f0a23cf39390db85c1c734e774187597f2e252c1a70
 MISC metadata.xml 489 BLAKE2B b9c1e67f7b3bce14a0d3330717204b25bfccc55d77343dba21b8a4d01b915dd690627a7affea0de0e7940c42ac2378e2e06dff243099b70b5c6a1805095d5fd1 SHA512 1416496833de2a3e28ad0f407701c0a08b6d3435a3ba65c159beac19c7a64d0f5f04d5200cbaf9217846cef0a101827bf50824eedc2b6ae7414a7fc6fc10b250
diff --git a/media-libs/x264/x264-0.0.20190903-r1.ebuild b/media-libs/x264/x264-0.0.20190903-r1.ebuild
deleted file mode 100644
index 56e33e266e44..000000000000
--- a/media-libs/x264/x264-0.0.20190903-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-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 )
-
-PATCHES=("${FILESDIR}"/${P}-STRINGS.patch)
-
-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}" \
-		--cross-prefix="${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.20220222.ebuild b/media-libs/x264/x264-0.0.20220222.ebuild
index 87b38ec2453d..c8bcf46dda7b 100644
--- a/media-libs/x264/x264-0.0.20220222.ebuild
+++ b/media-libs/x264/x264-0.0.20220222.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal toolchain-funcs
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="A free library for encoding X264/AVC streams"
 HOMEPAGE="https://www.videolan.org/developers/x264.html"
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	# Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
 	SRC_URI="https://dev.gentoo.org/~aballier/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${PN}-master"
 fi
 
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index a16cb3d6a416..aac24f183989 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal toolchain-funcs
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="A free library for encoding X264/AVC streams"
 HOMEPAGE="https://www.videolan.org/developers/x264.html"