gentoo auto-resync : 02:11:2022 - 21:10:25

6 files changed, 72 insertions, 8 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 007029202ad7..24dfe72ebd25 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
index 5ba5785e8499..3b6045714329 100644
--- a/x11-libs/libXaw3dXft/Manifest
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw3dXft-1.6.2h.tar.bz2 593436 BLAKE2B e0e5c3a3e5b4564d58bb059ad7eb594d1a46cc37e0e21799ea11892d206a57f3f11a46d7413310d2a43738f03e001f5dc6f8c3b86bbe806fbc651661e9f720db SHA512 bc9b6de80379bdc82c7f5cd46ac78a422282b018eed979ef5548d0382f43e53619a6ebaf40c6b9ae264d597536022dc1daf023c1d1a04e948d4b4658bc6479ca
 EBUILD libXaw3dXft-1.6.2h.ebuild 799 BLAKE2B d738a11d8970718a695ad9fa165bb1407a1adbd4a1d165fabb8438b0c59caafbd91f005808953e22cb17a70f6e03034b02f00afaef8d13364a75ddc8db231563 SHA512 53e2075e19e38fa12e3d8a299e1ea07bb88bd4546098b15ba76292f1d2272034e31ebb4c2fb86d20b34e9f7a3637e07254d61c2789899ce0286db489f2607a7c
-MISC metadata.xml 482 BLAKE2B 72697de1fc204fcd4873595c5b22d8e45fbd4a7fc036003da81d425df1e022574fac78dc373cbcbfc618d748e0532dbdf5cdd52cd98bac569545515d1f040171 SHA512 7e29b3ac2214a41c2812af079b69d7b5784fc52b957b6807059d8e5daf18ebd3d9ab059db1852cd736c3efa8f944ddffefedd11f9263a0db1d70ac76e1d19f05
+MISC metadata.xml 328 BLAKE2B 40dfd53b0ddf66b8c03a1c5358d22f67ebc54693ad3cd5fa21f10002814e45d48856aa3e8685db21c72d0f759d93722da73e41ef27f0004565432eae6670a2b6 SHA512 d78dd7fb90d69d9f795cd866b2d3805a3caa446e5cbfc1140e7b32da4031b6aa19aeeefe774761c80d11a6a36a11c3a4455872854477b3634e5f49c5d5eccf0c
diff --git a/x11-libs/libXaw3dXft/metadata.xml b/x11-libs/libXaw3dXft/metadata.xml
index 3a232be3e15a..5318f2ee316c 100644
--- a/x11-libs/libXaw3dXft/metadata.xml
+++ b/x11-libs/libXaw3dXft/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>ceamac.paragon@gmail.com</email>
+	<maintainer type="person">
+		<email>ceamac@gentoo.org</email>
 		<name>Viorel Munteanu</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sf-xpaint</remote-id>
 	</upstream>
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 3ba6c8cd77ac..30153fa18257 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,6 @@
 DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
+DIST pixman-0.42.2.tar.xz 652984 BLAKE2B 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957 SHA512 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8
 EBUILD pixman-0.40.0.ebuild 2005 BLAKE2B 443ba3024143ba6106054358c3ecd28e4e3951f378d15740fed4141fa65908fe99b3ba074914b6860f03b5c30c855bfd84bad78d2fcbe6a9241ca452d93491f4 SHA512 1bdf7a0d33ef2b3bf03fa5d2e91b6d71e58336ad9b602869a54a5cf27c2303c4303916223740d1f5d79dae5280c92a12d3717950c5f8071bb2f90d45c0c9cfa0
-EBUILD pixman-9999.ebuild 2013 BLAKE2B aecf684907839c8ae0fcbfab97d226ba9638b4b192c4fd9cc20ec8b96aa0b661a38aa9e7eee71e3d204f56b6618cfc4e1862f9a93016f6ccca13f2dd3976b76c SHA512 5938e49282080d1be36df40014b922a8ff5fe71bb435a8146a81e5dfb9ee89e0c8b05c07732b8f74a68369897c62d019a4912109b33695f520f2d7de293ec13d
+EBUILD pixman-0.42.2.ebuild 2090 BLAKE2B 9b8348e5668a887e3110fa1da03bbce6a6c2b80d5b5276cc6314e136397a21b235eb7ef55e9cf1743f9c2529cc0075d12918ed44d351597a383e4d84ff4cf800 SHA512 1a04048f9291dc901b9fe28a5fabadd5967328ae2962da3f6053f41f185c83e6afa23d433273acc252d7a6efca9c12c4de015f8672c1a9c30fdcb82b78543c67
+EBUILD pixman-9999.ebuild 2090 BLAKE2B 9b8348e5668a887e3110fa1da03bbce6a6c2b80d5b5276cc6314e136397a21b235eb7ef55e9cf1743f9c2529cc0075d12918ed44d351597a383e4d84ff4cf800 SHA512 1a04048f9291dc901b9fe28a5fabadd5967328ae2962da3f6053f41f185c83e6afa23d433273acc252d7a6efca9c12c4de015f8672c1a9c30fdcb82b78543c67
 MISC metadata.xml 483 BLAKE2B 4302fc025e7ce3dfb1b2f099371f0b3263942203ffd50730c40afe491feb003d2ec17cbf8ddd4ad3c1c0d752c46b87dd944e907b6c31a6ffdcaab7b518c247fb SHA512 f4777b9c1ae7527be4f354836c51142b095ab27dd56b173a6e0b7146ad68257136f326ff7c0fa564706dcc53aebe9171d8f844bab026c139cab717c559bf2a5e
diff --git a/x11-libs/pixman/pixman-0.42.2.ebuild b/x11-libs/pixman/pixman-0.42.2.ebuild
new file mode 100644
index 000000000000..0fbef29030a3
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.42.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs
+
+DESCRIPTION="Low-level pixel manipulation routines"
+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 ~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 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() {
+	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)
+	fi
+
+	local emesonargs=(
+		$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
+		$(meson_use     cpu_flags_arm_iwmmxt2 iwmmxt2)
+		$(meson_feature cpu_flags_x86_mmxext mmx)
+		$(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 cpu_flags_arm_neon a64-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
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	export OMP_NUM_THREADS=$(makeopts_jobs)
+	meson_src_test -t 100
+}
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index ee72ddca48c6..0fbef29030a3 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -47,8 +47,10 @@ multilib_src_configure() {
 		$(meson_feature cpu_flags_x86_ssse3 ssse3)
 		$(meson_feature cpu_flags_ppc_altivec vmx)
 		$(meson_feature cpu_flags_arm_neon neon)
+		$(meson_feature cpu_flags_arm_neon a64-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