sys-apps/etckeeper imported into main tree

diff --git a/sys-apps/etckeeper/ChangeLog b/sys-apps/etckeeper/ChangeLog
deleted file mode 100644 (file)
index 4dcb483..0000000
--- a/sys-apps/etckeeper/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-# ChangeLog for sys-apps/etckeeper
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*etckeeper-0.63 (06 Jun 2012)
-
-  06 Jun 2012; Manuel Rüger (mrueg) gentoo@rueg.eu -etckeeper-0.62.ebuild,
-  +etckeeper-0.63.ebuild:
-  Version bump to 0.63
-
-*etckeeper-0.62 (29 Apr 2012)
-
-  29 Apr 2012; Manuel Rüger (mrueg) gentoo@rueg.eu +etckeeper-0.62.ebuild,
-  +files/etckeeper-0.62-gentoo.patch, +files/bashrc, +metadata.xml:
-  New ebuild for bug #216114 thanks to hasufell and floppym
-

diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
deleted file mode 100644 (file)
index 8ce8b04..0000000
--- a/sys-apps/etckeeper/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX bashrc 231 RMD160 a1eb319591ada9aa3188c69d1c0bb54c3eb63b11 SHA1 d037188ebefb456bc0cfb4b83f5d861ea71bc371 SHA256 535c56e91b5c7d6b1897d7d178f497c8f215eb39f1d207de83765d92ef703225
-AUX etckeeper-0.62-gentoo.patch 2414 RMD160 4ae79fc17fd3b12f84315c954b85072cc39491bf SHA1 88e3ad5288a0976733b5c50450ae3249eacb3ff3 SHA256 7da6953d21b6048aa8ca7c0b7aff0dd4faf7be00fb34ea3cfad2bcd9c33bb4ef
-DIST etckeeper-0.63.tar.gz 45799 RMD160 1d1341505d07f9ee2e9ff62a267c4d207d25ebb5 SHA1 ebed44999720d8cd8108e18dbf97d29b0159a429 SHA256 1c0f11afaae43d6da6b942e3ddd15c401a5099ddc97c6405f20e3e78fec6b47d
-EBUILD etckeeper-0.63.ebuild 1684 RMD160 4220029b18f3ee3515213ad268ee15bee86026db SHA1 04e53f1296e03eaa2885d214569840101124deea SHA256 a660acce9148031fe5703ff909ac19e5ae4f992e81452cb255afb2df0674e232
-MISC ChangeLog 512 RMD160 0578b0d1603d6cdc580e8c14272ab0c4dc9de767 SHA1 374c2451e3a5f870a4009f064c61c5aed0703427 SHA256 81f2be449fd8e20a549b1f796447827e8d0fef489ec674280979f07d193e9b44
-MISC metadata.xml 304 RMD160 db7c9ddd400199dfd93c2a4e918ca4483b649483 SHA1 8de910fc9a5b9c9d1849a50303b047c11917917b SHA256 be1b9ddd7f3f8fe623ae20d717024cd53ed3345231e45752a26ff3ad503faecb

