summaryrefslogtreecommitdiffstats
path: root/abs/extra
diff options
context:
space:
mode:
Diffstat (limited to 'abs/extra')
-rw-r--r--abs/extra/bash-completion/cowsay.bashcomp34
-rw-r--r--abs/extra/bluez-python/PKGBUILD17
-rw-r--r--abs/extra/bluez/PKGBUILD45
-rw-r--r--abs/extra/bluez/__changelog (renamed from abs/extra/bluez/__Changelog)0
-rwxr-xr-xabs/extra/cddb-py/PKGBUILD27
-rw-r--r--abs/extra/community/firefox/browser-app-makefile.patch11
-rw-r--r--abs/extra/community/python-beaker/PKGBUILD21
-rw-r--r--abs/extra/community/python-beaker/__changelog1
-rw-r--r--abs/extra/community/python-chardet/PKGBUILD20
-rw-r--r--abs/extra/community/python-mako/PKGBUILD21
-rw-r--r--abs/extra/community/python-markupsafe/PKGBUILD23
-rw-r--r--abs/extra/community/pyxdg/PKGBUILD20
-rw-r--r--abs/extra/community/transmission-cli/PKGBUILD4
-rw-r--r--abs/extra/ddclient/ddclient-foreground.patch47
-rw-r--r--abs/extra/ddclient/ddclient.conf.dynamic.dyndns.sample162
-rw-r--r--abs/extra/gnome-python-extras/PKGBUILD23
-rw-r--r--abs/extra/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch61
-rw-r--r--abs/extra/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch22
-rw-r--r--abs/extra/gnome-python/PKGBUILD24
-rw-r--r--abs/extra/gtk-doc/gtk-doc.install14
-rw-r--r--abs/extra/imdbpy/PKGBUILD37
-rw-r--r--abs/extra/libebml/PKGBUILD14
-rw-r--r--abs/extra/libmatroska/PKGBUILD15
-rw-r--r--abs/extra/mkvtoolnix/PKGBUILD11
-rw-r--r--abs/extra/monitorix/monitorix.install30
-rw-r--r--abs/extra/nss/nss-nolocalsql.patch53
-rw-r--r--abs/extra/openjdk6/gcjwebplugin_xulrunner.diff11
-rw-r--r--abs/extra/pycrypto/PKGBUILD23
-rw-r--r--abs/extra/pyopenssl/PKGBUILD21
-rw-r--r--abs/extra/pyorbit/PKGBUILD26
-rw-r--r--abs/extra/pyqt/ChangeLog21
-rw-r--r--abs/extra/pyqt/PKGBUILD44
-rw-r--r--abs/extra/pyrex/PKGBUILD22
-rw-r--r--abs/extra/python-geoip/PKGBUILD21
-rw-r--r--abs/extra/python-imaging/PKGBUILD42
-rw-r--r--abs/extra/python-imaging/__changelog2
-rw-r--r--abs/extra/python-lxml/PKGBUILD34
-rw-r--r--abs/extra/python-m2crypto/PKGBUILD31
-rw-r--r--abs/extra/python-m2crypto/openssl1.patch531
-rw-r--r--abs/extra/python-oauth/PKGBUILD26
-rw-r--r--abs/extra/python-opengl/LICENSE30
-rw-r--r--abs/extra/python-opengl/PKGBUILD31
-rw-r--r--abs/extra/python-pybluez/PKGBUILD24
-rw-r--r--abs/extra/python-pycurl/PKGBUILD23
-rwxr-xr-xabs/extra/python-pymedia/PKGBUILD19
-rw-r--r--abs/extra/python-pyserial/PKGBUILD21
-rw-r--r--abs/extra/python2-distribute/PKGBUILD24
-rw-r--r--abs/extra/python2-distribute/distribute-0.6.14_python2_and_3.patch51
-rw-r--r--abs/extra/pyusb/PKGBUILD18
-rw-r--r--abs/extra/sip/PKGBUILD2
-rw-r--r--abs/extra/snes9x/snes9x-fixes2.patch29
-rwxr-xr-xabs/extra/snes9x/snes9x.install13
-rw-r--r--abs/extra/xulrunner/xulrunner.install11
53 files changed, 51 insertions, 1857 deletions
diff --git a/abs/extra/bash-completion/cowsay.bashcomp b/abs/extra/bash-completion/cowsay.bashcomp
deleted file mode 100644
index 77d8be9..0000000
--- a/abs/extra/bash-completion/cowsay.bashcomp
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/games-misc/cowsay/files/cowsay.bashcomp,v 1.1 2005/02/06 14:37:54 ka0ttic Exp $
-
-# bash command-line completion for cowsay
-# Author: Aaron Walker <ka0ttic@gentoo.org>
-# Modified by: Michal Bentkowski <mr.ecik at gmail.com>
-
-_cowsay() {
- local cur prev opts x
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts="-e -f -h -l -n -T -W -b -d -g -p -s -t -w -y"
-
- if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
- COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
- return 0
- fi
-
- case "${prev}" in
- -f)
- COMPREPLY=( $( command ls /usr/share/cowsay| \
- sed -ne 's/^\('$cur'.*\)\.cow$/\1/p') )
- return 0
- ;;
- -[eTW])
- COMPREPLY=()
- ;;
- esac
-}
-complete -o filenames -F _cowsay cowsay cowthink
-
-# vim: set ft=sh tw=80 sw=4 et :
diff --git a/abs/extra/bluez-python/PKGBUILD b/abs/extra/bluez-python/PKGBUILD
deleted file mode 100644
index 9738eb7..0000000
--- a/abs/extra/bluez-python/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Contributor: Li Dongyang<Jerry87905@gmail.com>
-
-pkgname=bluez-python
-pkgver=0.1.4
-pkgrel=2
-pkgdesc="A BlueZ python binding on top of dbus-python"
-arch=(i686 x86_64)
-url="http://code.google.com/p/bluez-python"
-license=('LGPL')
-depends=('bluez>=4.30' 'dbus-python')
-source=(http://bluez-python.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('013f283d3c32765e67c89ebf7f5470ea')
-
-build() {
- cd $startdir/src/$pkgname
- python2 setup.py install --root=$startdir/pkg
-}
diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD
index f8dfbe5..9fff334 100644
--- a/abs/extra/bluez/PKGBUILD
+++ b/abs/extra/bluez/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
pkgname=bluez
-pkgver=4.69
+pkgver=4.81
pkgrel=1
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
@@ -22,26 +22,25 @@ source=("http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2"
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/lib \
- --mandir=/usr/share/man \
- --enable-gstreamer \
- --enable-alsa \
- --enable-usb \
- --enable-netlink \
- --enable-tools \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-dfutool \
- --enable-hidd \
- --enable-pand \
- --enable-dund \
- --enable-cups \
- --enable-manpages \
- --enable-configfiles \
- --enable-pcmciarules || return 1
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/lib \
+ --enable-gstreamer \
+ --enable-alsa \
+ --enable-usb \
+ --enable-tools \
+ --enable-bccmd \
+ --enable-dfutool \
+ --enable-hidd \
+ --enable-pand \
+ --enable-dund \
+ --disable-cups \
+ --enable-udevrules \
+ --enable-configfiles || return 1
make || return 1
+}
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install || return 1
install -D -m644 "$srcdir/$pkgname-$pkgver/network/network.conf" "$pkgdir/etc/bluetooth/" || return 1
@@ -53,8 +52,12 @@ build() {
install -D -m755 "$srcdir/run.dund" "$pkgdir/etc/sv/dund/run" || return 1
install -D -m755 "$srcdir/run.pand" "$pkgdir/etc/sv/pand/run" || return 1
install -D -m755 "$srcdir/run.rfcomm" "$pkgdir/etc/sv/rfcomm/run" || return 1
+
+ sed -i 's#/usr/bin/python#/usr/bin/python2#' test/simple-agent
+ install -Dm755 test/simple-agent ${pkgdir}/usr/bin/bluez-simple-agent
}
-md5sums=('350568aa11a95eac6e56e9289ff1f91d'
+
+md5sums=('75fbc768bf626fc8f4cf466006767723'
'd12be5b494525bb1ba6eac5c3983dd3e'
'1c88fcd455920ad8ee0c7cae3fe15771'
'a9c1b4da8b5a3969865272bd0fb01da2'
diff --git a/abs/extra/bluez/__Changelog b/abs/extra/bluez/__changelog
index 124d0eb..124d0eb 100644
--- a/abs/extra/bluez/__Changelog
+++ b/abs/extra/bluez/__changelog
diff --git a/abs/extra/cddb-py/PKGBUILD b/abs/extra/cddb-py/PKGBUILD
deleted file mode 100755
index 7b8ed12..0000000
--- a/abs/extra/cddb-py/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 26144 2010-09-13 19:36:37Z schuay $
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-# Contributor: David Keogh <davekeogh@shaw.ca>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=cddb-py
-pkgver=1.4
-pkgrel=5
-pkgdesc="CDDB-Server access from Python"
-arch=('i686' 'x86_64')
-url="http://cddb-py.sourceforge.net"
-license=('GPL')
-depends=('python2')
-source=("http://downloads.sourceforge.net/sourceforge/cddb-py/CDDB-${pkgver}.tar.gz")
-md5sums=('254698082bafe3030d07d88fb7e13fe2')
-
-package() {
- cd ${srcdir}/CDDB-${pkgver}
-
- for file in CDDB.py DiscID.py; do
- sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
- done
-
- python2 setup.py install --root=${pkgdir} --optimize=1
-}
-
diff --git a/abs/extra/community/firefox/browser-app-makefile.patch b/abs/extra/community/firefox/browser-app-makefile.patch
deleted file mode 100644
index 9a02c40..0000000
--- a/abs/extra/community/firefox/browser-app-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- browser/app/Makefile 2009-07-27 22:41:13.000000000 +0930
-+++ browser-new/app/Makefile 2009-07-27 22:42:51.000000000 +0930
-@@ -279,7 +279,7 @@
-
- ifneq (,$(filter-out OS2 WINNT WINCE,$(OS_ARCH)))
-
--$(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
-+$(MOZ_APP_NAME): $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
- cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
- -e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
- chmod +x $@
diff --git a/abs/extra/community/python-beaker/PKGBUILD b/abs/extra/community/python-beaker/PKGBUILD
deleted file mode 100644
index 6cf06b4..0000000
--- a/abs/extra/community/python-beaker/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 87715 2010-08-18 03:37:40Z allan $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Massimiliano Torromeo < massimiliano DOT torromeo AT gmail DOT com >
-pkgname=python-beaker
-pkgver=1.5.4
-pkgrel=2
-arch=('any')
-license=('custom')
-pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications"
-url="http://beaker.groovie.org/"
-depends=('python2')
-makedepends=('python2-distribute')
-source=("http://cheeseshop.python.org/packages/source/B/Beaker/Beaker-$pkgver.tar.gz")
-md5sums=('de84e7511119dc0b8eb4ac177d3e2512')
-
-build() {
- cd ${srcdir}/Beaker-${pkgver}
- sed -i "s#/usr/bin/python#/usr/bin/python2#" beaker/crypto/pbkdf2.py
- python2 setup.py install --root=${pkgdir} --optimize=1
- install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/abs/extra/community/python-beaker/__changelog b/abs/extra/community/python-beaker/__changelog
deleted file mode 100644
index 9e2b603..0000000
--- a/abs/extra/community/python-beaker/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-makedepends=('setuptools') -> makedepends=('python2-distribute')
diff --git a/abs/extra/community/python-chardet/PKGBUILD b/abs/extra/community/python-chardet/PKGBUILD
deleted file mode 100644
index 6ed1086..0000000
--- a/abs/extra/community/python-chardet/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 87872 2010-08-18 15:26:20Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-pkgname=python-chardet
-_pkgnamebase=python2-chardet
-pkgver=2.0.1
-pkgrel=2
-pkgdesc="Python module for character encoding auto-detection"
-arch=('any')
-url="http://chardet.feedparser.org"
-license=('LGPL')
-depends=('python2')
-source=(http://chardet.feedparser.org/download/${_pkgnamebase}-${pkgver}.tgz)
-sha256sums=('56fa0c37189b0a5f082d064dec59d69a044aaa3eeb7acb9b3081e2ba306deaa4')
-
-build() {
- cd "${srcdir}/${_pkgnamebase}-${pkgver}"
- python2 setup.py install --root="${pkgdir}" --optimize=1
-}
-
diff --git a/abs/extra/community/python-mako/PKGBUILD b/abs/extra/community/python-mako/PKGBUILD
deleted file mode 100644
index 8d68c9b..0000000
--- a/abs/extra/community/python-mako/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 87883 2010-08-18 15:32:33Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-pkgname=python-mako
-pkgver=0.3.4
-pkgrel=4
-pkgdesc="Hyperfast and lightweight templating for the Python platform."
-arch=('any')
-url="http://www.makotemplates.org/"
-license=('custom')
-depends=('python2' 'python-markupsafe>=0.9.2' 'python-beaker>=1.5.4')
-makedepends=('setuptools')
-source=(http://www.makotemplates.org/downloads/Mako-$pkgver.tar.gz)
-md5sums=('2ae56ccc6c9b5c4e2e67f42b69475009')
-
-build() {
- cd "$srcdir/Mako-$pkgver"
- python2 setup.py install --root="$pkgdir" --optimize=1 || return 1
- install -D LICENSE "$pkgdir/usr/share/licenses/python-mako/COPYING" || return 1
-}
-
diff --git a/abs/extra/community/python-markupsafe/PKGBUILD b/abs/extra/community/python-markupsafe/PKGBUILD
deleted file mode 100644
index 92c9282..0000000
--- a/abs/extra/community/python-markupsafe/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 87877 2010-08-18 15:28:18Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Alex Anthony <alex.anthony28991@gmail.com>
-
-pkgname=python-markupsafe
-pkgver=0.9.2
-pkgrel=2
-pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/MarkupSafe"
-license=('custom')
-depends=('python2')
-makedepends=('setuptools')
-source=(http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz)
-md5sums=('69b72d1afdd9e808f9c1ef65f819c7a6')
-
-build() {
- cd ${srcdir}/MarkupSafe-${pkgver}
- python2 setup.py install --root=${pkgdir} --optimize=1
-
- install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
diff --git a/abs/extra/community/pyxdg/PKGBUILD b/abs/extra/community/pyxdg/PKGBUILD
deleted file mode 100644
index 8c3d7bc..0000000
--- a/abs/extra/community/pyxdg/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 89531 2010-09-01 15:23:06Z remy $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-# Contributor: Mario A. Vazquez <mario_vazq@hotmail.com>
-
-pkgname=pyxdg
-pkgver=0.19
-pkgrel=2
-pkgdesc="Python library to access freedesktop.org standards."
-arch=('any')
-url="http://freedesktop.org/Software/pyxdg"
-license=("LGPL")
-depends=('python2')
-source=(http://www.freedesktop.org/~lanius/${pkgname}-${pkgver}.tar.gz)
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- python2 setup.py install --prefix=/usr --root=${pkgdir} || return 1
-}
-md5sums=('9f33542e846d0fc1e0bfa992a8555b0a')
-
diff --git a/abs/extra/community/transmission-cli/PKGBUILD b/abs/extra/community/transmission-cli/PKGBUILD
index 11dbf60..eaa1c08 100644
--- a/abs/extra/community/transmission-cli/PKGBUILD
+++ b/abs/extra/community/transmission-cli/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
pkgname=transmission-cli
-pkgver=2.12
+pkgver=2.13
pkgrel=1
pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
arch=('i686' 'x86_64')
@@ -38,7 +38,7 @@ package() {
install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1
install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1
}
-md5sums=('f3d34fdbbf3ae25635f9e7bf7e662cd9'
+md5sums=('eb126ae88b80487f2840896939019421'
'b91534aaf2e403331c611c615ab2c03d'
'ff22c13dbd52565f9e88b1de22514eb9'
'b5a49ea375333cd0fee40f70dbac4c2e'
diff --git a/abs/extra/ddclient/ddclient-foreground.patch b/abs/extra/ddclient/ddclient-foreground.patch
deleted file mode 100644
index a814ede..0000000
--- a/abs/extra/ddclient/ddclient-foreground.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ../ddclient-orig/ddclient 2009-10-19 22:45:15.000000000 +1030
-+++ ddclient 2009-10-19 22:50:11.000000000 +1030
-@@ -307,6 +307,7 @@
- my %variables = (
- 'global-defaults' => {
- 'daemon' => setv(T_DELAY, 0, 0, 1, 0, interval('60s')),
-+ 'foreground' => setv(T_BOOL, 0, 0, 1, 0, undef),
- 'file' => setv(T_FILE, 0, 0, 1, "$etc$program.conf", undef),
- 'cache' => setv(T_FILE, 0, 0, 1, "$cachedir$program.cache", undef),
- 'pid' => setv(T_FILE, 0, 0, 1, "", undef),
-@@ -535,6 +536,7 @@
- "usage: ${program} [options]",
- "options are:",
- [ "daemon", "=s", "-daemon delay : run as a daemon, specify delay as an interval." ],
-+ [ "foreground", "!", "-foreground : do not fork" ],
- [ "proxy", "=s", "-proxy host : use 'host' as the HTTP proxy" ],
- [ "server", "=s", "-server host : update DNS information on 'host'" ],
- [ "protocol", "=s", "-protocol type : update protocol used" ],
-@@ -623,7 +625,10 @@
- $SIG{'HUP'} = sub { $caught_hup = 1; };
- $SIG{'TERM'} = sub { $caught_term = 1; };
- $SIG{'KILL'} = sub { $caught_kill = 1; };
--if (opt('daemon') && !opt('force')) {
-+# don't fork() if foreground or force is on
-+if (opt('foreground') || opt('force')) {
-+ ;
-+} elsif (opt('daemon')) {
- $SIG{'CHLD'} = 'IGNORE';
- my $pid = fork;
- if ($pid < 0) {
-@@ -633,12 +638,15 @@
- exit 0;
- }
- $SIG{'CHLD'} = 'DEFAULT';
-- $opt{'syslog'} = 1;
- open(STDOUT, ">/dev/null");
- open(STDERR, ">/dev/null");
- open(STDIN, "</dev/null");
-+}
-
-+# write out the pid file if we're daemon'ized
-+if(opt('daemon')) {
- write_pid();
-+ $opt{'syslog'} = 1;
- }
-
- umask 077;
diff --git a/abs/extra/ddclient/ddclient.conf.dynamic.dyndns.sample b/abs/extra/ddclient/ddclient.conf.dynamic.dyndns.sample
deleted file mode 100644
index a492c8b..0000000
--- a/abs/extra/ddclient/ddclient.conf.dynamic.dyndns.sample
+++ /dev/null
@@ -1,162 +0,0 @@
-######################################################################
-##
-## $Id: sample-etc_ddclient.conf 102 2008-11-01 11:23:03Z wimpunk $
-##
-## Define default global variables with lines like:
-## var=value [, var=value]*
-## These values will be used for each following host unless overridden
-## with a local variable definition.
-##
-## Define local variables for one or more hosts with:
-## var=value [, var=value]* host.and.domain[,host2.and.domain...]
-##
-## Lines can be continued on the following line by ending the line
-## with a \
-##
-##
-## Warning: not all supported routers or dynamic DNS services
-## are mentioned here.
-##
-######################################################################
-daemon=300 # check every 300 seconds
-syslog=yes # log update msgs to syslog
-mail=root # mail all msgs to root
-mail-failure=root # mail failed update msgs to root
-pid=/var/run/ddclient.pid # record PID in file.
-ssl=yes # use ssl-support. Works with
- # ssl-library
-# postscript=script # run script after updating. The
- # new IP is added as argument.
-#
-#use=watchguard-soho, fw=192.168.111.1:80 # via Watchguard's SOHO FW
-#use=netopia-r910, fw=192.168.111.1:80 # via Netopia R910 FW
-#use=smc-barricade, fw=192.168.123.254:80 # via SMC's Barricade FW
-#use=netgear-rt3xx, fw=192.168.0.1:80 # via Netgear's internet FW
-#use=linksys, fw=192.168.1.1:80 # via Linksys's internet FW
-#use=maxgate-ugate3x00, fw=192.168.0.1:80 # via MaxGate's UGATE-3x00 FW
-#use=elsa-lancom-dsl10, fw=10.0.0.254:80 # via ELSA LanCom DSL/10 DSL Router
-#use=elsa-lancom-dsl10-ch01, fw=10.0.0.254:80 # via ELSA LanCom DSL/10 DSL Router
-#use=elsa-lancom-dsl10-ch02, fw=10.0.0.254:80 # via ELSA LanCom DSL/10 DSL Router
-#use=alcatel-stp, fw=10.0.0.138:80 # via Alcatel Speed Touch Pro
-#use=xsense-aero, fw=192.168.1.1:80 # via Xsense Aero Router
-#use=allnet-1298, fw=192.168.1.1:80 # via AllNet 1298 DSL Router
-#use=3com-oc-remote812, fw=192.168.0.254:80 # via 3com OfficeConnect Remote 812
-#use=e-tech, fw=192.168.1.1:80 # via E-tech Router
-#use=cayman-3220h, fw=192.168.0.1:1080 # via Cayman 3220-H DSL Router
-#
-#fw-login=admin, fw-password=XXXXXX # FW login and password
-#
-## To obtain an IP address from FW status page (using fw-login, fw-password)
-#use=fw, fw=192.168.1.254/status.htm, fw-skip='IP Address' # found after IP Address
-#
-## To obtain an IP address from Web status page (using the proxy if defined)
-#use=web, web=checkip.dyndns.org/, web-skip='IP Address' # found after IP Address
-#
-#use=ip, ip=127.0.0.1 # via static IP's
-#use=if, if=eth0 # via interfaces
-use=web # via web
-#
-#protocol=dyndns2 # default protocol
-#proxy=fasthttp.sympatico.ca:80 # default proxy
-#server=members.dyndns.org # default server
-#server=members.dyndns.org:8245 # default server (bypassing proxies)
-
-login=your-dynamic-dyndns-login # default login
-password=your-dynamic-dyndns-password # default password
-#mx=mx.for.your.host # default MX
-#backupmx=yes|no # host is primary MX?
-#wildcard=yes|no # add wildcard CNAME?
-
-##
-## dyndns.org dynamic addresses
-##
-## (supports variables: wildcard,mx,backupmx)
-##
-server=members.dyndns.org, \
-protocol=dyndns2 \
-your-dynamic-dyndns-host
-
-##
-## dyndns.org static addresses
-##
-## (supports variables: wildcard,mx,backupmx)
-##
-# static=yes, \
-# server=members.dyndns.org, \
-# protocol=dyndns2 \
-# your-static-host.dyndns.org
-
-##
-##
-## dyndns.org custom addresses
-##
-## (supports variables: wildcard,mx,backupmx)
-##
-# custom=yes, \
-# server=members.dyndns.org, \
-# protocol=dyndns2 \
-# your-domain.top-level,your-other-domain.top-level
-
-##
-## ZoneEdit (zoneedit.com)
-##
-# server=dynamic.zoneedit.com, \
-# protocol=zoneedit1, \
-# login=your-zoneedit-login, \
-# password=your-zoneedit-password \
-# your.any.domain,your-2nd.any.dom
-
-##
-## EasyDNS (easydns.com)
-##
-# server=members.easydns.com, \
-# protocol=easydns, \
-# login=your-easydns-login, \
-# password=your-easydns-password \
-# your.any.domain,your-2nd.any.domain
-
-##
-## Hammernode (hn.org) dynamic addresses
-##
-# server=dup.hn.org, \
-# protocol=hammernode1, \
-# login=your-hn-login, \
-# password=your-hn-password \
-# your-hn-host.hn.org,your-2nd-hn-host.hn.org
-
-##
-## dslreports.com dynamic-host monitoring
-##
-# server=members.dslreports.com \
-# protocol=dslreports1, \
-# login=dslreports-login, \
-# password=dslreports-password \
-# dslreports-unique-id
-
-##
-## OrgDNS.org account-configuration
-##
-# use=web, web=members.orgdns.org/nic/ip
-# server=www.orgdns.org \
-# protocol=dyndns2 \
-# login=yourLoginName \
-# password=yourPassword \
-# yourSubdomain.orgdns.org
-
-##
-## dnspark.com
-## (supports variables: mx, mxpri)
-##
-# use=web, web=ipdetect.dnspark.com, web-skip='Current Address:'
-# protocol=dnspark, \
-# server=www.dnspark.com, \
-# your-host.dnspark.com
-
-##
-## NameCheap (namecheap.com)
-##
-# protocol=namecheap, \
-# server=dynamicdns.park-your-domain.com, \
-# login=my-namecheap.com-login, \
-# password=my-namecheap.com-password \
-# myhost.namecheap.com
diff --git a/abs/extra/gnome-python-extras/PKGBUILD b/abs/extra/gnome-python-extras/PKGBUILD
deleted file mode 100644
index 297ef68..0000000
--- a/abs/extra/gnome-python-extras/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 35285 2009-04-11 20:46:50Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-python-extras
-pkgver=2.25.3
-pkgrel=1
-pkgdesc="Gnome Python interfaces for libraries not part of the core platform"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gnome-python>=2.22.1')
-makedepends=('libgtkhtml' 'gtkspell' 'gdl' 'xulrunner>=1.9' 'libgksu' 'pkgconfig' 'libgnomeui' 'libgda')
-optdepends=('libgtkhtml' 'gtkspell' 'gdl' 'xulrunner' 'libgksu' 'libgnomeui' 'libgda')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2)
-url="http://www.daa.com.au/~james/pygtk/"
-md5sums=('9f3b7ec5c57130b96061cb486b79c076')
-
-build() {
- cd "${srcdir}/gnome-python-extras-${pkgver}"
- ./configure --prefix=/usr || return 1
- make MOZILLA_HOME=/usr/lib/xulrunner-1.9 || return 1
- make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch b/abs/extra/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch
deleted file mode 100644
index 77fd0a4..0000000
--- a/abs/extra/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -up gnome-python-extras-2.19.1/configure.pkg-config gnome-python-extras-2.19.1/configure
---- gnome-python-extras-2.19.1/configure.pkg-config 2008-01-12 21:07:56.000000000 -0500
-+++ gnome-python-extras-2.19.1/configure 2008-01-12 21:09:49.000000000 -0500
-@@ -22096,14 +22096,14 @@ if test -n "$PKG_CONFIG"; then
- pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$mozpackage-gtkmozembed >= \$mozpackage_required_version,
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\mozilla-gtkmozembed >= \$mozpackage_required_version,
- gtk+-2.0 >= 2.4.0\"") >&5
-- ($PKG_CONFIG --exists --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+ ($PKG_CONFIG --exists --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
- gtk+-2.0 >= 2.4.0") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "mozilla-gtkmozembed >= $mozpackage_required_version,
- gtk+-2.0 >= 2.4.0" 2>/dev/null`
- else
- pkg_failed=yes
-@@ -22117,14 +22117,14 @@ if test -n "$PKG_CONFIG"; then
- pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$mozpackage-gtkmozembed >= \$mozpackage_required_version,
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\mozilla-gtkmozembed >= \$mozpackage_required_version,
- gtk+-2.0 >= 2.4.0\"") >&5
-- ($PKG_CONFIG --exists --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+ ($PKG_CONFIG --exists --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
- gtk+-2.0 >= 2.4.0") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "mozilla-gtkmozembed >= $mozpackage_required_version,
- gtk+-2.0 >= 2.4.0" 2>/dev/null`
- else
- pkg_failed=yes
-@@ -22144,10 +22144,10 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
- gtk+-2.0 >= 2.4.0"`
- else
-- GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
- gtk+-2.0 >= 2.4.0"`
- fi
- # Put the nasty error message in config.log where it belongs
-@@ -22179,7 +22179,7 @@ fi
- if test -n "$export_dynamic"; then
- GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
- fi
--MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
-+MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
-
-
-
diff --git a/abs/extra/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch b/abs/extra/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch
deleted file mode 100644
index d2fa26e..0000000
--- a/abs/extra/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-python-extras-2.19.1/docs/gtkmozembed/html/class-gtkmozembed.html.old gnome-python-extras-2.19.1/docs/gtkmozembed/html/class-gtkmozembed.html
-diff -up gnome-python-extras-2.19.1/docs/gtkmozembed/html/pygtkmozembed.devhelp.old gnome-python-extras-2.19.1/docs/gtkmozembed/html/pygtkmozembed.devhelp
-diff -up gnome-python-extras-2.19.1/docs/gtkmozembed/gtkmozembed-gtkmozembed.xml.old gnome-python-extras-2.19.1/docs/gtkmozembed/gtkmozembed-gtkmozembed.xml
-diff -up gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.override.old gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.override
-diff -up gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs.old gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs
---- gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs.old 2007-06-05 16:52:30.000000000 +0200
-+++ gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs 2007-11-27 12:54:42.000000000 +0100
-@@ -123,6 +123,14 @@
- )
- )
-
-+(define-function set_path
-+ (c-name "gtk_moz_embed_set_path")
-+ (return-type "none")
-+ (parameters
-+ '("char*" "aPath")
-+ )
-+)
-+
- (define-function gtk_moz_embed_set_profile_path
- (c-name "gtk_moz_embed_set_profile_path_deprecated")
- (return-type "none")
diff --git a/abs/extra/gnome-python/PKGBUILD b/abs/extra/gnome-python/PKGBUILD
deleted file mode 100644
index d9e0045..0000000
--- a/abs/extra/gnome-python/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 16730 2008-10-22 02:56:32Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-
-pkgname=gnome-python
-pkgver=2.22.3
-pkgrel=3
-pkgdesc="gnome-python is a set of interfaces to gnome-libs."
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('pygtk>=2.13.0' 'pyorbit>=2.24.0' 'libgnomeui>=2.24.0')
-makedepends=('pkgconfig')
-groups=('gnome')
-options=('!libtool')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.22/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ab12d94954a57de39b25eb7903d8429c')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./waf configure --prefix=/usr || return 1
- ./waf build ${MAKEFLAGS} || return 1
- ./waf install --destdir="${pkgdir}" || return 1
-}
diff --git a/abs/extra/gtk-doc/gtk-doc.install b/abs/extra/gtk-doc/gtk-doc.install
deleted file mode 100644
index 5e39bbf..0000000
--- a/abs/extra/gtk-doc/gtk-doc.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-cat << _EOF
-==> SGML support in gtk-doc is no longer maintained, only very old projects
-==> still use SGML. Install (open)jade for SGML support.
-_EOF
-}
-
-post_upgrade() {
- post_install $1
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/imdbpy/PKGBUILD b/abs/extra/imdbpy/PKGBUILD
deleted file mode 100644
index 58e5264..0000000
--- a/abs/extra/imdbpy/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 27018 2010-09-16 17:37:18Z schuay $
-# Maintainer: Ray Rashif <schivmeister@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Contributor: lang2 <wenzhi.liang@gmail.com>
-
-pkgname=imdbpy
-_realname=IMDbPY
-pkgver=4.6
-pkgrel=2
-pkgdesc="Python bindings for imdb"
-url="http://imdbpy.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('python2')
-makedepends=('setuptools')
-optdepends=('python-lxml' 'python-sqlalchemy' 'python-sqlobject')
-source=(http://downloads.sourceforge.net/$pkgname/$_realname-$pkgver.tar.gz)
-
-build(){
- cd "$srcdir/$_realname-$pkgver"
-
- # python2 fix
- for file in $(find . -name '*.py' -print); do
- sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
- sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
- done
-
- python2 setup.py install --root="$pkgdir"
-
- # fix directories path
- mv "$pkgdir/usr/etc" "$pkgdir"
- install -d "$pkgdir/usr/share"
- mv "$pkgdir/usr/imdb" "$pkgdir/usr/share"
- mv "$pkgdir/usr/doc" "$pkgdir/usr/share/imdb/"
-}
-md5sums=('876d4cd041fa23633e3637c22bf95622')
diff --git a/abs/extra/libebml/PKGBUILD b/abs/extra/libebml/PKGBUILD
index ffa4331..dfe2d6e 100644
--- a/abs/extra/libebml/PKGBUILD
+++ b/abs/extra/libebml/PKGBUILD
@@ -4,18 +4,20 @@
pkgname=libebml
pkgver=1.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="Extensible Binary Meta Language library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url="http://dl.matroska.org/downloads/libebml/"
depends=('gcc-libs')
license=('LGPL')
-#source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$pkgname-$pkgver.tar.bz2)
-source=($url/$pkgname-$pkgver.tar.bz2)
+source=(${url}/${pkgname}-${pkgver}.tar.bz2)
build() {
- cd $startdir/src/$pkgname-$pkgver/make/linux
+ cd ${srcdir}/${pkgname}-${pkgver}/make/linux
make || return 1
- make prefix=$startdir/pkg/usr install
+}
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}/make/linux
+ make prefix=${pkgdir}/usr install
}
md5sums=('6d438f03d8928d83a2d120ed02705f03')
diff --git a/abs/extra/libmatroska/PKGBUILD b/abs/extra/libmatroska/PKGBUILD
index f515d3e..4a85d50 100644
--- a/abs/extra/libmatroska/PKGBUILD
+++ b/abs/extra/libmatroska/PKGBUILD
@@ -4,17 +4,20 @@
pkgname=libmatroska
pkgver=1.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="Matroska library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+license=('LGPL')
url="http://dl.matroska.org/downloads/libmatroska/"
depends=('libebml>=1.0.0')
-#source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$pkgname-$pkgver.tar.bz2)
-source=($url/$pkgname-$pkgver.tar.bz2)
+source=(${url}/${pkgname}-${pkgver}.tar.bz2)
build() {
- cd $startdir/src/$pkgname-$pkgver/make/linux
+ cd ${srcdir}/${pkgname}-${pkgver}/make/linux
make sharedlib || return 1
- make prefix=$startdir/pkg/usr install
+}
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}/make/linux
+ make prefix=${pkgdir}/usr install
}
md5sums=('4efcf3945b17a6f0320cf1aaa326a4de')
diff --git a/abs/extra/mkvtoolnix/PKGBUILD b/abs/extra/mkvtoolnix/PKGBUILD
index 6404481..5ae4896 100644
--- a/abs/extra/mkvtoolnix/PKGBUILD
+++ b/abs/extra/mkvtoolnix/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: 03/08/04 <lefungus@altern.org>
pkgname=mkvtoolnix
-pkgver=4.1.1
+pkgver=4.4.0
pkgrel=1
pkgdesc="Set of tools to create, edit and inspect Matroska files"
arch=('i686' 'x86_64')
@@ -16,7 +16,10 @@ build() {
cd ${srcdir}/${pkgname}-${pkgver}/
./configure --prefix=/usr \
--with-boost-libdir=/usr/lib
- make || return 1
- make DESTDIR=${pkgdir}/ install
+ ./drake || return 1
}
-md5sums=('6f38fefd73b8b95de3ea3feb9de4cdd7')
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./drake DESTDIR=${pkgdir} install
+}
+md5sums=('1f2ea5997066ebb65444198576e5ec4a')
diff --git a/abs/extra/monitorix/monitorix.install b/abs/extra/monitorix/monitorix.install
deleted file mode 100644
index 6c1d1bd..0000000
--- a/abs/extra/monitorix/monitorix.install
+++ /dev/null
@@ -1,30 +0,0 @@
-remove_notes() {
- echo '----------------------------------------------------------------------'
- echo 'To remove all traces of monitorix from your system, you must manually'
- echo 'remove the following dir trees (doing so will delete your databases):'
- echo
- echo '/var/lib/monitorix'
- echo '/srv/http/monitorix'
- echo '----------------------------------------------------------------------'
-}
-
-# $1: The new package version
-# $2: The old package version
-post_upgrade() {
- echo ''
- echo ''
- echo 'now edit /etc/monitorix.conf'
- echo ' our $HOSTNAME - your hostname.'
- echo ' our $ENABLE_LMTEMP - switch this on if you wanna log your temps.'
- echo ' our @HDDTEMP_LIST - If you system has more than one hdd, add it to the array.'
- echo ' stats can be seen at http://$THIS_SYSTEMS_IP/monitorix/'
-
- echo ''
- echo ''
-}
-
-post_install(){
- . /etc/systemconfig
- sed -i "s/^our \$HOSTNAME.*$/our \$HOSTNAME = \"${hostname}\"\; /" /etc/monitorix.conf|
- post_upgrade
-}
diff --git a/abs/extra/nss/nss-nolocalsql.patch b/abs/extra/nss/nss-nolocalsql.patch
deleted file mode 100644
index b72cc66..0000000
--- a/abs/extra/nss/nss-nolocalsql.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/Makefile
---- mozilla/security/nss/lib/Makefile.nolocalsql 2007-11-06 15:12:37.000000000 +0100
-+++ mozilla/security/nss/lib/Makefile 2007-11-06 15:13:35.000000000 +0100
-@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
- DIRS := $(filter-out fortcrypt,$(DIRS))
- endif
-
--ifndef MOZILLA_CLIENT
--ifndef NSS_USE_SYSTEM_SQLITE
--DIRS := sqlite $(DIRS)
--endif
--endif
-+#ifndef MOZILLA_CLIENT
-+#ifndef NSS_USE_SYSTEM_SQLITE
-+#DIRS := sqlite $(DIRS)
-+#endif
-+#endif
-
- #######################################################################
- # (5) Execute "global" rules. (OPTIONAL) #
-diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/legacydb/manifest.mn
---- mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2007-11-06 15:10:59.000000000 +0100
-+++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2007-11-06 15:11:07.000000000 +0100
-@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
-
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
-
--ifdef MOZILLA_CLIENT
--INCLUDES += -I$(DIST)/include/sqlite3
--endif
-+#ifdef MOZILLA_CLIENT
-+#INCLUDES += -I$(DIST)/include/sqlite3
-+#endif
-
- CSRCS = \
- dbmshim.c \
-diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/manifest.mn
---- mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2007-11-06 15:08:14.000000000 +0100
-+++ mozilla/security/nss/lib/softoken/manifest.mn 2007-11-06 15:10:21.000000000 +0100
-@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
-
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
-
--ifdef MOZILLA_CLIENT
--INCLUDES += -I$(DIST)/include/sqlite3
--endif
-+#ifdef MOZILLA_CLIENT
-+#INCLUDES += -I$(DIST)/include/sqlite3
-+#endif
-
- EXPORTS = \
- pkcs11.h \
-diff -up mozilla/security/nss/lib/softoken/config.mk.nolocalsql mozilla/security/nss/lib/softoken/config.mk
diff --git a/abs/extra/openjdk6/gcjwebplugin_xulrunner.diff b/abs/extra/openjdk6/gcjwebplugin_xulrunner.diff
deleted file mode 100644
index 0ed9209..0000000
--- a/abs/extra/openjdk6/gcjwebplugin_xulrunner.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am 2008-07-21 15:12:07.000000000 +0000
-+++ Makefile.am.new 2008-07-22 08:37:49.000000000 +0000
-@@ -1176,7 +1176,7 @@
- # gcjwebplugin.so.
- gcjwebplugin.so: gcjwebplugin.cc
- $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
-- $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
-+ $(MOZILLA_LIBS) -Wl,-R/usr/lib/xulrunner-1.9 $(GLIB_CFLAGS) $(GLIB_LIBS) \
- $(GTK_CFLAGS) $(GTK_LIBS) \
- -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- -fpic -shared -o $@ $<
diff --git a/abs/extra/pycrypto/PKGBUILD b/abs/extra/pycrypto/PKGBUILD
deleted file mode 100644
index fba0c5d..0000000
--- a/abs/extra/pycrypto/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 96778 2010-10-24 17:01:27Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-
-pkgname=pycrypto
-pkgver=2.3
-pkgrel=1
-pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python."
-arch=(i686 x86_64)
-depends=('python2')
-url="http://www.dlitz.net/software/pycrypto/"
-license=(custom)
-source=(http://ftp.dlitz.net/pub/dlitz/crypto/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('4f11e85fbcf13960373650fc2dae8f088f9b001f07fb6d3efb2fcb5334987182')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py build
- python2 setup.py install --root="${pkgdir}" --optimize=1
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
- cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/abs/extra/pyopenssl/PKGBUILD b/abs/extra/pyopenssl/PKGBUILD
deleted file mode 100644
index 6d2c355..0000000
--- a/abs/extra/pyopenssl/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 87790 2010-08-18 10:10:07Z ibiru $
-# Maintainer : Ionut Biru<ibiru@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=pyopenssl
-pkgver=0.10
-pkgrel=3
-pkgdesc="pyOpenSSL is a Python interface to the OpenSSL library"
-arch=('i686' 'x86_64')
-url="http://pyopenssl.sourceforge.net"
-license=('LGPL')
-depends=('python2' 'openssl')
-source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz)
-md5sums=('34db8056ec53ce80c7f5fc58bee9f093')
-
-build() {
- cd "${srcdir}/pyOpenSSL-${pkgver}"
- python2 setup.py build
- python2 setup.py install --prefix="$pkgdir/usr" --optimize=1
-}
-
diff --git a/abs/extra/pyorbit/PKGBUILD b/abs/extra/pyorbit/PKGBUILD
deleted file mode 100644
index bc9bf1b..0000000
--- a/abs/extra/pyorbit/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 89716 2010-09-03 12:01:46Z remy $
-# Mantainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pyorbit
-pkgver=2.24.0
-pkgrel=4
-pkgdesc="Python bindings for ORBit2"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://www.pygtk.org"
-depends=('python2' 'orbit2>=2.14.16')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('574593815e75ee6e98062c75d6d1581f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr || return 1
- make || return 1
-}
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
-
diff --git a/abs/extra/pyqt/ChangeLog b/abs/extra/pyqt/ChangeLog
deleted file mode 100644
index e20b55a..0000000
--- a/abs/extra/pyqt/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-
-2009-04-11 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Fixing the rpath issue, thanks Gerardo
-
-2008-11-22 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 4.4.4
-
-2008-10-22 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Rebuilt for python 2.6
-
-2008-08-09 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 4.4.3
-
-2008-07-06 Douglas Soares de Andrade <douglas@archlinux.org>
-
- * Updated for i686: 4.4.2
-
diff --git a/abs/extra/pyqt/PKGBUILD b/abs/extra/pyqt/PKGBUILD
deleted file mode 100644
index af3667c..0000000
--- a/abs/extra/pyqt/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 97705 2010-11-01 13:35:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgname=pyqt
-pkgver=4.8.1
-pkgrel=1
-pkgdesc="A set of Python bindings for the Qt toolkit"
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-depends=('sip' 'qt' 'dbus-python')
-makedepends=('phonon' 'python-opengl' 'qt-assistant-compat')
-optdepends=('phonon: enable audio and video in PyQt applications'
- 'python-opengl: enable OpenGL 3D graphics in PyQt applications'
- 'qscintilla: QScintilla API'
- 'qt-assistant-compat: add PyQt online help in Qt Assistant')
-provides=('pyqt4')
-replaces=('pyqt4')
-conflicts=('pyqt4')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('1cac8f5d715c414f9cb2751b0e84cc07')
-
-build() {
- cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-
- python2 configure.py \
- --confirm-license \
- -v /usr/share/sip \
- --qsci-api
-
- # Thanks Gerardo for the rpath fix
- find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
- make
-}
-
-package(){
- cd ${srcdir}/PyQt-x11-gpl-${pkgver}
- # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
diff --git a/abs/extra/pyrex/PKGBUILD b/abs/extra/pyrex/PKGBUILD
deleted file mode 100644
index 031996e..0000000
--- a/abs/extra/pyrex/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 89621 2010-09-02 16:28:29Z remy $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Arjan timmerman <arjan@soulfly.nl>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=pyrex
-pkgver=0.9.9
-pkgrel=2
-pkgdesc="Language for writing Python extension modules"
-arch=(any)
-url="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/"
-license=('APACHE')
-depends=('python2')
-source=(http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-${pkgver}.tar.gz)
-md5sums=('515dee67d15d4393841e2d60e8341947')
-
-build() {
- cd "${srcdir}/Pyrex-${pkgver}"
- python2 setup.py install --root="${pkgdir}" --prefix=/usr || return 1
-}
-
diff --git a/abs/extra/python-geoip/PKGBUILD b/abs/extra/python-geoip/PKGBUILD
deleted file mode 100644
index b8d2063..0000000
--- a/abs/extra/python-geoip/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 89623 2010-09-02 16:32:29Z remy $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=python-geoip
-pkgver=1.2.4
-pkgrel=2
-pkgdesc="Python bindings for the GeoIP IP-to-country resolver library."
-arch=(i686 x86_64)
-url="http://www.maxmind.com/app/python"
-license=('LGPL')
-depends=('python2' 'geoip')
-source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz)
-replaces=('geoip-python')
-provides=('geoip-python')
-
-build() {
- cd ${startdir}/src/GeoIP-Python-${pkgver}
- python2 setup.py build install --root=${startdir}/pkg
-}
-md5sums=('50f820d854476efaf3b7af733ffe4236')
-
diff --git a/abs/extra/python-imaging/PKGBUILD b/abs/extra/python-imaging/PKGBUILD
deleted file mode 100644
index f947154..0000000
--- a/abs/extra/python-imaging/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 87626 2010-08-17 13:21:07Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: simo <simo@archlinux.org>
-
-pkgname=python-imaging
-pkgver=1.1.7
-pkgrel=4
-pkgdesc="PIL. Provides image processing capabilities for python"
-arch=('i686' 'x86_64')
-url="http://www.pythonware.com/products/pil/index.htm"
-license=('custom:"pil"')
-depends=('python2' 'libjpeg' 'freetype2')
-makedepends=('tk')
-optdepends=('tk')
-provides=("pil=$pkgver")
-conflicts=('pil')
-replaces=('pil')
-source=(http://effbot.org/downloads/Imaging-$pkgver.tar.gz)
-md5sums=('fc14a54e1ce02a0225be8854bfba478e')
-
-build() {
- cd $srcdir/Imaging-$pkgver
- sed -i "s#JPEG_ROOT\ =\ None#JPEG_ROOT\ =\ \"/opt/libjpeg6/lib\",\ \"/opt/libjpeg6/include\"#" setup.py
- python2 setup.py build_ext
-}
-
-package() {
- cd $srcdir/Imaging-$pkgver
- python2 setup.py install --root=$pkgdir
- install -dm755 $pkgdir/usr/include/python2.7/
- install -m644 -t $pkgdir/usr/include/python2.7/ libImaging/*.h
-
- # do not have files ending in .py in /usr/bin
- for f in pildriver pilprint pilconvert pilfile pilfont; do
- mv $pkgdir/usr/bin/$f{.py,}
- done
-
- # Install license
- install -Dm644 $srcdir/Imaging-$pkgver/README \
- $pkgdir/usr/share/licenses/$pkgname/README
-}
-
diff --git a/abs/extra/python-imaging/__changelog b/abs/extra/python-imaging/__changelog
deleted file mode 100644
index 91214ed..0000000
--- a/abs/extra/python-imaging/__changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-__change so that it builds against libjpeg6 and not libjpeg7
- sed -i "s#JPEG_ROOT\ =\ None#JPEG_ROOT\ =\ \"/opt/libjpeg6\"#" setup.py
diff --git a/abs/extra/python-lxml/PKGBUILD b/abs/extra/python-lxml/PKGBUILD
deleted file mode 100644
index fbec415..0000000
--- a/abs/extra/python-lxml/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Guillem Rieu <guillemr@gmx.net>
-
-pkgname=python-lxml
-pkgver=2.2.6
-pkgrel=3
-pkgdesc="Python binding for the libxml2 and libxslt libraries"
-arch=('i686' 'x86_64')
-license=('BSD' 'GPL' 'custom')
-url="http://codespeak.net/lxml"
-depends=('python2' 'libxslt')
-optdepends=("beautiful-soup: support for parsing not well formed HTML")
-conflicts=('lxml')
-replaces=('lxml')
-source=(http://codespeak.net/lxml/lxml-$pkgver.tgz)
-md5sums=('b1f700fb22d7ee9b977ee3eceb65b20c')
-
-build() {
- /bin/true
-}
-
-package() {
- cd ${srcdir}/lxml-$pkgver
-
- python2 setup.py install --root=${pkgdir} || return 1
-
- install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
- install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt || return 1
- install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt || return 1
-}
diff --git a/abs/extra/python-m2crypto/PKGBUILD b/abs/extra/python-m2crypto/PKGBUILD
deleted file mode 100644
index 4e8a1aa..0000000
--- a/abs/extra/python-m2crypto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 87898 2010-08-18 16:12:44Z ibiru $
-# Maintainer:
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python-m2crypto
-pkgver=0.20.2
-pkgrel=3
-pkgdesc="A crypto and SSL toolkit for Python"
-arch=('i686' 'x86_64')
-url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
-license=('BSD')
-depends=('python2' 'openssl')
-makedepends=('swig')
-source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz"
- 'openssl1.patch')
-md5sums=('6c24410410d6eb1920ea43f77a93613a'
- '80a707ad6610f2871efdf40658e30364')
-
-build() {
- cd "${srcdir}/M2Crypto-${pkgver}"
- patch -Np0 -i ${srcdir}/openssl1.patch
- python2 setup.py build
-}
-
-package() {
- cd "${srcdir}/M2Crypto-${pkgver}"
- python2 setup.py install --root="${pkgdir}/" --optimize=1
-
- install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/abs/extra/python-m2crypto/openssl1.patch b/abs/extra/python-m2crypto/openssl1.patch
deleted file mode 100644
index 59dba55..0000000
--- a/abs/extra/python-m2crypto/openssl1.patch
+++ /dev/null
@@ -1,531 +0,0 @@
-Index: tests/test_ssl.py
-===================================================================
---- tests/test_ssl.py (revision 698)
-+++ tests/test_ssl.py (working copy)
-@@ -405,8 +405,11 @@
- try:
- ctx = SSL.Context('sslv23', weak_crypto=1)
- s = SSL.Connection(ctx)
-- s.connect(self.srv_addr)
-- self.failUnlessEqual(s.get_version(), 'SSLv2')
-+ if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL
-+ s.connect(self.srv_addr)
-+ self.failUnlessEqual(s.get_version(), 'SSLv2')
-+ else:
-+ self.assertRaises(SSL.SSLError, s.connect, self.srv_addr)
- s.close()
- finally:
- self.stop_server(pid)
-Index: tests/test_x509.py
-===================================================================
---- tests/test_x509.py (revision 698)
-+++ tests/test_x509.py (working copy)
-@@ -142,7 +142,7 @@
- cn.set_data("Hello There!")
- assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text()
-
-- assert n.as_hash() == 1697185131
-+ self.assertEquals(n.as_hash(), 1697185131)
-
- self.assertRaises(IndexError, lambda: n[100])
- self.assert_(n[10])
-Index: tests/test_smime.py
-===================================================================
---- tests/test_smime.py (revision 698)
-+++ tests/test_smime.py (working copy)
-@@ -6,7 +6,7 @@
- """
-
- import unittest
--from M2Crypto import SMIME, BIO, Rand, X509, EVP
-+from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err
-
- class SMIMETestCase(unittest.TestCase):
- cleartext = 'some text to manipulate'
-@@ -213,7 +213,7 @@
-
- self.filenameSmime = 'tests/sig.p7s'
- f = BIO.openfile(self.filenameSmime, 'wb')
-- assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1
-+ assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error()
- f.close()
-
- def test_write_pkcs7_der(self):
-Index: SWIG/_evp.i
-===================================================================
---- SWIG/_evp.i (revision 695)
-+++ SWIG/_evp.i (working copy)
-@@ -180,7 +180,7 @@
-
- PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter,
- keylen, key);
-- ret = PyString_FromStringAndSize(key, keylen);
-+ ret = PyString_FromStringAndSize((char*)key, keylen);
- OPENSSL_cleanse(key, keylen);
- return ret;
- }
-@@ -339,7 +339,7 @@
- klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf,
- (unsigned char *)dbuf, dlen, iter,
- key, NULL); /* Since we are not returning IV no need to derive it */
-- ret = PyString_FromStringAndSize(key, klen);
-+ ret = PyString_FromStringAndSize((char*)key, klen);
- return ret;
- }
-
-@@ -435,7 +435,7 @@
- PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error()));
- return NULL;
- }
-- ret = PyString_FromStringAndSize(sigbuf, siglen);
-+ ret = PyString_FromStringAndSize((char*)sigbuf, siglen);
- OPENSSL_cleanse(sigbuf, siglen);
- OPENSSL_free(sigbuf);
- return ret;
-@@ -513,7 +513,7 @@
- PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed");
- return NULL;
- }
-- der = PyString_FromStringAndSize(pp, len);
-+ der = PyString_FromStringAndSize((char*)pp, len);
- OPENSSL_free(pp);
- return der;
- }
-Index: SWIG/_ssl.i
-===================================================================
---- SWIG/_ssl.i (revision 695)
-+++ SWIG/_ssl.i (working copy)
-@@ -17,13 +17,17 @@
- %apply Pointer NONNULL { SSL_CTX * };
- %apply Pointer NONNULL { SSL * };
- %apply Pointer NONNULL { SSL_CIPHER * };
--%apply Pointer NONNULL { STACK * };
-+%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * };
-+%apply Pointer NONNULL { STACK_OF(X509) * };
- %apply Pointer NONNULL { BIO * };
- %apply Pointer NONNULL { DH * };
- %apply Pointer NONNULL { RSA * };
- %apply Pointer NONNULL { EVP_PKEY *};
- %apply Pointer NONNULL { PyObject *pyfunc };
-
-+%rename(ssl_get_ciphers) SSL_get_ciphers;
-+extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl);
-+
- %rename(ssl_get_version) SSL_get_version;
- extern const char *SSL_get_version(CONST SSL *);
- %rename(ssl_get_error) SSL_get_error;
-@@ -668,29 +672,25 @@
- return SSL_CIPHER_get_bits(c, NULL);
- }
-
--STACK *ssl_get_ciphers(SSL *ssl) {
-- return (STACK *)SSL_get_ciphers(ssl);
-+int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) {
-+ return sk_SSL_CIPHER_num(stack);
- }
-
--int sk_ssl_cipher_num(STACK *stack) {
-- return sk_num(stack);
-+SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) {
-+ return sk_SSL_CIPHER_value(stack, idx);
- }
-
--SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) {
-- return (SSL_CIPHER *)sk_value(stack, idx);
-+STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) {
-+ return SSL_get_peer_cert_chain(ssl);
- }
-
--STACK *ssl_get_peer_cert_chain(SSL *ssl) {
-- return (STACK *)SSL_get_peer_cert_chain(ssl);
-+int sk_x509_num(STACK_OF(X509) *stack) {
-+ return sk_X509_num(stack);
- }
-
--int sk_x509_num(STACK *stack) {
-- return sk_num(stack);
-+X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) {
-+ return sk_X509_value(stack, idx);
- }
--
--X509 *sk_x509_value(STACK *stack, int idx) {
-- return (X509 *)sk_value(stack, idx);
--}
- %}
-
- %threadallow i2d_ssl_session;
-Index: SWIG/_x509.i
-===================================================================
---- SWIG/_x509.i (revision 695)
-+++ SWIG/_x509.i (working copy)
-@@ -148,8 +148,15 @@
- extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long);
- %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp;
- extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long);
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+%rename(x509_name_hash) X509_NAME_hash_old;
-+extern unsigned long X509_NAME_hash_old(X509_NAME *);
-+#else
- %rename(x509_name_hash) X509_NAME_hash;
- extern unsigned long X509_NAME_hash(X509_NAME *);
-+#endif
-+
- %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID;
- extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int);
-
-@@ -171,7 +178,7 @@
- if (PyString_Check($input)) {
- Py_ssize_t len;
-
-- $1 = PyString_AsString($input);
-+ $1 = (unsigned char *)PyString_AsString($input);
- len = PyString_Size($input);
- if (len > INT_MAX) {
- PyErr_SetString(PyExc_ValueError, "object too large");
-@@ -184,7 +191,7 @@
- }
- }
- %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data;
--extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int);
-+extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int);
- %typemap(in) (CONST unsigned char *, int);
-
- %rename(x509_req_new) X509_REQ_new;
-@@ -230,7 +237,7 @@
- %rename(x509_store_ctx_free) X509_STORE_CTX_free;
- extern void X509_STORE_CTX_free(X509_STORE_CTX *);
- %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain;
--extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
-+extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
-
- %rename(x509_extension_get_critical) X509_EXTENSION_get_critical;
- extern int X509_EXTENSION_get_critical(X509_EXTENSION *);
-@@ -348,7 +355,7 @@
- PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
- }
- else {
-- ret = PyString_FromStringAndSize(buf, len);
-+ ret = PyString_FromStringAndSize((char*)buf, len);
- OPENSSL_free(buf);
- }
- return ret;
-@@ -435,12 +442,12 @@
- }
-
- int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) {
-- return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0);
-+ return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0);
- }
-
- /* x509_name_add_entry_by_txt */
- int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) {
-- return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set);
-+ return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set);
- }
-
- PyObject *x509_name_get_der(X509_NAME *name)
-@@ -450,23 +457,23 @@
- }
-
- /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */
--STACK *sk_x509_new_null(void) {
-- return (STACK *)sk_X509_new_null();
-+STACK_OF(X509) *sk_x509_new_null(void) {
-+ return sk_X509_new_null();
- }
-
- /* sk_X509_free() is a macro. */
--void sk_x509_free(STACK *stack) {
-- sk_X509_free((STACK_OF(X509) *)stack);
-+void sk_x509_free(STACK_OF(X509) *stack) {
-+ sk_X509_free(stack);
- }
-
- /* sk_X509_push() is a macro. */
--int sk_x509_push(STACK *stack, X509 *x509) {
-- return sk_X509_push((STACK_OF(X509) *)stack, x509);
-+int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) {
-+ return sk_X509_push(stack, x509);
- }
-
- /* sk_X509_pop() is a macro. */
--X509 *sk_x509_pop(STACK *stack) {
-- return sk_X509_pop((STACK_OF(X509) *)stack);
-+X509 *sk_x509_pop(STACK_OF(X509) *stack) {
-+ return sk_X509_pop(stack);
- }
-
- int x509_store_load_locations(X509_STORE *store, const char *file) {
-@@ -493,21 +500,29 @@
- return X509_REQ_set_version(x, version);
- }
-
--int x509_req_add_extensions(X509_REQ *req, STACK *exts) {
-- return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts);
-+int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) {
-+ return X509_REQ_add_extensions(req, exts);
- }
-
--X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
-- return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len);
-+X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
-+ return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len);
- }
-
--LHASH *
--x509v3_lhash(){
-- return lh_new(NULL,NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+LHASH_OF(CONF_VALUE)
-+#else
-+LHASH
-+#endif
-+*x509v3_lhash() {
-+ return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */
- }
-
- X509V3_CTX *
--x509v3_set_conf_lhash(LHASH * lhash){
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) {
-+#else
-+x509v3_set_conf_lhash(LHASH * lhash) {
-+#endif
- X509V3_CTX * ctx;
- if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) {
- PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash");
-@@ -517,11 +532,20 @@
- return ctx;
- }
-
--X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) {
-+X509_EXTENSION *
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) {
-+#else
-+x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) {
-+#endif
- X509_EXTENSION * ext = NULL;
- ext = X509V3_EXT_conf(conf, ctx, name, value);
- PyMem_Free(ctx);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ lh_CONF_VALUE_free(conf);
-+#else
- lh_free(conf);
-+#endif
- return ext;
- }
-
-@@ -543,33 +567,33 @@
- }
-
- /* sk_X509_EXTENSION_new_null is a macro. */
--STACK *sk_x509_extension_new_null(void) {
-- return (STACK *)sk_X509_EXTENSION_new_null();
-+STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) {
-+ return sk_X509_EXTENSION_new_null();
- }
-
- /* sk_X509_EXTENSION_free() is a macro. */
--void sk_x509_extension_free(STACK *stack) {
-- sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack);
-+void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) {
-+ sk_X509_EXTENSION_free(stack);
- }
-
- /* sk_X509_EXTENSION_push() is a macro. */
--int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) {
-- return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext);
-+int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) {
-+ return sk_X509_EXTENSION_push(stack, x509_ext);
- }
-
- /* sk_X509_EXTENSION_pop() is a macro. */
--X509_EXTENSION *sk_x509_extension_pop(STACK *stack) {
-- return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack);
-+X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) {
-+ return sk_X509_EXTENSION_pop(stack);
- }
-
- /* sk_X509_EXTENSION_num() is a macro. */
--int sk_x509_extension_num(STACK *stack) {
-- return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack);
-+int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) {
-+ return sk_X509_EXTENSION_num(stack);
- }
-
- /* sk_X509_EXTENSION_value() is a macro. */
--X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) {
-- return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i);
-+X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) {
-+ return sk_X509_EXTENSION_value(stack, i);
- }
-
- /* X509_STORE_CTX_get_app_data is a macro. */
-@@ -590,7 +614,7 @@
- #define I2DTYPE int (*)()
- #endif
-
--STACK *
-+STACK_OF(X509) *
- make_stack_from_der_sequence(PyObject * pyEncodedString){
- STACK_OF(X509) *certs;
- Py_ssize_t encoded_string_len;
-@@ -606,7 +630,7 @@
- return NULL;
- }
-
-- certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free );
-+ certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free );
- if (!certs) {
- PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
- return NULL;
-@@ -616,13 +640,13 @@
- }
-
- PyObject *
--get_der_encoding_stack(STACK * stack){
-+get_der_encoding_stack(STACK_OF(X509) *stack){
- PyObject * encodedString;
-
- unsigned char * encoding;
- int len;
-
-- encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len);
-+ encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len);
- if (!encoding) {
- PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
- return NULL;
-Index: SWIG/_aes.i
-===================================================================
---- SWIG/_aes.i (revision 695)
-+++ SWIG/_aes.i (working copy)
-@@ -76,7 +76,7 @@
- AES_encrypt((const unsigned char *)in, out, key);
- else
- AES_decrypt((const unsigned char *)in, out, key);
-- return PyString_FromStringAndSize(out, outlen);
-+ return PyString_FromStringAndSize((char*)out, outlen);
- }
-
- int AES_type_check(AES_KEY *key) {
-Index: SWIG/_util.i
-===================================================================
---- SWIG/_util.i (revision 695)
-+++ SWIG/_util.i (working copy)
-@@ -48,7 +48,7 @@
- PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error()));
- return NULL;
- }
-- obj = PyString_FromStringAndSize(ret, len);
-+ obj = PyString_FromStringAndSize((char*)ret, len);
- OPENSSL_free(ret);
- return obj;
- }
-Index: SWIG/_m2crypto.i
-===================================================================
---- SWIG/_m2crypto.i (revision 695)
-+++ SWIG/_m2crypto.i (working copy)
-@@ -38,6 +38,19 @@
- #define CONST098
- #endif
-
-+/* Bring in STACK_OF macro definition */
-+%include <openssl/safestack.h>
-+
-+/* Bring in LHASH_OF macro definition */
-+/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes
-+ XXX stdio.h etc. which we fail to include. So we have to (re)define
-+ XXX LHASH_OF here instead.
-+%include <openssl/lhash.h>
-+*/
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define LHASH_OF(type) struct lhash_st_##type
-+#endif
-+
- %include constraints.i
- %include _threads.i
- %include _lib.i
-Index: SWIG/_rand.i
-===================================================================
---- SWIG/_rand.i (revision 695)
-+++ SWIG/_rand.i (working copy)
-@@ -87,7 +87,7 @@
- Py_INCREF(Py_None);
- return Py_None;
- } else {
-- PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n));
-+ PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n));
- PyMem_Free(blob);
- PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret));
- return tuple;
-Index: SWIG/_pkcs7.i
-===================================================================
---- SWIG/_pkcs7.i (revision 695)
-+++ SWIG/_pkcs7.i (working copy)
-@@ -12,7 +12,7 @@
- %apply Pointer NONNULL { EVP_CIPHER * };
- %apply Pointer NONNULL { EVP_PKEY * };
- %apply Pointer NONNULL { PKCS7 * };
--%apply Pointer NONNULL { STACK * };
-+%apply Pointer NONNULL { STACK_OF(X509) * };
- %apply Pointer NONNULL { X509 * };
-
- %rename(pkcs7_new) PKCS7_new;
-@@ -54,8 +54,8 @@
-
- %threadallow pkcs7_encrypt;
- %inline %{
--PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
-- return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags);
-+PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
-+ return PKCS7_encrypt(stack, bio, cipher, flags);
- }
-
- PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) {
-@@ -96,14 +96,14 @@
-
- %threadallow pkcs7_sign1;
- %inline %{
--PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) {
-- return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags);
-+PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) {
-+ return PKCS7_sign(x509, pkey, stack, bio, flags);
- }
- %}
-
- %threadallow pkcs7_verify1;
- %inline %{
--PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) {
-+PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) {
- int outlen;
- char *outbuf;
- BIO *bio;
-@@ -113,7 +113,7 @@
- PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1");
- return NULL;
- }
-- if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) {
-+ if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) {
- PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error()));
- BIO_free(bio);
- return NULL;
-@@ -131,7 +131,7 @@
- return ret;
- }
-
--PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) {
-+PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) {
- return pkcs7_verify1(pkcs7, stack, store, NULL, flags);
- }
- %}
-@@ -229,7 +229,7 @@
- }
-
- /* return STACK_OF(X509)* */
--STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) {
-+STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) {
- return PKCS7_get0_signers(p7, certs, flags);
- }
-
diff --git a/abs/extra/python-oauth/PKGBUILD b/abs/extra/python-oauth/PKGBUILD
deleted file mode 100644
index 523867f..0000000
--- a/abs/extra/python-oauth/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Snowknight (hopkinsth@gmail.com)
-pkgname=python-oauth
-pkgver=1.0.1
-pkgrel=4
-pkgdesc="An open protocol to allow API authentication in a simple and standard method from desktop and web applications."
-arch=('any')
-url="http://code.google.com/p/oauth/"
-license=('MIT')
-depends=('python2')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/o/oauth/oauth-${pkgver}.tar.gz)
-md5sums=('30ed3cc8c11d7841a89feab437aabf81')
-sha1sums=('b2d7609e4852b33d0d33f0bc6ae5cab8fadca014')
-
-build() {
- cd ${srcdir}/oauth-${pkgver}
-
- python2 setup.py build || return 1
-}
-package() {
- cd ${srcdir}/oauth-${pkgver}
- python2 setup.py install --root=${pkgdir} || return 1
-
- install -Dm644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
diff --git a/abs/extra/python-opengl/LICENSE b/abs/extra/python-opengl/LICENSE
deleted file mode 100644
index 11d88fb..0000000
--- a/abs/extra/python-opengl/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2006-2008 Alex Holkner
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of pyglet nor the names of its
-# contributors may be used to endorse or promote products
-# derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
diff --git a/abs/extra/python-opengl/PKGBUILD b/abs/extra/python-opengl/PKGBUILD
deleted file mode 100644
index d0638b1..0000000
--- a/abs/extra/python-opengl/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 89543 2010-09-01 17:18:01Z remy $
-# Contributor: Josh Taylor <joshtaylor.mail@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=python-opengl
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="The cross platform Python binding to OpenGL and related APIs"
-url="http://pyopengl.sourceforge.net"
-license=('BSD')
-arch=('any')
-depends=('python2' 'tk' 'freeglut' 'setuptools')
-provides=('pyopengl' 'python-pyopengl')
-conflicts=('pyopengl' 'python-pyopengl')
-source=(http://downloads.sourceforge.net/pyopengl/PyOpenGL-${pkgver}.tar.gz
- 'LICENSE')
-md5sums=('221d4a6a0928fcfeef26751370ec5f52'
- '0b53c508a63e5dbaf44cdfb0fa103b3a')
-
-build() {
- /bin/true
-}
-
-package() {
- cd ${srcdir}/PyOpenGL-${pkgver}
- python2 setup.py install --root=${pkgdir} || return 1
- install -Dm644 ${srcdir}/LICENSE \
- ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/abs/extra/python-pybluez/PKGBUILD b/abs/extra/python-pybluez/PKGBUILD
deleted file mode 100644
index 275720f..0000000
--- a/abs/extra/python-pybluez/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 26298 2010-09-14 17:18:19Z schuay $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: cs-cam - me.at.camdaniel.com
-
-pkgname=python-pybluez
-pkgver=0.18
-pkgrel=2
-pkgdesc="Python wrapper for the BlueZ Bluetooth stack"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pybluez/"
-license=('GPL')
-provides=('pybluez')
-conflicts=('pybluez')
-replaces=('pybluez')
-depends=('python2' 'bluez')
-source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz)
-md5sums=('be8c8ce615c3189fda1aaf3d568314b2')
-
-build() {
- cd $srcdir/PyBluez-$pkgver
- python2 setup.py install --root=$pkgdir
- ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so
-}
-
diff --git a/abs/extra/python-pycurl/PKGBUILD b/abs/extra/python-pycurl/PKGBUILD
deleted file mode 100644
index 7dd5e90..0000000
--- a/abs/extra/python-pycurl/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 25898 2010-09-11 12:22:23Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: kontrast <kontr4st@gmail.com>
-
-pkgname=python-pycurl
-pkgver=7.19.0
-pkgrel=6
-pkgdesc="A Python interface to libcurl"
-arch=('i686' 'x86_64')
-url="http://pycurl.sourceforge.net"
-license=('GPL')
-depends=('python2' 'curl')
-replaces=('pycurl')
-provides=('pycurl')
-source=("http://pycurl.sourceforge.net/download/pycurl-${pkgver}.tar.gz")
-md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
-
-package() {
- cd ${srcdir}/pycurl-${pkgver}
- python2 setup.py install --curl-config=/usr/bin/curl-config --prefix ${pkgdir}/usr
-}
-
diff --git a/abs/extra/python-pymedia/PKGBUILD b/abs/extra/python-pymedia/PKGBUILD
deleted file mode 100755
index a23d441..0000000
--- a/abs/extra/python-pymedia/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=python-pymedia
-pkgver=1.3.5.0
-pkgrel=1
-pkgdesc="A Python library for accessing and manipulating media files"
-url="http://www.pymedia.org"
-license=""
-depends=('libvorbis' 'faad2' 'lame')
-makedepends=('python>=2.3')
-replaces=('pymedia')
-provides=('pymedia')
-arch=i686
-source=(http://easynews.dl.sourceforge.net/sourceforge/pymedia/pymedia-$pkgver.tar.gz)
-md5sums=('3b9efcd105707c6696579e3ca8852d0e')
-
-build() {
- cd $startdir/src/pymedia-$pkgver
- sed -i -e "s:/usr/local/include/lame:/usr/include/lame:g" setup.py
- yes "" | python setup.py install --root=$startdir/pkg --prefix=/usr
- }
diff --git a/abs/extra/python-pyserial/PKGBUILD b/abs/extra/python-pyserial/PKGBUILD
deleted file mode 100644
index 0cfb46c..0000000
--- a/abs/extra/python-pyserial/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 29428 2010-10-14 09:13:52Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgname=python-pyserial
-pkgver=2.5
-pkgrel=2
-pkgdesc="Multiplatform Serial Port Module for Python"
-arch=('any')
-url="http://pyserial.sf.net"
-license=('custom:PYTHON')
-depends=('python2')
-source=(http://downloads.sourceforge.net/sourceforge/pyserial/pyserial-$pkgver.tar.gz)
-md5sums=('34340820710239bea2ceca7f43ef8cab')
-
-build() {
- cd $srcdir/pyserial-$pkgver
- python2 setup.py install --root=$pkgdir
- install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt
-}
diff --git a/abs/extra/python2-distribute/PKGBUILD b/abs/extra/python2-distribute/PKGBUILD
deleted file mode 100644
index e92d9c7..0000000
--- a/abs/extra/python2-distribute/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Sebastien Binet <binet@farnsworth>
-pkgname=python2-distribute
-pkgver=0.6.14
-pkgrel=3
-pkgdesc="A collection of extensions to the Python 2 distutils"
-arch=('any')
-license=('PSF')
-url="http://packages.python.org/distribute"
-depends=('python2')
-conflicts=('setuptools')
-replaces=('setuptools')
-provides=('setuptools=0.6c11')
-source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
- distribute-${pkgver}_python2_and_3.patch)
-sha1sums=('6bea50b97f36bf751548bb486a534204a690aa4d'
- 'de635febfb11dc6878e5bdbac4a0e1d539c19d79')
-
-package() {
- cd ${srcdir}/distribute-${pkgver}
- patch -Np1 -i ../distribute-${pkgver}_python2_and_3.patch
- python2 setup.py install --prefix=/usr --root=${pkgdir}
-}
-# vim: set noexpandtab tabstop=8 shiftwidth=8 textwidth=132 autoindent
diff --git a/abs/extra/python2-distribute/distribute-0.6.14_python2_and_3.patch b/abs/extra/python2-distribute/distribute-0.6.14_python2_and_3.patch
deleted file mode 100644
index dc5da86..0000000
--- a/abs/extra/python2-distribute/distribute-0.6.14_python2_and_3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur distribute-0.6.14.ori//distribute.egg-info/entry_points.txt distribute-0.6.14/distribute.egg-info/entry_points.txt
---- distribute-0.6.14.ori//distribute.egg-info/entry_points.txt 2010-07-14 20:14:10.000000000 -0400
-+++ distribute-0.6.14/distribute.egg-info/entry_points.txt 2010-10-21 09:26:43.386667396 -0400
-@@ -31,7 +31,8 @@
- depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
- [console_scripts]
--easy_install = setuptools.command.easy_install:main
-+easy_install-3.1 = setuptools.command.easy_install:main
-+easy_install-2.7 = setuptools.command.easy_install:main
- easy_install-2.6 = setuptools.command.easy_install:main
-
- [setuptools.file_finders]
-diff -Naur distribute-0.6.14.ori//distribute_setup.py distribute-0.6.14/distribute_setup.py
---- distribute-0.6.14.ori//distribute_setup.py 2010-07-14 19:53:38.000000000 -0400
-+++ distribute-0.6.14/distribute_setup.py 2010-10-21 09:25:18.356667404 -0400
-@@ -299,8 +299,7 @@
- log.warn('Could not find the install location')
- return
- pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
-- setuptools_file = 'setuptools-%s-py%s.egg-info' % \
-- (SETUPTOOLS_FAKED_VERSION, pyver)
-+ setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION
- pkg_info = os.path.join(placeholder, setuptools_file)
- if os.path.exists(pkg_info):
- log.warn('%s already exists', pkg_info)
-diff -Naur distribute-0.6.14.ori//setup.py distribute-0.6.14/setup.py
---- distribute-0.6.14.ori//setup.py 2010-07-14 19:53:38.000000000 -0400
-+++ distribute-0.6.14/setup.py 2010-10-21 09:32:44.850000736 -0400
-@@ -96,6 +96,8 @@
- f.close()
-
-
-+console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]]
-+
- # if we are installing Distribute using "python setup.py install"
- # we need to get setuptools out of the way
- def _easy_install_marker():
-@@ -182,11 +184,7 @@
- "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
- ],
-
-- "console_scripts": [
-- "easy_install = setuptools.command.easy_install:main",
-- "easy_install-%s = setuptools.command.easy_install:main"
-- % sys.version[:3]
-- ],
-+ "console_scripts": console_scripts,
-
- "setuptools.file_finders":
- ["svn_cvs = setuptools.command.sdist:_default_revctrl"],
diff --git a/abs/extra/pyusb/PKGBUILD b/abs/extra/pyusb/PKGBUILD
deleted file mode 100644
index 6ad9bc3..0000000
--- a/abs/extra/pyusb/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Contributor: Jason Giangrande <jgiangrande@clarku.edu>
-pkgname=pyusb
-pkgver=0.4.3
-pkgrel=3
-pkgdesc="A native Python module written in C which provides USB access."
-arch=('i686' 'x86_64')
-url="http://pyusb.berlios.de/"
-license=('GPL')
-depends=('python2' 'libusb')
-makedepends=('python2-distribute')
-source=(http://downloads.sourceforge.net/project/pyusb/PyUSB%200.x/$pkgver/pyusb-$pkgver.tar.gz)
-md5sums=('a1a43bc6407caccbc22073c56439aa06')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py install -f --root="${pkgdir}" || return 1
-}
-
diff --git a/abs/extra/sip/PKGBUILD b/abs/extra/sip/PKGBUILD
index 6bba8f2..b17f34b 100644
--- a/abs/extra/sip/PKGBUILD
+++ b/abs/extra/sip/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=sip
pkgver=4.11.2
-pkgrel=1
+pkgrel=2
pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
arch=('i686' 'x86_64')
url="http://www.riverbankcomputing.com/software/sip/"
diff --git a/abs/extra/snes9x/snes9x-fixes2.patch b/abs/extra/snes9x/snes9x-fixes2.patch
deleted file mode 100644
index 6007bb6..0000000
--- a/abs/extra/snes9x/snes9x-fixes2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- snes9x-1.5-src.orig/unix/opengl.cpp 2006-06-30 13:34:57.000000000 +0000
-+++ snes9x-1.5-src/unix/opengl.cpp 2006-09-01 08:48:39.000000000 +0000
-@@ -214,7 +214,7 @@
-
- // Strip dots from the version string
- char *ptr;
-- while (ptr = strchr (ver, '.'))
-+ while ((ptr = strchr (ver, '.')))
- memmove (ptr, ptr + 1, strlen (ptr + 1) + 1);
-
- // Pad the string with zeros to 4 digits
-@@ -381,7 +381,7 @@
- int i = 0;
- for (uint32 y = 0; y < pheight; y++)
- {
-- uint16 *ptr = (uint16 *) (GFX.Screen + (y + startl) * GFX.Pitch2) + startx;
-+ uint16 *ptr = (uint16 *) (GFX.Screen + (y + startl) * GFX.Pitch) + startx;
- for (uint32 x = 0; x < pwidth; x++)
- {
- int color = *ptr++;
-@@ -399,7 +399,7 @@
- for (uint32 y = 0; y < pheight; y++)
- {
- memmove (basetexbuffer + sizeof (uint16) * texture_size * y,
-- (GFX.Screen + (y + startl) * GFX.Pitch2) + startx,
-+ (GFX.Screen + (y + startl) * GFX.Pitch) + startx,
- sizeof (uint16) * texture_size);
- }
- data = basetexbuffer;
diff --git a/abs/extra/snes9x/snes9x.install b/abs/extra/snes9x/snes9x.install
deleted file mode 100755
index 1528f50..0000000
--- a/abs/extra/snes9x/snes9x.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- echo ">> If you wish to use Snes9x with OpenGL try osnes9x"
- /bin/true
-}
-
-post_upgrade() {
- echo ">> If you wish to use Snes9x with OpenGL try osnes9x"
- /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/xulrunner/xulrunner.install b/abs/extra/xulrunner/xulrunner.install
deleted file mode 100644
index 0b4cf9c..0000000
--- a/abs/extra/xulrunner/xulrunner.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- # Ensure that the ld.so.conf file contains the xulrunner libs.
- cp -f /etc/ld.so.conf /tmp/ld.so.conf
- grep -v xulrunner /tmp/ld.so.conf > /etc/ld.so.conf
- echo /usr/lib/xulrunner-1.9.1.1 >> /etc/ld.so.conf
- /sbin/ldconfig
-}
-
-post_upgrade() {
- post_install $*
-}