version bump

(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

3 files changed, 147 insertions, 1 deletions

diff --git a/sys-apps/etckeeper/ChangeLog b/sys-apps/etckeeper/ChangeLog
index 8cce4f220562..f661115bff2f 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.24 2013/07/27 22:32:03 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.25 2013/07/29 20:45:23 hasufell Exp $
+
+*etckeeper-1.5 (29 Jul 2013)
+
+  29 Jul 2013; Julian Ospald <hasufell@gentoo.org> +etckeeper-1.5.ebuild,
+  +files/etckeeper-1.5-gentoo.patch:
+  version bump
 
   27 Jul 2013; Manuel Rüger <mrueg@gentoo.org> -etckeeper-0.63-r1.ebuild,
   -etckeeper-0.63.ebuild, -files/etckeeper-0.63-gentoo.patch:
diff --git a/sys-apps/etckeeper/etckeeper-1.5.ebuild b/sys-apps/etckeeper/etckeeper-1.5.ebuild
new file mode 100644
index 000000000000..bdd1afcaed3a
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.5.ebuild
@@ -0,0 +1,76 @@
+# 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.5.ebuild,v 1.1 2013/07/29 20:45:23 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"
+KEYWORDS="~amd64 ~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/${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.5-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.5-gentoo.patch
new file mode 100644
index 000000000000..15f7cbf0af2d
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.5-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, 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"