gentoo resync : 20.03.2022

6 files changed, 52 insertions, 93 deletions

diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index d88510610dbe..a9e56e705a58 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -1,11 +1,10 @@
 AUX plocate-1.1.10-meson-use-feature-option-for-libiouring.patch 1833 BLAKE2B 4aba8c5ff0e5aade451ef02e60db223ff00f53c8d8e0761a83ae8a306348df0c42bb25549396684e75b4f1ae6d62b7b18972f2890291ba1643481c2401548c76 SHA512 8b8a08f0cbbe9455f5c2c88c609cab602bcb15f2f162c9ca597c779b550067ff430556df0d16f90221b615582e1d637e08b0cf29e013ef103fec0ccebb5b4c7e
+AUX plocate-1.1.15-meson-use-feature-option-for-libiouring.patch 1943 BLAKE2B cbcd583d93c3423c4cb8f13b3891ec34690ec1447c92f60291ec395437f11626aef82e669f470482c63232b9a7ebe73ed67cb7e0595a9f08b309f742c0d79d72 SHA512 110292358260f5fdf6f687b80c0375a91f224a190f6a25ec166c406cf4d39732493e0ebfea0fc02ccca18d95fdfcbff5d17d00cd10ac28c9a4ae46db8faf0ac9
 AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc16a4662b606f5a0c6c62e4b1475a02ec3f244dde1ff73fe0ad16e0850aec53e6e8836fd0ba1273ad07 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
-DIST plocate-1.1.11.tar.gz 72366 BLAKE2B 2b945b3e61244670e2295e1e5abc2af65d2cdbb2393a96961cd4ae97384a735c327037771e6f41927cec0860207a6f98b7b0c2b03d08678bdb0d72a94dfa04f7 SHA512 59f88a11ebbac5f350acca6d1a5890ac1c1cb10c1de2e4e149df60fc63673eefa7f143b06f79ec4e59c65d435b3e222eba5618c48afab97983d76f56fbe8b433
-DIST plocate-1.1.13.tar.gz 72741 BLAKE2B 251c5ff570bda125c839e125eab093e15545beb24e75d29c21f13050fc088653f11ba1acbf4c4f6f6aaca4f134908b8084ad4b1e8b0cad83a1a05e1bc2973cdc SHA512 a7c761e4da169716686f438846587e4bdb6df4de039cd7b4fed455e5f52b8aa235714f0c1059787f65f1553a07929802d0ecda0b26111d4f0f811af96a48cb7d
 DIST plocate-1.1.14.tar.gz 73037 BLAKE2B 032963fa268d31664a8abd38ca501aacda4cfe29c8fd1e41228a4cfd5976174736e8d8f8aa1265de8953ec63211700da73e4cdd3eef42c059a638cdd9cd59379 SHA512 c97c9e4aed785af6bd8c2a30d5d5c7190cb4c513f1d6b66bb2885c9550b4cd39f097fac4bd736c211a921955422d0c27b5f35713f03ebe136450cb724fcfe600
