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

Conflicts:
	community-testing/clementine/PKGBUILD
	community-testing/gedit-plugins/PKGBUILD
	community-testing/giggle/PKGBUILD
	community-testing/gimmie/PKGBUILD
	community-testing/glipper/PKGBUILD
	community-testing/gnome-system-tools/PKGBUILD
	community-testing/gnote/PKGBUILD
	community-testing/gnubiff/PKGBUILD
	community-testing/google-gadgets/PKGBUILD
	community-testing/gphpedit/PKGBUILD
	community-testing/ibus/PKGBUILD
	community-testing/inputattach/PKGBUILD
	community-testing/liboobs/PKGBUILD
	community-testing/perl-gtk2-webkit/PKGBUILD
	community-testing/shotwell/PKGBUILD
	community-testing/surf/PKGBUILD
	community-testing/system-tools-backends/PKGBUILD
	community-testing/uzbl/PKGBUILD
	community-testing/workrave/PKGBUILD
	community/cherrypy/PKGBUILD
	community/llvm/PKGBUILD
	community/xonotic/PKGBUILD
	extra/ntfs-3g/PKGBUILD
	extra/ntfsprogs/PKGBUILD
	extra/rhino/PKGBUILD
	testing/accountsservice/PKGBUILD
	testing/anjuta/PKGBUILD
	testing/ardour/PKGBUILD
	testing/at-spi/PKGBUILD
	testing/at-spi2-atk/PKGBUILD
	testing/at-spi2-core/PKGBUILD
	testing/atk/PKGBUILD
	testing/atkmm/PKGBUILD
	testing/avahi/PKGBUILD
	testing/banshee/PKGBUILD
	testing/brasero/PKGBUILD
	testing/cairomm/PKGBUILD
	testing/cheese/PKGBUILD
	testing/claws-mail-extra-plugins/PKGBUILD
	testing/clutter-gst/PKGBUILD
	testing/clutter-gtk/PKGBUILD
	testing/clutter-gtk2/PKGBUILD
	testing/clutter/PKGBUILD
	testing/cups-pk-helper/PKGBUILD
	testing/dconf/PKGBUILD
	testing/devhelp/PKGBUILD
	testing/ekiga/PKGBUILD
	testing/empathy/PKGBUILD
	testing/eog-plugins/PKGBUILD
	testing/eog/PKGBUILD
	testing/epiphany-extensions/PKGBUILD
	testing/epiphany/PKGBUILD
	testing/evince/PKGBUILD
	testing/evolution-data-server/PKGBUILD
	testing/evolution-exchange/PKGBUILD
	testing/evolution/PKGBUILD
	testing/farsight2/PKGBUILD
	testing/file-roller/PKGBUILD
	testing/folks/PKGBUILD
	testing/gcalctool/PKGBUILD
	testing/gconf-editor/PKGBUILD
	testing/gconf/PKGBUILD
	testing/gdk-pixbuf2/PKGBUILD
	testing/gdl/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gedit/PKGBUILD
	testing/gimp-devel/PKGBUILD
	testing/gimp/PKGBUILD
	testing/gjs/PKGBUILD
	testing/glade/PKGBUILD
	testing/glib-networking/PKGBUILD
	testing/glib2/PKGBUILD
	testing/glibmm/PKGBUILD
	testing/gnome-applets/PKGBUILD
	testing/gnome-bluetooth/PKGBUILD
	testing/gnome-color-manager/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/gnome-desktop/PKGBUILD
	testing/gnome-disk-utility/PKGBUILD
	testing/gnome-games/PKGBUILD
	testing/gnome-keyring/PKGBUILD
	testing/gnome-media/PKGBUILD
	testing/gnome-menus/PKGBUILD
	testing/gnome-nettool/PKGBUILD
	testing/gnome-panel/PKGBUILD
	testing/gnome-pilot/PKGBUILD
	testing/gnome-power-manager/PKGBUILD
	testing/gnome-screensaver/PKGBUILD
	testing/gnome-session/PKGBUILD
	testing/gnome-settings-daemon/PKGBUILD
	testing/gnome-sharp/PKGBUILD
	testing/gnome-shell/PKGBUILD
	testing/gnome-system-monitor/PKGBUILD
	testing/gnome-terminal/PKGBUILD
	testing/gnome-themes-standard/PKGBUILD
	testing/gnome-user-share/PKGBUILD
	testing/gnome-utils/PKGBUILD
	testing/gobject-introspection/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtk-vnc/PKGBUILD
	testing/gtk2/PKGBUILD
	testing/gtk3/PKGBUILD
	testing/gtkhtml4/PKGBUILD
	testing/gtkmm/PKGBUILD
	testing/gtkmm3/PKGBUILD
	testing/gtksourceview3/PKGBUILD
	testing/gucharmap/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/kdeplasma-applets-networkmanagement/PKGBUILD
	testing/kismet/PKGBUILD
	testing/lcms2/PKGBUILD
	testing/libcanberra/PKGBUILD
	testing/libchamplain/PKGBUILD
	testing/libdmapsharing/PKGBUILD
	testing/libgda/PKGBUILD
	testing/libgdata/PKGBUILD
	testing/libgnome-keyring/PKGBUILD
	testing/libgnome-media-profiles/PKGBUILD
	testing/libgnomekbd/PKGBUILD
	testing/libgpod/PKGBUILD
	testing/libgweather/PKGBUILD
	testing/libimobiledevice/PKGBUILD
	testing/liblrdf/PKGBUILD
	testing/libnice/PKGBUILD
	testing/libnotify/PKGBUILD
	testing/libpeas/PKGBUILD
	testing/librsvg/PKGBUILD
	testing/libsocialweb/PKGBUILD
	testing/libsoup/PKGBUILD
	testing/libunique/PKGBUILD
	testing/libunique3/PKGBUILD
	testing/libwebkit/PKGBUILD
	testing/libwnck/PKGBUILD
	testing/libwnck3/PKGBUILD
	testing/libxklavier/PKGBUILD
	testing/liferea/PKGBUILD
	testing/mail-notification/PKGBUILD
	testing/metacity/PKGBUILD
	testing/midori/PKGBUILD
	testing/miro/PKGBUILD
	testing/mousetweaks/PKGBUILD
	testing/mpd/PKGBUILD
	testing/mutter/PKGBUILD
	testing/mx/PKGBUILD
	testing/nautilus-open-terminal/PKGBUILD
	testing/nautilus-sendto/PKGBUILD
	testing/nautilus/PKGBUILD
	testing/network-manager-applet/PKGBUILD
	testing/networkmanager-openvpn/PKGBUILD
	testing/networkmanager-pptp/PKGBUILD
	testing/networkmanager-vpnc/PKGBUILD
	testing/networkmanager/PKGBUILD
	testing/notification-daemon/PKGBUILD
	testing/opal/PKGBUILD
	testing/pangomm/PKGBUILD
	testing/pidgin/PKGBUILD
	testing/polkit-gnome/PKGBUILD
	testing/polkit/PKGBUILD
	testing/ptlib/PKGBUILD
	testing/pygobject/PKGBUILD
	testing/pygtk/PKGBUILD
	testing/pywebkitgtk/PKGBUILD
	testing/raptor/PKGBUILD
	testing/raptor1/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD
	testing/rest/PKGBUILD
	testing/rhythmbox/PKGBUILD
	testing/seahorse/PKGBUILD
	testing/slv2/PKGBUILD
	testing/soprano/PKGBUILD
	testing/sound-juicer/PKGBUILD
	testing/telepathy-gabble/PKGBUILD
	testing/telepathy-glib/PKGBUILD
	testing/telepathy-logger/PKGBUILD
	testing/telepathy-mission-control/PKGBUILD
	testing/tomboy/PKGBUILD
	testing/totem-plparser/PKGBUILD
	testing/totem/PKGBUILD
	testing/udisks/PKGBUILD
	testing/upower/PKGBUILD
	testing/vinagre/PKGBUILD
	testing/vino/PKGBUILD
	testing/vte/PKGBUILD
	testing/yelp/PKGBUILD
	testing/zenity/PKGBUILD

