From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1BCED158CB7 for ; Thu, 19 Aug 2021 02:24:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66DEDE0827; Thu, 19 Aug 2021 02:24:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB940E0828 for ; Thu, 19 Aug 2021 02:24:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2092E335D83 for ; Thu, 19 Aug 2021 02:24:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 827047B9 for ; Thu, 19 Aug 2021 02:24:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1629339313.f86f7acf1b4cb919a762e1595dea1011463099c7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/plocate/, sys-apps/plocate/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/plocate/Manifest sys-apps/plocate/files/plocate-1.1.9-no-systemd-check.patch sys-apps/plocate/plocate-1.1.9.ebuild X-VCS-Directories: sys-apps/plocate/files/ sys-apps/plocate/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f86f7acf1b4cb919a762e1595dea1011463099c7 X-VCS-Branch: master Date: Thu, 19 Aug 2021 02:24:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 06ad5e05-da52-4298-8bdf-bbd636619b48 X-Archives-Hash: 1269f9a84ed8a39e497c001576492c2b commit: f86f7acf1b4cb919a762e1595dea1011463099c7 Author: Arsen Arsenović aarsen me> AuthorDate: Thu Aug 19 00:40:45 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Aug 19 02:15:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f86f7acf sys-apps/plocate: add version 1.1.9 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Arsen Arsenović aarsen.me> Closes: https://github.com/gentoo/gentoo/pull/22022 Signed-off-by: Sam James gentoo.org> sys-apps/plocate/Manifest | 1 + .../files/plocate-1.1.9-no-systemd-check.patch | 38 ++++++++++ sys-apps/plocate/plocate-1.1.9.ebuild | 82 ++++++++++++++++++++++ 3 files changed, 121 insertions(+) diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest index 4d4a1d480d4..381cb363f74 100644 --- a/sys-apps/plocate/Manifest +++ b/sys-apps/plocate/Manifest @@ -1 +1,2 @@ DIST plocate-1.1.8.tar.gz 71569 BLAKE2B 06ad0e9535b76bf0102cdeeb6014e2d84f85f51f5926520566e9c6871f04ac09651bb0674ed679d2a4c0d4e516e55dfef35a7021112fad3549bf76993554aeb5 SHA512 a685347df64ac1a3eb7789cb7023b4d0ffed5fb7435a4bd88c3943991e145a387829532ec0c01d30d851b97b8d3173ff4c7c274775e639b75f0b1b45e5bca2a6 +DIST plocate-1.1.9.tar.gz 71973 BLAKE2B c761735ee54c6f8430839dee1582b10e7eaf15e29cefed94d59221d0111d002cac88d86050099b6cdf0130b71a995c0d26fe57cbd9eccdf00b3489f5bd1ae432 SHA512 2a2bffa338add760e598ac14b68d063cb0cc7df244b6af84f70166294a0c0b66acdedce432d0573e8f2d8dcd3ddba597baa407e93cddc5c58a0b492a1e031135 diff --git a/sys-apps/plocate/files/plocate-1.1.9-no-systemd-check.patch b/sys-apps/plocate/files/plocate-1.1.9-no-systemd-check.patch new file mode 100644 index 00000000000..677f20fc799 --- /dev/null +++ b/sys-apps/plocate/files/plocate-1.1.9-no-systemd-check.patch @@ -0,0 +1,38 @@ +From 0b1e568bc66df9fdb0bfd6f54b4ff2e540769dbe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= +Date: Thu, 19 Aug 2021 02:36:54 +0200 +Subject: [PATCH] unconditionally configure systemd service + +--- + meson.build | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +diff --git a/meson.build b/meson.build +index dc14eb1..9a3b3fe 100644 +--- a/meson.build ++++ b/meson.build +@@ -76,18 +76,9 @@ updatedb_conf_man = configure_file(input: 'updatedb.conf.5.in', + configuration: conf_data) + install_man(updatedb_conf_man) + +-if get_option('install_systemd') +- unitdir = get_option('systemunitdir') +- if unitdir == '' +- unitdir = dependency('systemd').get_pkgconfig_variable('systemdsystemunitdir') +- endif +- +- updatedb_service = configure_file(input: 'plocate-updatedb.service.in', +- output: 'plocate-updatedb.service', +- configuration: conf_data) +- install_data(updatedb_service, install_dir: unitdir) +- install_data('plocate-updatedb.timer', install_dir: unitdir) +-endif ++updatedb_service = configure_file(input: 'plocate-updatedb.service.in', ++ output: 'plocate-updatedb.service', ++ configuration: conf_data) + + # Requires having TurboPFor checked out, so not built by default. + # Unless you have a recent Meson, there's no apparently good way +-- +2.31.1 + diff --git a/sys-apps/plocate/plocate-1.1.9.ebuild b/sys-apps/plocate/plocate-1.1.9.ebuild new file mode 100644 index 00000000000..8153e282f37 --- /dev/null +++ b/sys-apps/plocate/plocate-1.1.9.ebuild @@ -0,0 +1,82 @@ +# 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.9-no-systemd-check.patch +) + +src_prepare() { + # Pretend liburing dep doesn't exist when USE flag off + if ! use io-uring; then + sed -i "s/dependency('liburing/dependency('/" meson.build || die + fi + + # 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 + ) + 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 +}