gentoo auto-resync : 05:01:2023 - 00:07:41

3 files changed, 2 insertions, 44 deletions

diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index de63e73ce4a2..6b498435bd23 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,11 +1,10 @@
 AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
 AUX etckeeper-1.18.18-gentoo.patch 2413 BLAKE2B 91bbb0196c3038a62cfaed56aee7f8c7a4e4853cdb283a5541e60634882fa6e252aaca629d0588284638f15d36ee520bed2b73c375d7dfcbb683662833c2d8a4 SHA512 34ef7d24e738ea0bb49f97d88045e2963283577cfc1f807a41825ca97ee92cc915ed9b96a258bf2d44f8882472e920087ce0670cc82a0a86b78c314268b9895f
-AUX etckeeper-1.18.19-backticks-EOF.patch 1477 BLAKE2B 24e0fbdc4331959c5d5aaa9d04a4c8928fcd866b4bff3b1d1f212db53cadcf7ad149aec66a115a190e0187317a194eb28c05357724adb804b7161188ef307d9d SHA512 58ff5135f22e2500b2110197f15d4b64148208a693a53c07c792ec6d63cdd2fd95219680cf542739d0e89aece7bb36f91a1b6b31f8f5e0baeb32735ed9b9ddc0
 AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6
 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
 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
 EBUILD etckeeper-1.18.18.ebuild 2229 BLAKE2B 893d9dd8e5396b7c2e09c257e5a76336de8137fdd48e163d1dec4c3e4e0476c1d8cb18a31eb442bd4367db8066ab401c46359dc8a345f68847dddca7ea66f4a8 SHA512 a0e84e59fb262669829960f02b6ea1d3172a9a5d515900f2328eef73851cd5d8c675f264ba4d82a31a688444c7a6fb11576d570a7fb4c74149be8ec57a5b4fa4
-EBUILD etckeeper-1.18.19.ebuild 2493 BLAKE2B e14ec4cfa0020e786f1d53cae4f55456e1552b4a6ac1d86e88c2ccbf80a53fb2dcb2bad22034470d6e67e9f123bd0833070a33356638019eb0e09acb374afc6f SHA512 21643b9a3c781ee110fc8a9ce50b468c5ea0708f658fa9d2d6fb7844694228af3209bc099ae783db5e5d55ed379faa5cdd516b81672b10d6cf2ef03e8e6cab66
+EBUILD etckeeper-1.18.20.ebuild 2411 BLAKE2B 70519eddbf7b8276492d0d9c7ab7a02213b32b9e7955b8d8918b9c343ed2de3e61c80aaf31d494634e3bdd6cc476b69cb02747b4189f97627ec94f76c66a27e8 SHA512 1024610ca03c99941e406f6d1e61d9c55496a0e06324444ca152ed9b0700ed3e2ad0852d06c10e5c3519fc85cb944a9eab80619d05b772c2cffa7e3a42fb84bd
 MISC metadata.xml 785 BLAKE2B 7a93b0ed9e98d9e3512a2be8fb0a1f9b1790ab563d6865e46348be6b05c8965937548890ff312d90cc52052c6a177922faacc53fa1eea6f35bec6924bdb69aa9 SHA512 47adfa4031df7a657b55fdf529f4465c704f278804fb9b08ab334e0f44e714b3f106c94a73cd6e0c903c2d2633243d23c93374a35a0ec15686248da6dbd33fde
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
-