Proposed enhancement from Arfrever included

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 24 insertions, 23 deletions

diff --git a/dev-tcltk/snack/ChangeLog b/dev-tcltk/snack/ChangeLog
index a8a137c8dd3a..bcfc06ffb2bf 100644
--- a/dev-tcltk/snack/ChangeLog
+++ b/dev-tcltk/snack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tcltk/snack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.42 2010/04/02 09:27:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.43 2010/04/05 14:02:59 jlec Exp $
+
+  05 Apr 2010; Justin Lecher <jlec@gentoo.org> snack-2.2.10-r4.ebuild:
+  Proposed enhancement from Arfrever included
 
 *snack-2.2.10-r4 (02 Apr 2010)
 
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index b3eeac1df5dd..99a36eb5b037 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -7,14 +7,14 @@ DIST snack2.2.10.tar.gz 1798252 RMD160 52616bc4cf06baee0e5d7a91faa5b385ee60c7a7
 DIST snack2.2.9.tar.gz 1792744 RMD160 9eeb8153e57db05c332e755f3f875b0aaccc85cf SHA1 666568b5b1c4f0b6aab873ef9b6b2fccc5ce0ae5 SHA256 620fc9a3f3bd9f3a386d64b465fcffc2030992cd7558bab3122b8929b7f4bf88
 EBUILD snack-2.2.10-r2.ebuild 1856 RMD160 c8ed64eed0ebe7446fa4db514878cec43663202a SHA1 9eaf01ebf8cf8d1170641b6ffbd2dac2aca6828c SHA256 6938723608a60cda65a1331584a0718713cb72748b518587a02d9cb44b1a0190
 EBUILD snack-2.2.10-r3.ebuild 1882 RMD160 b36323e75ec262aa0ca010eb85728a61bca82b7f SHA1 299dae6ed63a111a94cf4d4d67784ee4628d7ad3 SHA256 d3d55f3ebc93618f42f18a31ec05b2ff764eaa8a3e7bc052bed89547acc1e5ac
-EBUILD snack-2.2.10-r4.ebuild 2164 RMD160 c2f042aeb0df55622b26fdfda70d39c7f5b4e886 SHA1 68f4a0f7e68b0e298728cddc736597e77abe358a SHA256 bd454ed429fa2fb003e6a2a3ebec02e2da4c39819271e82af98fdeeddd35438d
+EBUILD snack-2.2.10-r4.ebuild 2202 RMD160 7dcf6789aff18bb6b16e7ddc6b4b6e9435f6eb8d SHA1 ec14170d04c696206457c32c33fc1a6bd9ea6cde SHA256 2da5dacd2db0d64729867710ffaa1b6dad340b895e51b7b50e7beabcad85c453
 EBUILD snack-2.2.9.ebuild 1289 RMD160 483d074867aeb4a7c5db0be677deb754cb67182d SHA1 dbdca805c68c3d5cc7b6c2c184dcaecac32d6f5b SHA256 ceec03d4ee5dab42ab6b1a9cb57365a4fcea55e38d1ea8e4c2763638820f8662
-MISC ChangeLog 5292 RMD160 d470ae70835012f2fc7b65d44dbe0e071f73e5d4 SHA1 e7021df6a9af4a0e945aa6fb434719419da41408 SHA256 a887855b44b2d96fb4bc65fd84680e1b849fd3b4ba9ba096f5833b38fea86446
+MISC ChangeLog 5410 RMD160 a097b67576ef23574e011a5461453f7a3d160c31 SHA1 d41c1526045d309876eb8d127e483e6e4a564c38 SHA256 f3a668c1489b6ed3bb93676cd20f4c512b18364df4eca05c4a6c1fedd6058913
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku1uHEACgkQgAnW8HDreRb4UwCeKzWzJTOlS9LLwPXNpih84nqB
-gwMAnjzec09eMmYXnHp8FCtRa973B6Y4
-=Mgok
+iEYEARECAAYFAku57ZgACgkQgAnW8HDreRayOwCeKJ0lgSSw54KWXIiA1WFzAAv3
+9AAAn1RMJ2CuQHmvudaywV4+OBELjb/P
+=leQk
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/snack/snack-2.2.10-r4.ebuild b/dev-tcltk/snack/snack-2.2.10-r4.ebuild
index a476485b9232..776edef575fb 100644
--- a/dev-tcltk/snack/snack-2.2.10-r4.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r4.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.10-r4.ebuild,v 1.2 2010/04/02 09:28:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.10-r4.ebuild,v 1.3 2010/04/05 14:02:59 jlec Exp $
 
 EAPI="3"
 
-PYTHON_DEPEND="python? 2"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_MODNAME="tkSnack.py"
 
-inherit eutils multilib python
+inherit eutils distutils multilib
 
 DESCRIPTION="The Snack Sound Toolkit (Tcl)"
 HOMEPAGE="http://www.speech.kth.se/snack/"
@@ -25,6 +27,7 @@ DEPEND="
 	alsa? ( media-libs/alsa-lib )
 	vorbis? ( media-libs/libvorbis )"
 RDEPEND="${DEPEND}"
+RESTRICT_PYTHON_ABIS="3.*"
 
 S="${WORKDIR}/${PN}${PV}/unix"
 
@@ -50,8 +53,11 @@ src_configure() {
 	fi
 
 	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
+}
 
+src_compile() {
+	# We do not want to run distutils_src_compile
+	emake || die
 }
 
 src_install() {
@@ -59,30 +65,22 @@ src_install() {
 
 	if use python ; then
 		cd "${S}"/../python
-		python setup.py install --root="${ED}" || die
+		distutils_src_install
 	fi
 
 	cd "${S}"/..
 
-	dodoc README changes
-	dohtml doc/*
+	dodoc README changes || die
+	dohtml doc/* || die
 
 	if use examples ; then
 		sed -i -e 's/wish[0-9.]+/wish/g' demos/tcl/* || die
 		docinto examples/tcl
-		dodoc demos/tcl/*
+		dodoc demos/tcl/* || die
 
 		if use python ; then
 			docinto examples/python
-			dodoc demos/python/*
+			dodoc demos/python/* || die
 		fi
 	fi
 }
-
-pkg_postinst() {
-	python_mod_optimize tkSnack.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup tkSnack.py
-}