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

3 files changed, 40 insertions, 24 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index ef46c6954..12ca1640c 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,11 +9,11 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20140322
-_libretools_commit=ff15727c30e5b9af5225869e38cbcfa2b08da6c2
-_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd
-md5sums=('36c7ef4d4f7e0b1fc6836babd40bb004'
-         'ec69dffa68829f063224de19bbd55fa9')
+pkgver=20140511
+_libretools_commit=9f1ef0bbdf1bc246c0c035a2dd6a4bcfa41664ef
+_devtools_commit=66f612510a5df14f4a017809e1eec671aee8cc26
+md5sums=('5bb8e455f86bdbe6a6757b9e34d69620'
+         'dd8f9d7b0465ba855883e2fa99567967')
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -38,9 +38,10 @@ check() {
 }
 
 package_librelib() {
-  pkgdesc="Shell library portion of libretools"
+  pkgdesc="The shell library portion of libretools"
+  license=(GPL2)
   depends=(
-    wget # `aur` and `lib/blacklist.sh`
+    wget # `blacklist`
   )
 
   cd "$srcdir/$pkgbase-$_libretools_commit"
@@ -48,6 +49,8 @@ package_librelib() {
 }
 
 package_gitget() {
+  pkgdesc="A simple to use downloader for git URLs"
+  license=(GPL2)
   depends=("librelib=$pkgver" git)
 
   provides=("libregit=$pkgver")
@@ -62,17 +65,18 @@ package_libretools() {
   backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
   install=libretools.install
   replaces=(chroottools)
-  conflicts=(devtools)
+  conflicts=(devtools chroottools)
 
   depends=(
     "librelib=$pkgver"
     "gitget=$pkgver" # `createworkdir`
+    "systemd>=212" # force newer systemd
     arch-install-scripts # `archroot` uses `pacstrap`
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
     subversion # `diff-unfree`
     tokyocabinet # `treepkg`
-    "systemd>208" # force newer systemd
+    wget # `aur`
   )
   optdepends=('namcap: to check package files')
 
@@ -82,6 +86,7 @@ package_libretools() {
 
 package_libretools-mips64el() {
   pkgdesc="Scripts for Parabola development (for mips64el architecture)"
+  license=(GPL3)
   depends=("$pkgbase=$pkgver"
     git # mips-add
   )
diff --git a/pcr/git-remote-mediawiki/PKGBUILD b/pcr/git-remote-mediawiki/PKGBUILD
index 8fb47724a..d5ffd33be 100644
--- a/pcr/git-remote-mediawiki/PKGBUILD
+++ b/pcr/git-remote-mediawiki/PKGBUILD
@@ -1,10 +1,12 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
 pkgname=git-remote-mediawiki
 url=https://github.com/moy/Git-Mediawiki/wiki
 license=('GPL') # GPLv2+
 pkgdesc="Support for MediaWiki remotes in git"
 
-pkgver=1.8.5.1
-pkgrel=2
+pkgver=1.9.2
+pkgrel=1
 arch=('any')
 depends=(
   git
@@ -14,18 +16,15 @@ depends=(
   perl-mediawiki-api
 )
 
-_symlink() {
-	local src=$1
-	local dst=$2
-	mkdir -p "${pkgdir}/${dst%/*}"
-	ln -s "$(realpath "$src" --relative-to="${dst%/*}")" "${pkgdir}/${dst}"
-}
-
 package() {
-	_mwdir=/usr/share/git/mw-to-git
-	_perldir=/usr/share/perl5/vendor_perl
-	_gitdir=/usr/lib/git-core
-	_symlink ${_mwdir}/Git/Mediawiki.pm          ${_perldir}/Git/Mediawiki.pm
-	_symlink ${_mwdir}/git-mw.perl               ${_gitdir}/git-mw
-	_symlink ${_mwdir}/git-remote-mediawiki.perl ${_gitdir}/git-remote-mediawiki
+	local _mwdir=/usr/share/git/mw-to-git
+	local _perldir=/usr/share/perl5/vendor_perl
+	local _gitdir=/usr/lib/git-core
+
+	install -d "$pkgdir"/$_perldir/Git
+	install -d "$pkgdir"/$_gitdir
+
+	ln -srT "$pkgdir"/${_mwdir}/Git/Mediawiki.pm          "$pkgdir"/${_perldir}/Git/Mediawiki.pm
+	ln -srT "$pkgdir"/${_mwdir}/git-mw.perl               "$pkgdir"/${_gitdir}/git-mw
+	ln -srT "$pkgdir"/${_mwdir}/git-remote-mediawiki.perl "$pkgdir"/${_gitdir}/git-remote-mediawiki
 }
diff --git a/pcr/git-send-email/PKGBUILD b/pcr/git-send-email/PKGBUILD
new file mode 100644
index 000000000..22d484073
--- /dev/null
+++ b/pcr/git-send-email/PKGBUILD
@@ -0,0 +1,12 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=git-send-email
+pkgver=1.9.2
+pkgdesc="Meta-package for packages nescessary for git send-email"
+url="http://git-scm.com/"
+license=('GPL2')
+
+pkgrel=1
+arch=(any)
+
+depends=(git perl-mime-tools perl-net-smtp-ssl perl-authen-sasl)