-EBUILD plocate-1.1.11.ebuild 2081 BLAKE2B 075034c462d4781f2ff0d9de298569e215538d5d498c5d2cd042aa680b2f2cccf3d24ece0a4b4790d6e8f8c95dfe402b79512e132c036b43c6c033deeb5af995 SHA512 726ee0a4705cd7b695db84d995f8845efc75060f863bd9fe9a0d7908a1383a12efd9c380c43d4a66d2926bd3bf4572f3ffa640ce51473d44c0064b695eb79d99
-EBUILD plocate-1.1.13.ebuild 2081 BLAKE2B 075034c462d4781f2ff0d9de298569e215538d5d498c5d2cd042aa680b2f2cccf3d24ece0a4b4790d6e8f8c95dfe402b79512e132c036b43c6c033deeb5af995 SHA512 726ee0a4705cd7b695db84d995f8845efc75060f863bd9fe9a0d7908a1383a12efd9c380c43d4a66d2926bd3bf4572f3ffa640ce51473d44c0064b695eb79d99
-EBUILD plocate-1.1.14.ebuild 2082 BLAKE2B 1b946f516eff9d7dfe9b4aeab26be44c83cb414955d64548248fb8bd45ce84d248ab0944c1f3b1f5e1ef5238846a71a03cb5d3f083393cf233fd180ee3be5d2f SHA512 a234c89bf645c147609135d630aeb0c5b3a47b0dcd84a686b74c9fa0c1d59a3c11ba5a18d90f559f37baa3d074e205ff4c9c5b09c4bd034a9126acb3cf52cbc3
-MISC metadata.xml 1393 BLAKE2B 1459e2cc800bad910a9e08a1fd0d6b6a533d3420279a4a89d5c07d91775180669684d5b454962323acb5ecc1d96de650f48623a9f63319004ad25bea7b4ded97 SHA512 16e282b1d1bc1f71631bbde3ca935c1e0747175460860ef068e6855a9efa3d843841e0b9deaa0848a2f4fbff32aa630f0b93c398b196c6619a61f59263ee8e31
+DIST plocate-1.1.15.tar.gz 73274 BLAKE2B 72dba287ba3357d2fa541542bf5e9d283eac672b7f3b2eebab687ecec930d6e91400eeb0f24c97d6133d69cae0308bc4473b7c8cbc5e263dd18ae8a7728a42a4 SHA512 772f82af38fd7b61fa51ac31f71d4a855542cfa617867da54b5ad8202f49f9e1861064a01e9b8f0937c3da902d84f19a50c1d0e4f037a491a9a6819b2413cfa1
+EBUILD plocate-1.1.14.ebuild 2081 BLAKE2B 0a76aaedf386c23cf05742cd7f1f59f884a2bb4decc3962a9e3d4241e95ddd02f7bfde57ebeaec86f79c22c55293400a8e2b7bf8e25ac5161dd7078cffecac42 SHA512 48f6d71e2cb738b3b0b734a4a93e0d81d094daadd61e2f66eb8be7eb114305343c3f2819d0a8d25729e0a968a433100dad64427bd6286d1f41ab0e35165152f1
+EBUILD plocate-1.1.15.ebuild 2081 BLAKE2B b1239b595cf96315985570b333e21cfbd7accc2fc2f17476f68fabe3a339d7ac873560b1706161f75fefefe7933d4c8c641f7fd32908f6a037d389c85d7f9960 SHA512 a55b2468ddab3d0cbf68ef177ca2f34e9d1728dbe896715712788d3f32b72542a1677ac0d8b74fe5d167f0afc8066e32b37def98320f1f64b5eb9aade8f654ab
+MISC metadata.xml 1437 BLAKE2B d3aece3d36e8cc4ceaf9947f0b535c7e2187a25cbb88910f704b1d72a2784831bfb746cca323c98183964688e6b5f2f2fa6bf54c97f8fc99eeea4ee946983e0d SHA512 b24d79da1b27531a7f3353128f7fbc583ef064f4aff58894e9d37dfa9144203c1f1898113aa31f82604aea93de66423e3313924bad25e31e075832c77a99c39e
diff --git a/sys-apps/plocate/files/plocate-1.1.15-meson-use-feature-option-for-libiouring.patch b/sys-apps/plocate/files/plocate-1.1.15-meson-use-feature-option-for-libiouring.patch
new file mode 100644
index 000000000000..dec128cddf6d
--- /dev/null
+++ b/sys-apps/plocate/files/plocate-1.1.15-meson-use-feature-option-for-libiouring.patch
@@ -0,0 +1,41 @@
+From e61f3b1dfcc883b701cf6dd331f2d93dcc8919f5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Thu, 19 Aug 2021 12:03:39 +0200
+Subject: [PATCH plocate] meson: use feature option for libiouring
+
+source-based distributions would prefer to allow this option to be
+disabled without a hack, regardless of is libiouring installed or not,
+and meson already supports feature options for this purpose.
+---
+rebased from plocate-1.1.10-meson-use-feature-option-for-libiouring.patch on
+top of 1.1.15
+
+ meson.build       | 2 +-
+ meson_options.txt | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 2a7d20c..81bc891 100644
+--- a/meson.build
++++ b/meson.build
+@@ -9,7 +9,7 @@ add_project_arguments('-DPACKAGE_VERSION="' + meson.project_version() + '"', lan
+ add_project_arguments('-DPACKAGE_BUGREPORT="steinar+plocate@gunderson.no"', language: 'cpp')
+ 
+ cxx = meson.get_compiler('cpp')
+-uringdep = dependency('liburing', required: false)
++uringdep = dependency('liburing', required: get_option('use_libiouring'))
+ zstddep = dependency('libzstd')
+ threaddep = dependency('threads')
+ atomicdep = cxx.find_library('atomic', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index a9f3358..1f2274f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -4,3 +4,4 @@ option('systemunitdir', type: 'string', description: 'Where to install systemd u
+ option('locategroup', type: 'string', value: 'plocate', description: 'Group that the install script will use for the .db file')
+ option('updatedb_progname', type: 'string', value: 'updatedb', description: 'Binary name of updatedb')
+ option('dbpath', type: 'string', value: 'plocate/plocate.db', description: 'Path to plocate database relative to "sharedstatedir"')
++option('use_libiouring', type: 'feature', value: 'auto', description: 'Enable libiouring dependency (default: autodetect)')
+-- 
+2.34.1
+
diff --git a/sys-apps/plocate/metadata.xml b/sys-apps/plocate/metadata.xml
index 5ae4111e4ca2..f205b9997243 100644
--- a/sys-apps/plocate/metadata.xml
+++ b/sys-apps/plocate/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>arsen@aarsen.me</email>
 		<name>Arsen Arsenović</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jeffrey@icurse.nl</email>
 		<name>Jeffrey Lin</name>
 	</maintainer>
@@ -17,7 +17,7 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/sys-apps/plocate/plocate-1.1.13.ebuild b/sys-apps/plocate/plocate-1.1.13.ebuild
deleted file mode 100644
index f9cef1542c88..000000000000
--- a/sys-apps/plocate/plocate-1.1.13.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info meson systemd
-
-DESCRIPTION="Posting locate is a much faster locate"
-HOMEPAGE="https://plocate.sesse.net/"
-SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
-
-# GPL-2 for updatedb
-# GPL-2+ for plocate itself
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="+io-uring"
-
-RDEPEND="
-	acct-group/locate
-	app-arch/zstd:=
-	io-uring? ( sys-libs/liburing:= )
-	!sys-apps/mlocate
-"
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~IO_URING"
-ERROR_IO_URING="required for USE=io-uring"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.10-meson-use-feature-option-for-libiouring.patch
-)
-
-src_prepare() {
-	# We'll install the manpage ourself to locate.1
-	sed -i "/install_man('plocate.1')/d" meson.build || die
-
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlocategroup=locate
-		-Dinstall_systemd=true
-		-Dinstall_cron=false
-		-Dsystemunitdir="$(systemd_get_systemunitdir)"
-		"$(meson_feature io-uring use_libiouring)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dodoc README NEWS
-	newman "${S}"/${PN}.1 locate.1
-	dosym plocate /usr/bin/locate
-
-	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf
-	doins "${FILESDIR}"/plocate-cron.conf
-	fperms 0644 /etc/{updatedb,plocate-cron}.conf
-
-	insinto /etc/cron.daily
-	# Ensure that the cron file has the same name as the
-	# systemd-timer, to avoid plocate being run twice daily on systems
-	# with a systemd compatiblity layer. See also bug #780351.
-	newins "${FILESDIR}"/plocate.cron plocate-updatedb
-	fperms 0755 /etc/cron.daily/plocate-updatedb
-
-	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "The database for the locate command is generated daily by a cron job,"
-		elog "if you install for the first time you can run the updatedb command manually now."
-		elog
-		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
-		elog "please customize it to your system requirements."
-	fi
-}
diff --git a/sys-apps/plocate/plocate-1.1.14.ebuild b/sys-apps/plocate/plocate-1.1.14.ebuild
index a3e786010409..1c92c6cde6cf 100644
--- a/sys-apps/plocate/plocate-1.1.14.ebuild
+++ b/sys-apps/plocate/plocate-1.1.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
 # GPL-2+ for plocate itself
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="+io-uring"
 
 RDEPEND="
diff --git a/sys-apps/plocate/plocate-1.1.11.ebuild b/sys-apps/plocate/plocate-1.1.15.ebuild
index f9cef1542c88..632c45be5000 100644
--- a/sys-apps/plocate/plocate-1.1.11.ebuild
+++ b/sys-apps/plocate/plocate-1.1.15.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
@@ -28,7 +28,7 @@ CONFIG_CHECK="~IO_URING"
 ERROR_IO_URING="required for USE=io-uring"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.10-meson-use-feature-option-for-libiouring.patch
+	"${FILESDIR}"/${PN}-1.1.15-meson-use-feature-option-for-libiouring.patch
 )
 
 src_prepare() {