add fix to make python-2.3.3 db-4.2 (gentoo flavour) aware

4 files changed, 40 insertions, 15 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 2a7fc5dc9081..b62de5c75070 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.79 2004/02/09 23:25:00 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.80 2004/02/11 00:16:31 liquidx Exp $
 
   10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> python-2.3.3.ebuild:
   set ppc in keywords
 
+  10 Feb 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild,
+  files/python-2.3-db4.2.patch:
+  add fix to make python-2.3.3 db-4.2 (gentoo flavour) aware
+
   06 Feb 2004; <gustavoz@gentoo.org> python-2.3.3.ebuild:
   Stable on sparc
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index fbd6d35a6722..ce655a631979 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,28 +1,29 @@
-MD5 8166a22165b6353a3111425c6ca235ee ChangeLog 14373
+MD5 0ac311f8e7030d5b25c70b4ba5fc7af8 ChangeLog 14533
+MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 58b06d58bccd371fcbf1b781164c75a9 python-2.1.3-r1.ebuild 2345
 MD5 f7959cf61958991a7e25f83a4e8b2ff8 python-2.2.1-r5.ebuild 2912
 MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027
-MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 e1f163ef92e80940f820c7759c8abb46 python-2.2.3-r5.ebuild 4347
-MD5 e5772e02d176a0b7f1cf90c83c9245db python-2.3.3.ebuild 5800
+MD5 d48b1bed891cc06b90a8a2224053b679 python-2.3.3.ebuild 5838
+MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
 MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 62
 MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
+MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3 66
 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
-MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178
-MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
 MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
-MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
 MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
-MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
+MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
+MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767
 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 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015
 MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
+MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
+MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
 MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
 MD5 85f269cd745feae3953f7e35215e242d files/python-updater 8138
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
-MD5 d5e1334ddcc639401001d01f26ce0af5 files/digest-python-2.3.3 66
-MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
-MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767
-MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
-MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
diff --git a/dev-lang/python/files/python-2.3-db4.2.patch b/dev-lang/python/files/python-2.3-db4.2.patch
new file mode 100644
index 000000000000..fccbd5987751
--- /dev/null
+++ b/dev-lang/python/files/python-2.3-db4.2.patch
@@ -0,0 +1,19 @@
+--- setup.py.old	2004-02-10 22:22:12.028012888 +0000
++++ setup.py	2004-02-10 22:24:17.751899952 +0000
+@@ -497,14 +497,8 @@
+                                 '/opt/sfw',
+                                 '/sw/lib',
+                                 ),
+-                    'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
+-                                '/usr/local/include/db42',
+-                                '/usr/local/BerkeleyDB.4.1/include',
+-                                '/usr/local/include/db41',
+-                                '/usr/local/BerkeleyDB.4.0/include',
+-                                '/usr/local/include/db4',
+-                                '/opt/sfw/include/db4',
+-                                '/sw/include/db4',
++                    'incdirs': ('/usr/include/db4.2',
++                                '/usr/include/db4.1',
+                                 '/usr/include/db4',
+                                 )},
+             'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',),
diff --git a/dev-lang/python/python-2.3.3.ebuild b/dev-lang/python/python-2.3.3.ebuild
index fb80078c00f6..779d2147d57f 100644
--- a/dev-lang/python/python-2.3.3.ebuild
+++ b/dev-lang/python/python-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3.ebuild,v 1.14 2004/02/09 23:25:00 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.3.ebuild,v 1.15 2004/02/11 00:16:31 liquidx Exp $
 
 inherit flag-o-matic python
 
@@ -65,6 +65,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.3-gentoo_py_dontcompile.patch
 	epatch ${FILESDIR}/${PN}-2.3.2-disable_modules_and_ssl.patch
 	epatch ${FILESDIR}/${PN}-2.3-mimetypes_apache.patch
+	epatch ${FILESDIR}/${PN}-2.3-db4.2.patch
 }
 
 src_configure() {