version bump wrt #469370 by Manuel Rüger

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 157 insertions, 9 deletions

diff --git a/sys-apps/etckeeper/ChangeLog b/sys-apps/etckeeper/ChangeLog
index a43a305f48fb..3374290eeb5b 100644
--- a/sys-apps/etckeeper/ChangeLog
+++ b/sys-apps/etckeeper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/etckeeper
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.16 2013/05/29 13:37:22 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.17 2013/05/31 19:35:02 hasufell Exp $
+
+*etckeeper-1.3 (31 May 2013)
+
+  31 May 2013; Julian Ospald <hasufell@gentoo.org> +etckeeper-1.3.ebuild,
+  +files/etckeeper-1.3-gentoo.patch:
+  version bump wrt #469370 by Manuel Rüger
 
   29 May 2013; Julian Ospald <hasufell@gentoo.org> etckeeper-0.63-r1.ebuild:
   update REQUIRED_USE to include PYTHON_REQUIRED_USE
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index e2867ecf825b..bc468d98803e 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -4,19 +4,22 @@ Hash: SHA256
 AUX 99etckeeper 60 SHA256 237108fb8d1b16ba51410acea5963991de7a2eef9db7594d67a7f725772da16f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f WHIRLPOOL d41e2caa2b1ec0cd57defb10ff01f2acd3c7d043d19c90bb3b18573d957e0f7a2f21f56390d30e9306272ab45cd7407219a63f53c369cf84016008ef94a6ad2e
 AUX bashrc 116 SHA256 ed9584cd6fdc180dbd3c3d332b07f0287698c9a5602664b8442fea2743141e5a SHA512 8ea8195aa7d65370382c05c92951157b133914d946eec17da4cec32e469130553bdffd91261ce571f5cd31577d5381818ab2deb3f1e6ac872f054dd2798ceb0e WHIRLPOOL b15d4a65c31d7243993204619b2b4d9b1f4bcf539abf43d20fc8fce9d9eabd928a466b5139e66c35430f0e9c9c103344b4ceffa328a4374a7d45dbef0cb4e672
 AUX etckeeper-0.63-gentoo.patch 2140 SHA256 45c79f5e6f8c7a242923acd40302c18dfeedc5a1a0e4b6c85c821b0fbf129bdb SHA512 a87980c2ef589b15d778048e47107e9e66899b10facc3143d9b507e818f59f544c784115c511882382787911c9d25a85c9ebf8de2eccae9383d0e87c5adfb150 WHIRLPOOL 95a68fd5293a1a9d6c460e694a1bcdcb4d408a96943e46e07d97f21dad2123db4a9adfceae942d202a54c97c212e6e4ee64926980a3b3e7153e88294ab94e907
+AUX etckeeper-1.3-gentoo.patch 2219 SHA256 df979ae8a1fe6c2ad3c54d3ff748003a448137eb09485e1f32e107cb4d83b7f8 SHA512 8b59a0297db1a7608e53fe5f18dd2c2f4433747b72a9aad57cb8481ecd41e9c6e5be4ab0fab6c772f86bc5f0b738f79cfd7d9105648845d86672e4d4134bbd0b WHIRLPOOL f94de64bd77f7337773112b84c1fcb5be268b9077d58ab47caab60427e71e18fdd6dc9b8e12f695d5deb8aad84e25ea3f4bc44940b74ae48a1519003cd8443a1
 DIST etckeeper-0.63.tar.gz 45799 SHA256 c745b1a635bc3a4d184d6547c2551a72f067addc01a766fc741e85ba2f623763 SHA512 544b2d86d55266f321936759627684418da9b4993003767fd8ed59fa44462940e0e1610717ebce9b8e185139b747e5a6c9a0fbe3e7d765f2094d46e53c312f34 WHIRLPOOL c41347719c80672299088eb72a1331141ae67123e87fa87e3cdd3c01c08462e6cd2cbe1243943b21b30620e7a117614f1fef83547ac29b3ac1bb9cdf4ccd42a2
+DIST etckeeper-1.3.tar.gz 47274 SHA256 fb7c8ff7eef8ffb48f7fcefe4eecb2b745fd17396065d9844b608571547c69d5 SHA512 0786d5f9599b25580ddc1269b7dc414db6532bab1ca35f36b9eba594983b36d7b8cbbdafc9c8e9bea5471ae13b78051799cd83b9418adf68d93c5459a9c8982e WHIRLPOOL 6cceb3b59b06ba543c88f3b195f43364cab0c94ac48b2832204ccb719e008ccb05fe6b4b3046819b1e4a084783391e09f3d1e5c5ffa2d8567b0eccad8915b29c
 EBUILD etckeeper-0.63-r1.ebuild 1901 SHA256 5ae3eb35fe224b1d5fd1bce982dd32820265235c9090924d95c411cb7aea012f SHA512 c452c0d25ea537f3f05215ad7f39736dce2a5607b9605ebc6d452389eab5f98869dfc17fc5b1cd4eb233b2c717c94135dc3dbffefcad1e2a2296d774b9c038cd WHIRLPOOL 0ca8cea9679e741c087e8f669d9158d50a666f7144f314339cbeba9eb19008dfde24f6bce226abd5e4eba72e1bc0d164d5d9db67223fd77a65f030ce488fec7c
 EBUILD etckeeper-0.63.ebuild 1912 SHA256 52e98958279a1fabe6fcc6aba7776ad9b87c2a42e7b161617d3c86796175d731 SHA512 51741d2753404f35c56966c35589e11cf0abe8b462dea5baca9f0ad6dfac336fc39160d4fd2ac403430896b7b14f874b7e4c70ec94e26a6327c4c4a75de605d9 WHIRLPOOL 70c79cbe5423b1924a54c09b8038c45287e56ac571c969ec21b529806d5d2551144c311e4404e3b9144e8335d5131dc0653cc5ce6b2385d55bdb69a8454bc947
