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

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 14 insertions, 67 deletions

diff --git a/extra/m17n-lib/PKGBUILD b/extra/m17n-lib/PKGBUILD
index 5b4952dd3..0afbbe4e3 100644
--- a/extra/m17n-lib/PKGBUILD
+++ b/extra/m17n-lib/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 106797 2011-01-19 09:42:18Z bisson $
+# $Id: PKGBUILD 140555 2011-10-17 07:25:46Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Camille Moncelier <pix@devlife.org>
 
 pkgname=m17n-lib
-pkgver=1.6.2
-pkgrel=2
-pkgdesc='A multilingual text processing library (runtimes)'
+pkgver=1.6.3
+pkgrel=1
+pkgdesc='Multilingual text processing library (runtimes)'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.m17n.org/m17n-lib/'
 license=('GPL')
-depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf>=0.9.11')
+depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf')
 optdepends=('anthy: to use the anthy input method')
-options=('!libtool' '!makeflags')
-source=("http://www.m17n.org/m17n-lib-download/$pkgname-$pkgver.tar.gz"
-        'locale.patch')
-sha1sums=('9b9ada79357dd56c90c64cd36845c5537c363d79'
-          '55a09b9d8e6ea590d5c8f06d1397bfa0b00c1697')
+options=('!libtool' '!emptydirs')
+source=("http://www.m17n.org/m17n-lib-download/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('b3a725b1c417f167f6b2c6b7889b7d728a1e6b8f')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 -i ../locale.patch # cf. FS#20482
-  ./configure --prefix=/usr
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --enable-static=no
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/m17n-lib/locale.patch b/extra/m17n-lib/locale.patch
deleted file mode 100644
index 79fed402d..000000000
--- a/extra/m17n-lib/locale.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- old/src/locale.c	2010/03/19 11:59:43	1.12
-+++ new/src/locale.c	2010/11/05 11:20:41	1.13
-@@ -86,34 +86,24 @@
- MLocale *mlocale_monetary, *mlocale_numeric, ;
- #endif
- 
--/** Parse locale name NAME and return a newly created MLocale object.
--    If the locale is not supported by the system, return NULL.  */
-+/** Parse locale name NAME and return a newly created MLocale object.  */
- 
- static MLocale *
- make_locale (const char *name)
- {
--  char *current, *new, *str;
-+  char *str;
-   int len;
-   MLocale *locale;
-   char c;
- 
--  str = setlocale (LC_CTYPE, NULL);
--  len = strlen (str) + 1;
--  current = alloca (len);
--  memcpy (current, str, len); 
--
--  if (! (new = setlocale (LC_CTYPE, name)))
--    return NULL;
--
--
-   M17N_OBJECT (locale, NULL, MERROR_LOCALE);
--  locale->name = msymbol (new);
-+  locale->name = msymbol (name);
-   msymbol_put (locale->name, M_locale, (void *) locale);
-   M17N_OBJECT_UNREF (locale);
- 
--  len = strlen (new) + 1;
-+  len = strlen (name) + 1;
-   str = alloca (len);
--  memcpy (str, new, len);
-+  memcpy (str, name, len);
- 
-   c = '\0';
-   while (1)
-@@ -162,8 +152,6 @@
-     }
-   else
-     locale->coding = Mcoding_us_ascii;
--
--  setlocale (LC_CTYPE, current);
-   return locale;
- }
-