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

Conflicts:
	extra/libdvbpsi/PKGBUILD

13 files changed, 182 insertions, 107 deletions

diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD
index ffdf67f1d..79f03f0a4 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82451 2013-01-18 08:29:46Z giovanni $
+# $Id: PKGBUILD 89650 2013-05-01 05:38:53Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=ccid
-pkgver=1.4.9
+pkgver=1.4.10
 pkgrel=1
 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('LGPL' 'GPL')
 depends=('pcsclite' 'libusbx')
 makedepends=('pkg-config')
 backup=(etc/reader.conf.d/libccidtwin)
-source=("https://alioth.debian.org/frs/download.php/3864/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1afd9cc6fb1676d1fdd605d10c70d08e')
+source=("https://alioth.debian.org/frs/download.php/3897/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('5372e8593624dee837269bf86e4b8b06')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 90ac2a69d..6cd9aa702 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 89546 2013-04-29 22:36:26Z bgyorgy $
+# $Id: PKGBUILD 89648 2013-04-30 22:18:11Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.7.7
-pkgrel=2
+pkgver=1.7.8
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cinnamon.linuxmint.com/"
@@ -30,12 +30,12 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/
         "gnome-3.8.patch"
         "switch-applications.patch"
         "fallback-helpers.patch")
-md5sums=('a0ed2648d1d95edeac2e45e2c11508fe'
-         '2b1ece84416c3e4de030be15f1774d82'
-         'c3f25b06d345d9d36c197cd96e08f496'
-         '75c7e0d8d0e6fc4861753ce27e0438c8'
-         '3880fa4c5234771644e5b57a1ade4456'
-         '0dac5a546bf16921a4fdde8525366a24')
+sha256sums=('812042c6b7685e2054602a29ed190f8efc07f67f92be1bc496358307534cb969'
+            'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
+            'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
+            '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3'
+            '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
+            'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch
index e455a835e..4053a151b 100644
--- a/community/cinnamon/gnome-3.8.patch
+++ b/community/cinnamon/gnome-3.8.patch
@@ -196,11 +196,9 @@ index f12f8c5..939ea70 100644
    <schema id="org.cinnamon.screensaver" path="/org/cinnamon/screensaver/">
      <key name="default-message" type="s">
        <default>""</default>
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-index f964aed..4a38c84 100644
---- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-@@ -232,11 +232,11 @@ def getFirstFileFromBackgroundXml(self, filename):
+--- linuxmint-Cinnamon-a464dc9.orig/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py 2013-04-30 18:01:56.000000000 +0200
++++ linuxmint-Cinnamon-a464dc9/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py  2013-04-30 23:36:46.718385152 +0200
+@@ -232,11 +232,11 @@
      
  
  class BackgroundWallpaperPane (Gtk.VBox):
@@ -214,7 +212,7 @@ index f964aed..4a38c84 100644
          self._sidepage = sidepage
          
          scw = Gtk.ScrolledWindow()
-@@ -263,15 +263,15 @@ def _on_selection_changed(self, iconview):
+@@ -263,15 +263,15 @@
          if wallpaper:
              for key in wallpaper:
                  if key == "filename":
@@ -235,16 +233,7 @@ index f964aed..4a38c84 100644
              if (not "metadataFile" in wallpaper) or (wallpaper["metadataFile"] == ""):
                  self._sidepage.remove_wallpaper_button.set_sensitive(True)
      
-@@ -364,7 +364,7 @@ def run(self):
-         return res
- 
- class BackgroundSlideshowPane(Gtk.Table):
--    def __init__(self, sidepage, gnome_background_schema, cinnamon_background_schema):
-+    def __init__(self, sidepage, cinnamon_background_schema):
-         Gtk.Table.__init__(self)
-         self.set_col_spacings(5)
-         self.set_row_spacings(5)
-@@ -445,12 +445,11 @@ def _do_update_list(self, folder, recursive, delay, transition_duration = 0):
+@@ -445,12 +445,11 @@
              f = open(filename, "w")
              f.write(xml_data)
              f.close()
@@ -253,23 +242,23 @@ index f964aed..4a38c84 100644
  
  class BackgroundSidePage (SidePage):
      def __init__(self, name, icon, keywords, advanced, content_box):
-         SidePage.__init__(self, name, icon, keywords, advanced, content_box, True)
+         SidePage.__init__(self, name, icon, keywords, advanced, content_box, -1)
 -        self._gnome_background_schema = Gio.Settings("org.gnome.desktop.background")
          self._cinnamon_background_schema = Gio.Settings("org.cinnamon.background")
          self._add_wallpapers_dialog = AddWallpapersDialog()
          
-@@ -515,8 +514,8 @@ def build(self, advanced):
+@@ -515,8 +514,8 @@
          self.mainbox.set_visible_window(False)
          self.content_box.pack_start(self.mainbox, True, True, 3)
          
 -        self.wallpaper_pane = BackgroundWallpaperPane(self, self._gnome_background_schema)
 -        self.slideshow_pane = BackgroundSlideshowPane(self, self._gnome_background_schema, self._cinnamon_background_schema)
 +        self.wallpaper_pane = BackgroundWallpaperPane(self, self._cinnamon_background_schema)
-+        self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema)
++        self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema, self._cinnamon_background_schema)
          if self._cinnamon_background_schema["mode"] == "slideshow":
              self.mainbox.add(self.slideshow_pane)
          else:
