* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/files/, sys-apps/etckeeper/
@ 2023-01-04 19:06 Georgy Yakovlev
0 siblings, 0 replies; 4+ messages in thread
From: Georgy Yakovlev @ 2023-01-04 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 535853c7f9f73eaa50c15c67f5562b86ff40e5cc
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 19:03:03 2023 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 19:05:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=535853c7
sys-apps/etckeeper: add 1.18.20, drop 1.18.19
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-apps/etckeeper/Manifest | 2 +-
...per-1.18.19.ebuild => etckeeper-1.18.20.ebuild} | 4 ---
.../files/etckeeper-1.18.19-backticks-EOF.patch | 37 ----------------------
3 files changed, 1 insertion(+), 42 deletions(-)
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 012bc415a070..616a891acb5a 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,2 +1,2 @@
DIST etckeeper-1.18.18.tar.gz 101845 BLAKE2B 2072b54db4023211e85fcbed82bd93412eb02707d5447b297bf98e65f1d534e02e790612d9771ae433a07aa6a462dd9b5c5528207d2bcfd4059232417e3186e1 SHA512 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b
-DIST etckeeper-1.18.19.tar.gz 110687 BLAKE2B fe0b1a7cc108b81e15d03fad6f2e10538a4ff991fcbac132bd18930501ea3681786f5e20a942b32c621b6a595bb61d2dc99e33ef4f040e2958a6d8cafa7e4763 SHA512 8b4776f04c98996f0dd1c68694d026cc61e8b8c3b1163a18b98bce37eea95a4676c31bde172996b392fa48e160515a61ddd466798d9e70f4b3dd56615046df16
+DIST etckeeper-1.18.20.tar.gz 110787 BLAKE2B 8d69cd65a1cad7ff64eae95d70a3da70c60adfd2fa15ae34d45a394456ba362376a5fc93116841f25f907c71fb4df2af2e1d5ffe155e11c368f6862c53d39135 SHA512 b190da11ac589d6240c8293d961b75efe01e835091f9b5fba84c3c9062ffb4cb1dc52c9ea2bdf881f021c7d5584c4487d3c60121fdcb0a2a35e349c8321422c6
diff --git a/sys-apps/etckeeper/etckeeper-1.18.19.ebuild b/sys-apps/etckeeper/etckeeper-1.18.20.ebuild
similarity index 96%
rename from sys-apps/etckeeper/etckeeper-1.18.19.ebuild
rename to sys-apps/etckeeper/etckeeper-1.18.20.ebuild
index 0174a070e7e3..d55624b11c95 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.19.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.20.ebuild
@@ -30,10 +30,6 @@ RDEPEND="app-portage/portage-utils
RESTRICT="!test? ( test )"
-PATCHES=(
- "${FILESDIR}/etckeeper-1.18.19-backticks-EOF.patch" # sent upstream
-)
-
src_prepare() {
default
hprefixify *.d/* etckeeper
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch b/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch
deleted file mode 100644
index cf47e8108bef..000000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18.19-backticks-EOF.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 88cc70458f1dd902d001b63148b0df534b1ebdf6 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 4 Jan 2023 01:29:09 -0800
-Subject: [PATCH] init.d/50vcs-pre-commit-hook: replace backticks
-
-it's in EOF block, so bash tries to execute backticked commands despite
-being commented out.
-
-Initialized empty Git repository in /etc/.git/
-/etc/etckeeper/init.d/50vcs-pre-commit-hook: line 11: rev-parse: command not found
-Usage: grep [OPTION]... PATTERNS [FILE]...
-Try 'grep --help' for more information.
-/etc/etckeeper/init.d/50vcs-pre-commit-hook: line 11: worktree: command not found
-
-Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
----
- init.d/50vcs-pre-commit-hook | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/init.d/50vcs-pre-commit-hook b/init.d/50vcs-pre-commit-hook
-index 6e0669c..166540d 100755
---- a/init.d/50vcs-pre-commit-hook
-+++ b/init.d/50vcs-pre-commit-hook
-@@ -34,8 +34,8 @@ set -e
- #
- ################################################################################
-
--# Using `rev-parse` + `grep` rather than for instance parsing output from
--# `worktree list` since the worktree command is not present in older git version
-+# Using 'rev-parse' + 'grep' rather than for instance parsing output from
-+# 'worktree list' since the worktree command is not present in older git version
- # and parsing it would be slightly more complex.
- if git rev-parse --git-dir | grep -q /.git/worktrees
- then
---
-2.39.0
-
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/files/, sys-apps/etckeeper/
@ 2025-02-24 11:21 Petr Vaněk
0 siblings, 0 replies; 4+ messages in thread
From: Petr Vaněk @ 2025-02-24 11:21 UTC (permalink / raw
To: gentoo-commits
commit: 0bebae2b0319fc98ab119a84fc440c1f5ae72a19
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 11:00:16 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 11:00:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bebae2b
sys-apps/etckeeper: drop 1.18.18, 1.18.20
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
sys-apps/etckeeper/Manifest | 2 -
sys-apps/etckeeper/etckeeper-1.18.18.ebuild | 97 --------------------
sys-apps/etckeeper/etckeeper-1.18.20.ebuild | 100 ---------------------
.../etckeeper/files/etckeeper-1.18.18-gentoo.patch | 70 ---------------
4 files changed, 269 deletions(-)
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 694aa3e7151d..3e50ec0cb954 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,4 +1,2 @@
-DIST etckeeper-1.18.18.tar.gz 101845 BLAKE2B 2072b54db4023211e85fcbed82bd93412eb02707d5447b297bf98e65f1d534e02e790612d9771ae433a07aa6a462dd9b5c5528207d2bcfd4059232417e3186e1 SHA512 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b
-DIST etckeeper-1.18.20.tar.gz 110787 BLAKE2B 8d69cd65a1cad7ff64eae95d70a3da70c60adfd2fa15ae34d45a394456ba362376a5fc93116841f25f907c71fb4df2af2e1d5ffe155e11c368f6862c53d39135 SHA512 b190da11ac589d6240c8293d961b75efe01e835091f9b5fba84c3c9062ffb4cb1dc52c9ea2bdf881f021c7d5584c4487d3c60121fdcb0a2a35e349c8321422c6
DIST etckeeper-1.18.21.tar.gz 116961 BLAKE2B ad765ebc1e3b393a896b6491f21195a7c1081212f798b8586966adc72578c2bffe9adfb5a6004cba7ff87efb66f4318314dd3646e538d9bbe7a686250ea1f160 SHA512 c23bd0f24e04b565ceae77e552eb00926dae16f4a6c8c183c5a6bb404d5351ee7a040e01287b7c0d3d530bc8dea62cd2336b3151a349998aa9c145f1258ac2a0
DIST etckeeper-1.18.22.tar.gz 119999 BLAKE2B 579e94ef6ab6f198c162be78148ea2032149e558d73bfc5d040cb9288f33d6b5c48b0073c5578fae4050b647943cbb6bb5b67cce87f9687531fa84a21c287ff9 SHA512 e35ab90862c1f4426c17aec4d9ffe5975c652b290645ac333e9f27fcc157b9eba5e0efe73553a400464102c939f085f4e08f4b04564a015ad6941b1d50dbbe76
diff --git a/sys-apps/etckeeper/etckeeper-1.18.18.ebuild b/sys-apps/etckeeper/etckeeper-1.18.18.ebuild
deleted file mode 100644
index 3bc3ee63044b..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.18.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 prefix systemd tmpfiles
-
-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 arm64 hppa ~ppc ppc64 ~riscv ~sparc x86"
-SLOT="0"
-IUSE="cron test"
-
-BDEPEND="test? (
- dev-util/bats
- dev-vcs/git
-)"
-
-RDEPEND="app-portage/portage-utils
- cron? ( virtual/cron )
- || (
- dev-vcs/git
- dev-vcs/mercurial
- dev-vcs/darcs
- )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- # TODO: submit upstream
- "${FILESDIR}"/${PN}-1.18.18-gentoo.patch
-)
-
-src_prepare() {
- default
- hprefixify *.d/* etckeeper
- local systemdunitdir="$(systemd_get_systemunitdir)"
- systemdunitdir="${systemdunitdir#${EPREFIX}}"
- sed -i \
- -e s'@zsh/vendor-completions@zsh/site-functions@' \
- -e s"@/lib/systemd/system@"${systemdunitdir}"@" \
- Makefile || die
- rm -v init.d/60darcs-deleted-symlinks || die
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
-
- doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
-
- newbashcomp bash_completion ${PN}
- dodoc doc/README.mdwn
- newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
- rm -rv "${ED}/var/cache" || die
- newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-
- if use cron ; then
- exeinto /etc/cron.daily
- newexe - etckeeper <<'_EOF_'
-#!/bin/sh
-set -e
-if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
- . /etc/etckeeper/etckeeper.conf
- if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
- /etc/etckeeper/daily
- fi
-fi
-_EOF_
- fi
-
- local conf_update_dir="/etc/portage/conf-update.d"
- insinto "${conf_update_dir}"
- newins "${FILESDIR}/${PN}-conf-update-hook" "${PN}"
- fperms 755 "${conf_update_dir}/${PN}"
-}
-
-pkg_postinst() {
- tmpfiles_process "${PN}.conf"
-
- elog "${PN} supports git, mercurial and darcs"
- elog "This ebuild just ensures at least one is installed!"
- elog
- elog "You may want to adjust your /etc/portage/bashrc"
- elog "see the example file in /usr/share/doc/${PF}"
- 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.20.ebuild b/sys-apps/etckeeper/etckeeper-1.18.20.ebuild
deleted file mode 100644
index 8b7fc8ff184a..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.20.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 prefix systemd tmpfiles
-
-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 arm64 hppa ~ppc ppc64 ~riscv ~sparc x86"
-SLOT="0"
-IUSE="cron test"
-
-BDEPEND="test? (
- dev-util/bats
- dev-vcs/git
-)"
-
-RDEPEND="app-portage/portage-utils
- cron? ( virtual/cron )
- || (
- dev-vcs/git
- dev-vcs/mercurial
- dev-vcs/darcs
- )
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- default
- hprefixify *.d/* etckeeper
- local systemdunitdir="$(systemd_get_systemunitdir)"
- systemdunitdir="${systemdunitdir#${EPREFIX}}"
- sed -i \
- -e s'@zsh/vendor-completions@zsh/site-functions@' \
- -e s"@/lib/systemd/system@"${systemdunitdir}"@" \
- -e '/etckeeper-bzr\/__init__\.py/d' \
- Makefile || die
-
- # pre-configure for portage.
- sed -i \
- -e 's/^HIGHLEVEL_PACKAGE_MANAGER=apt/HIGHLEVEL_PACKAGE_MANAGER=emerge/' \
- -e 's/^LOWLEVEL_PACKAGE_MANAGER=dpkg/LOWLEVEL_PACKAGE_MANAGER=qlist/' \
- etckeeper.conf || die
-
- rm -v init.d/60darcs-deleted-symlinks || die
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
-
- doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
-
- newbashcomp bash_completion ${PN}
- dodoc doc/README.mdwn
- newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
- rm -rv "${ED}/var/cache" || die
- newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-
- if use cron ; then
- exeinto /etc/cron.daily
- newexe - etckeeper <<'_EOF_'
-#!/bin/sh
-set -e
-if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
- . /etc/etckeeper/etckeeper.conf
- if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
- /etc/etckeeper/daily
- fi
-fi
-_EOF_
- fi
-
- local conf_update_dir="/etc/portage/conf-update.d"
- insinto "${conf_update_dir}"
- newins "${FILESDIR}/${PN}-conf-update-hook" "${PN}"
- fperms 755 "${conf_update_dir}/${PN}"
-}
-
-pkg_postinst() {
- tmpfiles_process "${PN}.conf"
-
- elog "${PN} supports git, mercurial and darcs"
- elog "This ebuild just ensures at least one is installed!"
- elog
- elog "You may want to adjust your /etc/portage/bashrc"
- elog "see the example file in /usr/share/doc/${PF}"
- 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.18-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch
deleted file mode 100644
index 298671c90004..000000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18.18-gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 5ac7b1861a7e23935bc09cacfa6675d8a086877e Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Sun, 26 Jan 2020 23:24:54 -0800
-Subject: [PATCH] 1.18.18-gentoo
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/Makefile
-+++ b/Makefile
-@@ -68,7 +68,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
---- a/etckeeper.conf
-+++ b/etckeeper.conf
-@@ -33,11 +33,21 @@ DARCS_COMMIT_OPTIONS="-a"
-
- # The high-level package manager that's being used.
- # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps 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, xbps 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
---- a/list-installed.d/50list-installed
-+++ b/list-installed.d/50list-installed
-@@ -30,5 +30,9 @@ else
- apk info -v | sort
- elif [ "$LOWLEVEL_PACKAGE_MANAGER" = xbps ]; then
- xbps-query -l | awk '{print $2}' | sed -r 's/-([^-]+)$/ \1/g;'
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
-+ qlist -ICv
-+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
-+ cave print-packages -r installed
- fi
- fi
---- a/update-ignore.d/01update-ignore
-+++ b/update-ignore.d/01update-ignore
-@@ -107,8 +107,12 @@ writefile () {
- comment "new versions of conffiles, stored by xbps"
- ignore "*.new-*_[0-9]*"
- 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"
- ignore "*.old"
- # Not currently ignored as admins tend to rely on these files.
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/files/, sys-apps/etckeeper/
@ 2016-03-15 23:41 Manuel Rüger
0 siblings, 0 replies; 4+ messages in thread
From: Manuel Rüger @ 2016-03-15 23:41 UTC (permalink / raw
To: gentoo-commits
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+gentoobugs@utopios.org)
-Minor fixes by Manuel Rueger (mrueg@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"
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/files/, sys-apps/etckeeper/
@ 2016-02-15 23:22 Manuel Rüger
0 siblings, 0 replies; 4+ messages in thread
From: Manuel Rüger @ 2016-02-15 23:22 UTC (permalink / raw
To: gentoo-commits
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?= <manuel@rueg.eu>
+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
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-24 11:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-04 19:06 [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/files/, sys-apps/etckeeper/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2025-02-24 11:21 Petr Vaněk
2016-03-15 23:41 Manuel Rüger
2016-02-15 23:22 Manuel Rüger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox