gentoo resync : 29.06.2020

3 files changed, 2 insertions, 67 deletions

diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 0b4b09c332ac..f5c48c74a3af 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,6 +1,4 @@
-DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
 DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
-EBUILD pixman-0.38.4.ebuild 1729 BLAKE2B ce0f18be74b4586a2227b3b517af19aa0029d478c9a50a1d83c2d07a222dfc70395316853366a3a4f22395ccde57b4faff6488755c7046877b671fb5b5cfefb6 SHA512 412d23d206071fc1357940328f4f8697cbcf7bf0d5cc9d20e033304d376dff3b92a0e8256af0e5d5bced1e30a8af8101a3d00cb4088ad7cd341f64a05eaa2e3d
-EBUILD pixman-0.40.0.ebuild 1784 BLAKE2B 57b1f39d4925d1b29045487e62714d513dbc23238fec2fb1114babf1e80086f5ead1a0b7d13339e03b8544e3ef5fd560b2fc01ce6f8c9977e7a3b9f9e619960f SHA512 914f9f0c17eb82ac100c41034ad03e7ec004dab9e1032295d1199b75cf178d3bfdb2415261a803aa53a31cc5ed45ed3a46267b294cf81e1e639f8360a3add891
+EBUILD pixman-0.40.0.ebuild 1782 BLAKE2B 5611bd96da3c2cf69676cf6d3d1a73a5f049a9c2aae62dce9789bbcc9811eb435117abd6368db46fee849fe8f7a353cd6d5e14bdf0585e3046fd4be3a4f9fc8b SHA512 b2844fc06f7643c01a8f3c025f08f99452d1c39f99e441e2ab2c6d9897a6e7c43c1dc766fcfe8749b5916fe2e58c491227d405638c8d777d6bc1957bbf82d6c5
 EBUILD pixman-9999.ebuild 1791 BLAKE2B 269eebe1da7f127311d09a4e0fae271324a51deb494123a35a44d4b3b1d5c4f166bda201d40f318115045942213605cf4fba6049027fef18818e9bea3cb59464 SHA512 e3c4e3374dc265f3d92f0eddeb142eb6c194103ec69f63c877182cf762b8021d836c06e8fb7b951e43c5ed690aa25e47630cea8657488c0b338179a63502abf1
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild
deleted file mode 100644
index e327798978a0..000000000000
--- a/x11-libs/pixman/pixman-0.38.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 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} meson multilib-minimal 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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local openmp=disabled
-	tc-has-openmp && openmp=enabled
-
-	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 altivec vmx)
-		$(meson_feature neon neon)
-		$(meson_feature loongson2f loongson-mmi)
-		-Dgtk=disabled
-		-Dlibpng=disabled
-		-Dopenmp=$openmp # only used in unit tests
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	export OMP_NUM_THREADS=$(makeopts_jobs)
-	meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index 9ca0bf375385..d45108302210 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -16,7 +16,7 @@ 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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi