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

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

1 files changed, 46 insertions, 2 deletions

diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index ec40c0692..75a5ed22f 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1,5 +1,5 @@
 --- VirtualBox-4.2.12.orig/Config.kmk	2013-04-12 07:33:55.000000000 -0300
-+++ VirtualBox-4.2.12/Config.kmk	2013-05-10 15:03:20.817944799 -0300
++++ VirtualBox-4.2.12/Config.kmk	2013-05-23 18:48:57.560690206 -0300
 @@ -56,9 +56,6 @@
  PROPS_SYSMODS_ACCUMULATE_L   += INTERMEDIATES
  PROPS_MISCBINS_ACCUMULATE_L  += INTERMEDIATES
@@ -1001,8 +1001,9 @@
  else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS
  
   #
+diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
 --- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp		2013-05-10 17:03:11.087825690 -0300
++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp		2013-05-23 18:59:56.434051894 -0300
 @@ -650,27 +650,6 @@
      }
  };
@@ -1039,3 +1040,46 @@
  
  #ifdef VBOX_WITH_DEBUGGER_GUI
      /* 'Debug' actions: */
+diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h
+--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h	2013-04-12 07:38:01.000000000 -0300
++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h		2013-05-24 11:26:13.789861574 -0300
+@@ -62,7 +62,6 @@
+     UIActionIndexRuntime_Menu_SharedFolders,
+     UIActionIndexRuntime_Simple_SharedFoldersDialog,
+     UIActionIndexRuntime_Toggle_VRDEServer,
+-    UIActionIndexRuntime_Simple_InstallGuestTools,
+ 
+ #ifdef VBOX_WITH_DEBUGGER_GUI
+     /* 'Debugger' menu actions: */
+diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
+--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-04-12 07:38:01.000000000 -0300
++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-05-24 11:27:14.723176263 -0300
+@@ -651,7 +651,6 @@
+     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders));
+     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
+     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
+-    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
+ }
+ 
+ void UIMachineLogic::prepareActionConnections()
+@@ -705,8 +704,6 @@
+             this, SLOT(sltOpenSharedFoldersDialog()));
+     connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
+             this, SLOT(sltSwitchVrde(bool)));
+-    connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()),
+-            this, SLOT(sltInstallGuestAdditions()));
+ 
+ #ifdef VBOX_WITH_DEBUGGER_GUI
+     /* "Debug" actions connections: */
+diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp
+--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp	2013-04-12 07:38:01.000000000 -0300
++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp		2013-05-24 11:28:03.193841501 -0300
+@@ -244,8 +244,6 @@
+     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog));
+     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
+     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
+-    pMenu->addSeparator();
+-    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
+ }
+ 
+ #ifdef VBOX_WITH_DEBUGGER_GUI