tiny tweak for gdbm

2 files changed, 34 insertions, 32 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index ad236d9afb74..89701e0c71c2 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,40 +1,40 @@
-MD5 503d0b0e7c89b76f8593493c78a86ff1 ChangeLog 9114
-MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
-MD5 58b06d58bccd371fcbf1b781164c75a9 python-2.1.3-r1.ebuild 2345
-MD5 f7959cf61958991a7e25f83a4e8b2ff8 python-2.2.1-r5.ebuild 2912
-MD5 b5ce70d94f27185e138e67267ff416fe python-2.2.2-r1.ebuild 3123
-MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027
-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 19bbf070e008fe47a5b3b5aef4e2a174 python-2.2.3-r5.ebuild 4250
+MD5 b5ce70d94f27185e138e67267ff416fe python-2.2.2-r1.ebuild 3123
 MD5 789d8555967a31cc0de2126fa6468fc2 python-2.2.3.ebuild 2999
+MD5 3cd89fdbd28f90e7cea2ea70b90a67e7 python-2.2.3-r5.ebuild 4332
 MD5 a5eec23c78d6a0923c477e34ce969392 python-2.3.2-r1.ebuild 4812
+MD5 0a274212a2a49a52600b617a38bafa09 python-2.2.3-r2.ebuild 3441
+MD5 c70d578ef0b3e6358108691e8b88d458 python-2.2.2.ebuild 3027
+MD5 58b06d58bccd371fcbf1b781164c75a9 python-2.1.3-r1.ebuild 2345
+MD5 5806acebfc91d925f328a751fd5503e5 python-2.2.3-r4.ebuild 3491
+MD5 f7959cf61958991a7e25f83a4e8b2ff8 python-2.2.1-r5.ebuild 2912
 MD5 7c0dcd5a1aa1ec0db97cd0847faab0d7 python-2.3.2.ebuild 3675
-MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947
+MD5 58ed89f3cc48f16f8bc96b76490e5b6a python-2.2.3-r1.ebuild 3293
+MD5 503d0b0e7c89b76f8593493c78a86ff1 ChangeLog 9114
+MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
+MD5 b0e12c8b4f21bea05842149e9bd5ac94 files/python-updater 7397
+MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
+MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3 62
+MD5 aafa57d90e8894592bdf346eedc77faa files/digest-python-2.3.2 62
+MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
+MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732
+MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
+MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
+MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
+MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607
+MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
+MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
 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 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2-r1 62
-MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3 62
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r1 62
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r2 62
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r3 62
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r4 62
 MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r5 62
-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 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
-MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
-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
-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 b0e12c8b4f21bea05842149e9bd5ac94 files/python-updater 7397
+MD5 3dbbf5dfb3660eb003061a0c59f6e758 files/depreorder.py 1947
diff --git a/dev-lang/python/python-2.2.3-r5.ebuild b/dev-lang/python/python-2.2.3-r5.ebuild
index f615362d645a..420de0cb9740 100644
--- a/dev-lang/python/python-2.2.3-r5.ebuild
+++ b/dev-lang/python/python-2.2.3-r5.ebuild
@@ -1,10 +1,10 @@
 # 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.5 2003/11/03 20:57:50 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r5.ebuild,v 1.6 2003/11/03 22:17:40 drobbins Exp $
 
 inherit flag-o-matic eutils python
 
-IUSE="ncurses readline tcltk berkdb build doc ssl"
+IUSE="ncurses gdbm readline tcltk berkdb build doc ssl"
 
 PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
 PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~amd64 x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64"
 
 DEPEND="virtual/glibc
 	>=sys-libs/zlib-1.1.3
@@ -24,7 +24,7 @@ DEPEND="virtual/glibc
 				ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
 				berkdb? ( >=sys-libs/db-3 )
 				dev-libs/expat
-				sys-libs/gdbm
+				gdbm? ( sys-libs/gdbm )
 				ssl? ( dev-libs/openssl )
 				doc? ( =dev-python/python-docs-${PV}* )
 	)"
@@ -49,9 +49,11 @@ src_unpack() {
 src_configure() {
 	# disable extraneous modules with extra dependencies
 	if [ -n "`use build`" ]; then
-		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _socket _curses _curses_panel _tkinter"
+		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter"
 		export PYTHON_DISABLE_SSL=1
 	else
+		use gdbm \
+			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm"
 		use berkdb \
 			|| PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb"
 		use readline \