[gentoo-commits] repo/gentoo:master commit in: sys-apps/plocate/, sys-apps/plocate/files/
commit: 58178f9639dd779e18782eeb6440908a778e5ece Author: Florian Schmaus gentoo org> AuthorDate: Thu Sep 21 20:42:50 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Sep 21 20:43:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58178f96 sys-apps/plocate: drop 1.1.17, 1.1.18 Signed-off-by: Florian Schmaus gentoo.org> sys-apps/plocate/Manifest | 2 - .../files/plocate-1.1.18-missing-include.patch | 21 -- sys-apps/plocate/plocate-1.1.17.ebuild | 86 - sys-apps/plocate/plocate-1.1.18.ebuild | 87 -- 4 files changed, 196 deletions(-) diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest index 62b7544012e3..86ed6f23accf 100644 --- a/sys-apps/plocate/Manifest +++ b/sys-apps/plocate/Manifest @@ -1,3 +1 @@ -DIST plocate-1.1.17.tar.gz 73528 BLAKE2B b5694c3669a9717a9410093b1fba2eef029550989ffcbf9b6e7b48cc715c215b909c140cd98d47d30d31ccb6e04fd54e9b565bc8e16c1d9901ccf82a906de311 SHA512 36fa7ad01b5136ce75aad56d154cac511f2f4952a52ef2f16143e46b65a8b129e9011dbdd66d80a0288ef15291864cef0e51d26181b966a2f67b5e4f9fc42c7d -DIST plocate-1.1.18.tar.gz 73906 BLAKE2B 60f11df992c2865259c2c9cfda033b1b303738c19cc7ffa8a885bbc6fd26140263c7fe31acb2541fe9b298034d28a719935580561c7d4e88c564fa0e74eeccbe SHA512 da059980472df2269139a5b71d34579e239365714d54dfa2af68276c6e28178602eda302d2ec39cb7e5e07312019425159048047ddfc08bd3266e3bf7972d1c6 DIST plocate-1.1.19.tar.gz 73964 BLAKE2B bf488c124b219822c0b426f57f3389f2611395abb7ddd22c72c51086480af1811ab2ed5f2a96cb6ad7d769be7dd60c3482de46841f2d5be85abdc1a1ce586ee8 SHA512 7bbbe914dbab75adb7f38302b7a06cfbb7c18b0e580892dced89d72dc0076e98a75482833b76200bb68b99a0a6093639967b962d0b69be526360995f7d833fcd diff --git a/sys-apps/plocate/files/plocate-1.1.18-missing-include.patch b/sys-apps/plocate/files/plocate-1.1.18-missing-include.patch deleted file mode 100644 index d5a5043a0858.. --- a/sys-apps/plocate/files/plocate-1.1.18-missing-include.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://git.sesse.net/?p=plocate;a=commitdiff;h=a81eb2f2369de18d2376e266b36d2f32fff7600f -https://bugs.gentoo.org/899550 - -From a81eb2f2369de18d2376e266b36d2f32fff7600f Mon Sep 17 00:00:00 2001 -From: "Steinar H. Gunderson" -Date: Wed, 8 Feb 2023 22:46:51 +0100 -Subject: [PATCH] Add missing #include. - -Reported by sudhanshu goswami. a/updatedb.cpp -+++ b/updatedb.cpp -@@ -39,6 +39,7 @@ any later version. - #include - #include - #include -+#include - #include - #include - #include --- -2.39.2 diff --git a/sys-apps/plocate/plocate-1.1.17.ebuild b/sys-apps/plocate/plocate-1.1.17.ebuild deleted file mode 100644 index fa6c77b0c195.. --- a/sys-apps/plocate/plocate-1.1.17.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 ~x86" -IUSE="+io-uring" - -RDEPEND=" - acct-group/locate - app-arch/zstd:= - io-uring? ( sys-libs/liburing:= ) - !sys-apps/mlocate -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.15-meson-use-feature-option-for-libiouring.patch -) - -pkg_setup() { - if use io-uring && linux_config_exists; then - if ! linux_chkconfig_present IO_URING; then - ewarn "CONFIG_IO_URING must be enabled for USE=io-uring" - fi - fi -} - -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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/plocate/, sys-apps/plocate/files/
commit: 3d8072dc9f2702733f4b679ae82ac6989059dd8e Author: Sam James gentoo org> AuthorDate: Sat Mar 4 07:30:46 2023 + Commit: Sam James gentoo org> CommitDate: Sat Mar 4 07:39:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d8072dc sys-apps/plocate: fix build w/o io-uring Closes: https://bugs.gentoo.org/899550 Signed-off-by: Sam James gentoo.org> .../files/plocate-1.1.18-missing-include.patch | 21 + sys-apps/plocate/plocate-1.1.18.ebuild | 1 + 2 files changed, 22 insertions(+) diff --git a/sys-apps/plocate/files/plocate-1.1.18-missing-include.patch b/sys-apps/plocate/files/plocate-1.1.18-missing-include.patch new file mode 100644 index ..d5a5043a0858 --- /dev/null +++ b/sys-apps/plocate/files/plocate-1.1.18-missing-include.patch @@ -0,0 +1,21 @@ +https://git.sesse.net/?p=plocate;a=commitdiff;h=a81eb2f2369de18d2376e266b36d2f32fff7600f +https://bugs.gentoo.org/899550 + +From a81eb2f2369de18d2376e266b36d2f32fff7600f Mon Sep 17 00:00:00 2001 +From: "Steinar H. Gunderson" +Date: Wed, 8 Feb 2023 22:46:51 +0100 +Subject: [PATCH] Add missing #include. + +Reported by sudhanshu goswami. +--- a/updatedb.cpp b/updatedb.cpp +@@ -39,6 +39,7 @@ any later version. + #include + #include + #include ++#include + #include + #include + #include +-- +2.39.2 diff --git a/sys-apps/plocate/plocate-1.1.18.ebuild b/sys-apps/plocate/plocate-1.1.18.ebuild index d232fce2fe29..c6638fd4ed19 100644 --- a/sys-apps/plocate/plocate-1.1.18.ebuild +++ b/sys-apps/plocate/plocate-1.1.18.ebuild @@ -26,6 +26,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.1.15-meson-use-feature-option-for-libiouring.patch + "${FILESDIR}"/${P}-missing-include.patch ) pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/plocate/, sys-apps/plocate/files/
commit: 0c6c1f4b7652a338391635dc2c96f87704034506 Author: Arsen Arsenović aarsen me> AuthorDate: Mon Jan 31 21:31:09 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Feb 2 06:56:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c6c1f4b sys-apps/plocate: bump to 1.1.15 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Arsen Arsenović aarsen.me> Closes: https://github.com/gentoo/gentoo/pull/24035 Signed-off-by: Florian Schmaus gentoo.org> sys-apps/plocate/Manifest | 1 + ...5-meson-use-feature-option-for-libiouring.patch | 41 +++ sys-apps/plocate/plocate-1.1.15.ebuild | 81 ++ 3 files changed, 123 insertions(+) diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest index 40b1ce5f21ff..7f58f5dc35ac 100644 --- a/sys-apps/plocate/Manifest +++ b/sys-apps/plocate/Manifest @@ -1,3 +1,4 @@ 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 +DIST plocate-1.1.15.tar.gz 73274 BLAKE2B 72dba287ba3357d2fa541542bf5e9d283eac672b7f3b2eebab687ecec930d6e91400eeb0f24c97d6133d69cae0308bc4473b7c8cbc5e263dd18ae8a7728a42a4 SHA512 772f82af38fd7b61fa51ac31f71d4a855542cfa617867da54b5ad8202f49f9e1861064a01e9b8f0937c3da902d84f19a50c1d0e4f037a491a9a6819b2413cfa1 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 ..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?= +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+ploc...@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/plocate-1.1.15.ebuild b/sys-apps/plocate/plocate-1.1.15.ebuild new file mode 100644 index ..8e6ca0baf328 --- /dev/null +++ b/sys-apps/plocate/plocate-1.1.15.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2022 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/;
[gentoo-commits] repo/gentoo:master commit in: sys-apps/plocate/, sys-apps/plocate/files/
commit: f86f7acf1b4cb919a762e1595dea1011463099c7 Author: Arsen Arsenović aarsen me> AuthorDate: Thu Aug 19 00:40:45 2021 + Commit: Sam James gentoo org> CommitDate: Thu Aug 19 02:15:13 2021 + 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 000..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 000..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