Fix incorrect gitignore value. Patch by Taahir Ahmed. Fixes bug #503268.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 150 insertions, 3 deletions

diff --git a/sys-apps/etckeeper/ChangeLog b/sys-apps/etckeeper/ChangeLog
index 47fc78c62e95..fc80ee3ddb0b 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.37 2013/12/24 14:25:30 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.38 2014/03/06 20:30:07 mrueg Exp $
+
+*etckeeper-1.11-r1 (06 Mar 2014)
+
+  06 Mar 2014; Manuel Rüger <mrueg@gentoo.org> +etckeeper-1.11-r1.ebuild,
+  +files/etckeeper-1.11-gentoo.patch:
+  Fix incorrect gitignore value. Patch by Taahir Ahmed. Fixes bug #503268.
 
   24 Dec 2013; Manuel Rüger <mrueg@gentoo.org> -etckeeper-1.4.ebuild,
   -etckeeper-1.7.ebuild, -etckeeper-1.9.ebuild,
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index a834218b9856..e20fe9f08192 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,9 +1,11 @@
 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.7-gentoo.patch 2189 SHA256 81215c363c8ac2a5b1b3777bbab017bd99f8152dc159cd6ac822b11e25792038 SHA512 cea8e68f9b6342f593f5ab64875aca5b709043a76057896fa1ab5940496e2d9df7f85e75e38ee7305538c5c81a469529e6cb6af5d401750bca6f298bc82fc4c9 WHIRLPOOL da4872cc882ee16c5503b8c34ae28cdd4dcd21971143aad1e08ee7c4ef906ea2a12e146edbf9ce2a300739a3a8e71e9508f9c3800a5264c9f977c5d7e93d1cb1
 DIST etckeeper-1.10.tar.gz 48041 SHA256 8de13e53c858b696df5fa1c330a98c29c582bfed955fa1af3cebe96087873ff6 SHA512 512cccda7ec41836c30adedd590299ded80c58876544f57a693618ec5b5003e7a575b3801598537e4816d3868a0d5aad078578b0295f4d9a1404421bcd365f19 WHIRLPOOL 284647b85b95667bd7b4a8cab377a67c166569d7aa8a08dc06b413c6a1f6b80af6217bca7c72be2f10ceae18d66679522baf25a27ca1a4d2ebc9bc9fe114cad8
 DIST etckeeper-1.11.tar.gz 48100 SHA256 a58b84af8307623f8c59acd6b161bf781909a1dac4b82853baa3098d47decabc SHA512 f9ae79dfee4d97195b0a40ef319d75242662b9717d0293ac9722a7728e22374b6425391e91076ab5e0e4524a16c211511a2857b867d3610ff5c6b2bc561c96a7 WHIRLPOOL 174b857dce5d4ecdb26a01e030c312f57aeb9d1db3eaede5ead4c7e3a08ce05695ca528d226ce1847d28eb14a7360990bb21bb777a710f3b56ab5594ffd01301
 EBUILD etckeeper-1.10.ebuild 1891 SHA256 d4baeb9a93bab2531d129016d174c018163d69f4830b52ba76915fcc1befe9ad SHA512 6ee3f5794b4caa941e68fe02a633d9f7e8ac0aa1871c42ab9be82495857824e3c92794de485e7905c8551fd9b61f13325ed2ed0af20775025f0a8aa2380cf0b0 WHIRLPOOL 889d07f92976107fbc4065bc5e4824d53920e2a3ae8a6a85ac7b3c0348a6314aec4c2f2d51cef24cfce931ba83a537142a420937f1e8b17d7261da722c3fee95
+EBUILD etckeeper-1.11-r1.ebuild 1893 SHA256 8809555f6bf03e8c985ca740e3afd74e688031ac260361259d661de7a3938b18 SHA512 3d815576adb1687d33b08c2d19411f0ec5f7b7301eee7f0599ed6a07dd5de4eac29078641829452df7b8c7dd5b7196a28448c70cde25f54078e2acf1fb36f97c WHIRLPOOL 2e71ac258d87a4e65aa3d0beb514d89a7f56ec5ae832e7d1d6381dada0c0d184bce99e7a74603746ceb318f97415aec4bcf2e4d1fa68f4093cff9a18f5371767
 EBUILD etckeeper-1.11.ebuild 1898 SHA256 3de7cdb447e9d2490f241f1b998d83b6b30f99a29eefa6e8bffdc696e1ea4e1b SHA512 5356b7d7f5d02f81d6ab89ac7616c513f5aa209f368c7360f8de1305364e635fc927cb879714417b9c8bf4454bdf9955ccec4a2820b1186db77c09145c50d5b6 WHIRLPOOL 5e85f231e119400ceb453949b1391d1912700845b7bd615beefd6fed0bb4eef436316037227269f15ea566004dc78e71e4788255e2ff9a8eca48ab616a3dab17
-MISC ChangeLog 4956 SHA256 6fb21d042f0eef8cc66944fbbf1542b32274f33e9771ef8641baa464761d0524 SHA512 8c47393c65f2e274deece21de1dc369c0bf8b190bd636742a4f622062e808ddaf97c75947015042a5999bb7c05b71d646d66398f79d5d5eafaecdd7be8687ba7 WHIRLPOOL 11f572fa244e2d7f419d601cfe681583ba7d58c2395f1e5ef1fc31128048a092f8ef1def45e07e8de70368e6f16d8a81f21c95b8cafa0d995f3d7aefcd3e3281
+MISC ChangeLog 5179 SHA256 7250857d7dcf8deecdced0f2e92027083b35e1675cf3db6cca63dc771facb755 SHA512 edcc7ae274bd7e31e7fffd7e565811004a6a4f7c15e9d977a9579f3ab0302e8bc4fe2f31f2813bdbea86f23cb2434253eea64afde7fe866fa192162da9cd4cfc WHIRLPOOL eaed332ab99179fbd1c5c4556a2102479767a75208a27dbb2c970f26e2262910e5dd3ea212d6d8b9d2beeeb4a9828f5712d8d9a6bdb1661baea5e1de1ee34771
 MISC metadata.xml 976 SHA256 48bd7af76b5aad30f38c79884de21e36ce849f84c138152087595dbd8832ff06 SHA512 ffb60b75d294ca6d92002db677c97fc58022039b4b1f4446f30b0ae0c4a3998aa2c731010f4d745bb7b2205ed2dcb640820029f8178cda1bd34909c36f5385e7 WHIRLPOOL 8979b25b455077f7342da36fbcf719cc4276441f687afe94a87dca9ab69d4d6b60c960ef705a7109ef43fad98b7210753359d89c596a9d46910be9c009390ff9
diff --git a/sys-apps/etckeeper/etckeeper-1.11-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.11-r1.ebuild
new file mode 100644
index 000000000000..4f7b26a1d064
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.11-r1.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.11-r1.ebuild,v 1.1 2014/03/06 20:30:07 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 ~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.11-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.11-gentoo.patch
new file mode 100644
index 000000000000..9ac14b9c8337
--- /dev/null
+++ b/sys-apps/etckeeper/files/etckeeper-1.11-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"