python2: downgrade to python 2.6.6

1 files changed, 43 insertions, 36 deletions

diff --git a/abs/core/python2/PKGBUILD b/abs/core/python2/PKGBUILD
index 6e548de..1760736 100644
--- a/abs/core/python2/PKGBUILD
+++ b/abs/core/python2/PKGBUILD
@@ -1,68 +1,75 @@
-# $Id: PKGBUILD 96373 2010-10-20 03:29:47Z allan $
+# $Id: PKGBUILD 75257 2010-04-01 05:30:58Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=python2
-pkgver=2.7
-pkgrel=3
-_pybasever=2.7
+pkgver=2.6.6
+pkgrel=2
+_pybasever=2.6
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
 license=('PSF')
 url="http://www.python.org"
-depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3')
-makedepends=('tk')
-optdepends=('tk: for IDLE')
-conflicts=('python<3')
-options=('!makeflags')
+depends=('db>=4.8' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3')
+makedepends=('tk>=8.5.0')
+optdepends=('tk: for IDLE, pynche and modulator')
+provides=('python2' 'python' 'python-elementtree' 'python-ctypes')
+replaces=('python' 'python-elementtree' 'python-ctypes')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
-        python-2.7-db51.diff)
-md5sums=('0e8c9ec32abf5b732bea7d91b38c3339'
-         'd9b8161568ce17a305c1b71e61ccd4b5')
+	python-2.6-internal-expat.patch
+	python-2.6-db-4.8.patch
+	modulator-launcher
+	pynche-launcher)
 
 build() {
   cd ${srcdir}/Python-${pkgver}
 
-  patch -Np1 -i $srcdir/python-2.7-db51.diff
+  patch -Np0 -i ${srcdir}/python-2.6-internal-expat.patch || return 1
+
+  #http://bugs.python.org/issue6949
+  patch -Np0 -i ${srcdir}/python-2.6-db-4.8.patch || return 1
 
   export OPT="${CFLAGS}"
-  ./configure --prefix=/usr --enable-shared --with-threads \
-              --enable-unicode=ucs4 --with-system-expat
+  ./configure --prefix=/usr --enable-shared --with-threads --enable-unicode
 
   make || return 1
 }
-
 package() {
   cd ${srcdir}/Python-${pkgver}
-  make DESTDIR=${pkgdir} altinstall || return 1
+  make DESTDIR=${pkgdir} install
 
-  ln -sf python${_pybasever} $pkgdir/usr/bin/python2
-  ln -sf python${_pybasever}-config $pkgdir/usr/bin/python2-config
+  rm ${pkgdir}/usr/bin/python
+  ln -sf python${_pybasever} ${pkgdir}/usr/bin/python
+  ln -sf python${_pybasever} ${pkgdir}/usr/bin/python2
 
   ln -sf ../../libpython${_pybasever}.so \
     ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
 
-  mv $pkgdir/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/
-
-  # some useful "stuff"
-  install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
-  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
-    ${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
-  install -m755 Tools/scripts/{README,*py} \
-    ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
+  # Install the tools
+  #modulator
+  sed -i "s#%%PYBASEVER%%#${_pybasever}#" ${srcdir}/modulator-launcher
+  install -m755 ${srcdir}/modulator-launcher ${pkgdir}/usr/bin/modulator
+  cp -r Tools/modulator ${pkgdir}/usr/lib/python${_pybasever}/site-packages/
 
-  # fix conflicts with python
-  mv $pkgdir/usr/bin/idle{,2}
-  mv $pkgdir/usr/bin/pydoc{,2}
+  #pynche
+  sed -i "s#%%PYBASEVER%%#${_pybasever}#" ${srcdir}/pynche-launcher
+  install -m755 ${srcdir}/pynche-launcher ${pkgdir}/usr/bin/pynche
+  rm -f Tools/pynche/*.pyw
+  cp -r Tools/pynche ${pkgdir}/usr/lib/python${_pybasever}/site-packages/
 
-  # clean up #!s
-  find $pkgdir/usr/lib/python2.7/ -name '*.py' | \
-    xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+  #gettext
+  install -m755 Tools/i18n/pygettext.py ${pkgdir}/usr/bin/
+  install -m755 Tools/i18n/msgfmt.py ${pkgdir}/usr/bin/
 
-  # clean-up reference to build directory
-  sed -i "s#$srcdir/Python-${pkgver}:##" \
-    $pkgdir/usr/lib/python${_pybasever}/config/Makefile
+  mkdir -p ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts
+  install -m644 Tools/scripts/README ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
+  install -m755 Tools/scripts/*py ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
 
   # license
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
+md5sums=('cf4e6881bb84a7ce6089e4a307f71f14'
+         '993800dbcc0c4f199c1ceee998a06e71'
+         '10eb5449ead95b9cb13eae9f9a65894e'
+         'b4a531570415280dc406c8d5c1fa8d83'
+         '9f731b9033db285132a3524fb36409e7')