[gentoo-commits] gentoo-x86 commit in dev-tcltk/snack: ChangeLog snack-2.2.10-r4.ebuild

[Justin Lecher (jlec)]

jlec        10/04/05 14:02:59

  Modified:             ChangeLog snack-2.2.10-r4.ebuild
  Log:
  Proposed enhancement from Arfrever included
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.43                 dev-tcltk/snack/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/snack/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/snack/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/snack/ChangeLog?r1=1.42&r2=1.43

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog	2 Apr 2010 09:27:08 -0000	1.42
+++ ChangeLog	5 Apr 2010 14:02:59 -0000	1.43
@@ -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@g.o> snack-2.2.10-r4.ebuild:
+  Proposed enhancement from Arfrever included
 
 *snack-2.2.10-r4 (02 Apr 2010)
 



1.3                  dev-tcltk/snack/snack-2.2.10-r4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/snack/snack-2.2.10-r4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/snack/snack-2.2.10-r4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/snack/snack-2.2.10-r4.ebuild?r1=1.2&r2=1.3

Index: snack-2.2.10-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.10-r4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snack-2.2.10-r4.ebuild	2 Apr 2010 09:28:44 -0000	1.2
+++ snack-2.2.10-r4.ebuild	5 Apr 2010 14:02:59 -0000	1.3
@@ -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 @@
 	alsa? ( media-libs/alsa-lib )
 	vorbis? ( media-libs/libvorbis )"
 RDEPEND="${DEPEND}"
+RESTRICT_PYTHON_ABIS="3.*"
 
 S="${WORKDIR}/${PN}${PV}/unix"
 
@@ -50,8 +53,11 @@
 	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 @@
 
 	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
-}