commit: 5dc7a83ff9f4f4911e169fed3e58b6aec6fe74b7 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> AuthorDate: Mon Feb 15 23:21:48 2016 +0000 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> CommitDate: Mon Feb 15 23:21:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc7a83f
sys-apps/etckeeper: Version bump Package-Manager: portage-2.2.27 sys-apps/etckeeper/Manifest | 1 + sys-apps/etckeeper/etckeeper-1.18.3.ebuild | 74 ++++++++++++++++++++ .../etckeeper/files/etckeeper-1.18.3-gentoo.patch | 78 ++++++++++++++++++++++ 3 files changed, 153 insertions(+) diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index ab6ad43..2129a71 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -1,3 +1,4 @@ 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 DIST etckeeper-1.18.tar.gz 56203 SHA256 f9d9eedb2b66c4c40e16824e0899755226543b7c124756f5e0168353fc194d36 SHA512 439a3316b938fe78ab8f0032964ea62392098ca37043960995713f5ca698efb1df4e2c57177ebf3036ec1a8652157ecf990316fd68fd6376bb090b3f0bc42131 WHIRLPOOL 27998338d8bdd9cf32ba443b1cffd45e83b9ca77eb84fead4dfff9c1413425435b15b9be7f18360488ce149f2aba208041cd89f1d2d4b6f5bf8fc5e01130641a diff --git a/sys-apps/etckeeper/etckeeper-1.18.3.ebuild b/sys-apps/etckeeper/etckeeper-1.18.3.ebuild new file mode 100644 index 0000000..4e64cf6 --- /dev/null +++ b/sys-apps/etckeeper/etckeeper-1.18.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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 ~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.3-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/files/etckeeper-1.18.3-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch new file mode 100644 index 0000000..8661d39 --- /dev/null +++ b/sys-apps/etckeeper/files/etckeeper-1.18.3-gentoo.patch @@ -0,0 +1,78 @@ +From 026fa7c012a8c44cadfa56f605c0671639a6b04c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Manuel=20R=C3=BCger?= <[email protected]> +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 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, 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 + pacmatic -Q + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pkgng ]; then + pkg info -E "*" ++ 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 +
