Merged upstream, mesa needs revision

Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/gigi/PKGBUILD
	community-staging/lxdm/PKGBUILD
	community-staging/lxdm/lxdm-pam
	community-staging/lxdm/lxdm.install
	community-staging/lxdm/service
	community-testing/gigi/PKGBUILD
	community/calf/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/prboom/PKGBUILD
	community/scorched3d/PKGBUILD
	community/tmux/PKGBUILD
	community/torcs/PKGBUILD
	core/curl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/akonadi/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ftgl/PKGBUILD
	extra/gcin/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/mesa/PKGBUILD
	extra/python-telepathy/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/ruby/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/baobab/PKGBUILD
	gnome-unstable/epiphany/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-games/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-sqlite/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	staging/calligra/PKGBUILD
	staging/inkscape/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase-workspace/kdm.service
	staging/libreoffice/PKGBUILD
	staging/libreoffice/libreoffice-common.csh
	staging/libreoffice/libreoffice-common.sh
	staging/poppler/PKGBUILD
	testing/dbus-python/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iproute2/PKGBUILD
	testing/iptables/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase-workspace/kde-np.pam
	testing/kdebase-workspace/kde.pam
	testing/kdebindings-python/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/lvm2/lvm-on-crypt.service
	testing/lvm2/lvm.service
	testing/miro/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/ppp/PKGBUILD
	testing/ppp/ip-down
	testing/pyqt/PKGBUILD
	testing/qscintilla/PKGBUILD
	testing/sip/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/util-linux/PKGBUILD
	testing/wpa_supplicant/PKGBUILD
	testing/wpa_supplicant/config
	testing/xf86-video-intel/PKGBUILD

1 files changed, 34 insertions, 0 deletions

diff --git a/community-testing/python-psycopg1/PKGBUILD b/community-testing/python-psycopg1/PKGBUILD
new file mode 100644
index 000000000..b2a54c3d5
--- /dev/null
+++ b/community-testing/python-psycopg1/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 78095 2012-10-16 11:53:11Z allan $
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgbase=python-psycopg1
+pkgname=python2-psycopg1
+pkgver=1.1.21
+pkgrel=8
+pkgdesc="A PostgreSQL database adapter for Python"
+arch=('i686' 'x86_64')
+url="http://initd.org/projects/psycopg1"
+license=('GPL')
+depends=('python2-egenix-mx-base' 'postgresql')
+conflicts=('python-psycopg1<=1.1.21-7')
+replaces=('python-psycopg1<=1.1.21-7')
+source=(http://initd.org/psycopg/tarballs/PSYCOPG-1-1/psycopg-$pkgver.tar.gz)
+md5sums=('a31f79f68d6d32898d6f24e11369a106')
+sha1sums=('02d8a8b5dd682306117896c7c63a9a1b518997b6')
+
+build() {
+  cd "$srcdir/psycopg-$pkgver"
+
+  ./configure --prefix=/usr --with-python=/usr/bin/python2 \
+              --with-mxdatetime-includes=/usr/lib/python2.7/site-packages/mx/DateTime/mxDateTime
+  sed -e 's:\(echo "  install -m 555 $$mod \)\($(PY_MOD_DIR)\)\("; \\\):\1${DESTDIR}\2/$$mod\3:' \
+		-e 's:\($(INSTALL)  -m 555 $$mod \)\($(PY_MOD_DIR)\)\(; \\\):\1${DESTDIR}\2/$$mod\3:' \
+		-i Makefile
+  make
+}
+
+package_python2-psycopg1() {
+  cd "$srcdir/psycopg-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}