From f616ce4660c92a3fcb4f05663c2ab47c9defa0c3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 30 Nov 2022 01:22:10 +0000
Subject: gentoo auto-resync : 30:11:2022 - 01:22:10
---
dev-libs/Manifest.gz | Bin 95817 -> 95823 bytes
dev-libs/libclc/Manifest | 3 +
dev-libs/libclc/libclc-15.0.6.ebuild | 81 +++++++++
dev-libs/libgweather/Manifest | 7 +-
.../files/40.0-autoskip-network-test.patch | 29 ---
dev-libs/libgweather/files/40.0-meson-tweaks.patch | 109 ------------
dev-libs/libgweather/files/40.0-tests-locale.patch | 55 ------
dev-libs/libgweather/libgweather-40.0-r1.ebuild | 80 ---------
dev-libs/libgweather/metadata.xml | 3 -
dev-libs/libxml2/Manifest | 3 +-
.../libxml2-2.10.3-python3-unicode-errors.patch | 35 ++++
dev-libs/libxml2/libxml2-2.10.3-r1.ebuild | 196 +++++++++++++++++++++
dev-libs/libxml2/libxml2-2.10.3.ebuild | 194 --------------------
dev-libs/wayland/Manifest | 3 +-
dev-libs/wayland/wayland-1.21.0-r1.ebuild | 66 +++++++
dev-libs/wayland/wayland-9999.ebuild | 9 +
16 files changed, 395 insertions(+), 478 deletions(-)
create mode 100644 dev-libs/libclc/libclc-15.0.6.ebuild
delete mode 100644 dev-libs/libgweather/files/40.0-autoskip-network-test.patch
delete mode 100644 dev-libs/libgweather/files/40.0-meson-tweaks.patch
delete mode 100644 dev-libs/libgweather/files/40.0-tests-locale.patch
delete mode 100644 dev-libs/libgweather/libgweather-40.0-r1.ebuild
create mode 100644 dev-libs/libxml2/files/libxml2-2.10.3-python3-unicode-errors.patch
create mode 100644 dev-libs/libxml2/libxml2-2.10.3-r1.ebuild
delete mode 100644 dev-libs/libxml2/libxml2-2.10.3.ebuild
create mode 100644 dev-libs/wayland/wayland-1.21.0-r1.ebuild
(limited to 'dev-libs')
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4fc8f1acdc2a..144afa8f173f 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 00bbe9193a6d..d7fa70df430c 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,12 +4,15 @@ DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76
DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6cc574a31c4abe038331b86206348ac3ce93a243add2be3a0bbfc2ec5ec3f3562a5b5efea745cb1943c9c9153bc7b0fcf4de22e SHA512 cf2a89ebb6bc9d7e3f1fd09531c84ac9927cdbe5ee13a6fcb8ce4d08e5a9d6d480ad982f62126b9c757beafa283b34f2ba1fbc56223c641e70da2be4627f59a6
DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
+DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
+DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAKE2B 1ab79554a05f8d7a74c0b4bab319c30375475d3fd089764733744fde55c65eb38967cdb19e5b0211a1543549c2bfc3c0f3d43facb7e041f51988e8a65e4448f3 SHA512 4c4d3a748b967cbc75372d0db87ac48d32271a54047ddeeb028d565fa6b7004b2ab3abd82d8ff4621e50c9410fce28c3044550cc94aaf0f6e4f672498f47aba8
DIST llvm-project-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9
EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B eb984d3f19f3b147d3974722c11218117240cad75033c12eb6664ef7d492e9ed77fd3c3dfef2fe59bb0c23716072b7ff3b10840b19b213fa96121d5aa7faa335 SHA512 66b74a3cb2ee6c54e6d348d64fe239f2ea72a43f28d1ab0cf22a4757cf87cadde427516d8aa74b4c95a947f38d01571f23e69388a04694527e2be9b0fd1bf94e
EBUILD libclc-15.0.3.ebuild 1411 BLAKE2B 22c88236e222cf2e547b25bb19e971fc7df4416cb686dbcff6086a60c023c4b11ea44242bd1f65ce68fc760199ffb985c3635022c74d05df5ef8e25f07f28e2a SHA512 20d96c75fb7916cfd6ab2c9480d0833da81036c4104bfd922eac93e76ef44225b0e27c9fc20aa6bb10c2f7e609a52e8d752b447e41ad1a9ed51715d6e8c9d8eb
EBUILD libclc-15.0.5.ebuild 1669 BLAKE2B 8ab5c9ad7381e2aeafe2a41efcaea056bf8d3c73b17f12cb72a305b2f9bc914d0098d5fe49146b91c342d90efa57d99b17d509d2b3a00bf5ee6f27b304ac8e5f SHA512 6a3012c9ac885802c1d2ca5fd962890ab919f5715ea68442303ad8c7af9213af8dd0006b97e902cccc5fcc06ffb67d19033473715e4467243c1dcaaa55f2071f
EBUILD libclc-15.0.6.9999.ebuild 1658 BLAKE2B 3874dd2500b10a36ce6dd24bbce66bcba8b1835859e3a07debc3f4d17081b4b8f34d7adba7666b8c106b455a68b1ad41604d44d36b9ffc63ed40e1d5b99b0f8e SHA512 cf3d643b19823e6c0ec33122ea33b21da8300ac8b7476e906002ed7ef3e0501db2874d97c58e32ec71a524fc1278b29098f521cc0d6ca8076211305ab61a981a
+EBUILD libclc-15.0.6.ebuild 1669 BLAKE2B 8ab5c9ad7381e2aeafe2a41efcaea056bf8d3c73b17f12cb72a305b2f9bc914d0098d5fe49146b91c342d90efa57d99b17d509d2b3a00bf5ee6f27b304ac8e5f SHA512 6a3012c9ac885802c1d2ca5fd962890ab919f5715ea68442303ad8c7af9213af8dd0006b97e902cccc5fcc06ffb67d19033473715e4467243c1dcaaa55f2071f
EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
EBUILD libclc-16.0.0_pre20221120.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
EBUILD libclc-16.0.0_pre20221126.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
diff --git a/dev-libs/libclc/libclc-15.0.6.ebuild b/dev-libs/libclc/libclc-15.0.6.ebuild
new file mode 100644
index 000000000000..3a0f83d5a902
--- /dev/null
+++ b/dev-libs/libclc/libclc-15.0.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+LLVM_MAX_SLOT=15
+BDEPEND="
+ ${PYTHON_DEPS}
+ || (
+ (
+ sys-devel/clang:15
+ spirv? ( dev-util/spirv-llvm-translator:15 )
+ )
+ (
+ sys-devel/clang:14
+ spirv? ( dev-util/spirv-llvm-translator:14 )
+ )
+ (
+ sys-devel/clang:13
+ spirv? ( dev-util/spirv-llvm-translator:13 )
+ )
+ )
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+ if use spirv; then
+ has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+ return 1
+ fi
+ has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ # we do not need llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local libclc_targets=()
+
+ use spirv && libclc_targets+=(
+ "spirv-mesa3d-"
+ "spirv64-mesa3d-"
+ )
+ use video_cards_nvidia && libclc_targets+=(
+ "nvptx--"
+ "nvptx64--"
+ "nvptx--nvidiacl"
+ "nvptx64--nvidiacl"
+ )
+ use video_cards_r600 && libclc_targets+=(
+ "r600--"
+ )
+ use video_cards_radeonsi && libclc_targets+=(
+ "amdgcn--"
+ "amdgcn-mesa-mesa3d"
+ "amdgcn--amdhsa"
+ )
+ [[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+ libclc_targets=${libclc_targets[*]}
+ local mycmakeargs=(
+ -DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+ -DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 1e4efff57c8b..4735fc50cf09 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,12 +1,7 @@
AUX 4.0.0-autoskip-network-test.patch 976 BLAKE2B ce6866636be48e553621a18dcda5ca122f204ad074d7472c740ea8db8cb283fe8f6ab63e2bc3862fd2c0725446c7c2969bc2f431bd175d9d2b96f68c401f3e0b SHA512 6f47d66e243dac3162b3e89e5fe893de7d87cc8dce9893534a12e76f1e9b830a18cdf3a9f6a26de89094841d1874843da301ed10f35e0b7e6d9ae4b2bca07f54
AUX 4.0.0-vapigen.patch 1153 BLAKE2B 1462b72ad3d25d4d5eac255d49217d74ef2cab67c740dc1feaaafa671977eaa92557c623c4f37f8cc4f76ee05018f040dd3604b6eb413bdc46830f77e2aff8c0 SHA512 0aae04a26f68e63b30911d3a76dd0569823ea11e247c14a34f81a15686caf33ea2834368e8b545faa1d0bd5f66e749916722e2cd77feef151c5cebd6d0fec1dd
-AUX 40.0-autoskip-network-test.patch 1038 BLAKE2B c233294ad5a301e8a7b6b96e606124a5440cc93507f291147acc6f8178341b1ce4ce292250d56467364bfadc2d28d49f02e5f3aa8f4cddac7dc621621a57d93c SHA512 fe2ff110863627e61454d1583d155b9f73c7c64814a77736783eaa533e50bbacc61065eb66a84af20f83323f0b66a1a38c70af26a1f7ef5a559865dc885c786d
-AUX 40.0-meson-tweaks.patch 3192 BLAKE2B e30f8f47beaa9683b6709389a0c603b28bbf160a1391dfead3d9bc1117bc3d811ac5cad4706bc85720f330ff5b22d5cd276947ee9bbe0f8911073a0e9a0b35be SHA512 c135d708154060d84023f2e33d16bd5a6a798311b858d0ebd15a9a51a1bf69c33ab93ef02bd8b6b65c5cfaf071af4a7a154630e3fed0767173cdfa576e554d1d
-AUX 40.0-tests-locale.patch 2023 BLAKE2B 97acdc022d38e465bd114dd3411b33752827b77167894386384614a1e0ec19f8abe1a2f52aa785dc768bb3599e20fcf64330dfb220c3519da93b42b38e736c3c SHA512 4e8edc725bccaa30ecf19f428e2e863b2cfabeb209bedd9095b12e149600ec2fce7ac8b385b1e7655d0262c8810a60891272956a829e70b513b16af0c1463435
DIST libgweather-4.0.0.tar.xz 4722620 BLAKE2B f2500d065fe9607b740c2f6c87378d5fc86c15951b2880f89c3ac22021d085eed601b645dcf1c9864fe1fa47860aa14ed1ab858263a7634c3b7615231d3ee6d1 SHA512 1441b8996a53b277e9453d3fcf32448800c963f40c32542f9055362bc3188dcf2e706466133d53b3f1b6343dc97b15cf5eabe16b950e7c9451cb79eeef87a9c3
DIST libgweather-4.2.0.tar.xz 2752164 BLAKE2B 9cc51363d6a2a09497269760701e0e0c1beb68c0096262fb6e2885414f838b41c151df7b057def457fdd49f9036d853ab624a9683a5cf57bbdefaed5376fe69f SHA512 cd95c6714575c0afc52455bb99c9116af27716868648debe0e5309904cfaf7516cf2379e415b3d9dd57b5dd223bae8e8acbaf705a3867dad8f75aec22eea908e
-DIST libgweather-40.0.tar.xz 2704404 BLAKE2B 27bc69c350ae91a07307d75b5ea1d03bb251f51bf87d5d54861965b61d7ed825ab708466cbe9d961c4f544b8b17ca6ed37b723c003ce2c1ef020270d6812c61d SHA512 72e295246bf03550039a70bd4bf5b8f06357a6b70e04308c197fba309e406d410a97d128d849d97a29a6a114faa1ef5452e6632870b7ea45223a0c305c228cc1
EBUILD libgweather-4.0.0-r1.ebuild 1713 BLAKE2B 8e879bfee3e337eb3e6967e1e1d015db133319268a4b9ac07d1b8c8cff67563f685142f2888eaab92ab1230b5da8a8559abbe701f670abb0794c5b830bdac24a SHA512 02adc00aff1fefeb298f1f31e0a8638cbe3ad0b594e9411a555afad824da294c74754075ee79c94e4220a581fdb3edf628400ecd5ebbc93f55ac6371d530fb4c
EBUILD libgweather-4.2.0.ebuild 1980 BLAKE2B b18581d1f95146358384b6e0ed43319da427a0e3192ca52fd423f6b5ac8e69eb94946c3a95416274c95aa93dc7b3898d67a7a8d6a0c046f4ec7d409894221cf6 SHA512 6774bb6d9fa6612f80800a02de1ca1ae2e76297a885657f7116f8d31901401c3e28db7e3d4557fce06aa3ffd3975d63752ce6734ed11f42fc2791f1240922961
-EBUILD libgweather-40.0-r1.ebuild 2092 BLAKE2B e31b69c5f372be23e2cbe67224f0e0798307b2071618085702d6ebcd1b3821b6ab4f02bb66fb6eb7e7000814ca2f723a4398b89a7142600154ab52503841fc3a SHA512 5d3187f4d95062d1cc4118a6b5cb18ee23ab60e7248a4465673f2b17c0d684b84341a03e88d0335d98b2492bee4dabb509ff2b6c93933dabcb4cb0decadbb4f4
-MISC metadata.xml 452 BLAKE2B 2377940e7a5653937291757ff1dacda3d430c77d811685dee8ac14eca7f6aa7bc22c17b80ab4e25baa40c89d40dbdd59d18025b8d25da25cfcb9b625cbe536a7 SHA512 ef80b6ee32f6f8414e68f494509aedbba54a1c9b9e24d88c7e2bb8a6476d5558098cd74a1fefce7f9e5b03f4c00f523321e1968f0754444437d0f0600a809ad5
+MISC metadata.xml 352 BLAKE2B 3726dfdf7269138db7992dbab72db960ed2362a8c753362376f28fa37e0849ef89f74b132dea4c63120dfb777f27566aea12f5dc92ddbeeb5a3b8139d4feeb9c SHA512 06dcfdd1ba301e34b2b9a23f3cdb5a686daa8fcc7a2caa8ac921eade3e805589ba2bb148da5f64f95f93d62dda71b5e19f37b33f1e35201c61bd8e0bb996bbf4
diff --git a/dev-libs/libgweather/files/40.0-autoskip-network-test.patch b/dev-libs/libgweather/files/40.0-autoskip-network-test.patch
deleted file mode 100644
index def65382613b..000000000000
--- a/dev-libs/libgweather/files/40.0-autoskip-network-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1d0ae284635ef1975a581b4d73ab497ccbd4532f Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 30 Aug 2020 10:35:13 +0300
-Subject: [PATCH 2/2] tests: Skip metar tests when METAR_SOURCES couldn't be
- resolved
-
----
- libgweather/test_libgweather.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
-index ee13dc7b..7ffaac41 100644
---- a/libgweather/test_libgweather.c
-+++ b/libgweather/test_libgweather.c
-@@ -438,6 +438,11 @@ test_metar_weather_stations (void)
- g_test_message ("SSL/TLS failure, please check your glib-networking installation");
- g_test_failed ();
- return;
-+ } else if (msg->status_code == SOUP_STATUS_CANT_RESOLVE) {
-+ g_test_skip ("Could not resolve " METAR_SOURCES " - network sandboxed?");
-+ g_object_unref (session);
-+ g_object_unref (msg);
-+ return;
- }
- g_assert_cmpint (msg->status_code, >=, 200);
- g_assert_cmpint (msg->status_code, <, 300);
---
-2.26.2
-
diff --git a/dev-libs/libgweather/files/40.0-meson-tweaks.patch b/dev-libs/libgweather/files/40.0-meson-tweaks.patch
deleted file mode 100644
index aa56c592890f..000000000000
--- a/dev-libs/libgweather/files/40.0-meson-tweaks.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From bbf17eac53c128904190ef2d74176b0717d7d907 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 23 Feb 2019 12:21:01 +0200
-Subject: [PATCH] build: Provide introspection option and don't build manual
- tests
-
----
- libgweather/meson.build | 21 ++++++++++++++-------
- meson.build | 4 ++++
- meson_options.txt | 2 ++
- 3 files changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/libgweather/meson.build b/libgweather/meson.build
-index 26f067e6..8f0f9047 100644
---- a/libgweather/meson.build
-+++ b/libgweather/meson.build
-@@ -74,6 +74,15 @@ lib_libgweather = shared_library('gweather-3',
- install: true,
- )
-
-+libgweather_dep = declare_dependency(
-+ sources: [gweather_enum_types[1]],
-+ dependencies: deps_libgweather,
-+ link_with: lib_libgweather,
-+ include_directories: root_inc,
-+)
-+
-+if get_option('introspection')
-+
- gweather_gir = gnome.generate_gir(lib_libgweather,
- sources: introspection_sources,
- dependencies: deps_libgweather,
-@@ -91,13 +100,6 @@ gweather_gir = gnome.generate_gir(lib_libgweather,
- install: true,
- )
-
--libgweather_dep = declare_dependency(
-- sources: [gweather_enum_types[1], gweather_gir],
-- dependencies: deps_libgweather,
-- link_with: lib_libgweather,
-- include_directories: root_inc,
--)
--
- if enable_vala
- gnome.generate_vapi('gweather-3.0',
- sources: gweather_gir[0],
-@@ -106,11 +108,13 @@ if enable_vala
- install: true
- )
- endif
-+endif
-
- test_cargs = ['-DTEST_LOCATIONS="@0@"'.format(locations_bin.full_path()),
- '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()),
- '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root())]
-
-+if false
- executable('test_locations',
- ['test_locations.c'],
- c_args: test_cargs,
-@@ -121,6 +125,7 @@ executable('test_locations_utc',
- c_args: test_cargs,
- dependencies: libgweather_dep,
- install: false)
-+endif
-
- exe = executable('test_libgweather',
- ['test_libgweather.c'],
-@@ -129,6 +134,7 @@ exe = executable('test_libgweather',
- install: false)
- test('test_libgweather', exe, depends: [locations_bin])
-
-+if false
- executable('test_metar',
- ['test_metar.c', gweather_c_sources],
- c_args: test_cargs,
-@@ -144,3 +150,4 @@ executable('test_weather',
- c_args: test_cargs,
- dependencies: libgweather_dep,
- install: false)
-+endif
-diff --git a/meson.build b/meson.build
-index 87f9a7d8..48ff0ca2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -104,6 +104,10 @@ else
- enable_vala = enable_vala != 'false'
- endif
-
-+if enable_vala and not get_option('introspection')
-+ error('Vala bindings require introspection support')
-+endif
-+
- root_inc = include_directories('.')
-
- subdir('data')
-diff --git a/meson_options.txt b/meson_options.txt
-index 19b2c6a7..bf4c5175 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -8,3 +8,5 @@ option('enable_vala', type: 'combo', choices : ['true', 'false', 'auto'], value
- description: 'Install vala bindings')
- option('gtk_doc', type: 'boolean', value: false,
- description: 'Whether to generate the API reference')
-+option('introspection', type: 'boolean', value: true,
-+ description: 'generate GObject Introspection data')
---
-2.26.2
-
diff --git a/dev-libs/libgweather/files/40.0-tests-locale.patch b/dev-libs/libgweather/files/40.0-tests-locale.patch
deleted file mode 100644
index ea1f6020152d..000000000000
--- a/dev-libs/libgweather/files/40.0-tests-locale.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6b2801a8195990fdf5166b62f62ddfbad55f11e4 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Mon, 9 Mar 2020 12:21:57 +0000
-Subject: [PATCH 1/2] Do not run local-dependent tests with missing locales
-
-Not everyone has all the locales installed all the time, so let's check
-if a locale is available before using it.
----
- libgweather/test_libgweather.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
-index b10c1f16..ee13dc7b 100644
---- a/libgweather/test_libgweather.c
-+++ b/libgweather/test_libgweather.c
-@@ -678,6 +678,7 @@ test_location_names (void)
- {
- g_autoptr(GWeatherLocation) world = NULL;
- g_autoptr(GWeatherLocation) brussels = NULL;
-+ char *old_locale;
-
- world = gweather_location_get_world ();
- g_assert_nonnull (world);
-@@ -689,10 +690,19 @@ test_location_names (void)
- g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
- gweather_location_unref (brussels);
-
-+ old_locale = g_strdup (setlocale (LC_ALL, NULL));
- setlocale (LC_ALL, "fr_FR.UTF-8");
-
- g_clear_pointer (&world, gweather_location_unref);
- g_clear_pointer (&brussels, gweather_location_unref);
-+ if (strstr (setlocale (LC_ALL, NULL), "fr_FR.UTF-8") == NULL)
-+ {
-+ g_test_skip ("locale fr_FR.UTF-8 not available, skipping localization tests");
-+ setlocale (LC_ALL, old_locale);
-+ g_free (old_locale);
-+ return;
-+ }
-+
- _gweather_location_reset_world ();
-
- world = gweather_location_get_world ();
-@@ -705,7 +715,7 @@ test_location_names (void)
- g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
- gweather_location_unref (brussels);
-
-- setlocale (LC_ALL, "");
-+ setlocale (LC_ALL, old_locale);
- g_clear_pointer (&world, gweather_location_unref);
- g_clear_pointer (&brussels, gweather_location_unref);
- _gweather_location_reset_world ();
---
-2.26.2
-
diff --git a/dev-libs/libgweather/libgweather-40.0-r1.ebuild b/dev-libs/libgweather/libgweather-40.0-r1.ebuild
deleted file mode 100644
index 1f291f569c0c..000000000000
--- a/dev-libs/libgweather/libgweather-40.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Location and timezone database and weather-lookup library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list
-
-IUSE="glade gtk-doc +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
- >=dev-libs/glib-2.44.0:2
- >=x11-libs/gtk+-3.13.5:3[introspection?]
- >=net-libs/libsoup-2.44:2.4
- >=dev-libs/libxml2-2.6.0:2
- sci-geosciences/geocode-glib:0
- >=sys-libs/timezone-data-2010k
-
- glade? ( >=dev-util/glade-3.16:3.10 )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- gtk-doc? ( >=dev-util/gtk-doc-1.11
- app-text/docbook-xml-dtd:4.3 )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
- $(vala_depend)
-"
-
-PATCHES=(
- "${FILESDIR}"/40.0-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
- "${FILESDIR}"/40.0-tests-locale.patch # Don't fail tests when a locale is not present, https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/58
- "${FILESDIR}"/40.0-autoskip-network-test.patch
-)
-
-python_check_deps() {
- has_version -b "dev-python/pygobject[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- xdg_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use glade glade_catalog)
- $(meson_use vala enable_vala)
- $(meson_use gtk-doc gtk_doc)
- $(meson_use introspection)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/dev-libs/libgweather/metadata.xml b/dev-libs/libgweather/metadata.xml
index f9ab907e6cd0..f48e69f0d501 100644
--- a/dev-libs/libgweather/metadata.xml
+++ b/dev-libs/libgweather/metadata.xml
@@ -5,9 +5,6 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
- <use>
- <flag name="glade">Installs catalog files for <pkg>dev-util/glade</pkg></flag>
- </use>
<upstream>
<remote-id type="gnome-gitlab">GNOME/libgweather</remote-id>
</upstream>
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 7f9456dc10f9..605e005d57c0 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,7 +1,8 @@
+AUX libxml2-2.10.3-python3-unicode-errors.patch 1208 BLAKE2B 8515db0c9d79c4397c3ef4147660ddf395b863de3658a8db27db20d2274949962172a42637bf9555d3d7bf63ead8f695d19f28ddb5e957b5302c8aed466058c7 SHA512 f2ab7934687ba14bf7541a381317d88c20d9912b424d1b206f8feb60224482f12e03c79ff4e8637025ee8d1bddd870183db932380990eafca833eea1c1373a06
DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 SHA512 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c
DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.10.3.ebuild 5335 BLAKE2B 46ade566ce046d0cf524741064b8e4f365f3df13c709cf6897feb91c3d71197a98f1a26ee41081dc92a79ec13cdbca57e948ac5a18bf8207d91ee307e3b07dc9 SHA512 7ea53bd001bb838007665254d02cdd1ba7ab5ab7ee6d5c056d7406dd799d215a3bcfcbc6a053a5e0e7a7f5552d74189ff66bacbc0e65d9bdbfabf953b5dbcd51
+EBUILD libxml2-2.10.3-r1.ebuild 5404 BLAKE2B 919b60c508a8c85462c190e7b9ad5f1d0caf5afd833b63d439cb24afe97a1eb62bc8fdab5345593fa79be01797cf359164a9b1a4e61e9e3ae6f0890e519aaddf SHA512 2b9f2b1d3e9176f6f78937e17d461c6f70d0e8607bf13df3bcb71893245770687acf82df568c17d574306da8d1f105ae786b29472df4cc90e98fd3298d62fd5e
EBUILD libxml2-9999.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760
MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/files/libxml2-2.10.3-python3-unicode-errors.patch b/dev-libs/libxml2/files/libxml2-2.10.3-python3-unicode-errors.patch
new file mode 100644
index 000000000000..525e1fe36c0b
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.10.3-python3-unicode-errors.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/745162
+https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
+
+--- a/python/libxml.c
++++ b/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ PyObject *message;
+ PyObject *result;
+ char str[1000];
++ unsigned char *ptr = (unsigned char *)str;
+
+ #ifdef DEBUG_ERROR
+ printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ str[999] = 0;
+ va_end(ap);
+
++#if PY_MAJOR_VERSION >= 3
++ /* Ensure the error string doesn't start at UTF8 continuation. */
++ while (*ptr && (*ptr & 0xc0) == 0x80)
++ ptr++;
++#endif
++
+ list = PyTuple_New(2);
+ PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+ Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+- message = libxml_charPtrConstWrap(str);
++ message = libxml_charPtrConstWrap(ptr);
+ PyTuple_SetItem(list, 1, message);
+ result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++ /* Forget any errors caused in the error handler. */
++ PyErr_Clear();
+ Py_XDECREF(list);
+ Py_XDECREF(result);
+ }
diff --git a/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild b/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild
new file mode 100644
index 000000000000..bc2c968b0da6
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit flag-o-matic python-r1 multilib-minimal
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+ inherit autotools git-r3
+else
+ inherit gnome.org libtool
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+SRC_URI+="
+ test? (
+ ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+ ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+ https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+ )"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+IUSE="debug examples +ftp icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+ icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+ python? ( ${PYTHON_DEPS} )
+ readline? ( sys-libs/readline:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} == 9999 ]] ; then
+ BDEPEND+=" dev-util/gtk-doc-am"
+fi
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/xml2-config
+)
+
+PATCHES=( "${FILESDIR}"/${PN}-2.10.3-python3-unicode-errors.patch )
+
+DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ else
+ local tarname=${P/_rc/-rc}.tar.xz
+
+ # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+ # as they are needed as tarballs in ${S}/xstc instead and not unpacked
+ unpack ${tarname}
+
+ if [[ -n ${PATCHSET_VERSION} ]] ; then
+ unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
+ fi
+ fi
+
+ cd "${S}" || die
+
+ if use test ; then
+ cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+ "${DISTDIR}/${XSTS_TARBALL_2}" \
+ "${S}"/xstc/ \
+ || die "Failed to install test tarballs"
+ unpack ${XMLCONF_TARBALL}
+ fi
+}
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == 9999 ]] ; then
+ eautoreconf
+ else
+ # Please do not remove, as else we get references to PORTAGE_TMPDIR
+ # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+ elibtoolize
+ fi
+}
+
+multilib_src_configure() {
+ # Filter seemingly problematic CFLAGS (bug #26320)
+ filter-flags -fprefetch-loop-arrays -funroll-loops
+
+ # Notes:
+ # The meaning of the 'debug' USE flag does not apply to the --with-debug
+ # switch (enabling the libxml2 debug module). See bug #100898.
+ libxml2_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --enable-ipv6 \
+ $(use_with ftp) \
+ $(use_with debug run-debug) \
+ $(use_with icu) \
+ $(use_with lzma) \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_with readline) \
+ $(multilib_native_use_with readline history) \
+ "$@"
+ }
+
+ # Build python bindings separately
+ libxml2_configure --without-python
+
+ multilib_is_native_abi && use python &&
+ python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+ pushd "${BUILD_DIR}"/python >/dev/null || die
+
+ emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+ popd >/dev/null || die
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use python ; then
+ NATIVE_BUILD_DIR="${BUILD_DIR}"
+ python_foreach_impl run_in_build_dir libxml2_py_emake all
+ fi
+}
+
+multilib_src_test() {
+ ln -s "${S}"/xmlconf || die
+
+ emake check
+
+ multilib_is_native_abi && use python &&
+ python_foreach_impl run_in_build_dir libxml2_py_emake check
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ multilib_is_native_abi && use python &&
+ python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+
+ # Hack until automake release is made for the optimise fix
+ # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
+ multilib_is_native_abi && use python && python_foreach_impl python_optimize
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if ! use examples ; then
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+ rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+ fi
+
+ rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+ # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+ if [[ -n "${ROOT}" ]]; then
+ elog "Skipping XML catalog creation for stage building (bug #208887)."
+ else
+ # Need an XML catalog, so no-one writes to a non-existent one
+ CATALOG="${EROOT}/etc/xml/catalog"
+
+ # We don't want to clobber an existing catalog though,
+ # only ensure that one is there
+ # <obz@gentoo.org>
+ if [[ ! -e "${CATALOG}" ]]; then
+ [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+ "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+ einfo "Created XML catalog in ${CATALOG}"
+ fi
+ fi
+}
diff --git a/dev-libs/libxml2/libxml2-2.10.3.ebuild b/dev-libs/libxml2/libxml2-2.10.3.ebuild
deleted file mode 100644
index 7b940b3948b0..000000000000
--- a/dev-libs/libxml2/libxml2-2.10.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: Please bump in sync with dev-libs/libxslt
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit flag-o-matic python-r1 multilib-minimal
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20130923.tar.gz"
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
- inherit autotools git-r3
-else
- inherit gnome.org libtool
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-SRC_URI+="
- test? (
- ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
- ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
- https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
- )"
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-LICENSE="MIT"
-SLOT="2"
-IUSE="debug examples +ftp icu lzma +python readline static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} == 9999 ]] ; then
- BDEPEND+=" dev-util/gtk-doc-am"
-fi
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/xml2-config
-)
-
-DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- else
- local tarname=${P/_rc/-rc}.tar.xz
-
- # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked
- unpack ${tarname}
-
- if [[ -n ${PATCHSET_VERSION} ]] ; then
- unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
- fi
- fi
-
- cd "${S}" || die
-
- if use test ; then
- cp "${DISTDIR}/${XSTS_TARBALL_1}" \
- "${DISTDIR}/${XSTS_TARBALL_2}" \
- "${S}"/xstc/ \
- || die "Failed to install test tarballs"
- unpack ${XMLCONF_TARBALL}
- fi
-}
-
-src_prepare() {
- default
-
- if [[ ${PV} == 9999 ]] ; then
- eautoreconf
- else
- # Please do not remove, as else we get references to PORTAGE_TMPDIR
- # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
- elibtoolize
- fi
-}
-
-multilib_src_configure() {
- # Filter seemingly problematic CFLAGS (bug #26320)
- filter-flags -fprefetch-loop-arrays -funroll-loops
-
- # Notes:
- # The meaning of the 'debug' USE flag does not apply to the --with-debug
- # switch (enabling the libxml2 debug module). See bug #100898.
- libxml2_configure() {
- ECONF_SOURCE="${S}" econf \
- --enable-ipv6 \
- $(use_with ftp) \
- $(use_with debug run-debug) \
- $(use_with icu) \
- $(use_with lzma) \
- $(use_enable static-libs static) \
- $(multilib_native_use_with readline) \
- $(multilib_native_use_with readline history) \
- "$@"
- }
-
- # Build python bindings separately
- libxml2_configure --without-python
-
- multilib_is_native_abi && use python &&
- python_foreach_impl run_in_build_dir libxml2_configure --with-python
-}
-
-libxml2_py_emake() {
- pushd "${BUILD_DIR}"/python >/dev/null || die
-
- emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
-
- popd >/dev/null || die
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi && use python ; then
- NATIVE_BUILD_DIR="${BUILD_DIR}"
- python_foreach_impl run_in_build_dir libxml2_py_emake all
- fi
-}
-
-multilib_src_test() {
- ln -s "${S}"/xmlconf || die
-
- emake check
-
- multilib_is_native_abi && use python &&
- python_foreach_impl run_in_build_dir libxml2_py_emake check
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- multilib_is_native_abi && use python &&
- python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
-
- # Hack until automake release is made for the optimise fix
- # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
- multilib_is_native_abi && use python && python_foreach_impl python_optimize
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if ! use examples ; then
- rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
- rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
- fi
-
- rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
- # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
- if [[ -n "${ROOT}" ]]; then
- elog "Skipping XML catalog creation for stage building (bug #208887)."
- else
- # Need an XML catalog, so no-one writes to a non-existent one
- CATALOG="${EROOT}/etc/xml/catalog"
-
- # We don't want to clobber an existing catalog though,
- # only ensure that one is there
- # <obz@gentoo.org>
- if [[ ! -e "${CATALOG}" ]]; then
- [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
- "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
- einfo "Created XML catalog in ${CATALOG}"
- fi
- fi
-}
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 17ad0ab88e71..edc54fc7f278 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,5 @@
DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
+EBUILD wayland-1.21.0-r1.ebuild 1675 BLAKE2B f278a266e2635568419ceed5bd71c12ad13f8bafc905912f11e9e20b9866ee7ef2b2fec255da0fd5e40aa9a448e6e3c3e93dfff254836a471b9ee94e1bf8ed83 SHA512 82972eec97e3a4a1b709edc74a52fa4e290044eb7e5addbf4c58677d1386b66fdb045669e64d1d7d1644858d15e91fd784c2641e50b4b297556b5f2c35e1b587
EBUILD wayland-1.21.0.ebuild 1478 BLAKE2B 0884da89055eb938e9dd782c9ad0e50358205e4752ed4600f8f216f08081f34252c9f1122edffd1123be6f3693d0fe4ddbfd3ad4d2a908e2410ba911d18e44ad SHA512 f6a4e29a0bd5c0bf567a378dd3a715ba3b1f37731777766591467707b426fa845c33e5726e69028093cd5debb300368a73d41190bcbc2e5132479ba0d1397fe4
-EBUILD wayland-9999.ebuild 1485 BLAKE2B 8e82cc08d4efab01be9e60daa08f568c9c2760cd5247f66ac2aac0886ec0dcb3b9d5cc262ed7612e08c77f97c08371b454a35f2af693eb6a8cc88a19c23575d0 SHA512 fbb427c35c1e5df874e99391438babcca5c943b548dfc8c4380e694979833045a94be367d920d696c9e5b332171351e2ff298214e7e82c0c4bbc42a669ca9f12
+EBUILD wayland-9999.ebuild 1675 BLAKE2B f278a266e2635568419ceed5bd71c12ad13f8bafc905912f11e9e20b9866ee7ef2b2fec255da0fd5e40aa9a448e6e3c3e93dfff254836a471b9ee94e1bf8ed83 SHA512 82972eec97e3a4a1b709edc74a52fa4e290044eb7e5addbf4c58677d1386b66fdb045669e64d1d7d1644858d15e91fd784c2641e50b4b297556b5f2c35e1b587
MISC metadata.xml 337 BLAKE2B af249efc25c3eadde73d0b49cba0e6c8a021fb4b7c9a0b96f27a4e71185c76f8ac7ff0b9efdfeadf2df324cfa578db3a73fc7bee8c249cba35d41e2145017e16 SHA512 771b226f8e16d8c570bc2ea89ee3c5176e1d0f2209afb3b2af5a9d19fbdc2037a411b84d546bea054449c8074fb0fb3c3726fb2692d084521c64cda60600c0b8
diff --git a/dev-libs/wayland/wayland-1.21.0-r1.ebuild b/dev-libs/wayland/wayland-1.21.0-r1.ebuild
new file mode 100644
index 000000000000..c232ff0e5669
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.21.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+ inherit git-r3
+else
+ SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+inherit meson-multilib
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ ~dev-util/wayland-scanner-${PV}
+ virtual/pkgconfig
+ doc? (
+ >=app-doc/doxygen-1.6[dot]
+ app-text/xmlto
+ >=media-gfx/graphviz-2.26.0
+ )
+"
+DEPEND="
+ >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_native_use_bool doc documentation)
+ $(meson_native_true dtd_validation)
+ -Dlibraries=true
+ -Dscanner=false
+ $(meson_use test tests)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ # We set it on purpose to only a short subdir name, as socket paths are
+ # created in there, which are 108 byte limited. With this it hopefully
+ # barely fits to the limit with /var/tmp/portage/${CATEGORY}/${PF}/temp/x
+ export XDG_RUNTIME_DIR="${T}"/x
+ mkdir "${XDG_RUNTIME_DIR}" || die
+ chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+ multilib-minimal_src_test
+}
+
+src_install() {
+ meson-multilib_src_install
+
+ if use doc; then
+ mv "${ED}"/usr/share/doc/"${PN}"/* "${ED}"/usr/share/doc/"${PF}"/ || die
+ rmdir "${ED}"/usr/share/doc/"${PN}" || die
+ fi
+}
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index bbe4c3904bca..c232ff0e5669 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -55,3 +55,12 @@ src_test() {
multilib-minimal_src_test
}
+
+src_install() {
+ meson-multilib_src_install
+
+ if use doc; then
+ mv "${ED}"/usr/share/doc/"${PN}"/* "${ED}"/usr/share/doc/"${PF}"/ || die
+ rmdir "${ED}"/usr/share/doc/"${PN}" || die
+ fi
+}
--
cgit v1.2.3