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, 5 insertions, 49 deletions

diff --git a/extra/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch b/extra/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch
deleted file mode 100644
index 5352688a2..000000000
--- a/extra/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 715c6ddf3de90936c9ba7a6bb6904b7072d3b241 Mon Sep 17 00:00:00 2001
-From: Ionut Biru <ibiru@archlinux.org>
-Date: Fri, 30 Sep 2011 10:57:14 +0000
-Subject: [PATCH] Avoid use of deprecated G_CONST_RETURN
-
-Signed-off-by: Ionut Biru <ibiru@archlinux.org>
----
- libepc/enums.c.in |    2 +-
- libepc/enums.h.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libepc/enums.c.in b/libepc/enums.c.in
-index 75f737c..bc81b84 100644
---- a/libepc/enums.c.in
-+++ b/libepc/enums.c.in
-@@ -65,7 +65,7 @@ G@Type@Class*
-  *
-  * Returns: The string representation of @value, or %NULL.
-  */
--G_CONST_RETURN gchar*
-+const gchar*
- @enum_name@_to_string (@EnumName@ value)
- {
-   const G@Type@Value *@type@_value = g_@type@_get_value (@enum_name@_get_class (), value);
-diff --git a/libepc/enums.h.in b/libepc/enums.h.in
-index fea8b07..48973e5 100644
---- a/libepc/enums.h.in
-+++ b/libepc/enums.h.in
-@@ -19,7 +19,7 @@ G_BEGIN_DECLS
- 
- GType                 @enum_name@_get_type  (void) G_GNUC_CONST;
- G@Type@Class*           @enum_name@_get_class (void) G_GNUC_CONST;
--G_CONST_RETURN gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE;
-+const gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE;
- /*** END value-header ***/
- 
- /*** BEGIN file-tail ***/
--- 
-1.7.6.4
-
diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD
index 2ad391d40..0dd0d0e9d 100644
--- a/extra/libepc/PKGBUILD
+++ b/extra/libepc/PKGBUILD
@@ -1,25 +1,21 @@
-# $Id: PKGBUILD 139209 2011-10-01 18:55:29Z ibiru $
+# $Id: PKGBUILD 140436 2011-10-14 09:44:47Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libepc
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=1
 pkgdesc="Easy Publish and Consume Library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://live.gnome.org/libepc"
 depends=('gtk3' 'avahi' 'libsoup')
-makedepends=('intltool' 'gtk-doc' 'gnome-common')
+makedepends=('intltool')
 options=('!libtool' '!makeflags')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz
-        0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch)
-sha256sums=('1377defd339122a5ef71509d3b761810c58f178985d655b74bc34760ef4ae49e'
-            'd2bcfd72abc4cd74975a70c667c38d88154117d1eef10a8e8b75bc07cb1dde06')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('3dff25a7f2f0d024b7609389f13664789b0ab45a0e5740908395e3d49cceefc2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch"
-  gnome-autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make