From 7284863d8d2b1d207d01741475e134284e4e6f9f Mon Sep 17 00:00:00 2001 From: Manuel Rüger Date: Wed, 1 Feb 2017 14:45:12 +0100 Subject: sys-apps/etckeeper: Version bump to 1.18.6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- sys-apps/etckeeper/Manifest | 1 + sys-apps/etckeeper/etckeeper-1.18.6.ebuild | 72 ++++++++++++++++++++ .../etckeeper/files/etckeeper-1.18.6-gentoo.patch | 78 ++++++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 sys-apps/etckeeper/etckeeper-1.18.6.ebuild create mode 100644 sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch (limited to 'sys-apps') diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index ccfd7269a026..32f8dc6f2381 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -1,3 +1,4 @@ DIST etckeeper-1.18.1.tar.gz 56366 SHA256 80adee6e17bfc41359ffb85a401d9a510ae25956950adbfdd07a0bda36d99e9b SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35 WHIRLPOOL 890b38f761f49a5a4713fa850bc18e09688ed8fb04d9b41f3727f868448fb1ba1ecf92750df777fc6011a3f88abeb8756105fbdc60ebf6fd3e693360764fb27c DIST etckeeper-1.18.4.tar.gz 67499 SHA256 a8f28c24d2c296db861fd5f1e95e6c9aa924eed19a331487cf42687f49123600 SHA512 fa1d8eda9037be7933fd5be6ea4b5dfb77d6858ffab4ae4dad838d5c6ec066cb254c700732bfa0becd388b952b2b216bd7027cf3a67f806048e6cb3aa9c276c3 WHIRLPOOL df03d41ffbc86c94a2c1a62d50751e117ae7fe52d8551c752e2b53cae34685a3dd0f088d08ed8ac1545aeac0ec16bc3900b8e0d97c95c0da4cfb52ace7b59607 DIST etckeeper-1.18.5.tar.gz 68041 SHA256 a4ddb313037c6861efbc24a55ed8e66cd98591e190aedf2657c8a1071f821889 SHA512 6a0ff1dd2dcc665da8a68bf48ea5bb12c9ae1f1a8737f3bcec47f9d055602e469b69a4ceed9a2042b89492a98c17f2065596f5e65fc228734de1aad7db3a12c1 WHIRLPOOL 6fea65228add2ff3dfe29438d2dd4cde9562e8c0a69ed7ce2c07ac929d7109af3f96dc3d85bfdaceead716394bb80fd0b7206b5cfc3e408e922e215c03985b8e +DIST etckeeper-1.18.6.tar.gz 73487 SHA256 7db1a2b48c011b5e04ec95af559de8d1d243bdcdf6cd591b3b0b46d1f21e9602 SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c WHIRLPOOL 41805cff70804abe574831ec1bb2bc4e2e5079ff97c777f2597f8af4f6e972009312b5f1760a0c17e0db0f150266b94cdc1f49afb8e15401d8c57ad540112324 diff --git a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild new file mode 100644 index 000000000000..245afd7e0e47 --- /dev/null +++ b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 ~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/files/etckeeper-1.18.6-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch new file mode 100644 index 000000000000..a229683bbb01 --- /dev/null +++ b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch @@ -0,0 +1,78 @@ +From 026fa7c012a8c44cadfa56f605c0671639a6b04c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Manuel=20R=C3=BCger?= +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 + -- cgit v1.2.3-65-gdbad