gentoo auto-resync : 05:05:2023 - 17:31:39

3 files changed, 51 insertions, 4 deletions

diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index f5c9e08163fb..f0c977b6fcea 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,6 @@
+AUX libpsl-0.21.2-tests-optional.patch 1141 BLAKE2B a72459d3e735391222d0a4e2fb7e42eccdd07a0c2ef05c381b49f3a967df797d3da225fcb5cb6d98ad8a14eb460589e60f7f16d338171c7b081741d5382b09ed SHA512 1b3fee48b1f5c85f58f704e3447e831b1a0b17a07b7f1e9456e8fde54ece4222be79c3f11811bfc5c601317b5a4b18ac7c358e5d438a08c6452b4ccdbd53b2aa
 DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5
 DIST libpsl-0.21.2.tar.gz 7617025 BLAKE2B b50f805bb467dc3284bc91645a37a2208098ad809d3771c74ef13c3b8f6029a07ad80a56702c7e3d1a1125d272403c85dd97b64a28465b9ff2d095eaf94b9a4d SHA512 f1df72220bf4391d4701007100b0df66c833a2cbcb7481c9d13f0b9e0cad3b66d2d15d4b976e5bad60d2ad1540355112fa1acb07aa925c241d2d7cd20681c71d
 EBUILD libpsl-0.21.1-r1.ebuild 1586 BLAKE2B 3d841d84d4286bba718b89be473b1735604600248e2e7b62a521b6737074c4141b2252918b7aea91af4f5aec6d0ae9d61b568acb5a416e1ff2db4f2a92ca034f SHA512 690f17d27b96c1c66bb94917c8d71c0884f79e5e6b75f36912a5b56f3ae4420ab754dbe52e82a04fa40fa9132aa755764278078ba0a9e6293fc0323c24556daf
-EBUILD libpsl-0.21.2.ebuild 1196 BLAKE2B c1c93ce6d89b3436019da1279a2232ba2ca488ed40622d182e0aaf52e3a9d10ecbd5e7255d7974c36e4f9e9cb95e8ab79f2613cdf65584092387e237ad261262 SHA512 9d428de4fb598a4b687d66424fab2a6ab5fc9d4165007bd7921c740d0690ab6de35629d9c0df89208fbd22a978dfd78dd4eab8b72d62a608d24e6a2e3a16aba3
+EBUILD libpsl-0.21.2.ebuild 1311 BLAKE2B b5f9fb3476567bad769fb93ec34e0acc6ad46abff57b51caf28323c8a671277758f5551d4387ca511ca99ae0e6470cf3084fa4312a5240f82a9353970500fe0b SHA512 50c828251a50b878458cbe9616356bf2c1bfab4f41f7383c11a91d4e0a05754b916670a25dcf07e02961d28a92ccd4e020df3233947d17c575cec1da7656ddff
 MISC metadata.xml 255 BLAKE2B 36ae66735664b8ed69846146d268e59f89bbea0d01d46f692709b9bfc521f70875a331b0995442435566e1896d9090bc9d9a6b9a63bf5de51b55d9a095f60d7a SHA512 4ce190fd174d39c74bce7eec22d651f9f15248ebbb7a2ffb68f7c9bae01ed412b6652285fcbb055770896d8ea0a1241c3aea30c2a0f4c223aba3b1dd723f1b9e
diff --git a/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch b/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch
new file mode 100644
index 000000000000..0f5773d75739
--- /dev/null
+++ b/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch
@@ -0,0 +1,39 @@
+https://github.com/rockdaboot/libpsl/commit/fb6b75317ab669c255906fa4db256837332eb1ed
+
+From fb6b75317ab669c255906fa4db256837332eb1ed Mon Sep 17 00:00:00 2001
+From: Vincent Torri <vtorri@outlook.fr>
+Date: Sat, 14 Jan 2023 17:25:31 +0100
+Subject: [PATCH] add 'tests' option to disable tests and fuzzers
+
+---
+ meson.build       | 6 ++++--
+ meson_options.txt | 3 +++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index d96748d..4492354 100644
+--- a/meson.build
++++ b/meson.build
+@@ -132,6 +132,8 @@ endif
+ subdir('include')
+ subdir('src')
+ subdir('tools')
+-subdir('tests')
+-subdir('fuzz')
++if get_option('tests')
++  subdir('tests')
++  subdir('fuzz')
++endif
+ subdir(join_paths('docs', 'libpsl'))
+diff --git a/meson_options.txt b/meson_options.txt
+index e9d6a23..d66f256 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,3 +17,6 @@ option('psl_testfile', type : 'string', value : '',
+ 
+ option('docs', type: 'boolean', value: false,
+   description: 'Build the API reference (requires gtk-doc)')
++
++option('tests', type: 'boolean', value: true,
++  description: 'Build the tests and fuzzers')
+
diff --git a/net-libs/libpsl/libpsl-0.21.2.ebuild b/net-libs/libpsl/libpsl-0.21.2.ebuild
index 221ce7a987cc..8dba8ae8ee92 100644
--- a/net-libs/libpsl/libpsl-0.21.2.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit meson-multilib python-any-r1
 
 DESCRIPTION="C library for the Public Suffix List"
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="icu +idn"
+IUSE="icu +idn test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
@@ -29,6 +30,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-optional.patch
+)
+
 pkg_pretend() {
 	if use icu && use idn ; then
 		ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"."
@@ -36,7 +41,9 @@ pkg_pretend() {
 }
 
 multilib_src_configure() {
-	local emesonargs=()
+	local emesonargs=(
+		$(meson_use test tests)
+	)
 
 	# Prefer idn even if icu is in USE as well
 	if use idn ; then