Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

21 files changed, 94 insertions, 68 deletions

diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 2b3d37e0b..9a39c7a8f 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=3
+pkgrel=5
 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 d07cb1c64..a7b9ad140 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=bumblebee
 pkgname=bumblebee-libre
-pkgver=3.2
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support"
 arch=('i686' 'x86_64')
@@ -27,18 +27,19 @@ backup=('etc/bumblebee/bumblebee.conf'
         'etc/bumblebee/xorg.conf.nouveau')
 source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz"
         'libre.patch')
-md5sums=('690d0b3aea4ae1fc2a72fe2719ecfd74'
-         'f8b6044310039911236f53a625c611a6')
+md5sums=('30974e677bb13e8a3825fd6f3e7d3b24'
+         '1daed1e00f74538add6c435dfa0569d1')
 
 prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
 
     # Remove nonfree references to nonfree nvidia driver and unnecessaries files
     rm -rv "README.markdown"
-    rm -rv "conf/"{99-remove-nvidia-dev.rules,xorg.conf.nvidia}
+    rm -rv "conf/"{99-bumblebee-nvidia-dev.rules,xorg.conf.nvidia}
     rm -rv "doc"
     rm -rv "scripts/bumblebee-bugreport.in"
     patch -Np1 -i "${srcdir}/libre.patch"
+}
 
 build() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/libre/bumblebee-libre/libre.patch b/libre/bumblebee-libre/libre.patch
index 0952b1d11..81d49ca33 100644
--- a/libre/bumblebee-libre/libre.patch
+++ b/libre/bumblebee-libre/libre.patch
@@ -1,27 +1,31 @@
-diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am
---- bumblebee-3.1.orig/Makefile.am	2013-02-24 21:29:35.055167554 -0200
-+++ bumblebee-3.1/Makefile.am	2013-04-06 07:25:37.798457580 -0300
+diff -Nur bumblebee-3.2.1.orig/Makefile.am bumblebee-3.2.1/Makefile.am
+--- bumblebee-3.2.1.orig/Makefile.am	2013-04-26 12:49:03.022174178 -0300
++++ bumblebee-3.2.1/Makefile.am	2013-04-28 17:08:11.719589284 -0300
 @@ -1,7 +1,6 @@
  # -*- Makefile -*-
  
  GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)")
--relnotes = doc/RELEASE_NOTES_3_1
+-relnotes = doc/RELEASE_NOTES_3_2_1
  
  bumblebeedconfdir=$(sysconfdir)/bumblebee
  
-@@ -19,19 +18,12 @@
+@@ -20,23 +19,16 @@
  noinst_SCRIPTS += scripts/sysvinit/bumblebeed
  endif
  
 -bin_SCRIPTS = scripts/bumblebee-bugreport
 -
+ xconfddir = $(bumblebeedconfdir)/xorg.conf.d
+ xconfd_DATA = conf/xorg.conf.d/10-dummy.conf
+ 
  CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS)
  EXTRA_DIST = scripts/systemd/bumblebeed.service.in \
  	scripts/upstart/bumblebeed.conf.in \
--	conf/99-remove-nvidia-dev.rules \
+-	conf/99-bumblebee-nvidia-dev.rules \
  	conf/bumblebee.conf.in \
 -	conf/xorg.conf.nvidia \
  	conf/xorg.conf.nouveau \
+ 	$(xconfd_DATA) \
 -	README.markdown \
  	scripts/bash_completion/bumblebee \
 -	scripts/bumblebee-bugreport.in \
@@ -29,7 +33,7 @@ diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am
  	version.sh
  # for laziness include all headers found
  EXTRA_DIST += src/*.h src/*/switching.h
-@@ -52,8 +44,7 @@
+@@ -57,17 +49,11 @@
  	src/driver.c src/bumblebeed.c
  bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt
  
@@ -39,7 +43,16 @@ diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am
  
  completiondir = $(sysconfdir)/bash_completion.d
  completion_DATA = scripts/bash_completion/bumblebee
-@@ -91,10 +82,6 @@
+ 
+-if WITH_UDEV_RULES
+-udevrulesdir = $(UDEV_RULES_DIR)
+-udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules
+-endif
+-
+ do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \
+ 	-e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \
+ 	-e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \
+@@ -97,10 +83,6 @@
  	mkdir -p scripts/systemd
  	$(do_subst) < $< > $@
  
@@ -50,38 +63,49 @@ diff -Nur bumblebee-3.1.orig/Makefile.am bumblebee-3.1/Makefile.am
  if WITH_PIDFILE
  scripts/sysvinit/bumblebeed: $(srcdir)/scripts/sysvinit/bumblebeed.in
  	mkdir -p scripts/sysvinit
