commit: 974dedaabc59840e7f64110a166029eb52ba4be3 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> AuthorDate: Tue Mar 15 23:39:08 2016 +0000 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> CommitDate: Tue Mar 15 23:39:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=974dedaa
sys-apps/etckeeper: Remove old Package-Manager: portage-2.2.28 sys-apps/etckeeper/Manifest | 1 - sys-apps/etckeeper/etckeeper-1.11-r1.ebuild | 75 ---------------------- .../etckeeper/files/etckeeper-1.11-gentoo.patch | 64 ------------------ 3 files changed, 140 deletions(-) diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index 2480bef..fa9c5e3 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -1,3 +1,2 @@ -DIST etckeeper-1.11.tar.gz 48100 SHA256 a58b84af8307623f8c59acd6b161bf781909a1dac4b82853baa3098d47decabc SHA512 f9ae79dfee4d97195b0a40ef319d75242662b9717d0293ac9722a7728e22374b6425391e91076ab5e0e4524a16c211511a2857b867d3610ff5c6b2bc561c96a7 WHIRLPOOL 174b857dce5d4ecdb26a01e030c312f57aeb9d1db3eaede5ead4c7e3a08ce05695ca528d226ce1847d28eb14a7360990bb21bb777a710f3b56ab5594ffd01301 DIST etckeeper-1.18.1.tar.gz 56366 SHA256 80adee6e17bfc41359ffb85a401d9a510ae25956950adbfdd07a0bda36d99e9b SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35 WHIRLPOOL 890b38f761f49a5a4713fa850bc18e09688ed8fb04d9b41f3727f868448fb1ba1ecf92750df777fc6011a3f88abeb8756105fbdc60ebf6fd3e693360764fb27c DIST etckeeper-1.18.3.tar.gz 64982 SHA256 736302ee00c5a007901c60baab2dd67d419033ed1c62df3e98416e4ded8d4486 SHA512 c60ba647f15fa41e38ffb8492ce98820a53a0ce20eec9590b3098fa042b43f6f2d1c21d6143342150208e0eae48fca60efdfe9f779c973397e4035031813618c WHIRLPOOL 96181f1b5445b8f4bede9df180daafe97f40a3b8219ebd9b9fbab2cc643874d65c30c9e3b3899e3994130dc29004074de91b66de82114b7cd42bcdd1e99d068d diff --git a/sys-apps/etckeeper/etckeeper-1.11-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.11-r1.ebuild deleted file mode 100644 index cc387fe..0000000 --- a/sys-apps/etckeeper/etckeeper-1.11-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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="http://kitenet.net/~joey/code/etckeeper/"; -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}"/${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 - - newbashcomp bash_completion ${PN} - dodoc README TODO - docinto examples - dodoc "${FILESDIR}"/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/etckeeper-1.11-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.11-gentoo.patch deleted file mode 100644 index 9ac14b9..0000000 --- a/sys-apps/etckeeper/files/etckeeper-1.11-gentoo.patch +++ /dev/null @@ -1,64 +0,0 @@ -Original patch by Luke-Jr (luke-jr+gentoob...@utopios.org) -Minor fixes by Manuel Rueger (mr...@rueg.eu) - -https://bugs.gentoo.org/show_bug.cgi?id=216114 -Gentoo specific additions - ---- Makefile -+++ Makefile -@@ -23,7 +23,6 @@ - $(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf - $(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper - $(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8 -- $(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper - ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt) - $(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper - mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex -@@ -39,7 +37,6 @@ - ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper) - $(INSTALL_DATA) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py - endif -- -./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" - echo "** installation successful" - - clean: etckeeper.spec ---- etckeeper.conf -+++ etckeeper.conf -@@ -31,11 +31,13 @@ - - # The high-level package manager that's being used. - # (apt, pacman-g2, yum, zypper etc) --HIGHLEVEL_PACKAGE_MANAGER=apt -+# For gentoo this is emerge -+HIGHLEVEL_PACKAGE_MANAGER=emerge - - # The low-level package manager that's being used. - # (dpkg, rpm, pacman, pacman-g2, etc) --LOWLEVEL_PACKAGE_MANAGER=dpkg -+# For gentoo this is qlist -+LOWLEVEL_PACKAGE_MANAGER=qlist - - # To push each commit to a remote, put the name of the remote here. - # (eg, "origin" for git). ---- list-installed.d/50list-installed -+++ list-installed.d/50list-installed -@@ -9,4 +9,6 @@ - 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 - fi ---- update-ignore.d/01update-ignore -+++ update-ignore.d/01update-ignore -@@ -99,6 +99,10 @@ - ignore "*.pacorig" - ignore "*.pacsave" - nl -+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then -+ comment "new and old versions of conffiles, stored by emerge" -+ ignore "*._cfg*" -+ nl - fi - - comment "old versions of files"
