Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 91 insertions, 0 deletions

diff --git a/pcr/etckeeper/.gitignore b/pcr/etckeeper/.gitignore
new file mode 100644
index 000000000..b4a9ca909
--- /dev/null
+++ b/pcr/etckeeper/.gitignore
@@ -0,0 +1 @@
+etckeeper-0.63/
diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD
new file mode 100644
index 000000000..163c320db
--- /dev/null
+++ b/pcr/etckeeper/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Buce <dmbuce@gmail.com>
+# Contributor: Danie Roux <accounts@danieroux.com>
+
+# This requires makepkg newer than 4.0.3, which at this time means from git
+
+pkgname=etckeeper
+pkgver=0.64
+pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository."
+url="http://kitenet.net/~joey/code/etckeeper/"
+license=('GPL2')
+
+pkgrel=1
+arch=('any')
+depends=('inetutils' 'python2')
+makedepends=('bzr') # bzr must be there at compile time to have bzr support
+optdepends=('git' 'hg' 'bzr' 'darcs')
+backup=(etc/etckeeper/etckeeper.conf)
+source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}"
+        etckeeper-pacman.patch
+        etckeeper-archlinux.conf)
+
+build() {
+  cd "$srcdir/etckeeper-$pkgver"
+
+  # add pacman support to list-to `list-installed`
+  patch -p0 -i "$srcdir/etckeeper-pacman.patch"
+
+  # use python2
+  sed -i 's@^#!/usr/bin/python$@&2@' etckeeper-bzr/__init__.py
+
+  make CONFFILE="$srcdir/etckeeper-archlinux.conf" build
+}
+
+package() {
+  cd "$srcdir/etckeeper-$pkgver"
+
+  make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install
+}
+
+md5sums=('SKIP'
+         'f1f00bf9331d1ef7f29b0ac29cdfcbda'
+         '99d8d2838f49fa0f2f21c9e37948100d')
diff --git a/pcr/etckeeper/etckeeper-archlinux.conf b/pcr/etckeeper/etckeeper-archlinux.conf
new file mode 100644
index 000000000..83e2c577d
--- /dev/null
+++ b/pcr/etckeeper/etckeeper-archlinux.conf
@@ -0,0 +1,38 @@
+# The VCS to use.
+#VCS="hg"
+VCS="git"
+#VCS="bzr"
+#VCS="darcs"
+
+# Options passed to git commit when run by etckeeper.
+GIT_COMMIT_OPTIONS=""
+
+# Options passed to hg commit when run by etckeeper.
+HG_COMMIT_OPTIONS=""
+
+# Options passed to bzr commit when run by etckeeper.
+BZR_COMMIT_OPTIONS=""
+
+# Options passed to darcs record when run by etckeeper.
+DARCS_COMMIT_OPTIONS="-a"
+
+# Uncomment to avoid etckeeper committing existing changes
+# to /etc automatically once per day.
+#AVOID_DAILY_AUTOCOMMITS=1
+
+# Uncomment the following to avoid special file warning
+# (the option is enabled automatically by cronjob regardless).
+#AVOID_SPECIAL_FILE_WARNING=1
+
+# Uncomment to avoid etckeeper committing existing changes to 
+# /etc before installation. It will cancel the installation,
+# so you can commit the changes by hand.
+#AVOID_COMMIT_BEFORE_INSTALL=1
+
+# The high-level package manager that's being used.
+# (apt, pacman-g2, yum etc)
+HIGHLEVEL_PACKAGE_MANAGER=pacman
+
+# The low-level package manager that's being used.
+# (dpkg, rpm, pacman-g2, etc)
+LOWLEVEL_PACKAGE_MANAGER=pacman
diff --git a/pcr/etckeeper/etckeeper-pacman.patch b/pcr/etckeeper/etckeeper-pacman.patch
new file mode 100644
index 000000000..1fb4acb62
--- /dev/null
+++ b/pcr/etckeeper/etckeeper-pacman.patch
@@ -0,0 +1,9 @@
+--- list-installed.d/50list-installed.orig	2012-10-21 23:45:30.000000000 -0400
++++ list-installed.d/50list-installed	2012-10-21 23:45:39.000000000 -0400
+@@ -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" = pacman ]; then
++	{ pacman -Qd|sed 's/.*/& (dep)/'; pacman -Qe|sed 's/.*/& (explicit)/'; } |sort
+ fi