Merge branch 'master' of ssh://gparabola/abslibre

Conflicts:
	libre/aif-libre/PKGBUILD

6 files changed, 93 insertions, 7 deletions

diff --git a/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD
index 3d87faa7f..fbf03418a 100644
--- a/libre/aif-libre/PKGBUILD
+++ b/libre/aif-libre/PKGBUILD
@@ -2,14 +2,15 @@
 # Maintainer: Dieter Plaetinck <dieter@plaetinck.be>
 
 pkgname=aif-libre
-pkgver=2011.08.17
+pkgver=2011.08.25
 pkgrel=1
 pkgdesc="The ArchLinux Installation Framework (Parabola Rebranded)"
 arch=('any')
 url="https://projects.parabolagnulinux.org/aif.git"
 license=('GPL3')
 depends=('util-linux-ng' 'bash' 'pacman' 'coreutils' 'grub' 'grep' 'mkinitcpio' 'awk' 'sed' 'libui-sh')
-optdepends=('cryptsetup: for encryption support'
+optdepends=('markdown: to generate the html installation guide'
+            'cryptsetup: for encryption support'
             'lvm2: for LVM support'
             'dhcpd: for dhcp networking support'
             'e2fsprogs: Ext support'
@@ -18,12 +19,13 @@ optdepends=('cryptsetup: for encryption support'
             'xfsprogs: XFS support'
             'ntp: setting date with NTP'
             'dialog: for ncurses support'
+            'curl: for the aif-report-issues.sh script'
             )
 replaces=('aif')
 conflicts=('aif')
 provides=('aif')
 source=($url/snapshot/aif-${pkgver}.tar.bz2)
-md5sums=('a234ffdf6fa5c116df97610e7306a98d')
+md5sums=('bdf7edbb88276ea99b45ee041a099e01')
 
 build() {
 
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index fd3ea4063..4eafae894 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -59,7 +59,6 @@ package_libretools() {
   install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin
   install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/mipsrelease ${pkgdir}/usr/bin
   install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/
   install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
   install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
@@ -73,11 +72,12 @@ package_libretools() {
 
 package_libretools-pr() {
   install -d ${pkgdir}/etc/libretools.d
-  install -m644 ${_gitname}/prtools.conf ${pkgdir}/etc/libretools.d
+  install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d
 
   install -d ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/prfullpkg ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/prmipsrelease ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/prtools/prfullpkg ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/prtools/prmipsrelease ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/prtools/prtoru ${pkgdir}/usr/bin
 }
 
 package_libretools-mips64el() {
diff --git a/~mtjm/h-client/PKGBUILD b/~mtjm/h-client/PKGBUILD
new file mode 100644
index 000000000..81b0c0a92
--- /dev/null
+++ b/~mtjm/h-client/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+
+pkgname=h-client
+_pkgver=0.0a0.dev-r26
+pkgver=${_pkgver/-/.}
+pkgrel=1
+pkgdesc="A client for an h-source server (such as http://www.h-node.com)"
+arch=('any')
+url="https://savannah.nongnu.org/projects/h-client/"
+license=('GPL3')
+depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk')
+options=(!emptydirs)
+# Official source is in SVN, this is made by "python2 setup.py sdist".
+source=("http://mtjm.eu/releases/hclient-${_pkgver}.tar.gz")
+md5sums=('1dee91bbd4f5985b986e21953a05c477')
+
+package() {
+  cd "$srcdir/hclient-${_pkgver}"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~mtjm/python2-pydns/PKGBUILD b/~mtjm/python2-pydns/PKGBUILD
new file mode 100644
index 000000000..76ea7b112
--- /dev/null
+++ b/~mtjm/python2-pydns/PKGBUILD
@@ -0,0 +1,25 @@
+# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# From https://aur.archlinux.org/packages.php?ID=42273
+# Maintainer: Filip S. Adamsen <fsa [at] fsadev [dot] com>
+# Contributor: Samed Beyribey <ras0ir AT eventualis DOT org>
+pkgname=python2-pydns
+_pkgname=pydns
+pkgver=2.3.5
+pkgrel=1
+pkgdesc="Python2 module for performing DNS queries"
+arch=('any')
+url="http://pydns.sourceforge.net"
+license=('custom')
+depends=('python2')
+options=(!emptydirs)
+source=(http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz)
+md5sums=('50fb6ec23808110162e84ef49140a73f')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  python2 setup.py build || return 1
+  python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname"
+}
diff --git a/~mtjm/ttf-beteckna/PKGBUILD b/~mtjm/ttf-beteckna/PKGBUILD
new file mode 100644
index 000000000..ff338e0d4
--- /dev/null
+++ b/~mtjm/ttf-beteckna/PKGBUILD
@@ -0,0 +1,22 @@
+# From https://aur.archlinux.org/packages.php?ID=22483
+# Maintainer: TDY <tdy@gmx.com>
+
+pkgname=ttf-beteckna
+pkgver=0.4
+pkgrel=1
+pkgdesc="A geometric sans serif typeface inspired by the popular Futura"
+arch=('any')
+url="http://gnu.ethz.ch/linuks.mine.nu/beteckna/"
+license=('GPL')
+depends=('fontconfig' 'xorg-font-utils')
+makedepends=('fontforge')
+install=ttf.install
+source=(http://gnu.ethz.ch/linuks.mine.nu/${pkgname/*-}/${pkgname/*-}-$pkgver.tar.gz)
+md5sums=('01c12138e0f689f4acdacb105f4350a7')
+
+build() {
+  cd "$srcdir/${pkgname/*-}-$pkgver"
+  install -dm755 "$pkgdir/usr/share/fonts/TTF"
+  fontforge -script sfd2ttf.ff *.sfd &> /dev/null || return 1
+  install -Dm644 *.ttf "$pkgdir/usr/share/fonts/TTF"
+}
diff --git a/~mtjm/ttf-beteckna/ttf.install b/~mtjm/ttf-beteckna/ttf.install
new file mode 100644
index 000000000..33b7d6549
--- /dev/null
+++ b/~mtjm/ttf-beteckna/ttf.install
@@ -0,0 +1,15 @@
+post_install() {
+  echo -n "==> Rebuilding font cache... "
+  fc-cache -f &> /dev/null
+  mkfontscale /usr/share/fonts/TTF
+  mkfontdir /usr/share/fonts/TTF
+  echo "done"
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}