Merge ssh://parabolagnulinux.org:1863/srv/git/abslibre

19 files changed, 44 insertions, 40 deletions

diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 4f4b5fd44..2b3d37e0b 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.6
 _extramodules=extramodules-3.8-LIBRE # Don't forget to update bbswitch.install
-pkgrel=2
+pkgrel=3
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
index aff067a94..8805ff9d1 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -4,10 +4,11 @@
 _pkgname=bumblebee
 pkgname=bumblebee-libre
 pkgver=3.1
-pkgrel=5.1
+pkgrel=6.2
 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support"
 arch=('i686' 'x86_64')
-depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl')
+depends=('virtualgl' 'glib2' 'mesa-libgl')
+makedepends=('help2man')
 optdepends=('xf86-video-nouveau: nouveau driver'
             'nouveau-dri: 3D acceleration features of nouveau'
             'bbswitch: switch on/off discrete card'
@@ -16,9 +17,9 @@ if [ "$CARCH" = "x86_64" ]; then
      optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun'
      optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun'
 fi
-replaces=('bumblebee')
+replaces=('bumblebee' 'nvidia-libgl')
 conflicts=('bumblebee' 'nvidia-libgl')
-provides=("bumblebee=$pkgver"'nvidia-libgl')
+provides=("bumblebee=$pkgver" 'nvidia-libgl')
 url="http://www.bumblebee-project.org"
 license=("GPL3")
 install='bumblebee.install'
@@ -42,7 +43,8 @@ build() {
     ./configure \
         CONF_DRIVER=nouveau \
         --prefix=/usr \
-        --sysconfdir=/etc
+        --sysconfdir=/etc \
+        --without-pidfile
 
     make
 }
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index c519fb4a1..cbf479d1c 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
 _extramodules=extramodules-3.8-LIBRE # Don't forget to update cdfs.install
-pkgrel=39
+pkgrel=40
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
 arch=(i686 x86_64 mips64el)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index e9ca63637..cc3749800 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -7,10 +7,10 @@
 
 pkgname=cgminer-libre
 _pkgflag=libre
-pkgver=2.11.3
+pkgver=2.11.4
 _build=
 pkgrel=1
-pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, with free OpenCL support."
+pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
@@ -36,7 +36,7 @@ build() {
   # Here you may want to use custom CFLAGS
   #export CFLAGS="-O2 -march=native -mtune=native -msse2"
 
-  ./configure --prefix=/usr --enable-cpumining --disable-adl
+  ./configure --prefix=/usr --enable-cpumining --enable-scrypt --disable-adl
   
   make
 }
@@ -52,6 +52,6 @@ package() {
   install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
 }
 
-md5sums=('fd2c69f943353fbc9723a5526d82c1b6'
+md5sums=('535ca85b504bd408d1eeddf4962ed685'
          'fe4a243fabe24608f5c05e40f0f118f6'
          'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index d8fc4308a..ff81b3b4b 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -23,11 +23,11 @@ pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
 pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=4
 
 pkgdesc="Language packs for Debian Iceape."
 arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.debian.org/source/sid/iceape"
+url="http://packages.debian.org/sid/iceape"
 license=('MPL' 'GPL')
 depends=("iceape-libre>=$pkgver")
 makedepends=('unzip' 'zip')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 1dff5d2dd..5152a456a 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=4
+pkgrel=5
 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -21,7 +21,7 @@ replaces=('mozilla' 'seamonkey')
 conflicts=('seamonkey')
 provides=('seamonkey')
 install=$_pkgname.install
-url="http://packages.debian.org/source/sid/${_pkgname}"
+url="http://packages.debian.org/sid/${_pkgname}"
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
         mozconfig
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index fd24630fe..ba1b80f5b 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -11,10 +11,10 @@ pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
 
-pkgrel=1
+pkgrel=2
 pkgdesc="Language packs for Debian Icedove."
 arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.debian.org/source/experimental/icedove"
+url="http://packages.debian.org/experimental/icedove"
 license=('MPL' 'GPL')
 depends=("icedove-libre>=$pkgver")
 makedepends=('unzip' 'zip')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index c727fb2ce..b5396781e 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -11,11 +11,11 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
-url="http://packages.debian.org/source/experimental/${_pkgname}"
+url="http://packages.debian.org/experimental/${_pkgname}"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
 makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
 optdepends=('libcanberra: for sound support')
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index af600985c..625995ecd 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -23,11 +23,11 @@ pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
-url="http://www.geticeweasel.org/"
+url="http://packages.debian.org/experimental/iceweasel"
 license=('MPL' 'GPL')
 depends=("iceweasel-libre>=$pkgver")
 makedepends=('unzip' 'zip')
@@ -66,9 +66,9 @@ for lang in ${_langpacks[@]}
 do
     eval "
 package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
-  replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
-  conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
-  provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z) firefox-i18n-$(echo $lang | tr A-Z a-z))
+  replaces=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
+  conflicts=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
+  provides=(firefox-i18n-$(echo $lang | tr A-Z a-z) iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
   install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
 }
 "
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 6dc52a213..19b9ee9a2 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=('i686' 'x86_64' 'mips64el')
@@ -36,8 +36,10 @@ if $_pgo; then
 fi
 
 optdepends=('networkmanager: Location detection via available WiFi networks')
-url="http://www.geticeweasel.org/"
+url="http://packages.debian.org/experimental/${_pkgname}"
 install=iceweasel.install
+replaces=('firefox')
+conflicts=('firefox')
 provides=('firefox')
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index f647e3913..bdc8b63c0 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181035 2013-03-30 11:31:35Z foutrelis $
+# $Id: PKGBUILD 182068 2013-04-06 09:25:55Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=40
+pkgrel=41
 epoch=1
 _extramodules=extramodules-3.8-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 1d4dd0702..15bc771ed 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -8,7 +8,7 @@ _pkgflag=libre
 pkgver=1.2.1
 _pkgver=3066b2161439
 pkgrel=1
-pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendations"
+pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.${pkgname%-$_pkgflag}.net/"
 license=('GPL')
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index cf38b1882..faf704096 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
 pkgver=0.41
-pkgrel=9.4
+pkgrel=10
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 2fda312b6..51329569f 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -12,7 +12,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=16
+pkgrel=17
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 764beed0d..5bbbf618d 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
 _extramodules=extramodules-3.8-LIBRE
-pkgrel=19
+pkgrel=20
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index f48fd9f32..038191729 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
 pkgver=4.2.10
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 45bbfb86d..c7c0c7707 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.10
 _extramodules=extramodules-3.8-LIBRE
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index 41b5ac73a..3a8199ff8 100644
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.7-LIBRE'
+    EXTRAMODULES='extramodules-3.8-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.7-LIBRE'
+    EXTRAMODULES='extramodules-3.8-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.7-LIBRE'
+    EXTRAMODULES='extramodules-3.8-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
index 1ac430c3b..0a6d187e5 100644
--- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
@@ -3,17 +3,17 @@ cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.7-LIBRE'
+    EXTRAMODULES='extramodules-3.8-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.7-LIBRE'
+    EXTRAMODULES='extramodules-3.8-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.7-LIBRE'
+    EXTRAMODULES='extramodules-3.8-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }