[gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/

[Georgy Yakovlev]

commit:     921ad98183868f5269df7b2f6c4f2b49518ef7ee
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 12:55:01 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 12:55:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=921ad981

sys-apps/etckeeper: drop old

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-apps/etckeeper/Manifest                        |  2 -
 sys-apps/etckeeper/etckeeper-1.18.6.ebuild         | 71 --------------------
 sys-apps/etckeeper/etckeeper-1.18.8.ebuild         | 76 ---------------------
 .../etckeeper/files/etckeeper-1.18.6-gentoo.patch  | 78 ----------------------
 sys-apps/etckeeper/metadata.xml                    |  2 -
 5 files changed, 229 deletions(-)

diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 9a471bb7688..e00ca069370 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,3 +1 @@
 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.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
deleted file mode 100644
index 6ac5a424366..00000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-SLOT="0"
-IUSE="bazaar cron"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr )"
-RDEPEND="${DEPEND}
-	app-portage/portage-utils
-	cron? ( virtual/cron )
-	bazaar? ( ${PYTHON_DEPS} )
-	!bazaar? ( || ( ${VCS_DEPEND} ) )"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	:
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	bzr_install() {
-		${PYTHON} ./${PN}-bzr/__init__.py install --root="${ED}" ||
-			die "bzr support installation failed!"
-	}
-	use bazaar && python_foreach_impl bzr_install
-
-	if use prefix; then
-		doenvd "${FILESDIR}"/99${PN}
-		eprefixify "${ED%/}"/etc/env.d/99${PN}
-	fi
-
-	dodoc doc/README.mdwn
-	docinto examples
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily etckeeper
-	fi
-}
-
-pkg_postinst() {
-	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
-	elog "	dev-vcs/bzr"
-	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}/examples"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}

diff --git a/sys-apps/etckeeper/etckeeper-1.18.8.ebuild b/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
deleted file mode 100644
index 7c5d60b113f..00000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 prefix python-r1
-
-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="bazaar cron test"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	app-portage/portage-utils
-	cron? ( virtual/cron )
-	bazaar? ( ${PYTHON_DEPS} )
-	!bazaar? ( || ( ${VCS_DEPEND} ) )"
-DEPEND="${DEPEND}
-	test? ( dev-util/bats )"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch )
-
-src_prepare() {
-	default
-	hprefixify *.d/* etckeeper
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	bzr_install() {
-		"${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
-			die "bzr support installation failed!"
-	}
-	use bazaar && python_foreach_impl bzr_install
-
-	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
-
-	newbashcomp bash_completion ${PN}
-	dodoc doc/README.mdwn
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily etckeeper
-	fi
-}
-
-pkg_postinst() {
-	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
-	elog "	dev-vcs/bzr"
-	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}/examples"
-	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.6-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
deleted file mode 100644
index 247f98ede82..00000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 026fa7c012a8c44cadfa56f605c0671639a6b04c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@××××.eu>
-Date: Tue, 16 Feb 2016 00:19:07 +0100
-Subject: [PATCH] Support Gentoo's package managers
-
-
-diff --git a/Makefile b/Makefile
-index 70bddfa..6090a4e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,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 0d268bd..81214c7 100644
---- a/etckeeper.conf
-+++ b/etckeeper.conf
-@@ -31,11 +31,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 129447f..79d67f2 100755
---- a/list-installed.d/50list-installed
-+++ b/list-installed.d/50list-installed
-@@ -21,5 +21,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 7347287..5dbb398 100755
---- a/update-ignore.d/01update-ignore
-+++ b/update-ignore.d/01update-ignore
-@@ -99,6 +99,10 @@ writefile () {
- 		ignore "*.pacorig"
- 		ignore "*.pacsave"
- 		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.7.1
-

diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml
index 3005ddb1247..affe25c2e34 100644
--- a/sys-apps/etckeeper/metadata.xml
+++ b/sys-apps/etckeeper/metadata.xml
@@ -6,8 +6,6 @@
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<use>
-		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based repository
-		</flag>
 		<flag name="cron">Install cron script</flag>
 	</use>
 	<longdescription>etckeeper is a collection of tools to let /etc be stored in