Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

1 files changed, 0 insertions, 44 deletions

diff --git a/community/pypy/PKGBUILD b/community/pypy/PKGBUILD
deleted file mode 100644
index 63663c276..000000000
--- a/community/pypy/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 80543 2012-11-24 13:43:13Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-pkgname=pypy
-pkgver=2.0beta1
-pkgrel=1
-pkgdesc="A Python implementation written in Python, JIT enabled"
-url="http://codespeak.net/pypy/"
-arch=('i686' 'x86_64')
-depends=('libffi')
-provides=('python2')
-makedepends=('python2')
-optdepends=('openssl: openssl module'
-            'expat: pyexpat module'
-            'ncurses: ncurses module'
-            'zlib: zlib module'
-            'bzip2: bz2 module')
-license=('custom:MIT')
-source=(https://bitbucket.org/pypy/pypy/get/release-2.0-beta1.tar.bz2)
-md5sums=('a7e3e15c51e8f42af9f0c168b6c2750e')
-
-build() {
-  cd ${srcdir}/pypy-pypy-*/pypy/translator/goal
-
-  python2 translate.py -Ojit
-}
-
-package() {
-  cd ${srcdir}/pypy-pypy-*/pypy/translator/goal
-
-  install -Dm755 pypy-c ${pkgdir}/opt/pypy/pypy-c
-  mkdir -p ${pkgdir}/opt/pypy/{lib-python,pypy}
-
-  cd ${srcdir}/pypy-pypy-* 
-  cp -r lib-python/2.7 ${pkgdir}/opt/pypy/lib-python/
-  cp -r lib_pypy ${pkgdir}/opt/pypy/
-  cp -r include ${pkgdir}/opt/pypy/
-
-  mkdir -p ${pkgdir}/usr/bin
-  ln -s /opt/pypy/pypy-c ${pkgdir}/usr/bin/pypy
-
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/pypy/LICENSE
-}
-# vim: ts=2 sw=2 et: