Adopted to new python situation, #312215, EAPI=3

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

4 files changed, 48 insertions, 69 deletions

diff --git a/dev-tcltk/snack/ChangeLog b/dev-tcltk/snack/ChangeLog
index 6b1e26575d79..31bc966f6e06 100644
--- a/dev-tcltk/snack/ChangeLog
+++ b/dev-tcltk/snack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/snack
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.40 2009/10/10 15:30:43 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.41 2010/03/31 21:18:12 jlec Exp $
+
+*snack-2.2.10-r3 (31 Mar 2010)
+
+  31 Mar 2010; Justin Lecher <jlec@gentoo.org> -snack-2.2.10.ebuild,
+  -snack-2.2.10-r1.ebuild, +snack-2.2.10-r3.ebuild:
+  Adopted to new python situation, #312215, EAPI=3
 
   10 Oct 2009; Raúl Porcel <armin76@gentoo.org> snack-2.2.10-r2.ebuild:
   sparc stable wrt #282987
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 0b035b120cd4..a450f3dbf970 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX alsa-undef-sym.patch 1225 RMD160 6d8068bdad0a99e512f8c3a19e0b42ed3545433a SHA1 15865e0e304b094aff9de1fb1338faffc2fff8d8 SHA256 98ea274e8d6bd63e7ac785c65dcbd7d45fd7f904af974ffb3792c1b7917141f9
 DIST snack2.2.10.tar.gz 1798252 RMD160 52616bc4cf06baee0e5d7a91faa5b385ee60c7a7 SHA1 2c333fde061cf1cb7d5932c9cff4eb968c7d095a SHA256 4bfe764547ab92ba58f43b77366dbb7c7b3512d65a27cdbf9e585a9cb64ce81e
 DIST snack2.2.9.tar.gz 1792744 RMD160 9eeb8153e57db05c332e755f3f875b0aaccc85cf SHA1 666568b5b1c4f0b6aab873ef9b6b2fccc5ce0ae5 SHA256 620fc9a3f3bd9f3a386d64b465fcffc2030992cd7558bab3122b8929b7f4bf88
-EBUILD snack-2.2.10-r1.ebuild 1548 RMD160 769c984e6caa1d98725882dbc7c7b26bf6e2e1cc SHA1 0b6a386ece506e8f55b890421ee1e39476c0c6b4 SHA256 0f1096ac4397bef9a42cfd0cca64187e5f89595aad5c817fa4b1d75c58ec02b2
 EBUILD snack-2.2.10-r2.ebuild 1856 RMD160 c8ed64eed0ebe7446fa4db514878cec43663202a SHA1 9eaf01ebf8cf8d1170641b6ffbd2dac2aca6828c SHA256 6938723608a60cda65a1331584a0718713cb72748b518587a02d9cb44b1a0190
-EBUILD snack-2.2.10.ebuild 1314 RMD160 94979192313db37e4dd24dd850e680abc4949868 SHA1 64b1ea5c4fad347b8cc8d26e8960aaff46057743 SHA256 ba515b2eec434179ffddc58cb3bb29319ae81252aa565dca14bc03c3e6981e98
+EBUILD snack-2.2.10-r3.ebuild 1882 RMD160 b36323e75ec262aa0ca010eb85728a61bca82b7f SHA1 299dae6ed63a111a94cf4d4d67784ee4628d7ad3 SHA256 d3d55f3ebc93618f42f18a31ec05b2ff764eaa8a3e7bc052bed89547acc1e5ac
 EBUILD snack-2.2.9.ebuild 1289 RMD160 483d074867aeb4a7c5db0be677deb754cb67182d SHA1 dbdca805c68c3d5cc7b6c2c184dcaecac32d6f5b SHA256 ceec03d4ee5dab42ab6b1a9cb57365a4fcea55e38d1ea8e4c2763638820f8662
