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

Conflicts:
	community-testing/percona-server/PKGBUILD
	community/libdnet/PKGBUILD
	extra/libxfce4ui/PKGBUILD
	extra/libxi/PKGBUILD
	extra/live-media/PKGBUILD
	extra/python-urwid/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/xfconf/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdelibs/PKGBUILD
	kde-unstable/kdemultimedia/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk-kate/kdesdk-kate.install
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-printer-applet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	multilib/lib32-attr/PKGBUILD
	multilib/lib32-libldap/PKGBUILD
	multilib/lib32-libxi/PKGBUILD
	~lukeshu/android-udev/51-android.rules
	~lukeshu/android-udev/PKGBUILD

2 files changed, 17 insertions, 17 deletions

diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index eb145f5c0..ab0301ad7 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145112 2011-12-17 04:54:41Z bisson $
+# $Id: PKGBUILD 145630 2011-12-24 17:43:03Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=2.6.0
+pkgver=2.6.6
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
@@ -18,8 +18,8 @@ optdepends=('qt: support for qt4 input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
         'qt4-lib64.patch')
-sha1sums=('4abef8d37492b68d54ba40420f65d04779ee2ec5'
-          '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc')
+sha1sums=('ef2ba1af83ce5f25cf54a7d3e84a5739d3a9e5e0'
+          '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
 
 install=install
 
diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch
index abc15950e..c47248beb 100644
--- a/extra/gcin/qt4-lib64.patch
+++ b/extra/gcin/qt4-lib64.patch
@@ -1,6 +1,6 @@
 diff -aur old/configure new/configure
---- old/configure	2011-11-07 06:51:12.000000000 +1100
-+++ new/configure	2011-11-25 14:02:10.819256960 +1100
+--- old/configure	2011-12-21 00:48:03.000000000 +1100
++++ new/configure	2011-12-25 04:06:14.424317251 +1100
 @@ -188,7 +188,7 @@
  
  
@@ -10,9 +10,18 @@ diff -aur old/configure new/configure
  echo "testing if you have qt4 support"
  pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null
  if [ $? = 0 ]; then
+@@ -245,7 +245,7 @@
+   mv gcin.spec gcin.spec.tmp
+   grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec
+ else
+-  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc
++  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc
+   do
+ 	[ -x $i ] && QT4_MOC=$i
+   done
 diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
---- old/qt4-im/Makefile	2011-06-08 23:03:50.000000000 +1000
-+++ new/qt4-im/Makefile	2011-11-25 14:05:28.844110772 +1100
+--- old/qt4-im/Makefile	2011-12-19 14:52:46.000000000 +1100
++++ new/qt4-im/Makefile	2011-12-25 04:06:14.424317251 +1100
 @@ -1,5 +1,5 @@
  include ../config.mak
 -QT=qt4
@@ -20,12 +29,3 @@ diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
  QTIM=$(QT)/plugins/inputmethods
  IMMODULES=$(libdir)/$(QTIM)
  
-@@ -15,7 +15,7 @@
- 	$(CXX) -E $(CFLAGS) $(INCS) $< > $@
- 
- moc_gcin-qt.cpp:	gcin-qt.h
--	/usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
-+	/usr/bin/moc $< -o moc_gcin-qt.cpp
- 
- im-gcin.so: $(OBJS)
- 	export LD_RUN_PATH=$(gcinlibdir) ;\