bsddb4 fixes

5 files changed, 130 insertions, 6 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index a005a5636827..8cc2de53e95a 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.44 2003/10/26 15:58:01 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.45 2003/10/27 09:21:51 liquidx Exp $
+
+*python-2.2.3-r5 (27 Oct 2003)
+
+  27 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild,
+  files/python-2.2.3-db4.patch:
+  rev bump. fixes to idle.py and bsddb with db-4.1 for 2.2.3
 
   26 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> python-2.2.3-r4.ebuild:
   Fixed symlink to idle.py
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index d67e3ea6af1a..e57ed592e8c4 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,4 +1,4 @@
-MD5 a299b1776cf4ed7e7dc7cd2acc7724e9 ChangeLog 8273
+MD5 8bf2ec3eed7afe1971594b892580a5e2 ChangeLog 8469
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 58b06d58bccd371fcbf1b781164c75a9 python-2.1.3-r1.ebuild 2345
 MD5 f7959cf61958991a7e25f83a4e8b2ff8 python-2.2.1-r5.ebuild 2912
@@ -8,7 +8,7 @@ MD5 58ed89f3cc48f16f8bc96b76490e5b6a python-2.2.3-r1.ebuild 3293
 MD5 0a274212a2a49a52600b617a38bafa09 python-2.2.3-r2.ebuild 3441
 MD5 48d3de450107a8702bbd30ddfdceeed2 python-2.2.3-r3.ebuild 3488
 MD5 5806acebfc91d925f328a751fd5503e5 python-2.2.3-r4.ebuild 3491
-MD5 5806acebfc91d925f328a751fd5503e5 python-2.2.3-r5.ebuild 3491
+MD5 92c61b17ba9a81349b38f41a30a5763f python-2.2.3-r5.ebuild 3488
 MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999
 MD5 a53bcd98cbe4a9ff64acc1c655409b12 python-2.3.2-r1.ebuild 4031
 MD5 7c0dcd5a1aa1ec0db97cd0847faab0d7 python-2.3.2.ebuild 3675
@@ -27,7 +27,7 @@ MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2 62
 MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2-r1 62
 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
 MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
-MD5 f0c146ffac8dfec6e2ceb269efd2c13e files/python-2.2.3-db4.patch 1677
+MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
 MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732
 MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607
 MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
diff --git a/dev-lang/python/files/digest-python-2.2.3-r5 b/dev-lang/python/files/digest-python-2.2.3-r5
new file mode 100644
index 000000000000..283c3d783859
--- /dev/null
+++ b/dev-lang/python/files/digest-python-2.2.3-r5
@@ -0,0 +1 @@
+MD5 169f89f318e252dac0c54dd1b165d229 Python-2.2.3.tgz 6709556
diff --git a/dev-lang/python/files/python-2.2.3-db4.patch b/dev-lang/python/files/python-2.2.3-db4.patch
index 14ebed87023e..2405f8e0fd0c 100644
--- a/dev-lang/python/files/python-2.2.3-db4.patch
+++ b/dev-lang/python/files/python-2.2.3-db4.patch
@@ -8,7 +8,7 @@
 -            dblib = ['db-3.2']
 +        if self.compiler.find_library_file(lib_dirs, 'db-4.1'):
 +            dblib = ['db-4.1']
-+        if self.compiler.find_library_file(lib_dirs, 'db-4.0'):
++        elif self.compiler.find_library_file(lib_dirs, 'db-4.0'):
 +            dblib = ['db-4.0']
 +        elif self.compiler.find_library_file(lib_dirs, 'db-3.2'):
 +            dblib = ['db-3.2']	    
@@ -20,7 +20,7 @@
  
          db185_incs = find_file('db_185.h', inc_dirs,
 -                               ['/usr/include/db3', '/usr/include/db2'])