-MISC ChangeLog 2092 SHA256 292ed368c3c315fc0967606660b44e9ddd5cc02670552015ce46ac3c4c5ff51d SHA512 e0039aae6ca974c9ff5812114c380f05f03588737bb40661b2c3996435007bfae48d0d4e550e4cd1abada537fd43e59e3671a1b828e1dd4dd5a7909632b41be8 WHIRLPOOL 6d5baf2ba1aaba2f1ce55f0a646bc71d5ad6cf450ad3880c503379f3443b89483ecab1a0d26ab02813bfbf1c648852e492d8c5dd2a446732648bdf8eddf9681a
+EBUILD etckeeper-1.3.ebuild 1844 SHA256 c08821cc35fbf0e7e91c41a079a50071e081e7941587e699d7541dc6f93b1b9a SHA512 e184fa9386b0b14f70bd800c03ddba99190cb1f5c6625529e10e80256b7552ba4f23d41c0e65dc790cbee8b56586d4ed603127539f6f3769eb119bd897d8d37a WHIRLPOOL cdc4c48f337a015fcf77885932d88a6961477b0454b8e718d9415419a17446eefd313f968d1a86058f17170ebb4159303433adb883974a244258147dd77a4d35
+MISC ChangeLog 2278 SHA256 136cde06bec4f22ca02a3e3bf6fdb45fd58858ae8f8f1ce026cb186bf4da78e6 SHA512 51fb4ffa1d318587cff45d71709380760966623f40131411441dc3073ee4af9aacecfb3faa65ab8c05c4d1be21ce28739c7161032394af4254adb08e1590c297 WHIRLPOOL c252ce6f05c0a3cd25e33530efe3f490d10b45fe59438dae3a4c6452685021848deb08d90281ce4cbb72bbd1815e3b16e048aad8294af669ae449c4dfa4b80fa
 MISC metadata.xml 618 SHA256 c5a139c21d45c29ccad21235634a6444d464623809dfd78f8b9cb449febe0cdf SHA512 23d5752d8016a272faed748179eb98ae775139e3d7510fca000e390a96e5fd5ab1c908bc3fb3c5509b9e4530efbc41db00f85de8218eee882869b734d06519a3 WHIRLPOOL 3f63404d0415f1b2ce581abfc30a4f420156f885b606496abe78c2f62394f97cc080fe31d9d52ca5b695156159768aeb974ca9633bbf5bcc80ff591b68a6b06a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRpgSRAAoJEFpvPKfnPDWzjMcH/1IoQS03qelS/UqNI5ko2MU/
-1LhJFpCwSxsxp0lcYy9NeGTUlEVYXQOBCQlmu7/UD+ryEi/nuBvclI13WY3CUV/E
-P3lQJ7ZQOrJHWWJfP32WJNrCZllJxThhkspKlDGsRYzLnyBYe0V+6opHb7wM+23y
-lXdaa99dTpvplNYR7/v31+v80tFcfxZjuwjfF7O1rswwqe0TsNdYh5UYKCEdI2iK
-ey44lWN6olsq7H5eBxWDnt68Fjj+AUMttGvoTZ46SXdNh/bgadwJXbz4qYKdiU1M
-TybK7kraLIWZ2/kRPIcaF7uibcjNF4EIeFIoE/aGS0HiNnHb/MCvaJOCbvNUtlk=
-=Lwih
+iQEcBAEBCAAGBQJRqPtnAAoJEFpvPKfnPDWzl0MH/1E0gbaG0roAb+FllBaoOAcN
+YVGRTvEhb28arPQ6HWo5BnJSrry9U/iQIHTvyt1mZwMhxrpnwsz0apaSA/bYn6Sj
+9hKbJgbxUhoRmY0DzkYiNvPwNTlqmivSsDLlSGMWCNa1yOPjgBYvN0cIxteCF6GA
+7/7mA1+/3SlybecNU8BjzWyQydRZQAWw9jX2qisGeLeOsSVYLZjsEW3AnkHH1w+s
+Gl0BYkCHeMMh0RgmNjKkqZimDV/oBEDLcoSdllL7DUfJ60iAC1P/21zemPl07LRK
+YsVXh0JsZAcp+kKOD6seKXTdkvejQGcdogFHhP/c3kZVF2HOSDxILyy3/2uhFl0=
+=mE6J
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/etckeeper/etckeeper-1.3.ebuild b/sys-apps/etckeeper/etckeeper-1.3.ebuild
new file mode 100644
index 000000000000..f9be9305c364
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-1.3.ebuild,v 1.1 2013/05/31 19:35:02 hasufell 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"
+IUSE="bazaar cron"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+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/${P}/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.3-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.3-gentoo.patch
new file mode 100644
index 000000000000..d10c7dd4560c
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.3-gentoo.patch
@@ -0,0 +1,64 @@
+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-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
+@@ -7,4 +7,6 @@
+ 		egrep '(ok installed|ok config-files)' | cut -f2,3
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
+ 	rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
++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"