gentoo resync : 05.02.2020

4 files changed, 167 insertions, 0 deletions

diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index ba27a0e3d01e..1689b7f30891 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,8 +1,12 @@
 AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
+AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c
 AUX etckeeper-1.18.6-gentoo.patch 2588 BLAKE2B 38f0b3cf6ecc2b47b59d6eee3d081f47e79cd0ebd4b3d0099a893257275fa8f7803da6b3aea7a90232632aa4106a2a8b9477bb9a78e200635958de7c8b3db93b SHA512 eb2d8f7eca7d5731518aec24c931aebe8a70f22a049d88f002d7649809762d82619b4c0bbc47a6207f2e018fc35bc497c30308adbfa7b62b4191f105cf5aeb40
+AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
+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
+EBUILD etckeeper-1.18.14.ebuild 1706 BLAKE2B f08688e6ccfcd7f2171548e58d76eef26e330b2082a825f9d9912f1cdccbbc581496fdbb47fb3d445334d445039f60daf0d08e434b7e112f39a847ea53ba1d53 SHA512 a3989e50aa459f9b5fb6f0b846dc3c1072c5d5d07c77991b191e017817c5e24b5156101c53822bd094daf18dfb0125a206859a26719abd71352be0eb19ed9e09
 EBUILD etckeeper-1.18.6.ebuild 1718 BLAKE2B 79005365182bb210feefd82d5b5230097433922fed15cc5efdb3fb81109d2f3493aaf0283e4eaf0a0cce4fc3cd059cdd411a7f649fd699cd2dba7b72fb598954 SHA512 91f3da5f0d1022e47038d45820b6e3daba1739fc9dd650a576023b8da487270b2f4babbaac30be91e99cbddd8b68595e2c8998fdaded81bf520154b6d0c91795
 EBUILD etckeeper-1.18.8.ebuild 1863 BLAKE2B 5d24b9337feaaba19b3b96d1999e7c6c8e763227d77db048a45add4ef750965386adb7667023eaf7427b250f7f80cb1551126abdf7be0a1a6ce47cfaa9f21828 SHA512 ca5bb103396b54d5d38124e267c22dbc0da2444b7ab85b6168be9289ce3ad08703c8bf15da3ab332c921c50a8d9262d4544973066eea8ab19999b74e72daa51b
 MISC metadata.xml 864 BLAKE2B 0c772a7199527cbbd5dad94b7ad84bda0c95c9213f2b767c3d4b7ee6a9f97f5f2abf7814730427c8792e37b93534e86401026e1bbd2e4cdd5562f038c9be1e7c SHA512 eb19c5aae26f92d59e6bfb12f823dcade3e63ff6bbc9b8d363b5c76de128fb049ff815e7bb5b10d9ffb7d24b3d165969fcd01a6b1151f041192a09be1fdf1663
diff --git a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
new file mode 100644
index 000000000000..7935c8c83a3a
--- /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
index 000000000000..e677af993fe7
--- /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
index 000000000000..b13813d61984
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper.tmpfilesd
@@ -0,0 +1 @@
+d /var/cache/etckeeper 0770 root root -