Merge branch 'master' of ssh://gparabola/srv/git/abslibre

19 files changed, 47 insertions, 96 deletions

diff --git a/libre-testing/b43-tools-git/PKGBUILD b/libre-testing/b43-tools-git/PKGBUILD
index 42e331f7b..42e331f7b 100644..100755
--- a/libre-testing/b43-tools-git/PKGBUILD
+++ b/libre-testing/b43-tools-git/PKGBUILD
diff --git a/libre-testing/hplip-libre/PKGBUILD b/libre-testing/hplip-libre/PKGBUILD
deleted file mode 100644
index 02cae8862..000000000
--- a/libre-testing/hplip-libre/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer : Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
-# Contributor (Parabola): Jorge López <jorginho@adinet.com.uy>
-
-_pkgname=hplip
-pkgname=hplip-libre
-pkgver=3.12.4
-pkgrel=3
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com"
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-	 'net-snmp>=5.7.1')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
-            'dbus-python: for dbus support'
-            'sane: for scanner support'
-            'python-imaging: for commandline scanning support'
-            'python-notify: for Desktop notification support'
-            'rpcbind: for network support'
-            'python2-pyqt: for running hp-toolbox'
-            'python2-gobject2: for running hp-toolbox')
-replaces=('hpijs' "${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('a063f76aa47edab55a3f31ff2558df07'
-         '2fe18f4091afb3dec200271dc7836128')
-
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.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
-        local i
-        for i in ppd/hpijs/*.ppd.gz ; do
-                rm -f ${i}.temp
-                gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-                        gzip > ${i}.temp || return 1
-                mv ${i}.temp ${i}
-        done
-
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
-             --enable-qt4 \
-             --disable-foomatic-rip-hplip-install \
-             --enable-foomatic-ppd-install \
-             --enable-hpcups-install \
-             --enable-new-hpcups \
-             --enable-cups-ppd-install \
-             --enable-cups-drv-install \
-             --enable-hpijs-install \
-             --enable-foomatic-drv-install \
-             --enable-pp-build \
-             --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$_pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
- # move to /usr
- mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
- rm "$pkgdir"/lib -r
-}
diff --git a/libre-testing/hplip-libre/hplip.install b/libre-testing/hplip-libre/hplip.install
deleted file mode 100644
index cb0eaf8e8..000000000
--- a/libre-testing/hplip-libre/hplip.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  cat << EOF
-
-NOTE
-----
-# If you want to use this driver with sane:
-#  echo "hpaio" >> /etc/sane.d/dll.conf
-
-EOF
-}
diff --git a/libre-testing/icewm-themes-libre/PKGBUILD b/libre-testing/icewm-themes-libre/PKGBUILD
new file mode 100755
index 000000000..a6cb0a6ba
--- /dev/null
+++ b/libre-testing/icewm-themes-libre/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 65600 2012-02-21 09:25:34Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
+# Maintainer (Parabola): Ben Peterson <mulenmar@yahoo.com>
+
+pkgname=icewm-themes-libre
+_pkgname=icewm-themes
+pkgver=1.2.26
+pkgrel=4
+pkgdesc="Themes for Ice Window Manager. (no trademarked themes)"
+arch=('any')
+license=("GPLv2")
+url=http://www.debian.org
+depends=(icewm)
+source=(http://ftp.debian.org/debian/pool/main/i/icewm-themes/icewm-themes_$pkgver.orig.tar.gz)
+md5sums=('c0fd0de59e6f74c9c86c0bc334eb6b9e')
+replaces=('icewm-themes')
+
+
+build() {
+  cd $srcdir/$_pkgname-$pkgver
+  mkdir -p $pkgdir/usr/share/icewm/themes
+  cp -r $srcdir/$_pkgname-$pkgver/* $pkgdir/usr/share/icewm/themes/
+
+  # Remove themes with Microsoft® Windows® trademarks
+  rm $pkgdir/usr/share/icewm/themes/fake95 -rf
+  rm $pkgdir/usr/share/icewm/themes/GlamICE -rf
+
+  # Remove themes with Apple® trademarks (changing capitalizations doesn't make
+  # it free)
+  rm $pkgdir/usr/share/icewm/themes/liQuid -rf
+  rm $pkgdir/usr/share/icewm/themes/sortofaqua -rf
+  rm $pkgdir/usr/share/icewm/themes/aquablue -rf
+  rm $pkgdir/usr/share/icewm/themes/jim-mac -rf
+
+  # Remove themes with other trademarks
+  rm $pkgdir/usr/share/icewm/themes/slashdot -rf
+  rm $pkgdir/usr/share/icewm/themes/Slashdot -rf
+  rm $pkgdir/usr/share/icewm/themes/yamm -rf
+ 
+  # Remove themes with copyright violations
+  rm $pkgdir/usr/share/icewm/themes/Urbicande -rf
+
+
+  find $pkgdir -type d -exec chmod 755 {} \;
+  find $pkgdir -type f -exec chmod 644 {} \;
+}
diff --git a/libre-testing/openfwwf/PKGBUILD b/libre-testing/openfwwf/PKGBUILD
index 30168b159..30168b159 100644..100755
--- a/libre-testing/openfwwf/PKGBUILD
+++ b/libre-testing/openfwwf/PKGBUILD
diff --git a/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch b/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
index 2092fef90..2092fef90 100644..100755
--- a/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
+++ b/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
diff --git a/libre-testing/systemd/PKGBUILD b/libre-testing/systemd/PKGBUILD
index 3d7649c01..3d7649c01 100644..100755
--- a/libre-testing/systemd/PKGBUILD
+++ b/libre-testing/systemd/PKGBUILD
diff --git a/libre-testing/systemd/initcpio-hook-udev b/libre-testing/systemd/initcpio-hook-udev
index 75da7e4a8..75da7e4a8 100644..100755
--- a/libre-testing/systemd/initcpio-hook-udev
+++ b/libre-testing/systemd/initcpio-hook-udev
diff --git a/libre-testing/systemd/initcpio-install-timestamp b/libre-testing/systemd/initcpio-install-timestamp
index 259cc705b..259cc705b 100644..100755
--- a/libre-testing/systemd/initcpio-install-timestamp
+++ b/libre-testing/systemd/initcpio-install-timestamp
diff --git a/libre-testing/systemd/initcpio-install-udev b/libre-testing/systemd/initcpio-install-udev
index 762429983..762429983 100644..100755
--- a/libre-testing/systemd/initcpio-install-udev
+++ b/libre-testing/systemd/initcpio-install-udev
diff --git a/libre-testing/systemd/locale.sh b/libre-testing/systemd/locale.sh
index 11f1bbbee..11f1bbbee 100644..100755
--- a/libre-testing/systemd/locale.sh
+++ b/libre-testing/systemd/locale.sh
diff --git a/libre-testing/systemd/os-release b/libre-testing/systemd/os-release
index 65253e9c3..65253e9c3 100644..100755
--- a/libre-testing/systemd/os-release
+++ b/libre-testing/systemd/os-release
diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD
index 0487320e7..0487320e7 100644..100755
--- a/libre-testing/systemd/rePKGBUILD
+++ b/libre-testing/systemd/rePKGBUILD
diff --git a/libre-testing/systemd/systemd-tools.install b/libre-testing/systemd/systemd-tools.install
index c1c19d15d..c1c19d15d 100644..100755
--- a/libre-testing/systemd/systemd-tools.install
+++ b/libre-testing/systemd/systemd-tools.install
diff --git a/libre-testing/systemd/systemd.install b/libre-testing/systemd/systemd.install
index 0b10f9537..0b10f9537 100644..100755
--- a/libre-testing/systemd/systemd.install
+++ b/libre-testing/systemd/systemd.install
diff --git a/libre-testing/unace-libre/PKGBUILD b/libre-testing/unace-libre/PKGBUILD
index 8708694c6..8708694c6 100644..100755
--- a/libre-testing/unace-libre/PKGBUILD
+++ b/libre-testing/unace-libre/PKGBUILD
diff --git a/libre-testing/unar/PKGBUILD b/libre-testing/unar/PKGBUILD
index 4bb523a89..4bb523a89 100644..100755
--- a/libre-testing/unar/PKGBUILD
+++ b/libre-testing/unar/PKGBUILD
diff --git a/libre-testing/unarchiver/PKGBUILD b/libre-testing/unarchiver/PKGBUILD
index 0df133a6c..0df133a6c 100644..100755
--- a/libre-testing/unarchiver/PKGBUILD
+++ b/libre-testing/unarchiver/PKGBUILD
diff --git a/libre-testing/xadmaster/PKGBUILD b/libre-testing/xadmaster/PKGBUILD
index 8f358aae6..8f358aae6 100644..100755
--- a/libre-testing/xadmaster/PKGBUILD
+++ b/libre-testing/xadmaster/PKGBUILD