-@@ -536,21 +535,21 @@ def build(self, advanced):
+@@ -536,21 +535,21 @@
          l = Gtk.Label(_("Picture aspect"))
          l.set_alignment(0, 0.5)
          advanced_options_box.pack_start(l, False, False, 0)
@@ -295,6 +284,7 @@ index f964aed..4a38c84 100644
          hbox.pack_start(self.secondary_color, False, False, 2)
          advanced_options_box.pack_start(hbox, False, False, 0)
          self.content_box.show_all()
+
 diff --git a/js/ui/main.js b/js/ui/main.js
 index 74154ab..99aee95 100644
 --- a/js/ui/main.js
diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD
index c356a53c3..6efe35668 100644
--- a/community/python-sqlalchemy/PKGBUILD
+++ b/community/python-sqlalchemy/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 87107 2013-03-27 11:07:21Z jelle $ 
+# $Id: PKGBUILD 89654 2013-05-01 16:07:24Z jelle $ 
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=python-sqlalchemy
 pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=0.8.0
+pkgver=0.8.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el') # python2 package contain .so
 url="http://www.sqlalchemy.org/"
 license=('custom: MIT')
 makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose')
-source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz")
-md5sums=('3fb0b62e5d6ef4a022414f4233519ee2')
+source=(http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz)
+md5sums=('8e27886edc49e69921af77c2274caa41')
 
 build() {
   cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 4e3f60f67..c79899bda 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182769 2013-04-15 01:13:43Z allan $
+# $Id: PKGBUILD 184021 2013-05-01 05:45:14Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,8 +10,8 @@ else
     pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 fi
 pkgver=4.8.0
-pkgrel=2
-_snapshot=4.8-20130411
+pkgrel=3
+_snapshot=4.8-20130425
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -22,7 +22,7 @@ checkdepends=('dejagnu' 'inetutils')
 options=('!libtool' '!emptydirs')
 source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2)
         #ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-md5sums=('cb529205469260f0d56adc01088c4850')
+md5sums=('03690556f09991fbecac0467227c5d4e')
 
 if [ -n "${_snapshot}" ]; then
   _basedir=gcc-${_snapshot}
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD
index e10dff9e9..4bdad975b 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 143078 2011-11-22 13:07:42Z giovanni $
+# $Id: PKGBUILD 184029 2013-05-01 14:46:54Z foutrelis $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=libdvbpsi
 pkgver=0.2.2
-pkgrel=1.1
+pkgrel=1
+epoch=1
 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables"
 arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
