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

Conflicts:
	community/abe/PKGBUILD
	community/account-plugins/PKGBUILD
	community/adesklets/PKGBUILD
	community/aircrack-ng/PKGBUILD
	community/audit/PKGBUILD
	community/bchunk/PKGBUILD
	community/bibutils/PKGBUILD
	community/cantata/PKGBUILD
	community/cdck/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/clusterssh/PKGBUILD
	community/consonance/PKGBUILD
	community/credentials-preferences/PKGBUILD
	community/dee/PKGBUILD
	community/dosbox/PKGBUILD
	community/drbd/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/ekg/PKGBUILD
	community/ekg2/PKGBUILD
	community/emelfm2/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/evilwm/PKGBUILD
	community/fatrat/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/ffmpegsource/PKGBUILD
	community/fssos-nsvs/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gwibber/PKGBUILD
	community/html2text/PKGBUILD
	community/intellij-idea-libs/PKGBUILD
	community/libcgns2/PKGBUILD
	community/libmatio/PKGBUILD
	community/librcc/PKGBUILD
	community/libsignon-glib/PKGBUILD
	community/linux-tools/PKGBUILD
	community/minitube/PKGBUILD
	community/mpdscribble/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musepack-tools/PKGBUILD
	community/nginx/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/portaudio/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/prelink/PKGBUILD
	community/projectm/PKGBUILD
	community/prosody/PKGBUILD
	community/python-basemap/PKGBUILD
	community/qgit/PKGBUILD
	community/raptor1/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/signon-keyring-extension/PKGBUILD
	community/signon-plugin-oauth2/PKGBUILD
	community/signon-ui/PKGBUILD
	community/sshguard/PKGBUILD
	community/tea/PKGBUILD
	community/tint2/PKGBUILD
	community/tremulous/PKGBUILD
	community/vobcopy/PKGBUILD
	community/windowlab/PKGBUILD
	community/xdelta/PKGBUILD
	community/xmms2/PKGBUILD
	community/xosd/PKGBUILD
	core/gdbm/PKGBUILD
	core/heirloom-mailx/PKGBUILD
	core/libffi/PKGBUILD
	core/procps-ng/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/arj/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cdparanoia/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gstreamer/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/indent/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/lcms/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libchewing/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/libnotify/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libxmu/PKGBUILD
	extra/libxpm/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/neon/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pycups/PKGBUILD
	extra/python-cairo/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/talloc/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vino/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wget/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-twm/PKGBUILD
	extra/xorg-xclipboard/PKGBUILD
	extra/xorg-xclock/PKGBUILD
	extra/xorg-xkill/PKGBUILD
	extra/xorg-xlsclients/PKGBUILD
	extra/xorg-xman/PKGBUILD
	extra/xorg-xrdb/PKGBUILD
	extra/xpdf/PKGBUILD
	extra/xvidcore/PKGBUILD
	extra/yelp/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD

7 files changed, 0 insertions, 228 deletions

diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD
deleted file mode 100644
index 454f5f257..000000000
--- a/community/tremulous/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id: PKGBUILD 86782 2013-03-22 00:57:25Z eric $
-#Contributor: Daenyth <Daenyth+arch [AT] gmail [dot] com>
-
-pkgname=tremulous
-pkgver=1.1.0
-pkgrel=9
-pkgdesc="A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates."
-url="http://tremulous.net"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('sdl' 'openal>=1.7.411' 'libgl' "tremulous-data=$pkgver" "freetype2")
-makedepends=(mesa)
-provides=("tremulous-updated=$pkgver-$pkgrel")
-conflicts=('tremulous-updated')
-replaces=('trem-backport' 'tremulous-updated')
-source=(http://releases.mercenariesguild.net/client/mg-client-manual.txt
-        http://releases.mercenariesguild.net/client/mgclient_source_Release_1.011.tar.gz
-        http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz
-        http://projects.mercenariesguild.net/attachments/download/109/game.qvm
-        http://projects.mercenariesguild.net/attachments/download/111/lakitu7_qvm.txt
-        tremdedrc
-        tremulous.desktop
-        tremded.sh
-        tremulous.sh
-        tremulous.xpm
-        fix_fs26749.patch)
-
-backup=('etc/tremdedrc')
-noextract=(mg_tremded_source_1.01.tar.gz)
-
-md5sums=('e0e1b6e03e7596da00a77fe638560402'
-         '95e526b961f875ba66b6fdd4842c913b'
-         '938bdf944dff667b74e2132a87a49780'
-         '90343619d140557d0c481a61ffa5756c'
-         'a0b8970b33a27798c125f9152049013c'
-         'f0056120d0192a0d4d591d1114439c52'
-         'aef37632a2edcf74a53503a49530bad2'
-         'b755d7c022cddc449ca2de508dfeee30'
-         '8e89473f9fdb481ad44e5cea5f6f681e'
-         '7e3a881608f1c7c0ccece1e07fcf92d8'
-         'e85511d8a9e7309dc24fb90917463900')
-
-build() {
-  local _arch=${CARCH/i686/x86}
-
-  # Build the server
-  mkdir -p "$srcdir/tremded"
-  bsdtar -x -C "$srcdir/tremded" -f "$srcdir/mg_tremded_source_1.01.tar.gz"
-  cd "$srcdir/tremded"
-  make
-# Build the client
-  cd "$srcdir/Release_1.011"
-  patch -Np1 -i "$srcdir/fix_fs26749.patch"
-  make
-}
-
-package() {
-  cd "$srcdir/tremded"
-  install -D -m755 build/release-linux-$_arch/tremded.$_arch "$pkgdir/opt/tremulous/tremded.$_arch"
-  install -D -m644 "$srcdir/tremdedrc"                         "$pkgdir/etc/tremdedrc"
-  install -D -m644 "$srcdir/game.qvm"                          "$pkgdir/opt/tremulous/game.qvm"
-  install -D -m755 "$srcdir/tremded.sh"                        "$pkgdir/usr/bin/tremded"
-
-  cd "$srcdir/Release_1.011"
-  install -Dm755 build/release-linux-$_arch/tremulous.$_arch "$pkgdir/opt/tremulous/tremulous.$_arch"
-  install -D -m755 "$srcdir/tremulous.sh"                      "$pkgdir/usr/bin/tremulous"
-
-  # Install the documentation
-  install -Dm644 "$srcdir/mg-client-manual.txt" "$pkgdir/usr/share/tremulous/mg-client-manual.txt"
-  install -Dm644 "$srcdir/lakitu7_qvm.txt"      "$pkgdir/usr/share/tremulous/lakitu7_qvm.txt"
-
-  # Install the .desktop and icon files
-  install -D -m644 "$srcdir/tremulous.xpm"     "$pkgdir/usr/share/pixmaps/tremulous.xpm"
-  install -D -m644 "$srcdir/tremulous.desktop" "$pkgdir/usr/share/applications/tremulous.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/tremulous/fix_fs26749.patch b/community/tremulous/fix_fs26749.patch
deleted file mode 100644
index 12a73138c..000000000
--- a/community/tremulous/fix_fs26749.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN Release_1.011-old/src/qcommon/parse.c Release_1.011/src/qcommon/parse.c
---- Release_1.011-old/src/qcommon/parse.c	2011-12-02 19:11:49.307368651 -0500
-+++ Release_1.011/src/qcommon/parse.c	2011-12-02 19:13:27.556836387 -0500
-@@ -981,7 +981,7 @@
- {
-   if (*string == '\"')
-   {
--    strcpy(string, string+1);
-+    memmove(string, string+1, strlen(string));
-   }
-   if (string[strlen(string)-1] == '\"')
-   {
-@@ -1784,7 +1784,7 @@
-     if ((*ptr == '\\' || *ptr == '/') &&
-         (*(ptr+1) == '\\' || *(ptr+1) == '/'))
-     {
--      strcpy(ptr, ptr+1);
-+      memmove(ptr, ptr+1, strlen(ptr));
-     }
-     else
-     {
diff --git a/community/tremulous/tremded.sh b/community/tremulous/tremded.sh
deleted file mode 100644
index 339bdd501..000000000
--- a/community/tremulous/tremded.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-CARCH=`uname -m`
-ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64
-
-[ -f /etc/tremdedrc ] && . /etc/tremdedrc
-[ -f "$HOME/.tremdedrc" ] && . "$HOME/.tremdedrc"
-
-if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then
-	echo "Cannot find game.qvm -- linking to installed version."
-	if [ ! -d "$HOME/.tremulous/base/vm" ]; then
-		mkdir -p "$HOME/.tremulous/base/vm/" || exit 1
-	fi
-	ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1
-fi
-
-cd /opt/tremulous/
-./tremded.$ext "$TREM_ARGS" "$@"
diff --git a/community/tremulous/tremdedrc b/community/tremulous/tremdedrc
deleted file mode 100644
index 7fbe122f6..000000000
--- a/community/tremulous/tremdedrc
+++ /dev/null
@@ -1 +0,0 @@
-TREM_ARGS="+set dedicated 1 +exec server.cfg"
diff --git a/community/tremulous/tremulous.desktop b/community/tremulous/tremulous.desktop
deleted file mode 100644
index 357c357bd..000000000
--- a/community/tremulous/tremulous.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Tremulous
-Comment=A free team based FPS/RTS hybrid built on the ioq3 engine. Includes community updates.
-Icon=/usr/share/pixmaps/tremulous.xpm
-Exec=tremulous
-Terminal=false
-Categories=Game;ActionGame;
diff --git a/community/tremulous/tremulous.sh b/community/tremulous/tremulous.sh
deleted file mode 100644
index 01575befc..000000000
--- a/community/tremulous/tremulous.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-CARCH=`uname -m`
-ext=x86; [ "$CARCH" = 'x86_64' ] && ext=x86_64
-
-if [ ! -r "$HOME/.tremulous/base/vm/game.qvm" ]; then
-	echo "Cannot find game.qvm -- linking to installed version."
-	if [ ! -d "$HOME/.tremulous/base/vm" ]; then
-		mkdir -p "$HOME/.tremulous/base/vm/" || exit 1
-	fi
-	ln -s /opt/tremulous/game.qvm "$HOME/.tremulous/base/vm/game.qvm" || exit 1
-fi
-
-cd /opt/tremulous/
-./tremulous.$ext "$@"
diff --git a/community/tremulous/tremulous.xpm b/community/tremulous/tremulous.xpm
deleted file mode 100644
index 5e070c862..000000000
--- a/community/tremulous/tremulous.xpm
+++ /dev/null
@@ -1,90 +0,0 @@
-/* XPM */
-static char * tremulous_xpm[] = {
-"48 48 39 1",
-" 	c None",
-".	c #0F0F0F",
-"+	c #181818",
-"@	c #000000",
-"#	c #282828",
-"$	c #212121",
-"%	c #060606",
-"&	c #1D1D1D",
-"*	c #252525",
-"=	c #080808",
-"-	c #0E0E0E",
-";	c #050505",
-">	c #0B0B0B",
-",	c #0C0C0C",
-"'	c #232323",
-")	c #1F1F1F",
-"!	c #030303",
-"~	c #0D0D0D",
-"{	c #040404",
-"]	c #020202",
-"^	c #141414",
-"/	c #1E1E1E",
-"(	c #131313",
-"_	c #111111",
-":	c #010101",
-"<	c #191919",
-"[	c #090909",
-"}	c #292929",
-"|	c #070707",
-"1	c #121212",
-"2	c #1B1B1B",
-"3	c #161616",
-"4	c #0A0A0A",
-"5	c #222222",
-"6	c #242424",
-"7	c #1A1A1A",
-"8	c #151515",
-"9	c #101010",
-"0	c #171717",
-"                                                ",
-"                         ...                    ",
-"                       +@@@@@#                  ",
-"                      $@@@@@@%                  ",
-"                     &@@@@@@@@               *  ",
-"  =-                 ;@@@@@@@@>             ,@- ",
-"  @@'                ;@@@@@@@@@            ,@@  ",
-"  )@!                ;@@@@@@@@@           ~@@;  ",
-"   ;@{               ]@@@@@@@@@~         ,@@;   ",
-"   ^@@]             /@@@@@@@@@@@(       -@@;    ",
-"    .@@;            /@@@@@@@@@@@       -@@@/    ",
-"     _@@]           /@@@@@@@@@@@     #:@@@_     ",
-"      @@@;          /@@@@@@@@@@<     :@@@-      ",
-"       :@@!          ]@@@@@@@@@     @@@@-       ",
-"       $@@@;         ;@@@@@@@@[   ~]@@@-        ",
-"        %@@@;       }!@@@@@@@@- }|@@@@,         ",
-"         !@@@;     1@@@@@@@@@@ 2@@@@@~          ",
-"          ;@@@%    [@@@@@@@@@@@@@@@@,           ",
-"           @@@@{|||:@@@@@@@@@@@@@@!-            ",
-"           -@@@@@@@@@@@@@@@@@@@@@]              ",
-"            .@@@@@@@@@@@@@@@@@@@{               ",
-"              ]@@@@@@@@@@@@@@@@@                ",
-"               .@@@@@@@@@@@@@@@@                ",
-"                +@@@@@@@@@@@@@@@@@@@@@@@@@@/    ",
-"                 =@@@@@@@@@@@@@@@@@@@@@@@@@/    ",
-"               .=@@@@@@@@@@@@@@@@@@%            ",
-"             ,@@@@@@@@@@@@@@@@@@@@@             ",
-"        2>]@@@@@@@@@@@@@@@@@@@@@@@3             ",
-"      *:@@@@@@@@@@@@@@@@@@@@@@@@@^              ",
-"      @@@|||  4]@@@@@@@@@@@@@@@@@               ",
-"      556       _@@@@@@@@@@@@@@@@3              ",
-"                 >@@@@@@@@@@@@@@@@+             ",
-"                 ;@@@@@@@@@@@@@@@@@7            ",
-"                &@@@@@@@@@@@@@@@@@@@+           ",
-"                @@@@@@@@@@@@@@@@@@@@@/          ",
-"               8@@@@@@@@@@@@@@@[  =@@|          ",
-"               ;@@:::@@@@@@@@@[    %@@[         ",
-"               @@9   (@@@@@@@4      =@@         ",
-"              ,@@      {:@@:         {@!        ",
-"              !@@        <<          3@@0       ",
-"              !@-                     3@@6      ",
-"              ]@(                      (@[      ",
-"             7@@                        ]@      ",
-"             7@@                         *      ",
-"             7@}                                ",
-"             7@                                 ",
-"              .                                 ",
-"                                                "};