diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
commit | f78108598211053d41752a83e0345441bb9014ae (patch) | |
tree | dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /sys-apps/etckeeper | |
parent | dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff) |
gentoo resync : 11.02.2018
Diffstat (limited to 'sys-apps/etckeeper')
-rw-r--r-- | sys-apps/etckeeper/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/etckeeper/etckeeper-1.18.1.ebuild | 74 | ||||
-rw-r--r-- | sys-apps/etckeeper/etckeeper-1.18.6.ebuild | 4 | ||||
-rw-r--r-- | sys-apps/etckeeper/files/bashrc | 4 | ||||
-rw-r--r-- | sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch | 86 |
5 files changed, 3 insertions, 171 deletions
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index db812c09b745..29ae108c8738 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -1,10 +1,6 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f -AUX bashrc 116 BLAKE2B 66d01c9d1aa6d640c48bb6af06ceb1e6645848e2b011568fddef9491155125ba0adb2efd3039c2c572e6aa216f4f4d5de1b4d7e695461898c3b6282b4bc7de37 SHA512 8ea8195aa7d65370382c05c92951157b133914d946eec17da4cec32e469130553bdffd91261ce571f5cd31577d5381818ab2deb3f1e6ac872f054dd2798ceb0e AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c -AUX etckeeper-1.18-gentoo.patch 3066 BLAKE2B 23d83eb226c86cfd5102473180f1dd19537667b120d6946e9cb6f6d1f090209daf5fbc0a3f828c92c587f13f65ff8a2402d62b8ebcc75a4921a846572552169f SHA512 7cec9bbf989bf6dd0651fee386d180670b796d918d93523bb14a89a80851a3452e488f13c39ec751e1907a460ef34c32afb7fdb6696d7193afb6d70cdd9bb049 AUX etckeeper-1.18.6-gentoo.patch 2812 BLAKE2B 4df25391aad119d6c01cb4e35cf83a1105c7f125079b3bb3418f8b7c6cff52400eeceff8cfe5785eb968b6c4a3e9fd1112fe1fd7b654982141d9a0b7596d0ce1 SHA512 2f399e12c7bbeef539fd846532068c18fd0becdab505cbe56759c6eb7f9c4463eff49526858ffa745d4bc50619685dab81811db257506f9b537bbd7af9986958 -DIST etckeeper-1.18.1.tar.gz 56366 BLAKE2B ac3cff677139b09eb400acc757852b7650c68a1c50bc0fd6a13bc170215d7abf32cbaadda44fa6ce55245d1c225b0ea0890465b353c31fa31724dea92d7f06c9 SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c -EBUILD etckeeper-1.18.1.ebuild 1784 BLAKE2B f971fef60cc90e4030a1b4a46a3d48d2d74c8adf40d7efd73830150391b7fc279cbd87f65b270e4214c4477013f3ae1c3c1eda0e2446b68262ba288c6f037c7e SHA512 b391cdd6aee3426361274efe675398d02ef0918ec12d3c69bb91f9c9852b15227bc93cfa706073d5a622035cd37cc1b11ca8a736ebe77a3194e7cda1da991d85 -EBUILD etckeeper-1.18.6.ebuild 1712 BLAKE2B 6bd4133b41384aea4f957ffcca21e1e1e59c4e75d1261bce749c217ccc9c5c558c85c83592d8d527326f2e165ef508eab2046b134c380c0c395d34ca5ba4693e SHA512 91026959871b2613d84c0ee1eff23acc25e7d7157d3b9cc5753373fcde090b8b6f548238ebec31901ebbcbbc199eba7dc762cb4fe99bc5b7399f29cb323f0572 +EBUILD etckeeper-1.18.6.ebuild 1711 BLAKE2B 9f338ff11900fb652bb9f942dc993caed137ac5fc7af58e8b8741252f1ecac3f328c771f137533b5dfd7afab30acb186f67ac52c476023ffd0379ece8a202ec1 SHA512 870d331516eda64ee50228751d1d6552359e8b7fc8afe57293d2415d3380653185729e22018b17773b5573f1b151d3c46846fa5e226b6a6a66f9203b775913e7 MISC metadata.xml 780 BLAKE2B 82a4dde4c7c0f01d2bc47b85c0135d305f70515136415ad3484136e87b10ddd67e5317fd711fc758aee6a6d192e218e9b0259819708742de1842cb80437f46b5 SHA512 7977587ec28b947dca79efd21c0f5ec9244b52cb29d663e33952bfc9c64730eaa6b3a5e6c97387028bf2434da5f7cd4ff92c22f1d6bd5ff13071aa988e991bda 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 2f269c707d0b..000000000000 --- 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/etckeeper-1.18.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild index 959d3a284f74..036e3fa29f9a 100644 --- a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild +++ b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ 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" +KEYWORDS="amd64 ~arm x86" SLOT="0" IUSE="bazaar cron" REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sys-apps/etckeeper/files/bashrc b/sys-apps/etckeeper/files/bashrc deleted file mode 100644 index ce53621a22ac..000000000000 --- 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 a5018bd77d1a..000000000000 --- 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 - |