-MISC ChangeLog 4918 RMD160 ebb6ccdf174a32bec59f4592474d50a16df91215 SHA1 9123b0bf4261a67ebafdcb43961f618957f8506b SHA256 1f3bf43d879ac49deaace94d9cdf6de4fc9768f2595c0ce904c8324ea4fc63fc
+MISC ChangeLog 5120 RMD160 1f9f4cb2b5f657778bce390a0b4e60d87f5d1ad1 SHA1 11074bf048c30579f914fcac597f162d1b486223 SHA256 e8611874b7b722e22195e287b65b8eff806da9b508b8a64cc0c03b1fc62808f9
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuzvBoACgkQgAnW8HDreRbX1wCfaycLp8RTJOn1JgaULKy0ECxD
+RuwAoLsy0WZ7hSHm8GdPMseJUrPa7S93
+=Eu2b
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/snack/snack-2.2.10-r1.ebuild b/dev-tcltk/snack/snack-2.2.10-r3.ebuild
index 6f996d84e0d6..fb1c05e93d1f 100644
--- a/dev-tcltk/snack/snack-2.2.10-r1.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r3.ebuild
@@ -1,29 +1,40 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-r1.ebuild,v 1.9 2008/08/08 16:55:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.10-r3.ebuild,v 1.1 2010/03/31 21:18:12 jlec Exp $
 
-inherit eutils multilib
+EAPI="3"
+
+PYTHON_DEPEND="python? 2"
+
+inherit eutils multilib python
 
 DESCRIPTION="The Snack Sound Toolkit (Tcl)"
 HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="alsa examples python threads vorbis"
 
 RESTRICT="test" # Bug 78354
 
-DEPEND=">dev-lang/tcl-8.4.3
+DEPEND="
 	>dev-lang/tk-8.4.3
 	alsa? ( media-libs/alsa-lib )
-	vorbis? ( media-libs/libvorbis )
-	python? ( virtual/python )"
+	vorbis? ( media-libs/libvorbis )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}${PV}/unix"
 
-src_compile() {
+src_prepare() {
+	# bug 226137 - snack depends on alsa private symbol _snd_pcm_mmap_hw_ptr
+	epatch "${FILESDIR}"/alsa-undef-sym.patch
+	# bug 270839 - error from /usr/include/bits/mathcalls.h:310
+	sed -i -e 's|^\(#define roundf(.*\)|//\1|' ../generic/jkFormatMP3.c
+}
+
+src_configure() {
 	local myconf="--libdir=/usr/$(get_libdir) --includedir=/usr/include"
 
 	use alsa && myconf="${myconf} --enable-alsa"
@@ -34,9 +45,7 @@ src_compile() {
 		myconf="${myconf} --with-ogg-lib=/usr/$(get_libdir)"
 	fi
 
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-
+	econf ${myconf}
 }
 
 src_install() {
@@ -63,3 +72,11 @@ src_install() {
 		fi
 	fi
 }
+
+pkg_postinst() {
+	python_mod_optimize tkSnack.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup tkSnack.py
+}
diff --git a/dev-tcltk/snack/snack-2.2.10.ebuild b/dev-tcltk/snack/snack-2.2.10.ebuild
deleted file mode 100644
index a2df28e97866..000000000000
--- a/dev-tcltk/snack/snack-2.2.10.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.9 2007/06/25 10:40:53 peper Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="The Snack Sound Toolkit (Tcl)"
-HOMEPAGE="http://www.speech.kth.se/snack/"
-SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="alsa python threads vorbis"
-
-RESTRICT="test" # Bug 78354
-
-DEPEND=">dev-lang/tcl-8.4.3
-	>dev-lang/tk-8.4.3
-	alsa? ( media-libs/alsa-lib )
-	vorbis? ( media-libs/libvorbis )
-	python? ( virtual/python )"
-
-S="${WORKDIR}/${PN}${PV}/unix"
-
-src_compile() {
-	local myconf="--libdir=/usr/$(get_libdir) --includedir=/usr/include"
-
-	use alsa && myconf="${myconf} --enable-alsa"
-	use threads && myconf="${myconf} --enable-threads"
-
-	if use vorbis ; then
-		myconf="${myconf} --with-ogg-include=/usr/include"
-		myconf="${myconf} --with-ogg-lib=/usr/$(get_libdir)"
-	fi
-
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use python ; then
-		cd "${S}"/../python
-		python setup.py install --root="${D}" || die
-	fi
-
-	cd "${S}"/..
-
-	dodoc README changes
-	dohtml doc/*
-}