-diff -Nur bumblebee-3.1.orig/Makefile.in bumblebee-3.1/Makefile.in
---- bumblebee-3.1.orig/Makefile.in	2013-02-24 21:34:57.103561881 -0200
-+++ bumblebee-3.1/Makefile.in	2013-04-06 07:23:01.600417658 -0300
-@@ -315,7 +315,6 @@
+diff -Nur bumblebee-3.2.1.orig/Makefile.in bumblebee-3.2.1/Makefile.in
+--- bumblebee-3.2.1.orig/Makefile.in	2013-04-26 12:49:11.306174579 -0300
++++ bumblebee-3.2.1/Makefile.in	2013-04-28 17:21:38.698898621 -0300
+@@ -220,7 +220,6 @@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+-UDEV_RULES_DIR = @UDEV_RULES_DIR@
+ VERSION = @VERSION@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -273,7 +272,6 @@
  x11_CFLAGS = @x11_CFLAGS@
  x11_LIBS = @x11_LIBS@
  GITVERSION = $(shell "$(top_srcdir)/version.sh" "$(top_srcdir)")
--relnotes = doc/RELEASE_NOTES_3_1
+-relnotes = doc/RELEASE_NOTES_3_2_1
  bumblebeedconfdir = $(sysconfdir)/bumblebee
  AM_CPPFLAGS = ${regular_CPPFLAGS} \
  		-DCONFIG_FILE='"$(bumblebeedconfdir)/bumblebee.conf"' \
-@@ -327,16 +326,15 @@
+@@ -286,7 +284,6 @@
  
  noinst_SCRIPTS = scripts/systemd/bumblebeed.service \
  	scripts/upstart/bumblebeed.conf $(am__append_1)
 -bin_SCRIPTS = scripts/bumblebee-bugreport
+ xconfddir = $(bumblebeedconfdir)/xorg.conf.d
+ xconfd_DATA = conf/xorg.conf.d/10-dummy.conf
  CLEANFILES = $(noinst_SCRIPTS) conf/bumblebee.conf $(bin_SCRIPTS) \
- 	$(am__append_3)
+@@ -294,10 +291,10 @@
  # for laziness include all headers found
  EXTRA_DIST = scripts/systemd/bumblebeed.service.in \
  	scripts/upstart/bumblebeed.conf.in \
--	conf/99-remove-nvidia-dev.rules conf/bumblebee.conf.in \
--	conf/xorg.conf.nvidia conf/xorg.conf.nouveau README.markdown \
-+	conf/bumblebee.conf.in \
-+	conf/xorg.conf.nouveau \
- 	scripts/bash_completion/bumblebee \
+-	conf/99-bumblebee-nvidia-dev.rules conf/bumblebee.conf.in \
+-	conf/xorg.conf.nvidia conf/xorg.conf.nouveau $(xconfd_DATA) \
+-	README.markdown scripts/bash_completion/bumblebee \
 -	scripts/bumblebee-bugreport.in $(relnotes) version.sh src/*.h \
-+	scripts/bumblebee-bugreport.in version.sh src/*.h \
++	conf/bumblebee.conf.in \
++	conf/xorg.conf.nouveau $(xconfd_DATA) \
++	scripts/bash_completion/bumblebee \
++	version.sh src/*.h \
  	src/*/switching.h $(am__append_2)
  bin_optirun_SOURCES = src/module.c src/bbconfig.c src/bblogger.c src/bbrun.c \
  	src/bbsocket.c src/driver.c src/optirun.c src/bbsocketclient.c
-@@ -348,12 +346,9 @@
+@@ -309,12 +306,9 @@
  	src/driver.c src/bumblebeed.c
  
  bin_bumblebeed_LDADD = ${x11_LIBS} ${libbsd_LIBS} ${glib_LIBS} -lrt
@@ -91,7 +115,7 @@ diff -Nur bumblebee-3.1.orig/Makefile.in bumblebee-3.1/Makefile.in
  completiondir = $(sysconfdir)/bash_completion.d
  completion_DATA = scripts/bash_completion/bumblebee
 -@WITH_UDEV_RULES_TRUE@udevrulesdir = $(UDEV_RULES_DIR)
--@WITH_UDEV_RULES_TRUE@udevrules_DATA = conf/99-remove-nvidia-dev.rules
+-@WITH_UDEV_RULES_TRUE@udevrules_DATA = conf/99-bumblebee-nvidia-dev.rules
  do_subst = sed -e 's|[@]GITVERSION[@]|$(GITVERSION)|g' \
  	-e 's|[@]CONF_XDISP[@]|$(CONF_XDISP)|g' \
  	-e 's|[@]CONF_SOCKPATH[@]|$(CONF_SOCKPATH)|g' \
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index cbf479d1c..86ff43820 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=40
+pkgrel=42
 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 748b1a1da..5f7c62ca2 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -7,8 +7,8 @@
 
 pkgname=cgminer-libre
 _pkgflag=libre
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.1.0
+pkgrel=1
 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
 license=('GPL3')
@@ -18,7 +18,7 @@ makedepends=('opencl-headers')
 provides=(${pkgname%-$_pkgflag}=$pkgver)
 conflicts=${pkgname%-$_pkgflag}
 replaces=${pkgname%-$_pkgflag}
