sys-apps/etckeeper: bump to 1.18.14, removed bzr support

it's py2 only which is going away.
if bzr gets ported to py3 we can add it back here

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>

diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index e975ae25561dca66aa2d56f6866cda3c87e0b82d..9a471bb7688ff1666f480413968c235d3ca9e38e 100644 (file)
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,2 +1,3 @@
+DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948
 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
 DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c

diff --git a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
new file mode 100644 (file)
index 0000000..7935c8c
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ppc64 ~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=( "${FILESDIR}"/${PN}-1.18.14-gentoo.patch )
+
+src_prepare() {
+       default
+       hprefixify *.d/* etckeeper
+       sed -i \
+               -e s'@zsh/vendor-completions@zsh/site-functions@' \
+               -e s"@/lib/systemd/system@"$(systemd_get_systemunitdir)"@" \
+               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 debian/cron.daily etckeeper
+       fi
+}
+
+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.14-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch
new file mode 100644 (file)
index 0000000..e677af9
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch
@@ -0,0 +1,84 @@
+From 46e299da6914962007fb540a401a68a17d00bca3 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 26 Jan 2020 23:24:54 -0800
+Subject: [PATCH] 1.18.14-gentoo
+
+---
+ Makefile                          |  1 -
+ etckeeper.conf                    | 14 ++++++++++++--
+ list-installed.d/50list-installed |  4 ++++
+ update-ignore.d/01update-ignore   |  4 ++++
+ 4 files changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 73d2411..ffcf218 100644
+--- 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
+diff --git a/etckeeper.conf b/etckeeper.conf
+index f13de1c..16ff71d 100644
+--- 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 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 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
+diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed
+index d89b8ce..2db838d 100755
+--- a/list-installed.d/50list-installed
++++ b/list-installed.d/50list-installed
+@@ -23,5 +23,9 @@ else
+               pkg info -E "*"
+       elif [ "$LOWLEVEL_PACKAGE_MANAGER" = apk ]; then
+               apk info -v | sort
++      elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
++              qlist -ICv
++      elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
++              cave print-packages -r installed
+       fi
+ fi
+diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore
+index 8733a85..53afbde 100755
+--- a/update-ignore.d/01update-ignore
++++ b/update-ignore.d/01update-ignore
+@@ -103,6 +103,10 @@ writefile () {
+               comment "new versions of conffiles, stored by apk"
+               ignore "*.apk-new"
+               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"
+-- 
+2.25.0
+

diff --git a/sys-apps/etckeeper/files/etckeeper.tmpfilesd b/sys-apps/etckeeper/files/etckeeper.tmpfilesd
new file mode 100644 (file)
index 0000000..b13813d
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper.tmpfilesd
@@ -0,0 +1 @@
+d /var/cache/etckeeper 0770 root root -