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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     9d33bab33e199d28bbd80364ebc6a4fb76f47240
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  7 08:48:59 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb  7 08:51:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d33bab3

sys-apps/etckeeper: remove 1.18.1

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/etckeeper/Manifest                        |  1 -
 sys-apps/etckeeper/etckeeper-1.18.1.ebuild         | 74 -------------------
 sys-apps/etckeeper/files/bashrc                    |  4 -
 .../etckeeper/files/etckeeper-1.18-gentoo.patch    | 86 ----------------------
 4 files changed, 165 deletions(-)

diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index e3d58a911bc..b8d805cf951 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,2 +1 @@
-DIST etckeeper-1.18.1.tar.gz 56366 BLAKE2B ac3cff677139b09eb400acc757852b7650c68a1c50bc0fd6a13bc170215d7abf32cbaadda44fa6ce55245d1c225b0ea0890465b353c31fa31724dea92d7f06c9 SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35
 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c

diff --git a/sys-apps/etckeeper/etckeeper-1.18.1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.1.ebuild
deleted file mode 100644
index 2f269c707d0..00000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils 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://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm 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} ) )"
-
-src_prepare(){
-	epatch "${FILESDIR}"/${PN}-1.18-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
-
-	newbashcomp bash_completion ${PN}
-	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/files/bashrc b/sys-apps/etckeeper/files/bashrc
deleted file mode 100644
index ce53621a22a..00000000000
--- a/sys-apps/etckeeper/files/bashrc
+++ /dev/null
@@ -1,4 +0,0 @@
-case "${EBUILD_PHASE}" in
-	preinst|prerm) etckeeper pre-install ;;
-	postinst|postrm) etckeeper post-install ;;
-esac

diff --git a/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch
deleted file mode 100644
index a5018bd77d1..00000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 385d0e828d57e4998dd62fa34d5d929768fb894d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
-Date: Sun, 12 Apr 2015 23:39:30 +0200
-Subject: [PATCH] Support Gentoo's package managers.
-
-
-diff --git a/Makefile b/Makefile
-index c95d51a..4be900e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,6 @@ install: etckeeper.version
- 	mkdir -p $(DESTDIR)$(mandir)/man8
- 	$(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8
- 	mkdir -p $(DESTDIR)$(etcdir)/bash_completion.d
--	$(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper
- ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt)
- 	mkdir -p $(DESTDIR)$(etcdir)/apt/apt.conf.d
- 	$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
-@@ -52,7 +51,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 2aec35e..0a9c88b 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-g2, yum, dnf, zypper 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, pacman-g2, 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 2ac569a..91718d4 100755
---- a/list-installed.d/50list-installed
-+++ b/list-installed.d/50list-installed
-@@ -17,5 +17,9 @@ else
- 		rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
- 	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
- 		pacman -Q
-+	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 098fab8..88243ea 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.3.5
-