diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2023-01-04 11:03:03 -0800 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2023-01-04 11:05:58 -0800 |
| commit | 535853c7f9f73eaa50c15c67f5562b86ff40e5cc (patch) | |
| tree | 1c3bf4d7e7224ff4a6cad0f699fbe7072783df01 | |
| parent | dev-python/click-plugins: Stabilize 1.1.1 x86, #889720 (diff) | |
| download | gentoo-535853c7.tar.gz gentoo-535853c7.tar.bz2 gentoo-535853c7.zip | |
sys-apps/etckeeper: add 1.18.20, drop 1.18.19
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
| -rw-r--r-- | sys-apps/etckeeper/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/etckeeper/etckeeper-1.18.20.ebuild (renamed from sys-apps/etckeeper/etckeeper-1.18.19.ebuild) | 4 | ||||
| -rw-r--r-- | sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch | 37 |
3 files changed, 1 insertions, 42 deletions
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index 012bc415a070..616a891acb5a 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -1,2 +1,2 @@ DIST etckeeper-1.18.18.tar.gz 101845 BLAKE2B 2072b54db4023211e85fcbed82bd93412eb02707d5447b297bf98e65f1d534e02e790612d9771ae433a07aa6a462dd9b5c5528207d2bcfd4059232417e3186e1 SHA512 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b -DIST etckeeper-1.18.19.tar.gz 110687 BLAKE2B fe0b1a7cc108b81e15d03fad6f2e10538a4ff991fcbac132bd18930501ea3681786f5e20a942b32c621b6a595bb61d2dc99e33ef4f040e2958a6d8cafa7e4763 SHA512 8b4776f04c98996f0dd1c68694d026cc61e8b8c3b1163a18b98bce37eea95a4676c31bde172996b392fa48e160515a61ddd466798d9e70f4b3dd56615046df16 +DIST etckeeper-1.18.20.tar.gz 110787 BLAKE2B 8d69cd65a1cad7ff64eae95d70a3da70c60adfd2fa15ae34d45a394456ba362376a5fc93116841f25f907c71fb4df2af2e1d5ffe155e11c368f6862c53d39135 SHA512 b190da11ac589d6240c8293d961b75efe01e835091f9b5fba84c3c9062ffb4cb1dc52c9ea2bdf881f021c7d5584c4487d3c60121fdcb0a2a35e349c8321422c6 diff --git a/sys-apps/etckeeper/etckeeper-1.18.19.ebuild b/sys-apps/etckeeper/etckeeper-1.18.20.ebuild index 0174a070e7e3..d55624b11c95 100644 --- a/sys-apps/etckeeper/etckeeper-1.18.19.ebuild +++ b/sys-apps/etckeeper/etckeeper-1.18.20.ebuild @@ -30,10 +30,6 @@ RDEPEND="app-portage/portage-utils RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}/etckeeper-1.18.19-backticks-EOF.patch" # sent upstream -) - src_prepare() { default hprefixify *.d/* etckeeper diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch b/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch deleted file mode 100644 index cf47e8108bef..000000000000 --- a/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 88cc70458f1dd902d001b63148b0df534b1ebdf6 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Wed, 4 Jan 2023 01:29:09 -0800 -Subject: [PATCH] init.d/50vcs-pre-commit-hook: replace backticks - -it's in EOF block, so bash tries to execute backticked commands despite -being commented out. - -Initialized empty Git repository in /etc/.git/ -/etc/etckeeper/init.d/50vcs-pre-commit-hook: line 11: rev-parse: command not found -Usage: grep [OPTION]... PATTERNS [FILE]... -Try 'grep --help' for more information. -/etc/etckeeper/init.d/50vcs-pre-commit-hook: line 11: worktree: command not found - -Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> ---- - init.d/50vcs-pre-commit-hook | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/init.d/50vcs-pre-commit-hook b/init.d/50vcs-pre-commit-hook -index 6e0669c..166540d 100755 ---- a/init.d/50vcs-pre-commit-hook -+++ b/init.d/50vcs-pre-commit-hook -@@ -34,8 +34,8 @@ set -e - # - ################################################################################ - --# Using `rev-parse` + `grep` rather than for instance parsing output from --# `worktree list` since the worktree command is not present in older git version -+# Using 'rev-parse' + 'grep' rather than for instance parsing output from -+# 'worktree list' since the worktree command is not present in older git version - # and parsing it would be slightly more complex. - if git rev-parse --git-dir | grep -q /.git/worktrees - then --- -2.39.0 - |