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

3 files changed, 22 insertions, 30 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index c35d75b28..c5c200a32 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=blender
 epoch=11
 _pkgver=2.70
-pkgrel=2
+pkgrel=3
 _jpgver=1.5
 _pyver=3.4
 
@@ -13,7 +13,7 @@ _spn=false
   _spndesc=' (with spacenav support)'
 }
 
-pkgname=$_pkgname$_spnname-libre
+pkgname=$_pkgname-libre$_spnname
 pkgver=$_pkgver
 pkgdesc='Fully integrated 3D graphics creation suite, without nonfree cuda support'$_spndesc
 arch=(
@@ -74,11 +74,12 @@ makedepends=(
   llvm
   mesa
 )
-provides=($_pkgname)
-[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver")
-conflicts=($_pkgname)
-[[ $_spn == true ]] && conflicts+=($_pkgname-libre)
-replaces=$_pkgname
+[[ $_spn != true ]] && provides=($_pkgname)
+[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver" $_pkgname$_spnname-libre)
+[[ $_spn != true ]] && conflicts=($_pkgname)
+[[ $_spn == true ]] && conflicts+=($_pkgname-libre $_pkgname$_spnname-libre)
+[[ $_spn != true ]] && replaces=$_pkgname
+[[ $_spn == true ]] && replaces=$_pkgname$_spnname-libre
 options=(!strip)
 install=$_pkgname.install
 source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
@@ -94,7 +95,7 @@ prepare() {
   [[ $_OS == GNU/kFreeBSD ]] && sed -i 's|BUILD_PLATFORM;|"GNU/kFreeBSD";|' source/creator/buildinfo.c
   sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and BSD|
           s|Linux, FreeBSD|GNU and BSD|
-          s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.|
+          s|Unpack the archive, Then run the Blender executable.|Install from Parabola repo (pacman -S '"$pkgname"'), Then run blender.|
           \|Windows|d;\|Mac OS X|d
           s|The downloaded Blender package includes|The '"${pkgname^}"' package includes|
          ' release/text/readme.html
diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD
index 09a5d4d15..f5ba66574 100644
--- a/pcr/etckeeper/PKGBUILD
+++ b/pcr/etckeeper/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Diogo Leal <estranho@diogoleal.com>
 
 pkgname=etckeeper
-pkgver=1.4
+pkgver=1.11
 pkgdesc="Collection of tools to let /etc be stored in a git, hg, bzr or darcs repository."
 url="http://joeyh.name/code/etckeeper/"
 license=('GPL2')
@@ -12,22 +12,26 @@ 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')
+makedepends=('bzr' 'python2') # bzr must be there at compile time to have bzr support
+optdepends=('git' 'hg' 'bzr' 'darcs' 'python2: for bzr support')
 backup=(etc/etckeeper/etckeeper.conf)
-source=("libre://$pkgname-$pkgver.tar.gz" $pkgname-pacman.patch $pkgname-archlinux.conf)
 
+source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" $pkgname-archlinux.conf)
+md5sums=('75d13168ca79b9f53dfa6c9603924975'
+         '99d8d2838f49fa0f2f21c9e37948100d')
+
+mkdepends=('git')
 mksource=("$pkgname-$pkgver::git://git.kitenet.net/$pkgname#tag=${pkgver}")
 mkmd5sums=('SKIP')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # add pacman support to `list-installed`
-  patch -p0 -i "${srcdir}/${pkgname}-pacman.patch"
-
   # use python2
   sed -i 's@^#!/usr/bin/python$@&2@' etckeeper-bzr/__init__.py
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" build
 }
 
@@ -36,7 +40,3 @@ package() {
 
   make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" DESTDIR="$pkgdir" install
 }
-
-md5sums=('74be692fdb2d3352324e9332a270635d'
-         'f1f00bf9331d1ef7f29b0ac29cdfcbda'
-         '99d8d2838f49fa0f2f21c9e37948100d')
diff --git a/pcr/etckeeper/etckeeper-pacman.patch b/pcr/etckeeper/etckeeper-pacman.patch
deleted file mode 100644
index 1fb4acb62..000000000
--- a/pcr/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