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

Conflicts:
	extra/xorg-server/PKGBUILD
	libre/cdrkit-libre/PKGBUILD

8 files changed, 108 insertions, 45 deletions

diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
index b0c6d36a2..41dea657a 100644
--- a/libre/cdrkit-libre/PKGBUILD
+++ b/libre/cdrkit-libre/PKGBUILD
@@ -1,42 +1,35 @@
+# $Id: PKGBUILD 157442 2012-04-28 11:27:45Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
+_pkgname=cdrkit
 pkgname=cdrkit-libre
 pkgver=1.1.11
-pkgrel=2.2
-pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
+pkgrel=2.3
+pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdrkit.org/"
 license=('GPL2')
-depends=('file' 'bzip2' 'perl')
+depends=('file' 'bzip2')
+optdepends=('perl: for dirsplit')
 makedepends=('cmake')
-provides=('cdrtools' "cdrkit=${pkgver}")
-conflicts=('cdrtools' 'cdrkit')
-replaces=('cdrtools' 'cdrkit')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz)
+provides=("cdrkit=${pkgver}")
+conflicts=('cdrkit')
+replaces=('cdrkit')
+source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz)
+md5sums=('efe08e2f3ca478486037b053acd512e9')
 
-mksource() {
-    if [ ! -d ${pkgname}-${pkgver} ]; then
-        wget -O - http://cdrkit.org/releases/${pkgname/-libre/}-${pkgver}.tar.gz | \
-        bsdtar xzf -
-
-        mv -v ${pkgname/-libre/}-${pkgver} ${pkgname}-${pkgver}
-    fi
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
 
-    rm -rvf ${pkgname}-${pkgver}/{doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
+  # Remove nonfree apple_driver utility
+  rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
 
-    tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/
-    rm -r ${pkgname}-${pkgver}/
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
   make PREFIX="$pkgdir/usr" install
 
   # Make symlinks for cdrtools compatibility
@@ -54,4 +47,3 @@ package() {
   ln -s genisoimage.1 mkhybrid.1
   ln -s icedax.1 cdda2wav.1
 }
-md5sums=('e851c2d69ca17df7cfaabfa0d0e8e435')
diff --git a/libre/cdrtools-libre/PKGBUILD b/libre/cdrtools-libre/PKGBUILD
new file mode 100644
index 000000000..453979842
--- /dev/null
+++ b/libre/cdrtools-libre/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+_pkgname=cdrtools
+pkgname=cdrtools-libre
+pkgver=3.01a12
+pkgrel=1
+pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning (without nonfree apple_driver utility)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://cdrecord.berlios.de/private/cdrecord.html"
+license=('CDDL')
+depends=('acl')
+replaces=('cdrtools')
+conflicts=('cdrtools' 'cdrkit')
+provides=("cdrtools=${pkgver}" 'cdrkit')
+options=(!makeflags)
+backup=('etc/default/cdrecord' 'etc/default/rscsi')
+install=cdrtools.install
+source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2)
+md5sums=('563d80a7102175bea3e41fbfc269b914')
+
+build() {
+  cd "$srcdir"/cdrtools-${pkgver%%a*}
+
+  # Remove nonfree apple_driver utility
+  rm -rvf mkisofs/{apple_driver{.c,.8,.mk,_man.mk},README.hfs_boot,Rhfs_boot.mk}
+  sed -i -e '/apple_driver/d' mkisofs/Makefile
+  sed -i -e '/README.hfs_boot/d' pkgdefs/CSW/CSWcdrtools/prototype
+  sed -i -e '/README.hfs_boot/d' pkgdefs/OCSW/CSWcdrtools/prototype
+  sed -i -e '/README.hfs_boot/d' vms/vms_name_fix.sh
+
+  sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux
+  sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux
+  
+  export GMAKE_NOWARN=true
+  make INS_BASE=/usr INS_RBASE=/
+}
+
+package() {
+  cd "$srcdir"/cdrtools-${pkgver%%a*}
+
+  export GMAKE_NOWARN=true
+  make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install
+  rm -rf "$pkgdir"/usr/include
+  rm -rf "$pkgdir"/usr/lib/{*.a,profiled}
+
+  # autoload 'sg' module needed by cdrecord
+  install -d -m755 "$pkgdir"/usr/lib/modules-load.d/
+  echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf
+
+  # create symlinks for cdrkit compatibility
+  cd "$pkgdir"/usr/bin
+  ln -s cdrecord wodim
+  ln -s readcd readom
+  ln -s mkisofs genisoimage
+  ln -s cdda2wav icedax
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/cdrtools-libre/cdrtools.install b/libre/cdrtools-libre/cdrtools.install
new file mode 100644
index 000000000..3f49eb1bb
--- /dev/null
+++ b/libre/cdrtools-libre/cdrtools.install
@@ -0,0 +1,14 @@
+
+post_install() {
+  echo "To allow other users than root execute rscsi add an entry"
+  echo "to /etc/default/rscsi or use an \"rscsi\" user"
+  echo ""
+  post_upgrade
+}
+
+post_upgrade() {
+  echo "The manual loading (or loading using rc.conf)"
+  echo "of the 'sg' module is no longer necessary."
+  echo "It is automatically loaded during boot by systemd-tools (udev 185)."
+}
+
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index aea37615e..7778b62a1 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172168 2012-11-30 14:31:06Z tomegun $
+# $Id: PKGBUILD 178145 2013-02-16 23:09:01Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,8 +6,8 @@
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.12.11
-pkgrel=2
+pkgver=3.13.2
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hplipopensource.com"
@@ -49,9 +49,6 @@ build() {
  sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
  sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
  
- # fix rc script path - FS#31921
- sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py
- 
  # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
  # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
  # The hpcups driver does not use foomatic-rip
@@ -92,7 +89,9 @@ package() {
  rm -rf "$pkgdir"/usr/share/hal
  # log dir should not be world writeable
  chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ # remove rc script
+ rm -rf "$pkgdir"/etc/init.d
 }
-md5sums=('6caadc4a9e49076c284b146e2dce2937'
-         '835d3b854d097f229a32291338fa2320'
+md5sums=('cd7edef6b2df2cdb468b145cd2127e1b'
+         'cc3fc6de33ccf8bfce0bc890e30bd4e1'
          'ef64578c6cb3ce252dbdcb0f1c2f4a47')
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 756507986..d64060918 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -3,10 +3,10 @@
 _kernver=3.8
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
-_version=v3.8
-_pkgver=3.8-1-u
-pkgver=3.8.1
-pkgrel=1
+_version=v3.8-rc7
+_pkgver=3.8-rc7-1-u
+pkgver=3.8rc7.1
+pkgrel=4
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
@@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx')
 conflicts=('alx' 'alx-driver' 'dkms-alx')
 source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
 
-md5sums=('557e3099c642455ec272d9ddf46de484')
+md5sums=('3a1c7f870ff2fb96534b0d69245a4dab')
 
 
 build() {
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 7aa2c127b..4120e933f 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.65
+_kernver=3.0.66
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=3
+pkgrel=4
 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 298bbd2fb..3717e9627 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178204 2013-02-18 00:59:48Z foutrelis $
+# $Id: PKGBUILD 178426 2013-02-21 22:37:33Z 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=65
+_sublevel=66
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.64 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.65 # 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'
-         '080f45e61f2b17015ac68279a801c17b'
+         'b27bb5195c9fdb7fa6f609307a7d208b'
          '99f9c408b64393aceb2482c9a3e329ee'
          'fba95bf1857ce6bf863e13a1ab73f584'
          'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '62baade17c89e99f9aefc364a4304e78')
+         '7a7c3165d735a73cada5851d1b5d04ca')
 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 67065a1ef..2650a9f83 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.65-1-LIBRE-LTS
+KERNEL_VERSION=3.0.66-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'