1 files changed, 0 insertions, 110 deletions

diff --git a/extra/libnotify/libnotify-0.7.1-gtk3-tests.patch b/extra/libnotify/libnotify-0.7.1-gtk3-tests.patch
deleted file mode 100644
index 7d1230520..000000000
--- a/extra/libnotify/libnotify-0.7.1-gtk3-tests.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 92983cacd36fa9b050f911bc4de09b8c4fb9f3b2 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Thu, 16 Dec 2010 00:01:13 +0100
-Subject: [PATCH] gentoo: do not build gtk+:3 tests if not required
-
----
- configure.ac      |    5 +++++
- tests/Makefile.am |   30 +++++++++++++++++-------------
- 2 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 71609ed..7767c5b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,10 +97,15 @@ AC_SUBST(PACKAGE_LIBS)
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(pkg_modules)
- 
-+AC_ARG_ENABLE([tests],
-+	AS_HELP_STRING([--enable-tests], [Check for extra dependencies to build all tests]))
-+AS_IF([test $enable_tests = yes], [
- tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION"
- PKG_CHECK_MODULES(TESTS, [$tests_modules])
-+])
- AC_SUBST(TESTS_LIBS)
- AC_SUBST(TESTS_CFLAGS)
-+AM_CONDITIONAL([MORE_TESTS], [test $enable_tests = yes])
- 
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
- AC_SUBST(GLIB_GENMARSHAL)
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 7acf9a3..2856a82 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -2,18 +2,15 @@ INCLUDES = \
- 	-I$(top_srcdir) \
- 	$(TESTS_CFLAGS)
- 
--noinst_PROGRAMS = \
-+check_PROGRAMS = \
- 	test-replace \
--	test-replace-widget \
- 	test-server-info \
- 	test-default-action \
- 	test-multi-actions \
- 	test-action-icons \
--	test-image \
- 	test-basic \
- 	test-error \
- 	test-markup \
--	test-persistence \
- 	test-resident \
- 	test-rtl \
- 	test-size-changes \
-@@ -23,6 +20,22 @@ noinst_PROGRAMS = \
- 	test-xy-actions \
- 	test-xy-stress
- 
-+#if MORE_TESTS
-+check_PROGRAMS += \
-+	test-image \
-+	test-replace-widget \
-+	test-persistence
-+
-+test_replace_widget_SOURCES = test-replace-widget.c
-+test_replace_widget_LDADD  = $(common_ldflags)
-+
-+test_image_SOURCES = test-image.c
-+test_image_LDADD  = $(common_ldflags)
-+
-+test_persistence_SOURCES = test-persistence.c
-+test_persistence_LDADD = $(common_ldflags)
-+#endif
-+
- common_ldflags = \
- 	$(top_builddir)/libnotify/libnotify.la \
- 	$(TESTS_LIBS)
-@@ -30,9 +43,6 @@ common_ldflags = \
- test_replace_SOURCES = test-replace.c
- test_replace_LDADD  = $(common_ldflags)
- 
--test_replace_widget_SOURCES = test-replace-widget.c
--test_replace_widget_LDADD  = $(common_ldflags)
--
- test_server_info_SOURCES = test-server-info.c
- test_server_info_LDADD   = $(common_ldflags)
- 
-@@ -48,9 +58,6 @@ test_multi_actions_LDADD  = $(common_ldflags)
- test_action_icons_SOURCES = test-action-icons.c
- test_action_icons_LDADD  = $(common_ldflags)
- 
--test_image_SOURCES = test-image.c
--test_image_LDADD  = $(common_ldflags)
--
- test_basic_SOURCES = test-basic.c
- test_basic_LDADD = $(common_ldflags)
- 
-@@ -75,9 +82,6 @@ test_xy_stress_LDADD = $(common_ldflags)
- test_rtl_SOURCES = test-rtl.c
- test_rtl_LDADD = $(common_ldflags)
- 
--test_persistence_SOURCES = test-persistence.c
--test_persistence_LDADD = $(common_ldflags)
--
- test_resident_SOURCES = test-resident.c
- test_resident_LDADD = $(common_ldflags)
- 
--- 
-1.7.4.rc2
-