Use correct sqlite module name, when disabling it.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64

4 files changed, 22 insertions, 8 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 9feaedbc6c76..af1dbc3538d7 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.343 2008/09/12 13:34:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.344 2008/09/14 14:01:28 swegener Exp $
+
+  14 Sep 2008; Sven Wegener <swegener@gentoo.org> python-2.5.2-r6.ebuild,
+  python-2.5.2-r7.ebuild:
+  Use correct sqlite module name, when disabling it.
 
   12 Sep 2008; Raúl Porcel <armin76@gentoo.org> python-2.5.2-r7.ebuild:
   alpha/ia64 stable wrt #236723
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index ba305f98978c..b4261760429d 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX depreorder-topsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 AUX depreorder.py 2235 RMD160 a6da5f336bdf8c370861c7922a5fa79ce4ab89cb SHA1 3b8590d7fbece2367088c646a792a9618d786dec SHA256 93920120e596f34e4222e8686e6283b03cdd517f89f2dba3eda90d79fa016aba
 AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d45378c554b9822f6ed512a6cb7841ef50 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1
@@ -19,7 +22,14 @@ DIST python-gentoo-patches-2.5.2-r7.tar.bz2 28160 RMD160 c2a8c71f464f1cf0cd8e3d1
 EBUILD python-2.4.4-r14.ebuild 10535 RMD160 2ffd582459366ed94366ee2398f03482082d1f1b SHA1 2a02a4188ea4afd2b64a365446b15456219f18f9 SHA256 924509ba7408b306d4b97b5285f5be27e5748197e3d05fb3fe306e93f4aa300a
 EBUILD python-2.4.4-r5.ebuild 10353 RMD160 2e84fa53221be1417bcbfac063fadb8177f7997f SHA1 457badd502adf3e2e82454dde04902e9f930829e SHA256 c2fd3fb136d0855ebf4e92fec8487770b4d1ee1c1f9a93c7a59e012487d45ea4
 EBUILD python-2.4.4-r6.ebuild 10354 RMD160 4237041263cf6516bb1d62b070d92d47dc53fd87 SHA1 392f2af04382fe8db2ea674d54f40a3e5703c48d SHA256 dfae0111133299b0ad1665aeeb9d1b59ef72ad0ba38c1242b600cf709cbea9b6
-EBUILD python-2.5.2-r6.ebuild 10394 RMD160 d9e86da6ceb765326ca0963eb5188d66d24541d4 SHA1 bffe6cf4475664546aaf9cdf434572f12c24b336 SHA256 96c7630fdc9ec893e94cf81ab3c8cf824e7fc13e7d8ccedfb7c598891a846b63
-EBUILD python-2.5.2-r7.ebuild 10395 RMD160 5dc948a5f9460c4e502f2276dcb40721c3be39bf SHA1 3a85d3ee056922e925eb21e0e5ff86e3276e36bd SHA256 13ba64b06c6ff20293e0cd5e24237e7cca485f4d2aac0363770fd4465222ccb1
-MISC ChangeLog 60374 RMD160 1118fea942a0021d1fefa781372cf7f139647073 SHA1 49dc7d6b0fbab1714fdfc99e94be29f4bf1340d3 SHA256 8ab157f4a098f20af53486da5d71ba390b75ef9016dc1e3c92706c1e2490d277
+EBUILD python-2.5.2-r6.ebuild 10396 RMD160 9c22f554b8d57c682aa7253ca3177c3c71c96e7b SHA1 82358065e50458b79193fd01d40ef26d9b641a74 SHA256 5064c0d590e3869db6af2af6779b667afc5bca28c38693c4921151663e794c7a
+EBUILD python-2.5.2-r7.ebuild 10397 RMD160 8e3bc6779c690bb3e689118ef549eb327ea0ed90 SHA1 7b0a0bc786e6039931d60ed48be4fd14b667c3b9 SHA256 ec5c5ed05e448b9665b7ff77e794e45f471997365d4c7f63a4abba809c43de2f
+MISC ChangeLog 60529 RMD160 7441a8cdbac140cd2fb86c0f01ba1c35ee6461fc SHA1 814b3ef5ece5468e866377253aa956047814feff SHA256 7fde957fa75a6ea7189bdcfaddd182460b73464b300efe1bc9d998f4befa0294
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjNGUAACgkQI1lqEGTUzySNGgCg0DUuQPglxLbRdHQgUA1gx8V0
+6nQAni6h2r70Tjypco/K+WtT3pahZqgW
+=dBmw
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.5.2-r6.ebuild b/dev-lang/python/python-2.5.2-r6.ebuild
index 8326f1fd69fe..cf1bdcef0963 100644
--- a/dev-lang/python/python-2.5.2-r6.ebuild
+++ b/dev-lang/python/python-2.5.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r6.ebuild,v 1.2 2008/07/31 14:18:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r6.ebuild,v 1.3 2008/09/14 14:01:28 swegener Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -100,7 +100,7 @@ src_configure() {
 		use gdbm     || disable="${disable} gdbm"
 		use ncurses  || disable="${disable} _curses _curses_panel"
 		use readline || disable="${disable} readline"
-		use sqlite   || disable="${disable} sqlite3"
+		use sqlite   || disable="${disable} _sqlite3"
 		use ssl      || export PYTHON_DISABLE_SSL=1
 		use tk       || disable="${disable} _tkinter"
 		export PYTHON_DISABLE_MODULES="${disable}"
diff --git a/dev-lang/python/python-2.5.2-r7.ebuild b/dev-lang/python/python-2.5.2-r7.ebuild
index 3f9f1def8735..74f7fbcf9648 100644
--- a/dev-lang/python/python-2.5.2-r7.ebuild
+++ b/dev-lang/python/python-2.5.2-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r7.ebuild,v 1.6 2008/09/12 13:34:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.2-r7.ebuild,v 1.7 2008/09/14 14:01:28 swegener Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -100,7 +100,7 @@ src_configure() {
 		use gdbm     || disable="${disable} gdbm"
 		use ncurses  || disable="${disable} _curses _curses_panel"
 		use readline || disable="${disable} readline"
-		use sqlite   || disable="${disable} sqlite3"
+		use sqlite   || disable="${disable} _sqlite3"
 		use ssl      || export PYTHON_DISABLE_SSL=1
 		use tk       || disable="${disable} _tkinter"
 		export PYTHON_DISABLE_MODULES="${disable}"