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

3 files changed, 0 insertions, 61 deletions

diff --git a/community/frogatto/PKGBUILD b/community/frogatto/PKGBUILD
deleted file mode 100644
index dd0d29b6b..000000000
--- a/community/frogatto/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 78929 2012-10-27 23:44:28Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Tom Wambold <tom5760@gmail.com>
-
-pkgname='frogatto'
-arch=('i686' 'x86_64')
-pkgver=1.2
-pkgrel=7
-pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog"
-url="http://www.frogatto.com"
-license=('GPL')
-depends=('glew' 'sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'libpng' 'boost-libs' 'frogatto-data')
-makedepends=('mesa' 'boost')
-source=("frogatto-$pkgver.tar.gz::https://github.com/frogatto/frogatto/tarball/$pkgver"
-        frogatto
-        frogatto.desktop)
-md5sums=('b60924f384e04728eb6e76cdd48ab8f9'
-         '9ed2c9ea59e95fe3c0b3ad49e58f8890'
-         'e31563b04748a39292a59aaad633ff58')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgname"*
-
-  sed -i 's/ccache //g' Makefile
-  sed -i 's/-lprofiler//g' Makefile
-  sed -i 's/\.io_service/\.get_io_service/g' src/server.cpp
-  sed -i 's/-lboost_regex-mt/-lboost_regex/g' Makefile
-  sed -i 's/-lboost_system-mt/-lboost_system/g' Makefile
-  sed -i 's/-lboost_thread-mt/-lboost_thread/g' Makefile
-  sed -i 's/-lboost_iostreams-mt/-lboost_iostreams/g' Makefile
-  make game server
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgname"*
-
-  install -D -m755 game $pkgdir/opt/frogatto/game
-  install -D -m755 server $pkgdir/opt/frogatto/server
-
-  install -D -m644 src/LICENSE $pkgdir/usr/share/licenses/frogatto/LICENSE
-
-  cd $srcdir
-  install -DT -m755 frogatto $pkgdir/usr/bin/frogatto
-  install -D -m644 frogatto.desktop $pkgdir/usr/share/applications/frogatto.desktop
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/frogatto/frogatto b/community/frogatto/frogatto
deleted file mode 100644
index 0d741e0de..000000000
--- a/community/frogatto/frogatto
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/frogatto
-exec /opt/frogatto/game $*
diff --git a/community/frogatto/frogatto.desktop b/community/frogatto/frogatto.desktop
deleted file mode 100644
index b0795467a..000000000
--- a/community/frogatto/frogatto.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Frogatto
-GenericName=Old-school 2D platformer
-Comment=Old-school 2D platformer
-Exec=/usr/bin/frogatto
-Terminal=false
-MultipleArgs=false
-Type=Application
-Icon=/opt/frogatto/images/window-icon.png
-Categories=Game;ArcadeGame