Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/asciijump/PKGBUILD
	community/cairo-compmgr/PKGBUILD
	community/cwiid/PKGBUILD
	community/darcs/PKGBUILD
	community/gadmin-samba/PKGBUILD
	community/gstm/PKGBUILD
	community/haskell-dbus/PKGBUILD
	community/haskell-mmap/PKGBUILD
	community/lastfm-client/PKGBUILD
	community/libtar/PKGBUILD
	community/mget/PKGBUILD
	community/nexuiz/PKGBUILD
	community/pstreams/PKGBUILD
	community/pyglet/PKGBUILD
	community/python-html5lib/PKGBUILD
	community/python-pychm/PKGBUILD
	community/qoauth/PKGBUILD
	community/quilt/PKGBUILD
	community/stormbaancoureur/PKGBUILD
	community/winegame/PKGBUILD
	community/winestuff/PKGBUILD
	community/xdg-user-dirs/PKGBUILD
	core/libfetch/PKGBUILD
	extra/acpi/PKGBUILD
	extra/alex/PKGBUILD
	extra/allegro/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/erlang/PKGBUILD
	extra/ettercap/PKGBUILD
	extra/gftp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/happy/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-fgl/PKGBUILD
	extra/haskell-glut/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/libnet/PKGBUILD
	extra/linux_logo/PKGBUILD
	extra/mailman/PKGBUILD
	extra/midori/PKGBUILD
	extra/ntrack/PKGBUILD
	extra/pwgen/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/qtcurve-kde4/PKGBUILD
	extra/ristretto/PKGBUILD
	extra/rxvt-unicode/PKGBUILD
	extra/telepathy-sofiasip/PKGBUILD
	extra/tightvnc/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/windowmaker-crm-git/PKGBUILD
	libre/aufs2-libre/PKGBUILD
	libre/calibre-libre/PKGBUILD
	libre/calibre-libre/calibre-mount-helper
	libre/calibre-libre/calibre.install
	libre/calibre-libre/desktop_integration.patch
	libre/ffmpeg-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/libre.patch
	mozilla-testing/iceweasel-libre/mozconfig
	~lukeshu/openni-unstable/PKGBUILD

2 files changed, 0 insertions, 68 deletions

diff --git a/~mtjm/h-client/PKGBUILD b/~mtjm/h-client/PKGBUILD
deleted file mode 100644
index 4df7f5f28..000000000
--- a/~mtjm/h-client/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
-
-pkgname=h-client
-_pkgver=0.0a0.dev-r80
-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")
-sha512sums=('d148084be40aa741f012ba49285ea428b4d6c032a015f732e1a7987f8125acd04a033df97e4536cc9587a3535f701305e4d44f641479e99d0e49a0da652abf2a')
-
-check() {
-  cd "$srcdir/hclient-${_pkgver}"
-  python2 setup.py test
-}
-
-package() {
-  cd "$srcdir/hclient-${_pkgver}"
-  # Remove tests, they aren't useful after installation.
-  rm -rf {,build/lib/}tests_hclient
-  rm -rf {,build/lib/}hclient.egg-info
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~mtjm/python3-lxml/PKGBUILD b/~mtjm/python3-lxml/PKGBUILD
deleted file mode 100644
index 5d4effa47..000000000
--- a/~mtjm/python3-lxml/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Based on python-lxml.
-# $Id: PKGBUILD 146500 2012-01-12 05:14:02Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Guillem Rieu <guillemr@gmx.net>
-
-pkgname=python3-lxml
-pkgver=2.3.3
-pkgrel=1
-pkgdesc="Python 3 binding for the libxml2 and libxslt libraries"
-arch=('i686' 'x86_64' 'mips64el')
-license=('BSD' 'custom')
-url="http://lxml.de/"
-depends=('python' 'libxslt')
-conflicts=('lxml')
-source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-md5sums=('a7825793c69d004f388ec6600bad7a6f'
-         '5c4b1a05f6e46a4dd7ebed8b5ad9e32e')
-
-check() {
-  cd "${srcdir}"/lxml-$pkgver
-  make test
-}
-
-package() {
-  cd "${srcdir}"/lxml-$pkgver
-
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -Dm644 LICENSES.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
-  install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
-}