+license=('LGPL2.1')
 depends=('glibc')
 options=('!libtool')
 replaces=('libdvbpsi4' 'libdvbpsi5')
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 77a8baf3f..b2de0df03 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184013 2013-04-30 20:28:23Z giovanni $
+# $Id: PKGBUILD 184020 2013-05-01 05:23:57Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.04.29
+pkgver=2013.04.30
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('9cdb58c0ecc02711388e9cded104aad6')
+md5sums=('95533d91bd196e42fd748076dc244b09')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 623378fce..43b3b8dce 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=875
-__hgrev=acf7368a2acc
+_patchlevel=918
+__hgrev=c61da758a9a2
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-md5sums=('4d71e8b9ef6a214b3651d69be19fadec'
-         'ac2bfed9586c987f0b8435c91be3f18a'
+md5sums=('b1a619f017851646a8567deda17bdb36'
+         'SKIP'
          '6e7adfbd5d26c1d161030ec203a7f243'
          '20fceda56badf201695c57999b0bc609'
          '10353a61aadc3f276692d0e17db1478e'
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index 531f87a73..6aa9ae4fb 100755
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Cedric Girard <girard.cedric@gmail.com>
 # Contributor: N30N <archlinux@alunamation.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=unar
-pkgver=1.5
-pkgrel=3
+pkgver=1.6
+pkgrel=1
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://unarchiver.c3.cx/"
@@ -38,5 +39,5 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('d493957a56844ef9c1ad7b7dd24571fc'
+md5sums=('bab77e196569f8f571f29c14e2d78daa'
          '4fa4ecc6e4ba14d3b6952d064e728511')
diff --git a/pcr/lightspark/PKGBUILD b/pcr/lightspark/PKGBUILD
new file mode 100644
index 000000000..bab26aceb
--- /dev/null
+++ b/pcr/lightspark/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer : speps <speps at aur dot archlinux dot org>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=lightspark
+pkgver=0.7.2
+pkgrel=1
+pkgdesc='An alternative Flash Player for GNU/Linux.'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://lightspark.sourceforge.net'
+license=('GPL3' 'LGPL3')
+depends=('gtk2' 'ffmpeg' 'glew' 'curl' 'boost-libs' 'libxml++' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig')
+optdepends=('gnash-gtk: fallback support')
+install="$pkgname.install"
+source=(http://launchpad.net/lightspark/trunk/lightspark-$pkgver/+download/lightspark-$pkgver.tar.gz{,.asc})
+md5sums=('f078d505a354fb66dc5b68ad09a2aa81'
+         'SKIP')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  [ -d bld ] || mkdir bld && cd bld
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+           -DCMAKE_BUILD_TYPE=Release \
+           -DGNASH_EXE_PATH=/usr/bin/gtk-gnash
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver/bld"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/pcr/lightspark/lightspark.install b/pcr/lightspark/lightspark.install
new file mode 100644
index 000000000..bce670aff
--- /dev/null
+++ b/pcr/lightspark/lightspark.install
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/minetest-git/PKGBUILD b/pcr/minetest-git/PKGBUILD
new file mode 100644
index 000000000..b4a5eb7ce
--- /dev/null
+++ b/pcr/minetest-git/PKGBUILD
@@ -0,0 +1,91 @@
+# Maintainer: Konsta Kokkinen <kray@tsundere.fi>
+# Maintainer (Parabola): Jorge Araya Navarro <jorgean@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+pkgname=minetest-git
+pkgver=20130501
+pkgrel=1
+pkgdesc="An Infiniminer/Minecraft inspired game, git version."
+arch=('i686' 'x86_64')
+url='http://minetest.net/'
+license=('LGPL2.1')
+makedepends=('git' 'cmake' 'irrlicht' 'mesa' 'bzip2' 'libjpeg' 'libpng' 'zlib' 'curl')
+depends=('sqlite3' 'libgl' 'libxxf86vm' 'openal' 'hicolor-icon-theme' 'libvorbis' 'curl')
+conflicts=('minetest' 'minetest-hg')
+
+_srcroot="https://github.com/minetest/minetest.git"
+_srcname="minetest"
+
+_gameroot="https://github.com/minetest/minetest_game.git"
+_gamename="minetest_game"
+
+_commonroot="https://github.com/minetest/common.git"
+_commonname="common"
+
+_buildroot="https://github.com/minetest/build.git"
+_buildname="build"
+
+_survivalroot="https://github.com/minetest/survival.git"
+_survivalname="survival"
+
+package() {
+	cd "$srcdir"
+
+	msg "Pulling sources..."
+
+	if [ -d $_srcname ] ; then
+		cd $_srcname && git pull origin
+		msg "The local files are updated."
+	else
+		git clone $_srcroot $_gitname
+	fi
+
+	msg "Pulling game..."
+
+	cd "$srcdir/$_srcname/games/"
+
+        if [ -d $_gamename ] ; then
+                cd $_gamename && git pull origin   
+                msg "The local files are updated."
+        else
+                git clone $_gameroot $_gamename
+        fi
+
+	msg "Pulling common mods..."
+	cd "$srcdir"/"$_srcname"/games/
+
+	 if [ -d $_commonname ] ; then
+                cd $_commonname && git pull origin   
+                msg "The local files are updated."
+        else
+                git clone $_commonroot $_commonname
+        fi
+
+	msg "Pulling build mods..."
+	cd "$srcdir"/"$_srcname"/games/
+
+	 if [ -d $_buildname ] ; then
+                cd $_buildname && git pull origin   
+                msg "The local files are updated."
+        else
+                git clone $_buildroot $_buildname
+        fi
+
+	msg "Pulling survival mods..."
+	cd "$srcdir"/"$_srcname"/games/
+
+	 if [ -d $_survivalname ] ; then
+                cd $_survivalname && git pull origin   
+                msg "The local files are updated."
+        else
+                git clone $_survivalroot $_survivalname
+        fi
+
+
+
+	msg "GIT checkout done or server timeout"
+	msg "Starting make..."
+
+	cd "$srcdir/$_srcname"
+	cmake . -DCMAKE_INSTALL_PREFIX=/usr
+	make DESTDIR=${pkgdir} install
+}
diff --git a/pcr/minetest/PKGBUILD b/pcr/minetest/PKGBUILD
deleted file mode 100644
index 18546b470..000000000
--- a/pcr/minetest/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=minetest-git
-pkgver=20120918
-pkgrel=2
-pkgdesc="An Infiniminer/Minecraft inspired game, git version."
-arch=('i686' 'x86_64')
-url="http://celeron.55.lt/~celeron55/minetest/"
-license=('GPL')
-makedepends=('git' 'cmake' 'irrlicht' 'mesa' 'libjpeg' 'bzip2' 'libpng' 'zlib' 'libvorbis')
-depends=('libjpeg' 'bzip2' 'sqlite3' 'libgl' 'libxxf86vm' 'openal')
-conflicts=('minetest' 'minetest-hg')
-
-_srcroot="https://github.com/celeron55/minetest.git"
-_srcname="minetest"
-
-_gameroot="https://github.com/celeron55/minetest_game.git"
-_gamename="minetest_game"
-
-build() {
-	cd "$srcdir"
-
-	msg "Pulling sources..."
-
-	if [ -d $_srcname ] ; then
-		cd $_srcname && git pull origin
-		msg "The local files are updated."
-	else
-		git clone $_srcroot $_gitname
-	fi
-
-	msg "Pulling game..."
-
-	cd "$srcdir/$_srcname/games/"
-
-        if [ -d $_gamename ] ; then
-                cd $_gamename && git pull origin   
-                msg "The local files are updated."
-        else
-                git clone $_gameroot $_gamename
-        fi
-
-
-	msg "GIT checkout done or server timeout"
-	msg "Starting make..."
-
-	cd "$srcdir/$_srcname"
-	cmake . -DCMAKE_INSTALL_PREFIX=/usr
-    #install -d -m 755 ${pkgdir}/usr/share/applications
-    #install -d -m 755 ${pkgdir}/usr/share/icons/scalable/apps
-    #install -m 644 ${srcdir}/minetest.svg ${pkgdir}/usr/share/icons/scalable/apps
-    #install -m 644 ${srcdir}/minetest-git.desktop ${pkgdir}/usr/share/applications
-	make DESTDIR=${pkgdir} install
-}