diff options
30 files changed, 169 insertions, 507 deletions
diff --git a/community-testing/cdemu-daemon/PKGBUILD b/community-testing/cdemu-daemon/PKGBUILD deleted file mode 100644 index 78af6152f..000000000 --- a/community-testing/cdemu-daemon/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 72681 2012-06-19 12:54:14Z heftig $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Mateusz Herych <heniekk@gmail.com> -# Contributor: Charles Lindsay <charles@chaoslizard.org> - -pkgname=cdemu-daemon -pkgver=1.5.0 -pkgrel=6 -pkgdesc="CD/DVD-ROM device emulator daemon" -arch=('i686' 'x86_64') -url="http://cdemu.sourceforge.net/" -license=('GPL') -depends=('dbus' 'vhba-module>=20110915-5' 'libao' "libmirage=$pkgver") -optdepends=('alsa-lib: to enable the ALSA audio driver' - 'pulseaudio: to enable the PA audio driver') -backup=('etc/conf.d/cdemud' - 'etc/dbus-1/system.d/cdemud-dbus.conf') -install=$pkgname.install -source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" - 'cdemud.conf' 'cdemud.rc' 'system.patch' 'cdemu-daemon.service' - 'cdemud-dbus.conf') -md5sums=('5ba780caa26d855942512b5b3c22405a' - '6f31ad7a64d320cf4d6820432184070b' - 'cbc0937ef4ac50db3ce5cdbbe2e17a3b' - '90a2516639c05737fa10a110a1cba467' - 'be9a8f50da3f42129c0a0e3dea8cd56c' - 'afbf24bcdec382f58d95ba5de29bff71') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # make things Arch-friendly - patch -Np1 -i "$srcdir/system.patch" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/$pkgname - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # Custom dbus policy, tightening security to console and 'cdemu' group - install -m644 "$srcdir/cdemud-dbus.conf" \ - "$pkgdir/etc/dbus-1/system.d/cdemud-dbus.conf" - - # the init stuff - install -Dm644 "$srcdir/cdemud.conf" "$pkgdir/etc/conf.d/cdemud" - install -Dm755 "$srcdir/cdemud.rc" "$pkgdir/etc/rc.d/cdemud" - install -d "$pkgdir/usr/lib/modules-load.d" - echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf" - - # for systemd - install -Dm644 "$srcdir/cdemu-daemon.service" \ - "$pkgdir/usr/lib/systemd/system/cdemu-daemon.service" - echo "SystemdService=cdemu-daemon.service" >> \ - "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEMUD_Daemon.service" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/cdemu-daemon/cdemu-daemon.install b/community-testing/cdemu-daemon/cdemu-daemon.install deleted file mode 100644 index ba34d1ea0..000000000 --- a/community-testing/cdemu-daemon/cdemu-daemon.install +++ /dev/null @@ -1,27 +0,0 @@ -post_install () { - cat <<MSG - > The daemon is automatically started, but can be manually - started via /etc/rc.d/cdemud or cdemu-daemon.service. - > See /etc/conf.d/cdemud for further configuration. - - > Only users at the console or in the 'cdemu' group can - communicate with the system daemon or use a session - daemon. - - > If you want to output CD-Audio, write AUDIO_DRIVER=pulse or - AUDIO_DRIVER=alsa to ~/.cdemud and use "cdemu -b session" - to control a session daemon. -MSG - - return 0 -} - -post_upgrade () { - # Repeat install message due to policy changes - # Added on 2012-06-19, remove after a grace period - post_install - - return 0 -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/cdemu-daemon/cdemu-daemon.service b/community-testing/cdemu-daemon/cdemu-daemon.service deleted file mode 100644 index 9879a3e6f..000000000 --- a/community-testing/cdemu-daemon/cdemu-daemon.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=CDEmu Daemon - -[Service] -Type=dbus -BusName=net.sf.cdemu.CDEMUD_Daemon -ExecStart=/usr/lib/cdemu-daemon/cdemu-daemon-system.sh - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/cdemu-daemon/cdemud-dbus.conf b/community-testing/cdemu-daemon/cdemud-dbus.conf deleted file mode 100644 index 3043fe251..000000000 --- a/community-testing/cdemu-daemon/cdemud-dbus.conf +++ /dev/null @@ -1,24 +0,0 @@ -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - -<busconfig> - <!-- Only root can own the CDEMUD_Daemon service on bus --> - <policy user="root"> - <allow own="net.sf.cdemu.CDEMUD_Daemon"/> - </policy> - <policy group="root"> - <allow own="net.sf.cdemu.CDEMUD_Daemon"/> - </policy> - - <!-- Allow users at the console to invoke methods on the interface --> - <policy at_console="true"> - <allow send_destination="net.sf.cdemu.CDEMUD_Daemon"/> - </policy> - - <!-- Allow users in the 'cdemu' group to invoke methods on the interface --> - <policy group="cdemu"> - <allow send_destination="net.sf.cdemu.CDEMUD_Daemon"/> - </policy> -</busconfig> - diff --git a/community-testing/cdemu-daemon/cdemud.conf b/community-testing/cdemu-daemon/cdemud.conf deleted file mode 100644 index 1d8c55fe6..000000000 --- a/community-testing/cdemu-daemon/cdemud.conf +++ /dev/null @@ -1,8 +0,0 @@ -# how many optical drives to emulate -NUM_DEVICES=2 - -# audio backend (null, alsa or pulse) -AUDIO_DRIVER=null - -# log file -LOG_FILE=/var/log/cdemud.log diff --git a/community-testing/cdemu-daemon/cdemud.rc b/community-testing/cdemu-daemon/cdemud.rc deleted file mode 100644 index 09b9ec345..000000000 --- a/community-testing/cdemu-daemon/cdemud.rc +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting cdemud" - /usr/lib/cdemu-daemon/cdemu-daemon-system.sh & - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon cdemud - stat_done - fi - ;; - stop) - stat_busy "Stopping cdemud" - kill `pidof cdemud` &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - rm_daemon cdemud - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community-testing/cdemu-daemon/system.patch b/community-testing/cdemu-daemon/system.patch deleted file mode 100644 index 3c3d4b221..000000000 --- a/community-testing/cdemu-daemon/system.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -aur cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh ---- cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh 2012-03-25 16:35:40.577837996 +0800 -+++ cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh 2012-03-25 16:39:12.180024983 +0800 -@@ -1,15 +1,15 @@ - #!/bin/sh - # Starts the CDEmu daemon instance on D-Bus *session* bus. Optional - # configuration (number of devices, audio driver, log file) are read --# from ~/.cdemu-daemon -+# from ~/.cdemud - - # Default settings - NUM_DEVICES=2 --AUDIO_DRIVER=pulse --LOG_FILE=~/.cdemu-daemon.log -+AUDIO_DRIVER=null -+LOG_FILE=~/.cdemud.log - - # Read the settings --CONFIG_FILE=~/.cdemu-daemon -+CONFIG_FILE=~/.cdemud - - if [ -f ${CONFIG_FILE} ]; then - . ${CONFIG_FILE}; -diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh ---- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh 2012-03-25 16:35:40.581171312 +0800 -+++ cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh 2012-03-25 16:36:48.810801678 +0800 -@@ -1,15 +1,15 @@ - #!/bin/sh - # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional - # configuration (number of devices, audio driver, log file) are read --# from /etc/sysconfig/cdemu-daemon -+# from /etc/conf.d/cdemud - - # Default settings - NUM_DEVICES=2 - AUDIO_DRIVER=null --LOG_FILE=/tmp/cdemu-daemon.log -+LOG_FILE=/var/log/cdemud.log - - # Read the settings --CONFIG_FILE=/etc/sysconfig/cdemu-daemon -+CONFIG_FILE=/etc/conf.d/cdemud - - if [ -f ${CONFIG_FILE} ]; then - . ${CONFIG_FILE}; diff --git a/community/icecast/PKGBUILD b/community/icecast/PKGBUILD index 6c81ed1a6..cf2130e4e 100644 --- a/community/icecast/PKGBUILD +++ b/community/icecast/PKGBUILD @@ -1,54 +1,50 @@ -# $Id: PKGBUILD 46955 2011-05-13 20:41:15Z andrea $ +# $Id: PKGBUILD 72696 2012-06-20 10:14:35Z lfleischer $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jason Chu <jchu@xentac.net> pkgname=icecast -pkgver=2.3.2 -pkgrel=5 -pkgdesc="Streaming audio over the Internet" +pkgver=2.3.3 +pkgrel=1 +pkgdesc='Streaming audio over the Internet' arch=('i686' 'x86_64' 'mips64el') license=('GPL') -url="http://www.icecast.org/" +url='http://www.icecast.org/' depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora') backup=('etc/icecast.xml' 'etc/logrotate.d/icecast') source=("http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'icecastd' 'icecast.logrotate' + 'icecastd' + 'icecast.logrotate' 'start-by-nobody.patch') -md5sums=('ff516b3ccd2bcc31e68f460cd316093f' +md5sums=('2b5d1b40778922e5f6431b7758c359ad' 'e823c1fdb080aae3d0c54ef8be95f7cb' '59c6552bcb1dd9fb542af8670dfabd3c' 'd8e929d2214123a1954da4383bf16583') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/start-by-nobody.patch + patch -Np1 -i "${srcdir}/start-by-nobody.patch" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" - # install man-page + make DESTDIR="${pkgdir}" install + + # install man page sed -i -e 's/icecast2/icecast/g' debian/icecast2.1 - install -Dm644 debian/icecast2.1 \ - ${pkgdir}/usr/share/man/man1/icecast.1 - - # init file - install -Dm755 ${srcdir}/icecastd \ - ${pkgdir}/etc/rc.d/icecast - # rotate the logs (taken from Fedora) - install -Dm644 ${srcdir}/icecast.logrotate \ - ${pkgdir}/etc/logrotate.d/icecast - - # install log dir - install -d -g99 -o99 ${pkgdir}/var/log/icecast + install -Dm644 debian/icecast2.1 "${pkgdir}/usr/share/man/man1/icecast.1" + + # install rc.d script and logrotate config (taken from Fedora) + install -Dm755 "${srcdir}/icecastd" "${pkgdir}/etc/rc.d/icecast" + install -Dm644 "${srcdir}/icecast.logrotate" "${pkgdir}/etc/logrotate.d/icecast" + + # create log directory + install -d -g99 -o99 "${pkgdir}/var/log/icecast" } diff --git a/community/python2-ldap/PKGBUILD b/community/python2-ldap/PKGBUILD index a4f1646c6..393da122d 100644 --- a/community/python2-ldap/PKGBUILD +++ b/community/python2-ldap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71038 2012-05-22 09:19:07Z spupykin $ +# $Id: PKGBUILD 72704 2012-06-20 12:26:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Morgan LEFIEUX <comete_AT_archlinuxfr.org> pkgname=python2-ldap -pkgver=2.4.9 +pkgver=2.4.10 pkgrel=1 pkgdesc="Provides an object-oriented API to access LDAP directory servers from Python programs" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('python2' 'libldap>=2.4.26') makedepends=('chrpath') replaces=('python-ldap') source=(http://pypi.python.org/packages/source/p/python-ldap/python-ldap-$pkgver.tar.gz) -md5sums=('d76131af192771567d3f2d2aff9469a9') +md5sums=('a15827ca13c90e9101e5e9405c1d83be') build() { cd $srcdir/python-ldap-$pkgver diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD index ac2b0efc7..f6cbee184 100644 --- a/community/vym/PKGBUILD +++ b/community/vym/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70394 2012-05-05 13:56:05Z jlichtblau $ +# $Id: PKGBUILD 72708 2012-06-20 18:18:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: S�ren Holm <sgh@sgh.dk> pkgname=vym -pkgver=2.0.12 +pkgver=2.2.0 pkgrel=1 pkgdesc="A mindmapping tool" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ changelog=$pkgname.changelog install=$pkgname.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \ $pkgname.desktop) -sha256sums=('6557ce134506f6654767c63e4a7aedbd9acc4c6f02e38cdb6041fa4ca51ca06c' +sha256sums=('98ebf4f134a8e3ea0de8ce5853177edcdbef76a11a1156268fc167d2da40c6d1' 'e299c69c213e7aac3f5b5d0ab088132b4ec7cb63a391f272e75ed64f049d541b') build() { diff --git a/community/vym/vym.changelog b/community/vym/vym.changelog index 6035624df..dcf26d8f4 100644 --- a/community/vym/vym.changelog +++ b/community/vym/vym.changelog @@ -1,3 +1,6 @@ +2012-06-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vym 2.2.0-1 + 2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * vym 2.0.12-1 diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD index 9a2b4a648..ef3538c6e 100644 --- a/core/psmisc/PKGBUILD +++ b/core/psmisc/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 162104 2012-06-20 02:05:56Z eric $ +# $Id: PKGBUILD 162110 2012-06-20 09:21:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=psmisc pkgver=22.18 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous procfs tools" arch=('i686' 'x86_64' 'mips64el') url="http://psmisc.sourceforge.net/index.html" license=('GPL') groups=('base') depends=('ncurses') -source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) -sha1sums=('964f6daa0950b128a0840d9df4dc0b671730a83c') +source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz psmisc22.18-usage.patch) +sha1sums=('964f6daa0950b128a0840d9df4dc0b671730a83c' + '5cd326dd969b07c46d10c7d1172b91d65cbc6e10') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/psmisc22.18-usage.patch" ./configure --prefix=/usr make } diff --git a/core/psmisc/psmisc22.18-usage.patch b/core/psmisc/psmisc22.18-usage.patch new file mode 100644 index 000000000..7736a6542 --- /dev/null +++ b/core/psmisc/psmisc22.18-usage.patch @@ -0,0 +1,11 @@ +diff -Naur psmisc-22.18-orig/src/killall.c psmisc-22.18/src/killall.c +--- psmisc-22.18-orig/src/killall.c 2012-06-20 05:07:16.563742846 -0400 ++++ psmisc-22.18/src/killall.c 2012-06-20 05:08:38.250412923 -0400 +@@ -637,6 +637,7 @@ + " (must precede other arguments)\n")); + #endif /*WITH_SELINUX*/ + fputc('\n', stderr); ++ exit (1); + } + + diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index a4e041d3d..d8a9c7fea 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 159956 2012-05-27 10:22:22Z tomegun $ +# $Id: PKGBUILD 162106 2012-06-20 04:34:13Z eric $ # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod -pkgver=2.1.1 -pkgrel=3 +pkgver=2.1.2 +pkgrel=1 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64' 'mips64el') url="http://gtkpod.sourceforge.net" license=('GPL') depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk') -makedepends=('flex' 'intltool') +makedepends=('flex' 'intltool' 'libvorbis' 'faad2') optdepends=('libmp4v2: MP4/h264 support' 'vorbis-tools: OGG support' - 'id3v2: mp3 conversion support') + 'libvorbis: OGG support' + 'id3v2: mp3 conversion support' + 'faad2: m4a conversion support') install=gtkpod.install options=('!libtool') source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz") -md5sums=('36fd0324fd1d1da00fcddacef1b09983') +md5sums=('88fef3f947cbb7ae6b714080733a3b6b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index 594be0211..c1cec70f7 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 156972 2012-04-23 09:10:20Z ibiru $ +# $Id: PKGBUILD 162120 2012-06-21 01:49:02Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.16.0 +pkgver=0.16.1 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org" groups=('telepathy') license=('LGPL2.1') -depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3') +depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite') makedepends=('libxslt' 'python2') options=('!libtool' '!emptydirs') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) install=telepathy-gabble.install -md5sums=('15b15fb58a3c54102c3e3489b4bd5ee0') +md5sums=('f4e6ca551cc4603276f9acdc2b5d4db4') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy --with-tls=openssl make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console" } diff --git a/libre/hplip-libre/.hplip.install.swp b/libre/hplip-libre/.hplip.install.swp Binary files differnew file mode 100644 index 000000000..819e785c6 --- /dev/null +++ b/libre/hplip-libre/.hplip.install.swp diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 7523a2120..0f120e287 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -2,19 +2,19 @@ # 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> +# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> _pkgname=hplip pkgname=hplip-libre -pkgver=3.12.4 -pkgrel=4 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" +pkgver=3.12.6 +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" 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') +makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') optdepends=('cups: for printing support' 'dbus-python: for dbus support' 'sane: for scanner support' @@ -22,40 +22,41 @@ optdepends=('cups: for printing 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}") + 'python2-gobject2: for running hp-toolbox' + 'libusbx: for advanced usb support') +replaces=("${_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') +md5sums=('5303938e8630775ea6fb383af85775e5' + 'b562457e4c713d8609b3d6dd2be10baf') 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 '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.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 ./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 - + 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 @@ -70,7 +71,7 @@ build() { --enable-hpijs-install \ --enable-foomatic-drv-install \ --enable-pp-build \ - --enable-udev-acl-rules + --enable-udev-acl-rules #--help make } diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index a6ea72c60..a6dfc053b 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> # Changes: # * Adapt to linux-libre # * virtualbox-{archlinux,parabola}-* @@ -11,7 +11,7 @@ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox-libre pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source') -pkgver=4.1.16 +pkgver=4.1.18 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://virtualbox.org' @@ -194,7 +194,7 @@ package_virtualbox-parabola-additions(){ # install sample config install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service" } -md5sums=('eacfb802ecdd6d3435228eb3d3488719' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '5f85710e0b8606de967716ded7b2d351' '755ab0dd9bcacf2c00d2275b1ca69547' 'a1ff1d1b4423556887e48a32978226a6' diff --git a/libre/virtualbox-modules-lts/PKGBUILD b/libre/virtualbox-modules-lts/PKGBUILD index fc935a131..80caec248 100644 --- a/libre/virtualbox-modules-lts/PKGBUILD +++ b/libre/virtualbox-modules-lts/PKGBUILD @@ -1,12 +1,12 @@ # $Id$ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> pkgbase=virtualbox-modules-lts pkgname=('virtualbox-modules-lts' 'virtualbox-parabola-modules-lts') -pkgver=4.1.14 +pkgver=4.1.18 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://virtualbox.org' @@ -15,7 +15,7 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('f8baa04e6d589bc6b1fb4e7079fbe414' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index af4b1b86b..2e747105a 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -1,20 +1,20 @@ # $Id$ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> -#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +#Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') -pkgver=4.1.16 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgver=4.1.18 +pkgrel=1 +arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('eacfb802ecdd6d3435228eb3d3488719' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') diff --git a/testing/man-db/PKGBUILD b/testing/man-db/PKGBUILD deleted file mode 100644 index 7ec9750be..000000000 --- a/testing/man-db/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 162091 2012-06-19 18:25:25Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> - -pkgname=man-db -pkgver=2.6.2 -pkgrel=1 -pkgdesc="A utility for reading man pages" -arch=('i686' 'x86_64') -url="http://www.nongnu.org/man-db/" -license=('GPL' 'LGPL') -groups=('base') -depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline') -optdepends=('less' 'gzip') -backup=('etc/man_db.conf' - 'etc/cron.daily/man-db') -conflicts=('man') -provides=('man') -replaces=('man') -install=${pkgname}.install -source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig} - convert-mans man-db.cron.daily) -options=('!libtool') -md5sums=('647c48d46c464419185d031d04481ee5' - 'a9de1f9bbe620a5a9b9f5da8c58cd96c' - '2b7662a7d5b33fe91f9f3e034361a2f6' - 'd30c39ae47560304471b5461719e0f03') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --with-db=gdbm --disable-setuid --enable-mandirs=GNU \ - --with-sections="1 n l 8 3 0 2 5 4 9 6 7" - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # part of groff pkg - rm -f ${pkgdir}/usr/bin/zsoelim - - # script from LFS to convert manpages, see - # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html - install -D -m755 ${srcdir}/convert-mans ${pkgdir}/usr/bin/convert-mans - - #install whatis cron script - install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db -} - diff --git a/testing/man-db/convert-mans b/testing/man-db/convert-mans deleted file mode 100644 index 58a0224b0..000000000 --- a/testing/man-db/convert-mans +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -e -FROM="$1" -TO="$2" -shift ; shift -while [ $# -gt 0 ] -do - FILE="$1" - shift - iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv - mv .tmp.iconv "$FILE" -done diff --git a/testing/man-db/man-db.cron.daily b/testing/man-db/man-db.cron.daily deleted file mode 100755 index 53e66e1e9..000000000 --- a/testing/man-db/man-db.cron.daily +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable) -NICE=19 - -# 0 for none, 1 for real time, 2 for best-effort, 3 for idle -IONICE_CLASS=2 - -# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest -IONICE_PRIORITY=7 - -UPDATEMANDB="/usr/bin/mandb --quiet" - -# Update the "whatis" database -#/usr/sbin/makewhatis -u -w - -# taken from Debian -# man-db cron daily -set -e - -if ! [ -d /var/cache/man ]; then - # Recover from deletion, per FHS. - mkdir -p /var/cache/man - chmod 755 /var/cache/man -fi - -# regenerate man database - -if [ -x /usr/bin/nice ]; then - UPDATEMANDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEMANDB}" -fi - -if [ -x /usr/bin/ionice ]; then - UPDATEMANDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEMANDB}" -fi - -${UPDATEMANDB} - -exit 0 diff --git a/testing/man-db/man-db.install b/testing/man-db/man-db.install deleted file mode 100644 index f6f0f27a6..000000000 --- a/testing/man-db/man-db.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - echo "it's recommended to create an initial" - echo "database running as root:" - echo "\"/usr/bin/mandb --quiet\"" -} - -post_upgrade() { - if [ "`vercmp $2 2.5.3-2`" -lt 0 ]; then - echo "systemuser \"man\" is no more required" - echo "run \"userdel man\". please also" - echo "chown root:root /var/cache/man" - fi - # force database rebuild to get rid off badly imported pages - if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then - echo "(re)building database..." - mandb -c --quiet - fi -} - -post_remove() { - rm -rf /var/cache/man -} diff --git a/testing/mlocate/PKGBUILD b/testing/mlocate/PKGBUILD deleted file mode 100644 index 50a15650f..000000000 --- a/testing/mlocate/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 162087 2012-06-19 15:29:24Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: lydgate - -pkgname=mlocate -pkgver=0.25 -pkgrel=2 -pkgdesc="Faster merging drop-in for slocate" -arch=('i686' 'x86_64') -url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate" -license=('GPL') -depends=('glibc' 'coreutils' 'sh') -backup=('etc/updatedb.conf' - 'etc/cron.daily/updatedb') -source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz - updatedb.conf - updatedb.cron.daily) -md5sums=('c6d043b170613b0e327a815b497f680a' - 'b56d81de17fe29b01b4b28861acb8fd4' - 'cde5da81bebad2de556ef2e43d895e13') - -build() { - cd $srcdir/$pkgname-$pkgver - - sed -i '/^groupname /s/mlocate/locate/' Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib - make - -} - -check() { - cd $srcdir/$pkgname-$pkgver - make check -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install - - ln -s locate $pkgdir/usr/bin/slocate - chgrp 21 $pkgdir/usr/bin/locate - chmod 2755 $pkgdir/usr/bin/locate - - install -dm755 $pkgdir/var/lib - install -dm750 -g21 $pkgdir/var/lib/locate - - # Set up a default updatedb.conf and a daily cronjob - install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf - install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb -} diff --git a/testing/mlocate/updatedb.conf b/testing/mlocate/updatedb.conf deleted file mode 100644 index 633c17482..000000000 --- a/testing/mlocate/updatedb.conf +++ /dev/null @@ -1,4 +0,0 @@ -PRUNE_BIND_MOUNTS = "yes" -PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset cramfs debugfs devpts devtmpfs ecryptfs exofs ftpfs fuse fuse.encfs fuse.sshfs fusectl gfs gfs2 hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs sshfs sysfs tmpfs ubifs udf usbfs vboxsf" -PRUNENAMES = ".git .hg .svn" -PRUNEPATHS = "/afs /media /mnt /net /sfs /tmp /udev /var/cache /var/lib/pacman/local /var/lock /var/run /var/spool /var/tmp" diff --git a/testing/mlocate/updatedb.cron.daily b/testing/mlocate/updatedb.cron.daily deleted file mode 100755 index cac9bb063..000000000 --- a/testing/mlocate/updatedb.cron.daily +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable) -NICE=19 - -# 0 for none, 1 for real time, 2 for best-effort, 3 for idle -IONICE_CLASS=2 - -# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest -IONICE_PRIORITY=7 - -UPDATEDB="/usr/bin/updatedb" - -if [ -x /usr/bin/nice ]; then - UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}" -fi - -if [ -x /usr/bin/ionice ]; then - UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEDB}" -fi - -# Update the "locate" database -if [ -x /usr/bin/updatedb ]; then - if [ -f /etc/updatedb.conf ]; then - ${UPDATEDB} - else - ${UPDATEDB} -f proc - fi -fi diff --git a/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch b/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch new file mode 100644 index 000000000..8806fe849 --- /dev/null +++ b/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch @@ -0,0 +1,28 @@ +Index: src/freeglut_window.c +=================================================================== +--- src/freeglut_window.c (Revision 832) ++++ src/freeglut_window.c (Arbeitskopie) +@@ -594,10 +594,9 @@ + #if TARGET_HOST_POSIX_X11 + if ( window ) + { +- glXMakeContextCurrent( ++ glXMakeCurrent( + fgDisplay.Display, + window->Window.Handle, +- window->Window.Handle, + window->Window.Context + ); + +@@ -932,10 +932,9 @@ + XSetWMProtocols( fgDisplay.Display, window->Window.Handle, + &fgDisplay.DeleteWindow, 1 ); + +- glXMakeContextCurrent( ++ glXMakeCurrent( + fgDisplay.Display, + window->Window.Handle, +- window->Window.Handle, + window->Window.Context + ); + diff --git a/~lukeshu/freeglut26/PKGBUILD b/~lukeshu/freeglut26/PKGBUILD new file mode 100644 index 000000000..5245eca9d --- /dev/null +++ b/~lukeshu/freeglut26/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Arch): Eric Belanger <eric@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +_pkgname=freeglut +pkgname=freeglut26 +pkgver=2.6.0 +pkgrel=1 + +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") + +pkgdesc="Provides functionality for small OpenGL programs" +arch=('i686' 'x86_64') +url="http://freeglut.sourceforge.net/" +license=('MIT') +depends=('libxxf86vm' 'mesa' 'libxi') +replaces=('glut') +provides=('glut') +conflicts=('glut') +options=('!libtool') +source=(http://downloads.sourceforge.net/freeglut/${_pkgname}-${pkgver}.tar.gz \ + 2.6.0-GFX_radeon.patch) +md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3') +sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' '2e392c7d0b60016ec89e6a5edf504f5722351b95') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + # fixes an issue with the radeon[hd] ATI opensource drivers + # ref: http://bugs.gentoo.org/show_bug.cgi?id=295163 + patch -p0 -i "${srcdir}/2.6.0-GFX_radeon.patch" + + ./autogen.sh + ./configure --prefix=/usr --disable-static + make all +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" +} diff --git a/~lukeshu/make-graph/PKGBUILD b/~lukeshu/make-graph/PKGBUILD index f7f7cd0b1..0d9320f69 100644 --- a/~lukeshu/make-graph/PKGBUILD +++ b/~lukeshu/make-graph/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 138004 2011-09-14 05:05:12Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Arch): Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> _pkgname=make pkgname=$_pkgname-graph pkgver=3.82 -pkgrel=4.1 +pkgrel=4.2 provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") pkgdesc="GNU make utility to maintain groups of programs, with patch to dump a Graphviz dependency graph." arch=('i686' 'x86_64') url="http://www.gnu.org/software/make" license=('GPL3') -groups=('base-devel') +#groups=('base-devel') depends=('glibc' 'sh') install=$_pkgname.install source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 |