From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- sys-apps/etckeeper/Manifest | 9 +-- sys-apps/etckeeper/etckeeper-1.18.14.ebuild | 2 +- sys-apps/etckeeper/etckeeper-1.18.6.ebuild | 71 -------------------- sys-apps/etckeeper/etckeeper-1.18.8.ebuild | 76 --------------------- .../etckeeper/files/etckeeper-1.18.6-gentoo.patch | 78 ---------------------- sys-apps/etckeeper/metadata.xml | 2 - 6 files changed, 3 insertions(+), 235 deletions(-) delete mode 100644 sys-apps/etckeeper/etckeeper-1.18.6.ebuild delete mode 100644 sys-apps/etckeeper/etckeeper-1.18.8.ebuild delete mode 100644 sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch (limited to 'sys-apps/etckeeper') diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest index 3ad5693edca2..25f37aaf88ec 100644 --- a/sys-apps/etckeeper/Manifest +++ b/sys-apps/etckeeper/Manifest @@ -1,12 +1,7 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c -AUX etckeeper-1.18.6-gentoo.patch 2588 BLAKE2B 38f0b3cf6ecc2b47b59d6eee3d081f47e79cd0ebd4b3d0099a893257275fa8f7803da6b3aea7a90232632aa4106a2a8b9477bb9a78e200635958de7c8b3db93b SHA512 eb2d8f7eca7d5731518aec24c931aebe8a70f22a049d88f002d7649809762d82619b4c0bbc47a6207f2e018fc35bc497c30308adbfa7b62b4191f105cf5aeb40 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280 DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948 -DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c -DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c -EBUILD etckeeper-1.18.14.ebuild 1708 BLAKE2B 8d2787ec9c1993c898e0a8b80be0c3f277b6db0fba1bb98dbeb492b5d09100da3215049777fa3dd1a8872cc696386043d5fd061ecca6e21b481802c72a84f5c1 SHA512 306adb935e2c86de47060119a23a4cd072190e800f779a1b94bae81724b8efe73684c1dc33ecbca9e84046ad9ad142dccd9d1cff10937f53d492e515c6182978 -EBUILD etckeeper-1.18.6.ebuild 1717 BLAKE2B bcc5ee6c6a4d0a90db29322045c2fd803da154a1f667b2c5c2772c775aa57810ad287e49819b638109298d20f125be0f9d215669eaf6030a020da7a03a44d938 SHA512 7b3e7cc6fb32a9690c717ee6a4771594104bc0208c2b19ad804774ccbd3c0fd7def7192836fd877b183efe6bfe3b42a4c6842430d1228b7213f1fd28eaeb4a5e -EBUILD etckeeper-1.18.8.ebuild 1865 BLAKE2B ab0dc448bd4e4a4b66ec5f6a9f3138d23639a7c54966075f3d61533e9751b49d7f88ef73fe9d866cdec0e1b0f3d4df4fc37e9a7702426e2b3dba4c2218b946d2 SHA512 95f6501675893a560b58906553567fec84164d6965671cbd528733d5f83d7cc8d775bd0a35d4d093d3bbe6e43c95d08a1b857a698aa2fb2e0f904cc6f17b9221 -MISC metadata.xml 864 BLAKE2B 0c772a7199527cbbd5dad94b7ad84bda0c95c9213f2b767c3d4b7ee6a9f97f5f2abf7814730427c8792e37b93534e86401026e1bbd2e4cdd5562f038c9be1e7c SHA512 eb19c5aae26f92d59e6bfb12f823dcade3e63ff6bbc9b8d363b5c76de128fb049ff815e7bb5b10d9ffb7d24b3d165969fcd01a6b1151f041192a09be1fdf1663 +EBUILD etckeeper-1.18.14.ebuild 1705 BLAKE2B 6e4b27820a9de14ea5e1e0f6a588589983e3326a23ec968b0a53e3b486749e31de39cc230a0568bb32e889aea159effd15bb11a9002498c10a2091b196d7cc05 SHA512 d31598fc22846eaef27c8a653b72964de28ef944de6b627032b74cce5e5dce2ad220f56fd34581cf47d9e6bfae0b4c9e146f42758daaead79656995276999a41 +MISC metadata.xml 784 BLAKE2B c9e0c9c6193bc006043882ca31347e796f8e6669d4ae6121bf4334b24209a69a128ea87fe797711a7bfd3238981017dbc889793eae8f3cdf4271542abe938fd6 SHA512 b896905b4940b22136b9f5a83db6d0625cd99ffbb8e586c2b1c29d8b780db1cd59a9eebaf72bea13a4e134f2014948fcf3c3247d38da06a49f952fd456d13181 diff --git a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild index 7ba7193c63e8..19e82426b9ea 100644 --- a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild +++ b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://etckeeper.branchable.com/" SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ppc64 x86" SLOT="0" IUSE="cron test" diff --git a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild deleted file mode 100644 index 6ac5a4243660..000000000000 --- a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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 ~ppc64 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/etckeeper-1.18.8.ebuild b/sys-apps/etckeeper/etckeeper-1.18.8.ebuild deleted file mode 100644 index 7c5d60b113f6..000000000000 --- a/sys-apps/etckeeper/etckeeper-1.18.8.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit 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://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86" -SLOT="0" -IUSE="bazaar cron test" -REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )" - -VCS_DEPEND="dev-vcs/git - dev-vcs/mercurial - dev-vcs/darcs" -DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )" -RDEPEND="${DEPEND} - app-portage/portage-utils - cron? ( virtual/cron ) - bazaar? ( ${PYTHON_DEPS} ) - !bazaar? ( || ( ${VCS_DEPEND} ) )" -DEPEND="${DEPEND} - test? ( dev-util/bats )" -RESTRICT="!test? ( test )" - -PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch ) - -src_prepare() { - default - hprefixify *.d/* etckeeper -} - -src_compile() { - : -} - -src_install() { - emake DESTDIR="${ED}" install - - bzr_install() { - "${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" || - die "bzr support installation failed!" - } - use bazaar && python_foreach_impl bzr_install - - doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})" - - newbashcomp bash_completion ${PN} - dodoc doc/README.mdwn - newdoc "${FILESDIR}"/bashrc-r1 bashrc.example - - 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 deleted file mode 100644 index 247f98ede828..000000000000 --- a/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch +++ /dev/null @@ -1,78 +0,0 @@ -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 - diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml index 3005ddb12475..affe25c2e34c 100644 --- a/sys-apps/etckeeper/metadata.xml +++ b/sys-apps/etckeeper/metadata.xml @@ -6,8 +6,6 @@ Georgy Yakovlev - Support dev-vcs/bzr based repository - Install cron script etckeeper is a collection of tools to let /etc be stored in -- cgit v1.2.3