Version bump. Add paludis support by Taahir Ahmed. Fixes bug #503274.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

4 files changed, 171 insertions, 2 deletions

diff --git a/sys-apps/etckeeper/ChangeLog b/sys-apps/etckeeper/ChangeLog
index e483226cc3fa..6839bc22ce6e 100644
--- a/sys-apps/etckeeper/ChangeLog
+++ b/sys-apps/etckeeper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/etckeeper
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.44 2014/05/24 20:43:13 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.45 2014/06/14 12:50:47 mrueg Exp $
+
+*etckeeper-1.12 (14 Jun 2014)
+
+  14 Jun 2014; Manuel Rüger <mrueg@gentoo.org> +etckeeper-1.12.ebuild,
+  +files/etckeeper-1.12-gentoo.patch:
+  Version bump. Add paludis support by Taahir Ahmed. Fixes bug #503274.
 
   24 May 2014; Manuel Rüger <mrueg@gentoo.org> -etckeeper-1.10.ebuild,
   -files/etckeeper-1.7-gentoo.patch:
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 16080c1e5a96..a3d450e5dc2a 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,7 +1,10 @@
 AUX 99etckeeper 60 SHA256 237108fb8d1b16ba51410acea5963991de7a2eef9db7594d67a7f725772da16f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f WHIRLPOOL d41e2caa2b1ec0cd57defb10ff01f2acd3c7d043d19c90bb3b18573d957e0f7a2f21f56390d30e9306272ab45cd7407219a63f53c369cf84016008ef94a6ad2e
 AUX bashrc 116 SHA256 ed9584cd6fdc180dbd3c3d332b07f0287698c9a5602664b8442fea2743141e5a SHA512 8ea8195aa7d65370382c05c92951157b133914d946eec17da4cec32e469130553bdffd91261ce571f5cd31577d5381818ab2deb3f1e6ac872f054dd2798ceb0e WHIRLPOOL b15d4a65c31d7243993204619b2b4d9b1f4bcf539abf43d20fc8fce9d9eabd928a466b5139e66c35430f0e9c9c103344b4ceffa328a4374a7d45dbef0cb4e672
 AUX etckeeper-1.11-gentoo.patch 2189 SHA256 3017c1c43fc8d55678ae8d222e230403f0d07e6b25ce0d97ecfedf87d7ec7b00 SHA512 b099c12771fb2deb2a79eda2829037b8ecfc0cac2a6280da01146f89cdd5ca37c548045fae9992985ffd4826964256ae3fea7c1e599c9755849b79604d4ded95 WHIRLPOOL ed4bed5b337ed8a6fa01a1e61dd1d3ab84ebcc2d13b8525d8b49d115a6ba91bb19d1951f62a08c05d4843bfce94ba166865c6e0ec5bd210661bc5d23ed36a88a
+AUX etckeeper-1.12-gentoo.patch 3088 SHA256 6eedafbc3f3761da466b8c15a9aee0a67286ea80d7ac14971bbe9dc8c4402891 SHA512 92130437be1ef10f8bca022511c1a95dd8e942866ddf71c94db260630ff8a745d8accfeaabebf3b65c315a42490dec683c139e1dad247ff443fe76a2664c027a WHIRLPOOL 188969e0ff26d5a6b8d167a0cf164ef555b9730412ab176898e5a41f4b67c574376f476d3b1f1c5644f63f94f0ea8d465190cf5f81dfdd4cc285e97a20d97677
 DIST etckeeper-1.11.tar.gz 48100 SHA256 a58b84af8307623f8c59acd6b161bf781909a1dac4b82853baa3098d47decabc SHA512 f9ae79dfee4d97195b0a40ef319d75242662b9717d0293ac9722a7728e22374b6425391e91076ab5e0e4524a16c211511a2857b867d3610ff5c6b2bc561c96a7 WHIRLPOOL 174b857dce5d4ecdb26a01e030c312f57aeb9d1db3eaede5ead4c7e3a08ce05695ca528d226ce1847d28eb14a7360990bb21bb777a710f3b56ab5594ffd01301
+DIST etckeeper-1.12.tar.gz 48342 SHA256 83f4ac7e684d8ecc7a78d7c8b40ca2f26e8c0fad4924cd223a8a804571fcd5a5 SHA512 e1f2d34512845ecdbd06c4c839e31fb468ee94cf6696d8926017f8ace249d0033c0959e5d7b570bba2a06ae4a76880523785c75f868e850c55c103083f8b09b2 WHIRLPOOL c29334f4815c797b0d84477a3db20fdc896e81a5cc864eaa7daaed77c6cbd2adc12a85ddb3718881d50af00b7c41d5c2b571f3fbd0f58a48515126ab7bd250a8
 EBUILD etckeeper-1.11-r1.ebuild 1895 SHA256 bf6497fa11fbfb14c2c10fdeb252d4d0549ce141be006b6d6fd5a464b30698d7 SHA512 d75cd64bd19a4d79088ebd88202f04399e1b0563f8cb68ef673ee11d04888a3288516e7646c8b1280e9e247b28e0c92e8661cc8b5c3d6391c35f2e9358b96a8a WHIRLPOOL 27b3bccef2cf684af90fea54569df5f2ebc8cc17ede24d005188d0651f9a8e1b64ca47be0623eb7ebe3fbdbab2e8474b355097e368b4e391a844f4c3b0ec23df
