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

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

2 files changed, 12 insertions, 9 deletions

diff --git a/elementary/gtk-engine-equinox/PKGBUILD b/elementary/gtk-engine-equinox/PKGBUILD
index 8b398ccd5..1fa27c798 100644
--- a/elementary/gtk-engine-equinox/PKGBUILD
+++ b/elementary/gtk-engine-equinox/PKGBUILD
@@ -16,15 +16,18 @@ source=("http://gnome-look.org/CONTENT/content-files/121881-equinox-${pkgver}.ta
 sha256sums=('0cf8b8cc841e0da7d4a08ab5a70d3bb330fd76bdcb03165a47aaddcd47e02227')
 
 build() {
-    cd "${srcdir}"/equinox-$pkgver
+        # extract engine files
+        #tar xzf equinox-gtk-engine.tar.gz
+        cd "${srcdir}"/equinox-$pkgver
 
 	# Toolbar Fix
 	sed -i "s|\(EQUINOX_IS_TOOLBAR.*parent\)|widget \&\& \1|" src/equinox_style.c
         
 	./configure --prefix=/usr --enable-animation
-    make
+        make
+
 }
 package() {
 	cd "${srcdir}"/equinox-$pkgver
-    make DESTDIR="${pkgdir}" install
+        make DESTDIR="${pkgdir}" install
 }
diff --git a/elementary/trisquel-themes/PKGBUILD b/elementary/trisquel-themes/PKGBUILD
index 4f21fd10f..7cbc7f29d 100644
--- a/elementary/trisquel-themes/PKGBUILD
+++ b/elementary/trisquel-themes/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: fauno <fauno@kiwwwi.com.ar>
 
 pkgname=trisquel-themes
-pkgver=4.5
-_miniver=4.4.9
+pkgver=5.0
+_miniver=5.0
 pkgrel=1
 pkgdesc="Themes from Trisquel, including GTK2, Metacity, XFWM and Openbox themes"
 arch=('any')
@@ -10,7 +10,7 @@ url=http://trisquel.info
 license=('GPL')
 depends=()
 optdepends=('gtk-engine-equinox: for Trisquel GTK2 theme')
-source=(http://archive.trisquel.info/trisquel/pool/main/t/trisquel-gtk-theme/trisquel-gtk-theme_${pkgver}.tar.gz
+source=(http://archive.trisquel.info/trisquel/pool/main/t/trisquel-gtk-theme/trisquel-gtk-theme_${pkgver}-${pkgrel}.tar.gz
 http://archive.trisquel.info/trisquel/pool/main/t/trisquel-mini-data/trisquel-mini-data_${_miniver}.tar.gz)
 
 build() {
@@ -20,10 +20,10 @@ build() {
 package() {
 	install -d ${pkgdir}/usr/share/themes
 
-    for trisquelsrc in trisquel-gtk-theme-4.5/data trisquel-mini-data-4.0; do
+    for trisquelsrc in trisquel-gtk-theme/data trisquel-mini-data; do
 	    cp -R ${srcdir}/${trisquelsrc}/usr/share/themes/* \
               ${pkgdir}/usr/share/themes/
     done
 }
-md5sums=('cfb8f457a40090e242448951240e81d7'
-         '4ba11a4902c718b2b4ccc2216ae5f12a')
+md5sums=('ebb3392a7d758ae54036bd58d488df0b'
+         '5b1773d33669dde5a3985495fff47998')