From dfb2fcdea0928d362f80caf0a5181c9851bffad9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 22 Oct 2012 00:04:09 -0400 Subject: move etckeeper from [~lukeshu] to [pcr] --- pcr/etckeeper/.gitignore | 1 + pcr/etckeeper/PKGBUILD | 43 +++++++++++++++++++++++++++++ pcr/etckeeper/etckeeper-archlinux.conf | 38 +++++++++++++++++++++++++ pcr/etckeeper/etckeeper-pacman.patch | 9 ++++++ ~lukeshu/etckeeper/.gitignore | 1 - ~lukeshu/etckeeper/PKGBUILD | 43 ----------------------------- ~lukeshu/etckeeper/etckeeper-archlinux.conf | 38 ------------------------- ~lukeshu/etckeeper/etckeeper-pacman.patch | 9 ------ 8 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 pcr/etckeeper/.gitignore create mode 100644 pcr/etckeeper/PKGBUILD create mode 100644 pcr/etckeeper/etckeeper-archlinux.conf create mode 100644 pcr/etckeeper/etckeeper-pacman.patch delete mode 100644 ~lukeshu/etckeeper/.gitignore delete mode 100644 ~lukeshu/etckeeper/PKGBUILD delete mode 100644 ~lukeshu/etckeeper/etckeeper-archlinux.conf delete mode 100644 ~lukeshu/etckeeper/etckeeper-pacman.patch 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 +# Maintainer (AUR): Buce +# Contributor: Danie Roux + +# 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 diff --git a/~lukeshu/etckeeper/.gitignore b/~lukeshu/etckeeper/.gitignore deleted file mode 100644 index b4a9ca909..000000000 --- a/~lukeshu/etckeeper/.gitignore +++ /dev/null @@ -1 +0,0 @@ -etckeeper-0.63/ diff --git a/~lukeshu/etckeeper/PKGBUILD b/~lukeshu/etckeeper/PKGBUILD deleted file mode 100644 index 163c320db..000000000 --- a/~lukeshu/etckeeper/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer (Parabola): Luke Shumaker -# Maintainer (AUR): Buce -# Contributor: Danie Roux - -# 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/~lukeshu/etckeeper/etckeeper-archlinux.conf b/~lukeshu/etckeeper/etckeeper-archlinux.conf deleted file mode 100644 index 83e2c577d..000000000 --- a/~lukeshu/etckeeper/etckeeper-archlinux.conf +++ /dev/null @@ -1,38 +0,0 @@ -# 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/~lukeshu/etckeeper/etckeeper-pacman.patch b/~lukeshu/etckeeper/etckeeper-pacman.patch deleted file mode 100644 index 1fb4acb62..000000000 --- a/~lukeshu/etckeeper/etckeeper-pacman.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- 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 -- cgit v1.2.3