-MISC ChangeLog 5802 SHA256 45dcc380d140673316f0d806e29cc2c1e95a3296dc5dd4e6ccbd5b4ce90cff6d SHA512 b1ac766e93bc300de181bc25048450b2af1151791912fe5ec4c831bac464f13e84f89cbf0132416e74e32c4af0e1a739d50135383611252372a625131bc1045d WHIRLPOOL a34d9534bab4190ed2ab1dedac75d3caf1ecac154107bd3bc246e40d01a7c9e37f28b5934811a672dabe7aaba17a56b1336f1fc962954fb8478ce24eef3a8ca5
+EBUILD etckeeper-1.12.ebuild 1899 SHA256 e4f03b66ad5358369af091614ce55997480b1c4c2c9d1d05a17a2742377156ae SHA512 5d1fee1e4bf10f573d375eb3c7a20e09d294bb661581096e4b6a0acb9a2f70f14d1af40621fe911e629d448bdd7e292cc8bc2bed88923a88e47fc8e430dea565 WHIRLPOOL 615614d499798a1cc4709be3c8c685e6e235dc0a387fcfb7835069fd1b0544186e4012abfa07efa54d7605ffc1017ae77c54295011c734eaa8512df820d8ec20
+MISC ChangeLog 6016 SHA256 ce370e8f9d713d2e149a0f13755f897991d72a9091d72997939f70ebc0dbd9a8 SHA512 49d593679ddb5387b468e4a2b3c4912a5280c707b69fd4b10ea83cb5b7d8cfdd364fb53c47714ec4a3187c1baa22fe5d2ac603b119ca3fc94014b86fc801839e WHIRLPOOL 43cd9cb235a0479c51f7ad97278983a98d74dee2f5cfd8feaf6662e6ba23c77c388d9c695e57b3ebddedbb976ffd5c26c239951cb5c7c67319e5459918adfd4f
 MISC metadata.xml 976 SHA256 48bd7af76b5aad30f38c79884de21e36ce849f84c138152087595dbd8832ff06 SHA512 ffb60b75d294ca6d92002db677c97fc58022039b4b1f4446f30b0ae0c4a3998aa2c731010f4d745bb7b2205ed2dcb640820029f8178cda1bd34909c36f5385e7 WHIRLPOOL 8979b25b455077f7342da36fbcf719cc4276441f687afe94a87dca9ab69d4d6b60c960ef705a7109ef43fad98b7210753359d89c596a9d46910be9c009390ff9
diff --git a/sys-apps/etckeeper/etckeeper-1.12.ebuild b/sys-apps/etckeeper/etckeeper-1.12.ebuild
new file mode 100644
index 000000000000..5fedd01b76f2
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.12.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-1.12.ebuild,v 1.1 2014/06/14 12:50:47 mrueg Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 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.md 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.12-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.12-gentoo.patch
new file mode 100644
index 000000000000..75bd829a3327
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.12-gentoo.patch
@@ -0,0 +1,85 @@
+From bca936861ff64309383875c8dffcce0be6b8b00e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
+Date: Sat, 14 Jun 2014 14:47:55 +0200
+Subject: [PATCH] Support Gentoo's package managers.
+
+
+diff --git a/Makefile b/Makefile
+index 13ce4fe..37b09de 100644
+--- a/Makefile
++++ b/Makefile
+@@ -26,7 +26,6 @@ install:
+ 	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
+@@ -47,7 +46,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
+ 	mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
+ 	$(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
+diff --git a/etckeeper.conf b/etckeeper.conf
+index f988c10..29ea111 100644
+--- a/etckeeper.conf
++++ b/etckeeper.conf
+@@ -31,11 +31,17 @@ DARCS_COMMIT_OPTIONS="-a"
+ 
+ # The high-level package manager that's being used.
+ # (apt, pacman-g2, yum, zypper etc)
+-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
++# 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 f392027..02eb179 100755
+--- a/list-installed.d/50list-installed
++++ b/list-installed.d/50list-installed
+@@ -9,4 +9,8 @@ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
+ 	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
+diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore
+index a3aa73d..ba59b7e 100755
+--- a/update-ignore.d/01update-ignore
++++ b/update-ignore.d/01update-ignore
+@@ -99,6 +99,14 @@ writefile () {
+ 		ignore "*.pacorig"
+ 		ignore "*.pacsave"
+ 		nl
++	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then
++		comment "new and old versions of conffiles, stored by emerge"
++		ignore "._cfg*"
++		nl
++	elif [ "$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.0.0
+