diff --git a/sys-apps/etckeeper/etckeeper-0.63.ebuild b/sys-apps/etckeeper/etckeeper-0.63.ebuild
deleted file mode 100644 (file)
index 2d7f506..0000000
--- a/sys-apps/etckeeper/etckeeper-0.63.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils bash-completion-r1 python
-
-DESCRIPTION="a collection of tools to let /etc be stored in a repository"
-HOMEPAGE="http://kitenet.net/~joey/code/etckeeper/"
-COMMIT="cdca967f6f041e79970c1392e74fffac9ce49885"
-SRC_URI="http://git.kitenet.net/?p=etckeeper.git;a=snapshot;h=${COMMIT};sf=tgz
--> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-IUSE="bazaar"
-KEYWORDS="~amd64"
-SLOT="0"
-
-DEPEND="bazaar? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )"
-RDEPEND="app-portage/portage-utils
-       bazaar? ( dev-vcs/bzr )"
-
-S="${WORKDIR}"/${PN}-${COMMIT:0:7}
-
-SHAREDIR="/usr/share/${PN}"
-
-src_prepare(){
-       epatch "${FILESDIR}"/${PN}-0.62-gentoo.patch
-       if use bazaar; then
-               python_convert_shebangs 2 "${S}"/etckeeper-bzr/__init__.py
-       fi
-}
-src_compile(){
-       if use bazaar; then
-               emake
-       fi
-}
-src_install(){
-       emake DESTDIR="${D}" install
-       newbashcomp bash_completion etckeeper
-       if use bazaar; then
-               ./etckeeper-bzr/__init__.py install --root="${D}" || die "Error: bzr support installation"
-       fi
-       insinto ${SHAREDIR}
-       doins "${FILESDIR}"/bashrc
-}
-pkg_postinst(){
-       elog "You need to use either bzr, git or mercurial."
-       elog "If you want dev-vcs/bzr, enable bzr useflag."
-       elog "Run this command to add etckeeper to your /etc/portage/bashrc"
-       elog ""
-       elog "echo \"source ${SHAREDIR}/bashrc\" >> /etc/portage/bashrc"
-       elog ""
-       elog "or just put the content with your fancy feature additions into it directly"
-       elog "Remember to fit /etc/etckeeper/etckeeper.conf to your needs!"
-       elog "To initialise your etc-dir as a repository run:"
-       elog ""
-       elog "etckeeper init -d /etc"
-       elog ""
-}

diff --git a/sys-apps/etckeeper/files/bashrc b/sys-apps/etckeeper/files/bashrc
deleted file mode 100644 (file)
index d53e6b1..0000000
--- a/sys-apps/etckeeper/files/bashrc
+++ /dev/null
@@ -1,14 +0,0 @@
-case "$EBUILD_PHASE" in
-
-       "preinst" | "prerm" )
-                       if [ -x /usr/bin/etckeeper ]; then
-                                       etckeeper pre-install
-                       fi
-       ;;
-
-       "postinst" | "postrm" )
-                       if [ -x /usr/bin/etckeeper ]; then
-                                       etckeeper post-install
-                       fi
-               ;;
-esac

diff --git a/sys-apps/etckeeper/files/etckeeper-0.62-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-0.62-gentoo.patch
deleted file mode 100644 (file)
index b25f916..0000000
--- a/sys-apps/etckeeper/files/etckeeper-0.62-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Original patch by Luke-Jr (luke-jr+gentoobugs@utopios.org)
-Minor fixes by Manuel Rueger (mrueg@rueg.eu)
-See b.g.o #216144
-Gentoo specific additions
-
---- Makefile.old       2012-04-29 03:51:41.630628963 +0200
-+++ Makefile   2012-04-29 03:52:20.382629475 +0200
-@@ -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
-@@ -36,7 +35,6 @@
-       $(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py
-       $(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf
- endif
--      -./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
-       echo "** installation successful"
- 
- clean: etckeeper.spec
---- etckeeper.conf.old 2012-04-29 02:25:43.747560772 +0200
-+++ etckeeper.conf     2012-04-29 03:15:57.903600622 +0200
-@@ -31,8 +31,10 @@
- 
- # The high-level package manager that's being used.
- # (apt, pacman-g2, yum 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
---- list-installed.d/50list-installed.old      2012-04-29 02:25:33.493560638 +0200
-+++ list-installed.d/50list-installed  2012-04-29 03:14:59.583599851 +0200
-@@ -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.old        2012-04-29 02:25:27.914560566 +0200
-+++ update-ignore.d/01update-ignore    2012-04-29 03:15:46.000600464 +0200
-@@ -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"

diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml
deleted file mode 100644 (file)
index e2074d8..0000000
--- a/sys-apps/etckeeper/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <maintainer>
-               <email>maintainer-wanted@gentoo.org</email>
-       </maintainer>
-       <use>
-               <flag name='bazaar'>Support <pkg>dev-vcs/bzr</pkg> based overlays</flag>
-       </use>
-</pkgmetadata>