-source=(http://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v3.0.0.tar.gz
+source=("https://github.com/ckolivas/$_pkgname/archive/v$pkgver.tar.gz"
         "${pkgname%-$_pkgflag}.conf.d"
         "${pkgname%-$_pkgflag}.service")
 backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
@@ -51,6 +51,6 @@ package() {
   install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
 }
 
-md5sums=('63551fdb16086d57bfa4d39cd40d74cd'
-         'fe4a243fabe24608f5c05e40f0f118f6'
-         'bd76fc92fedce18c59ccea2aa79cc664')
+sha512sums=('486163017b722bb38cb42dfa5c72b57ac4c96ff0584da630f985d2f22c75418284af420a325aa82419b59dca29646b66f8c678eba7a0f36dc044207ac18c9b6c'
+            '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
+            '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 6c04db17b..efe1c3371 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.8.8
+_kernver=3.8.10
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=14
+pkgrel=15
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index d7902119f..ec552b834 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.74
+_kernver=3.0.75
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=12
+pkgrel=13
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index f4341cb83..a4f2d18ee 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183082 2013-04-17 12:40:54Z tpowa $
+# $Id: PKGBUILD 183699 2013-04-27 07:33:10Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=74
+_sublevel=75
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.73 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.74 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         'a0984b44eba8de48e20357c9c146baf6'
+         '13ae458b95cc12f1fcf7e37e91206cbe'
          'fe0e9b4415b82f306fc1b63eb9a742a4'
          '69a689019ea0b6ed46b387907f14bc8a'
          'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '624eacedd2a576161512ffefc1797bc1')
+         '8e9b3e526d0d339004e141fddf2390dc')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index b8118b60d..9f7b9706d 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.74-1-LIBRE-LTS
+KERNEL_VERSION=3.0.75-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 9d1e52de9..67bbcdc5d 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $
+# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-_sublevel=8
+_sublevel=10
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         'cc93810441658cdf40a4bc051f8f4774'
+         'fd9713a31ee671a9dec8ad0e65996c84'
          '9b425f069f920cdd6798b3adab79d3af'
          '9316ebdb21ea9948ae5c83795a3dcf61'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         'fead20edc727fbb89789194eaebb6daa')
+         '259774469ac9b2b1f41cf2f978743055')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index c6fa71c97..fd8297ddf 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.8.8-1-LIBRE
+KERNEL_VERSION=3.8.10-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 0634f6f6c..07abf931b 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=42
+pkgrel=43
 epoch=1
 _extramodules=extramodules-3.8-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
index d30bbb1a3..9b727361a 100644
--- a/libre/mcomix-libre/PKGBUILD
+++ b/libre/mcomix-libre/PKGBUILD
@@ -5,16 +5,16 @@
 
 _pkgname=mcomix
 pkgname=mcomix-libre
-pkgver=0.99
+pkgver=1.00
 pkgrel=1
-pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
+pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation"
 arch=('any')
 url="http://sourceforge.net/projects/mcomix/"
 license=('GPL')
 depends=('pygtk' 'python-imaging' 'xdg-utils' 'python2' \
          'desktop-file-utils' 'hicolor-icon-theme' 'python2-distribute')
 makedepends=('gettext' 'intltool')
-optdepends=('ununrar: for rar compressed comics')
+optdepends=('unar: for rar compressed comics')
 conflicts=('mcomix' 'comix')
 replaces=('mcomix' 'comix')
 provides=("mcomix=${pkgver}")
@@ -37,11 +37,12 @@ package() {
   export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/
   mkdir -p $PYTHONPATH
 
-  python2 setup.py install --prefix=${pkgdir}/usr --optimize=1 \
-    --single-version-externally-managed --root=/
+  python2 setup.py install --prefix=/usr --optimize=1 \
+    --single-version-externally-managed --root=${pkgdir}
 
-  install -Dm644 mime/comicbook.schemas \
-    ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas
+  install -Dm755 mime/comicthumb ${pkgdir}/usr/bin/comicthumb
+  install -Dm644 mime/comicthumb.1.gz ${pkgdir}/usr/share/man/man1/comicthumb.1.gz
+  install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas
 }
 
-md5sums=('a1ff7e1955042069d5005b4034e7a914')
+md5sums=('3a916dd9da17043ab59ccd17e26eb932')
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index ca594501d..fc949d923 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -25,7 +25,7 @@ conflicts=('tetex' 'texlive-latex3' 'texlive-core')
 provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
 replaces=('tetex' 'texlive-latex3' 'texlive-core')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
+source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip"
         "$_pkgname.maps")
 options=(!strip)
 install=texlive.install
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index 31ff6a3b4..cc6dd7509 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -16,7 +16,7 @@ replaces=('texlive-fontsextra')
 conflicts=('texlive-fontsextra')
 provides=('texlive-fontsextra')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
+source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index b327d2f61..184adb743 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -22,7 +22,7 @@ replaces=('texlive-latexextra')
 conflicts=('texlive-latexextra')
 groups=('texlive-most')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
+source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index faf704096..f726d9a8c 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=10
+pkgrel=12
 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 51329569f..92e66fc6a 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=17
+pkgrel=19
 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 5bbbf618d..3ba9ec1aa 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=20
+pkgrel=22
 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 172e318c5..175c9c49f 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.12
-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 59816a051..713c61158 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.12
 _extramodules=extramodules-3.8-LIBRE
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')