x11-libs/pixman: Sync with Gentoo

It's from Gentoo commit 3a0fb4286088b159f80569ece08b9eeae1a5dd65.

sdk_container/src/third_party/portage-stable/x11-libs/pixman/Manifest

@@ -1 +1 @@
-DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
+DIST pixman-0.42.2.tar.xz 652984 BLAKE2B 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957 SHA512 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8

sdk_container/src/third_party/portage-stable/x11-libs/pixman/metadata.xml

@@ -10,5 +10,6 @@
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:pixman:pixman</remote-id>
+    <remote-id type="freedesktop-gitlab">pixman/pixman</remote-id>
   </upstream>
 </pkgmetadata>

sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,18 +16,24 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs"
+IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test"
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
+}
 
 multilib_src_configure() {
-	local openmp=disabled
-	tc-has-openmp && openmp=enabled
-
 	if use arm && tc-is-clang ; then
 		# See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46
 		append-cflags $(test-flags-CC -fno-integrated-as)
@@ -40,13 +46,20 @@ multilib_src_configure() {
 		$(meson_feature cpu_flags_x86_sse2 sse2)
 		$(meson_feature cpu_flags_x86_ssse3 ssse3)
 		$(meson_feature cpu_flags_ppc_altivec vmx)
-		$(meson_feature cpu_flags_arm_neon neon)
 		$(meson_feature loongson2f loongson-mmi)
+		$(meson_feature test openmp) # only used in unit tests
+		$(meson_feature test tests)
 		-Ddefault_library=$(usex static-libs both shared)
 		-Dgtk=disabled
 		-Dlibpng=disabled
-		-Dopenmp=$openmp # only used in unit tests
 	)
+
+	if [[ ${ABI} == arm64 ]]; then
+		emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon))
+	elif [[ ${ABI} == arm ]]; then
+		emesonargs+=($(meson_feature cpu_flags_arm_neon neon))
+	fi
+
 	meson_src_configure
 }
 

sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,18 +16,24 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs"
+IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test"
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
+}
 
 multilib_src_configure() {
-	local openmp=disabled
-	tc-has-openmp && openmp=enabled
-
 	if use arm && tc-is-clang ; then
 		# See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46
 		append-cflags $(test-flags-CC -fno-integrated-as)
@@ -40,13 +46,20 @@ multilib_src_configure() {
 		$(meson_feature cpu_flags_x86_sse2 sse2)
 		$(meson_feature cpu_flags_x86_ssse3 ssse3)
 		$(meson_feature cpu_flags_ppc_altivec vmx)
-		$(meson_feature cpu_flags_arm_neon neon)
 		$(meson_feature loongson2f loongson-mmi)
+		$(meson_feature test openmp) # only used in unit tests
+		$(meson_feature test tests)
 		-Ddefault_library=$(usex static-libs both shared)
 		-Dgtk=disabled
 		-Dlibpng=disabled
-		-Dopenmp=$openmp # only used in unit tests
 	)
+
+	if [[ ${ABI} == arm64 ]]; then
+		emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon))
+	elif [[ ${ABI} == arm ]]; then
+		emesonargs+=($(meson_feature cpu_flags_arm_neon neon))
+	fi
+
 	meson_src_configure
 }