-+                               ['/usr/include/db4','/usr/include/db3', '/usr/include/db2'])
++                               ['/usr/include/db4.1','/usr/include/db4','/usr/include/db3', '/usr/include/db2'])
          db_inc = find_file('db.h', inc_dirs, ['/usr/include/db1'])
          if db185_incs is not None:
              exts.append( Extension('bsddb', ['bsddbmodule.c'],
diff --git a/dev-lang/python/python-2.2.3-r5.ebuild b/dev-lang/python/python-2.2.3-r5.ebuild
new file mode 100644
index 000000000000..7d08f24de3be
--- /dev/null
+++ b/dev-lang/python/python-2.2.3-r5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r5.ebuild,v 1.1 2003/10/27 09:21:51 liquidx Exp $
+
+inherit flag-o-matic eutils python
+
+IUSE="readline tcltk berkdb bootstrap build doc"
+
+PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
+PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
+PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
+
+S="${WORKDIR}/Python-${PV}"
+DESCRIPTION="A really great language"
+SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tgz"
+
+HOMEPAGE="http://www.python.org"
+LICENSE="PSF-2.2"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
+
+DEPEND="virtual/glibc >=sys-libs/zlib-1.1.3
+	doc? ( =dev-python/python-docs-${PV}* )
+	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
+	berkdb? ( >=sys-libs/db-3 )
+	tcltk? ( >=dev-lang/tk-8.0 )
+	|| ( dev-libs/expat
+	     ( !build?     ( dev-libs/expat ) )
+	     ( !bootstrap? ( dev-libs/expat ) )
+	    )"
+# This is a hairy one.  Basically depend on dev-libs/expat
+# if "build" or "bootstrap" not in USE.
+
+RDEPEND="${DEPEND} dev-python/python-fchksum"
+
+# The dev-python/python-fchksum RDEPEND is needed to that this python provides
+# the functionality expected from previous pythons.
+
+PROVIDE="virtual/python"
+
+SLOT="2.2"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-db4.patch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.3-add_portage_search_path.patch
+	epatch ${FILESDIR}/${PN}-2.2.3-gentoo_py_dontcompile.patch
+}
+
+src_compile() {
+	filter-flags -malign-double
+
+	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
+	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
+	export OPT="${CFLAGS}"
+
+	# adjust makefile to install pydoc into ${D} correctly
+	t="${S}/Makefile.pre.in"
+	cp ${t} ${t}.orig || die
+	sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' ${t}.orig > ${t}
+
+	local myopts
+	#if we are creating a new build image, we remove the dependency on g++
+	if [ "`use build`" -a ! "`use bootstrap`" ]
+	then
+		myopts="--with-cxx=no"
+	fi
+
+	# build python with threads support
+	myopts="${myopts} --with-threads"
+
+	econf --with-fpectl \
+		--infodir='${prefix}'/share/info \
+		--mandir='${prefix}'/share/man \
+		${myopts} || die
+	emake || die "Parallel make failed"
+}
+
+src_install() {
+	dodir /usr
+	make install prefix=${D}/usr || die
+
+	rm -f ${D}/usr/bin/python
+	dodoc README
+
+	# install our own custom python-config
+	exeinto /usr/bin
+	newexe ${FILESDIR}/python-config-${PYVER} python-config
+
+	# seems like the build do not install Makefile.pre.in anymore
+	# it probably shouldn't - use DistUtils, people!
+	insinto /usr/lib/python${PYVER}/config
+	doins ${S}/Makefile.pre.in
+
+	# While we're working on the config stuff... Let's fix the OPT var
+	# so that it doesn't have any opts listed in it. Prevents the problem
+	# with compiling things with conflicting opts later.
+	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile
+
+	# If USE tcltk lets install idle
+	# Need to script the python version in the path
+	if [ -n "`use tcltk`" ]; then
+		dodir /usr/lib/python${PYVER}/tools
+		cp -r "${S}/Tools/idle" "${D}/usr/lib/python${PYVER}/tools/"
+		dosym /usr/lib/python${PYVER}/tools/idle/idle.py /usr/bin/idle.py
+	fi
+}
+
+pkg_postinst() {
+	python_makesym
+	PYTHON_OVERRIDE_PYVER="2.2" python_mod_optimize
+	PYTHON_OVERRIDE_PYVER="2.2" python_mod_optimize -x site-packages ${ROOT}usr/lib/python${SLOT}
+}
+
+pkg_postrm() {
+	python_makesym
+	python_mod_cleanup
+}