From 42ff81a7480d9bba317b42fcca03b46da2a622ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 1 Oct 2022 07:10:13 +0100 Subject: gentoo auto-resync : 01:10:2022 - 07:10:12 --- sys-apps/etckeeper/Manifest | 3 + sys-apps/etckeeper/etckeeper-1.18.18.ebuild | 97 ++++++++++++++++++++++ .../etckeeper/files/etckeeper-1.18.18-gentoo.patch | 70 ++++++++++++++++ 3 files changed, 170 insertions(+) create mode 100644 sys-apps/etckeeper/etckeeper-1.18.18.ebuild create mode 100644 sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch (limited to 'sys-apps/etckeeper') diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index aa8022d11510..8ed4627a765c 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -2,10 +2,13 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c AUX etckeeper-1.18.17-egrep-deprecated.patch 3246 BLAKE2B 24d09c53fb52f1cb6115097a7a66f47b87b739190d6bdcd291fffb3059f45fd1194cee51b8ef02df18f5d505f55e10cf5011b3d0678dbfb7bc516fdac9cfcd30 SHA512 aaf9525f413d7f09139fc1c441a15f193f9625ac6428eabf10ee0e51d92ed1975839c5907e6291d062c51234de968497a33b58ca815651b51f3fe2fbee14651d +AUX etckeeper-1.18.18-gentoo.patch 2413 BLAKE2B 91bbb0196c3038a62cfaed56aee7f8c7a4e4853cdb283a5541e60634882fa6e252aaca629d0588284638f15d36ee520bed2b73c375d7dfcbb683662833c2d8a4 SHA512 34ef7d24e738ea0bb49f97d88045e2963283577cfc1f807a41825ca97ee92cc915ed9b96a258bf2d44f8882472e920087ce0670cc82a0a86b78c314268b9895f AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280 DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07 DIST etckeeper-1.18.17.tar.gz 100705 BLAKE2B afbd800d0d808997d1f618d81abf5b9c756384db4f4e0a9984349e9c512fc03ab04c04e9d968f99b5ff0eaf59727e4673fd107a0f6e04f14a0327c9247a39124 SHA512 6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00 +DIST etckeeper-1.18.18.tar.gz 101845 BLAKE2B 2072b54db4023211e85fcbed82bd93412eb02707d5447b297bf98e65f1d534e02e790612d9771ae433a07aa6a462dd9b5c5528207d2bcfd4059232417e3186e1 SHA512 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b EBUILD etckeeper-1.18.16-r1.ebuild 2204 BLAKE2B 7a8bbbd23ca0abdf6c78f1ec44c888dfeff7307bbc000ebe0a06e16f4e3ed329eabd9c602697a343ec7dfb461afb98f0ac41a1b79c28745cbb6c5cb16ddae68e SHA512 9a46883c094c997623f8ae7a316c9ed526eee01dbc3b51c260b3ea3ba4b81b0fbf91e60e4c430e0a9186e3688fe305fc85df7e1318d5a40df1543e0669170ff4 EBUILD etckeeper-1.18.17.ebuild 2271 BLAKE2B a55f09701c013ed97bf537345f08009665384bb1bdd1e15c369cf64ee239edd3446bc5acbe7769cb648e051a36b04a0a7fad940d25e810d8cb4973113cd8697e SHA512 fc794397bcd16c3927a875c6a301abda95caae227f6540163bddf50432e509c399d9c669feee0d3eda0a7ac2b436a12c4b6803a61cdbd64925a6373f9e47d3da +EBUILD etckeeper-1.18.18.ebuild 2235 BLAKE2B 151ab85349eeb7c6bc5049d14d7df04cf89cb6e14f6b8a503c09e236c4458f10fba0554d3d411228a431c70d3dcda9d94c34568ed838ef7633a12b85959b0c93 SHA512 3f1bfcc0f85e4822d7a727d67c45b795029353724f766d0f497f2f79971109a85b51c217691b8cbb80a53448ed6d6d70b04c88447979467b08025a0fd26c0743 MISC metadata.xml 785 BLAKE2B 7a93b0ed9e98d9e3512a2be8fb0a1f9b1790ab563d6865e46348be6b05c8965937548890ff312d90cc52052c6a177922faacc53fa1eea6f35bec6924bdb69aa9 SHA512 47adfa4031df7a657b55fdf529f4465c704f278804fb9b08ab334e0f44e714b3f106c94a73cd6e0c903c2d2633243d23c93374a35a0ec15686248da6dbd33fde diff --git a/sys-apps/etckeeper/etckeeper-1.18.18.ebuild b/sys-apps/etckeeper/etckeeper-1.18.18.ebuild new file mode 100644 index 000000000000..b63426712a0e --- /dev/null +++ b/sys-apps/etckeeper/etckeeper-1.18.18.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 prefix systemd tmpfiles + +DESCRIPTION="A collection of tools to let /etc be stored in a repository" +HOMEPAGE="https://etckeeper.branchable.com/" +SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +SLOT="0" +IUSE="cron test" + +BDEPEND="test? ( + dev-util/bats + dev-vcs/git +)" + +RDEPEND="app-portage/portage-utils + cron? ( virtual/cron ) + || ( + dev-vcs/git + dev-vcs/mercurial + dev-vcs/darcs + ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + # TODO: submit upstream + "${FILESDIR}"/${PN}-1.18.18-gentoo.patch +) + +src_prepare() { + default + hprefixify *.d/* etckeeper + local systemdunitdir="$(systemd_get_systemunitdir)" + systemdunitdir="${systemdunitdir#${EPREFIX}}" + sed -i \ + -e s'@zsh/vendor-completions@zsh/site-functions@' \ + -e s"@/lib/systemd/system@"${systemdunitdir}"@" \ + Makefile || die + rm -v init.d/60darcs-deleted-symlinks || die +} + +src_compile() { + : +} + +src_install() { + emake DESTDIR="${ED}" install + + doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})" + + newbashcomp bash_completion ${PN} + dodoc doc/README.mdwn + newdoc "${FILESDIR}"/bashrc-r1 bashrc.example + + rm -rv "${ED}/var/cache" || die + newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf + + if use cron ; then + exeinto /etc/cron.daily + newexe - etckeeper <<'_EOF_' +#!/bin/sh +set -e +if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then + . /etc/etckeeper/etckeeper.conf + if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then + /etc/etckeeper/daily + fi +fi +_EOF_ + fi + + local conf_update_dir="/etc/portage/conf-update.d" + insinto "${conf_update_dir}" + newins "${FILESDIR}/${PN}-conf-update-hook" "${PN}" + fperms 755 "${conf_update_dir}/${PN}" +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" + + elog "${PN} supports git, mercurial and darcs" + elog "This ebuild just ensures at least one is installed!" + elog + elog "You may want to adjust your /etc/portage/bashrc" + elog "see the example file in /usr/share/doc/${PF}" + elog + elog "To initialise your etc-dir as a repository run:" + elog "${PN} init -d /etc" +} diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch new file mode 100644 index 000000000000..298671c90004 --- /dev/null +++ b/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch @@ -0,0 +1,70 @@ +From 5ac7b1861a7e23935bc09cacfa6675d8a086877e Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Sun, 26 Jan 2020 23:24:54 -0800 +Subject: [PATCH] 1.18.18-gentoo + +Signed-off-by: Sam James +--- a/Makefile ++++ b/Makefile +@@ -68,7 +68,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper) + mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit + $(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py + endif +- -$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" + echo "** installation successful" + + clean: etckeeper.spec etckeeper.version +--- a/etckeeper.conf ++++ b/etckeeper.conf +@@ -33,11 +33,21 @@ DARCS_COMMIT_OPTIONS="-a" + + # The high-level package manager that's being used. + # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps etc) +-HIGHLEVEL_PACKAGE_MANAGER=apt ++#HIGHLEVEL_PACKAGE_MANAGER=apt ++ ++# Gentoo specific: ++# For portage this is emerge ++# For paludis this is cave ++HIGHLEVEL_PACKAGE_MANAGER=emerge + + # The low-level package manager that's being used. + # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk, xbps etc) +-LOWLEVEL_PACKAGE_MANAGER=dpkg ++#LOWLEVEL_PACKAGE_MANAGER=dpkg ++ ++# Gentoo specific: ++# For portage this is qlist ++# For paludis this is cave ++LOWLEVEL_PACKAGE_MANAGER=qlist + + # To push each commit to a remote, put the name of the remote here. + # (eg, "origin" for git). Space-separated lists of multiple remotes +--- a/list-installed.d/50list-installed ++++ b/list-installed.d/50list-installed +@@ -30,5 +30,9 @@ else + apk info -v | sort + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = xbps ]; then + xbps-query -l | awk '{print $2}' | sed -r 's/-([^-]+)$/ \1/g;' ++ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then ++ qlist -ICv ++ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then ++ cave print-packages -r installed + fi + fi +--- a/update-ignore.d/01update-ignore ++++ b/update-ignore.d/01update-ignore +@@ -107,8 +107,12 @@ writefile () { + comment "new versions of conffiles, stored by xbps" + ignore "*.new-*_[0-9]*" + nl ++ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then ++ comment "new and old versions of conffiles, stored by emerge" ++ ignore "._cfg*" ++ nl + fi +- ++ + comment "old versions of files" + ignore "*.old" + # Not currently ignored as admins tend to rely on these files. -- cgit v1.2.3