gentoo resync : 26.08.2021

3 files changed, 122 insertions, 0 deletions

diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 75031cd30f04..a0c4cb0e414d 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -1,7 +1,10 @@
+AUX plocate-1.1.10-meson-use-feature-option-for-libiouring.patch 1833 BLAKE2B 4aba8c5ff0e5aade451ef02e60db223ff00f53c8d8e0761a83ae8a306348df0c42bb25549396684e75b4f1ae6d62b7b18972f2890291ba1643481c2401548c76 SHA512 8b8a08f0cbbe9455f5c2c88c609cab602bcb15f2f162c9ca597c779b550067ff430556df0d16f90221b615582e1d637e08b0cf29e013ef103fec0ccebb5b4c7e
 AUX plocate-1.1.5-no-systemd-check.patch 764 BLAKE2B f2a97b7c85339e7b7de663e1097e98178913766f88fdcea68b25f3285b14ff8791d668ca2a608ed6bcdf5f9b5b3c2cfedb2e76ad5c674bba03664ee19232e5bb SHA512 440b96a621c9f39f3b9a846342d5dc1d95ef7a8b5253e1c569582bddd6e1a544767996885c5f19a5bcc78cfc48f522f93631c382d2cd360a528141bc8a029aa2
 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.10.tar.gz 72222 BLAKE2B 2d84177454380c9e806a46a6e7057aca15b65c9d83179ba35062d0b8772e7cb3ff50d594c294d73157e7705d4b2eea3f12d07e614076e6a6c7a9b532f42640f5 SHA512 eee4a8982b8fff18793cd06c35cdea501226fae6409df02e8bed3d14feb3ed4ba6c29e907f36f5efb74202e8926547def83379b03aeb6348e1a6e7b51f12fdb9
 DIST plocate-1.1.8.tar.gz 71569 BLAKE2B 06ad0e9535b76bf0102cdeeb6014e2d84f85f51f5926520566e9c6871f04ac09651bb0674ed679d2a4c0d4e516e55dfef35a7021112fad3549bf76993554aeb5 SHA512 a685347df64ac1a3eb7789cb7023b4d0ffed5fb7435a4bd88c3943991e145a387829532ec0c01d30d851b97b8d3173ff4c7c274775e639b75f0b1b45e5bca2a6
+EBUILD plocate-1.1.10.ebuild 2077 BLAKE2B 91d876de6fedc8a7ddca2fdc69c15c2621b3bf68f9cd0b99ed5cde99f79d34e60c1455aeed18d41abc6fe3f7ba0c3192e1c79066ccd06504218076fd5d7cade6 SHA512 b3df2ccd26728d8b186ffe9ac29f876f3c3fa1df2ee2aaa8437e7808140ed21884cb4401af22556d20bf5d5d9d6548f17533fa59c8da534bd7ef64e14886d425
 EBUILD plocate-1.1.8.ebuild 2063 BLAKE2B 35011f66c0957b50861f4a8e4c658ac6457e1d64bc3171713dd7627fcb358a6dd55d9d270966cfaf928bd007d5897e1c0fffa639d00065d2de06450a57dce0b4 SHA512 24b7f3f25aceba3661c38b60a76d6e4229d8bc57c1ce45e00461bd4f264d43bab8432a592ca9abb0b662bad77e0c8072c6243164f0f395a07abda602b8de3d1d
 MISC metadata.xml 1392 BLAKE2B b0e97157995ec77af0df5fe42d8bfe2949163b3f1ac9631e5b79942786491a3f9c2e29d004901abe994735373cef5cbe4f31646847e9cde1d26620b229396e81 SHA512 35cfb62bc7d28abb528835566018b03a724a1c4fa0a68661478007f924a685f42c5b43a2661e7a0b27548d3feae1f64223ac0f9be1c6d3ff600a57aadde69dcf
diff --git a/sys-apps/plocate/files/plocate-1.1.10-meson-use-feature-option-for-libiouring.patch b/sys-apps/plocate/files/plocate-1.1.10-meson-use-feature-option-for-libiouring.patch
new file mode 100644
index 000000000000..183c9f8e7fff
--- /dev/null
+++ b/sys-apps/plocate/files/plocate-1.1.10-meson-use-feature-option-for-libiouring.patch
@@ -0,0 +1,38 @@
+From 562128212376305bac8edd10d80c24f1223f1870 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.
+---
+ meson.build       | 2 +-
+ meson_options.txt | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6fb0f74..fb79e3f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -10,7 +10,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 8ac13c5..9c90bf0 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -3,3 +3,4 @@ option('install_systemd', type: 'boolean', value: true, description: 'Install sy
+ option('systemunitdir', type: 'string', description: 'Where to install systemd units to (default: autodetect)')
+ 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('use_libiouring', type: 'feature', value: 'auto', description: 'Enable libiouring dependency (default: autodetect)')
+-- 
+2.31.1
+
diff --git a/sys-apps/plocate/plocate-1.1.10.ebuild b/sys-apps/plocate/plocate-1.1.10.ebuild
new file mode 100644
index 000000000000..d198d630c595
--- /dev/null
+++ b/sys-apps/plocate/plocate-1.1.10.ebuild
@@ -0,0 +1,81 @@
+# 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 ~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
+}