Sat May 25 00:28:12 PDT 2013

5 files changed, 61 insertions, 14 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 51f0a0c0a..f7dfe3489 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91009 2013-05-17 10:26:19Z jelle $
+# $Id: PKGBUILD 91579 2013-05-24 14:55:19Z dwallace $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.31
+pkgver=0.9.32
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,13 +30,13 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('19abde7fd5a065cadfaee4ed12568d96'
+md5sums=('3b1c89a84872df900b9cfb706027df67'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
-build() {
-  cd "${srcdir}/${_pkgname}"
 
+prepare(){
+  cd "${srcdir}/${_pkgname}"
   #rm -rf src/{cherrypy,pyPdf}
   rm -rf src/cherrypy
   rm -rf resources/${pkgname}-portable.*
@@ -47,7 +47,10 @@ build() {
 
   sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
     $(find . -regex ".*.py\|.*.recipe")
+}
 
+build() {
+  cd "${srcdir}/${_pkgname}"
   # Remove nonfree fonts
   cd resources/fonts; \
     rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index e8a981a3d..1cb968c35 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182649 2013-04-12 07:08:42Z tpowa $
+# $Id: PKGBUILD 186154 2013-05-21 10:00:49Z tpowa $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: orelien <aurelien.foret@wanadoo.fr>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 _pkgname=rp-pppoe
 pkgname=rp-pppoe-libre
 pkgver=3.11
-pkgrel=3
+pkgrel=4
 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation"
 arch=('i686' 'x86_64')
 url="http://www.roaringpenguin.com/pppoe/"
@@ -36,7 +36,7 @@ prepare() {
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver/src"
-  ./configure --prefix=/usr --enable-plugin
+  ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin
   make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
 
@@ -49,6 +49,6 @@ package() {
 }
 md5sums=('13b5900c56bd602df6cc526e5e520722'
          'SKIP'
-         'af234125f956f3a356ab0d0fcaa9e8a2'
+         '45dc8fc3d0341a3930182a480859ad76'
          'd38a903a247d689ff0323d7b6caa1c6b'
          '3c53d550ac408608abb0b6cd6b76b6c2')
diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service
index 324164943..f9a2fdcc6 100644
--- a/libre/rp-pppoe-libre/adsl.service
+++ b/libre/rp-pppoe-libre/adsl.service
@@ -3,8 +3,8 @@ Description=ADSL Deamon
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/pppoe-start
-ExecStop=/usr/sbin/pppoe-stop
+ExecStart=/usr/bin/pppoe-start
+ExecStop=/usr/bin/pppoe-stop
 
 [Install]
 WantedBy=multi-user.target
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index cf2a4e4d4..b7b1988f9 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800'
          'c7951fe6888d939f3a7d0dafe477e82b'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
-         'a757fa81ccf64788952c69dc5e6e43ff'
+         '17fca4ba3a751c8a1db19b92b1820462'
          '50387fba578646a9d29de3f917a199d2')
 
 prepare() {
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