Clean up error message on missing Tkinter. Closes bug #149324, thanks to Gerolf Ziegenhain <derverstand@web.de> for reporting.

(Portage version: 2.1.2_pre1-r2)

7 files changed, 22 insertions, 25 deletions

diff --git a/dev-python/pmw/ChangeLog b/dev-python/pmw/ChangeLog
index 5d612f78b7b5..6f0e2dbe80c6 100644
--- a/dev-python/pmw/ChangeLog
+++ b/dev-python/pmw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pmw
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/ChangeLog,v 1.20 2005/10/02 14:14:11 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/ChangeLog,v 1.21 2006/09/27 17:23:17 marienz Exp $
+
+  27 Sep 2006; Marien Zwart <marienz@gentoo.org> pmw-0.8.5.ebuild,
+  pmw-1.1.ebuild, pmw-1.2.ebuild:
+  Clean up error message on missing Tkinter. Closes bug #149324, thanks to
+  Gerolf Ziegenhain <derverstand@web.de> for reporting.
 
   02 Oct 2005; Aron Griffis <agriffis@gentoo.org> pmw-1.2.ebuild:
   Mark 1.2 stable on ia64
diff --git a/dev-python/pmw/files/digest-pmw-0.8.5 b/dev-python/pmw/files/digest-pmw-0.8.5
index 2773cc24ad4b..3431b677373d 100644
--- a/dev-python/pmw/files/digest-pmw-0.8.5
+++ b/dev-python/pmw/files/digest-pmw-0.8.5
@@ -1 +1,3 @@
 MD5 1f6c205099c719102633800843fff51a Pmw.0.8.5.tar.gz 340469
+RMD160 97d5ea73c6b917a5320b0d9cb541103d06a175ee Pmw.0.8.5.tar.gz 340469
+SHA256 4c6dbb3deab7cc9671964c272890515f460c63b1c7d2cc78fe814b522cfa0aec Pmw.0.8.5.tar.gz 340469
diff --git a/dev-python/pmw/files/digest-pmw-1.1 b/dev-python/pmw/files/digest-pmw-1.1
index e9e333b6dc3c..3cce3873d3ed 100644
--- a/dev-python/pmw/files/digest-pmw-1.1
+++ b/dev-python/pmw/files/digest-pmw-1.1
@@ -1 +1,3 @@
 MD5 f28603d1d3cc2b76faf884c4bb430a59 Pmw.1.1.tar.gz 393556
+RMD160 a74124ae965e5327cd7e85c64f3b43a3670fccd9 Pmw.1.1.tar.gz 393556
+SHA256 1f947fab4193dba92087e5e370d99ec7f20410b7b2b6b49c6d157a665ab4e6ee Pmw.1.1.tar.gz 393556
diff --git a/dev-python/pmw/files/digest-pmw-1.2 b/dev-python/pmw/files/digest-pmw-1.2
index feafe54ff5a3..ccd521411f3c 100644
--- a/dev-python/pmw/files/digest-pmw-1.2
+++ b/dev-python/pmw/files/digest-pmw-1.2
@@ -1 +1,3 @@
 MD5 75c49c30595217c8d9376c36aa5426aa Pmw.1.2.tar.gz 396404
+RMD160 b312e32146e677e633a434661a10f9496fe36c6f Pmw.1.2.tar.gz 396404
+SHA256 14b921097a4071e8e4c88966d08e26a9c6b0ae9246f8dccd67709d01e7e2d574 Pmw.1.2.tar.gz 396404
diff --git a/dev-python/pmw/pmw-0.8.5.ebuild b/dev-python/pmw/pmw-0.8.5.ebuild
index fd17b1f9472a..f770c4cc03ec 100644
--- a/dev-python/pmw/pmw-0.8.5.ebuild
+++ b/dev-python/pmw/pmw-0.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-0.8.5.ebuild,v 1.17 2004/06/25 01:36:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-0.8.5.ebuild,v 1.18 2006/09/27 17:23:17 marienz Exp $
 
 DESCRIPTION="A toolkit for building high-level compound widgets in Python using the Tkinter module."
 HOMEPAGE="http://pmw.sourceforge.net/"
@@ -16,10 +16,7 @@ SRC_URI="mirror://sourceforge/pmw/Pmw.${PV}.tar.gz"
 S="${WORKDIR}"/Pmw
 
 src_compile() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		die "You need to recompile Python with Tkinter support"
-	fi
+	distutils_python_tkinter
 	python -c 'import compileall; compileall.compile_dir(".",force=1)'
 }
 
diff --git a/dev-python/pmw/pmw-1.1.ebuild b/dev-python/pmw/pmw-1.1.ebuild
index 6f7e376f4f43..093767a7b92a 100644
--- a/dev-python/pmw/pmw-1.1.ebuild
+++ b/dev-python/pmw/pmw-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.1.ebuild,v 1.9 2004/06/25 01:36:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.1.ebuild,v 1.10 2006/09/27 17:23:17 marienz Exp $
 
 DESCRIPTION="A toolkit for building high-level compound widgets in Python using the Tkinter module."
 HOMEPAGE="http://pmw.sourceforge.net/"
@@ -15,13 +15,7 @@ DEPEND=">=dev-lang/python-2.1"
 S="${WORKDIR}/Pmw"
 
 src_compile() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		eerror "You need to recompile python with Tkinter support."
-		eerror "That means: USE='tcltk' emerge python"
-		echo
-		die "missing tkinter support with installed python"
-	fi
+	distutils_python_tkinter
 	python -c 'import compileall; compileall.compile_dir(".",force=1)'
 }
 
diff --git a/dev-python/pmw/pmw-1.2.ebuild b/dev-python/pmw/pmw-1.2.ebuild
index c1f41fe49303..a7fff64548d8 100644
--- a/dev-python/pmw/pmw-1.2.ebuild
+++ b/dev-python/pmw/pmw-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.2.ebuild,v 1.13 2005/10/02 14:14:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.2.ebuild,v 1.14 2006/09/27 17:23:17 marienz Exp $
 
 inherit distutils python
 
@@ -18,12 +18,7 @@ S="${WORKDIR}/Pmw"
 
 pkg_setup() {
 	# check for Tkinter support in python
-	if ! python_mod_exists Tkinter; then
-		eerror "This package requires Tkinter support in Python. You'll need"
-		eerror "to recompile Python with:"
-		eerror "USE=\"tcltk\" emerge python"
-		die "Tkinter support missing"
-	fi
+	distutils_python_tkinter
 }
 
 src_compile() {