dev-tcltk/snack: Respect AR, #453914; respect CFLAGS, #453916; use distutils-r1 and autotools_utils eclasses

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

3 files changed, 117 insertions, 2 deletions

diff --git a/dev-tcltk/snack/ChangeLog b/dev-tcltk/snack/ChangeLog
index 4a59918cae1a..af26059e377d 100644
--- a/dev-tcltk/snack/ChangeLog
+++ b/dev-tcltk/snack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/snack
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.53 2013/01/24 22:24:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.54 2013/01/25 08:10:44 jlec Exp $
+
+*snack-2.2.10-r6 (25 Jan 2013)
+
+  25 Jan 2013; Justin Lecher <jlec@gentoo.org> +snack-2.2.10-r6.ebuild:
+  Respect AR, #453914; respect CFLAGS, #453916; use distutils-r1 and
+  autotools_utils eclasses
 
   24 Jan 2013; Agostino Sarubbo <ago@gentoo.org> snack-2.2.10-r5.ebuild:
   Stable for x86, wrt bug #446822
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 51151fbea6b1..786d4210d8e0 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX alsa-undef-sym.patch 1225 SHA256 98ea274e8d6bd63e7ac785c65dcbd7d45fd7f904af974ffb3792c1b7917141f9 SHA512 2f925029ca7ebcf0028beb2c303d07831879d9750b5f4f463a8d463964301d0182650b9ad50b103be6c0e5eb4cb58a19e02496b7afee8531dcb2c132a292ff97 WHIRLPOOL 8942c4daa55a918a5ef7739dac76e4facb9137d3b60b1a2e84c55fa0e92d6aaae27ee98f679b6a61c755fa71a136c81ac26058f780c3f0b8de9a017bf8c77cad
 AUX snack-2.2.10-CVE-2012-6303-fix.patch 778 SHA256 a3a897ed458484a67af00bc98406a739dfe40e263a01697d4f8aff0b948592f6 SHA512 6e2f7fcf8ca0c2792cf52432340f2319b8c82677a3568c9e382f91758f5e6bf26c3a05939d4a748c4198c4e50f27141ebd2cb298d8363765ed6582192d64d3e8 WHIRLPOOL 2e14c1b276e5a01015a9c2288a1d2e81add3e0bec367b64a9a382a1e0a47ba72c78b2958822ae3c0ed8fa1d95cc21a7138060cc234522a21be4aac368d47f76e
 AUX snack-2.2.10-darwin.patch 1108 SHA256 8ea2ae5fba07018cf457df25e008e0013bcfdcde46bd16f9aa8c26caa8d64445 SHA512 0d82270d830c8b7d15dcbead05d80c15666d1bac164f26c045859f7f4dc4c098961b48272ecd0b059a1b36ba8d560c563fe8e40add822f311026faf5f7eeaf0a WHIRLPOOL 0ea35f68784c18d1a95034a8810e95b3dbb2288e162122d3ecfc2689b9209802b356f6b1683cc4fdaea028004549d524269261e837b4185b848e4e923835c969
 DIST snack2.2.10.tar.gz 1798252 SHA256 4bfe764547ab92ba58f43b77366dbb7c7b3512d65a27cdbf9e585a9cb64ce81e SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b WHIRLPOOL 8374d482041a60443fff3c28614d08b97390648367088d37b7c9a140355e8481e444f09f0c0c9fd7370903b33a2f46eae7c96ec5dbce532bb47f06537ce799ee
 EBUILD snack-2.2.10-r4.ebuild 2398 SHA256 0ddeff5ea24feb11e857b6030d7373a461f488dc7faf5d1c4284e01720ea62f7 SHA512 1dbe01f35b55389785ea9feeeb55b7b88c2d2f795136bc4b452420fe4a4cb57243a009bc4a084ceaf63bea8035c77a0db739ab8147629955f9c188bd567437da WHIRLPOOL 462d758adf0e7afbd449f4ca7ef761832ee7cb39b579b720c13c2a4d8689293a1355a0999e0c25a18946d4f536db57203f1906bc85898ba686fec90428ff9438
 EBUILD snack-2.2.10-r5.ebuild 2329 SHA256 efad54bf8bb9781e6a030617ce5105b7bf8426b5aa8130c3d67ecd5131c73ba4 SHA512 8b61e07d33d636b3057eb1229708a1aff160677e69fcea68049ba411f27b42d1184322a585816b749c2a8a81a1033637e169b9f95dd129780fb50a78c37aa2a3 WHIRLPOOL 9b8077ad87f5de013e5081277df20af9c07b042de9a0ffcbdb5c9b63d001baa19a49ddb164fb8694c59b3ba0ee46b4de02c4442ebd1c9b784267e42e587782c1
-MISC ChangeLog 6632 SHA256 0fc889d31031e6d65b906b60d392a71a71ae4cb8c211143a2d72bfe6d04ad961 SHA512 bc29b63829d67e793eb18737a570005a260bcf16b330005ad2b575acf3b1fa486b27e9e005bc948151d81c4df7cc508f1b7023aff7998bc79a4f82096efee36d WHIRLPOOL cc14b581b08755b49aef19b324561ca392ff7da5d19c2a1f6add148dbe28c12f5de8d15cfd2827e70b145421ec3e38432f53f4a8ee8f14dc4d8a6e851622f361
+EBUILD snack-2.2.10-r6.ebuild 2139 SHA256 3805be0e9c67f992b38f29c20dc71df61df017ace373d4cdef72d99a92f5c34e SHA512 2a1ed8bb2932800f5d49fc979a68a9ea623971ab4298a8e8309c27a0c365cdb52332fd6ff37475b9f5eb3228158c4315d58784b387dbd8873b86acb8a36c4e48 WHIRLPOOL cb8eb9cf44b017e6a98c4a549f9c91fd220afbf776f4cb08e9cf746a064c0017de36c01afc2803b5aa34cb530d8384b2b3d14905d865653474a9bc1774542c3d
+MISC ChangeLog 6834 SHA256 11236c610fab8e842a1bbaa7a37ee33b114dccd085c3dcb12b16f6f545d6c7ea SHA512 b5328b4a117019852974e87245fac6b7c797c146069029ef9d561b6cc50bd13ffd95782d0c86d2a2fecfb21f62425fc200d4a7a7e80068bb91b9ce8f966f5ce3 WHIRLPOOL dcfe60445612fd7b4b26d7b04aaf7762ec395669a73777900153c4d2f6f8153f142b3dafef93f3b49cba59d88fbaae1c5208d2c2893bca8b2f920bf9ca21f8e1
 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlECPgUACgkQgAnW8HDreRbBzACggHNLK8TQ8KlRuYe0L4p3xh7y
+LY8AoKfSyuJ5QpPDkHgzNq4J60fAwK84
+=bLGD
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/snack/snack-2.2.10-r6.ebuild b/dev-tcltk/snack/snack-2.2.10-r6.ebuild
new file mode 100644
index 000000000000..4accaff7d1d5
--- /dev/null
+++ b/dev-tcltk/snack/snack-2.2.10-r6.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2013 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-r6.ebuild,v 1.1 2013/01/25 08:10:44 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+
+inherit autotools autotools-utils distutils-r1 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="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+SLOT="0"
+IUSE="alsa examples python threads vorbis"
+
+RESTRICT="test" # Bug 78354
+
+DEPEND="
+	dev-lang/tcl
+	dev-lang/tk
+	alsa? ( media-libs/alsa-lib )
+	python? ( ${PYTHON_DEPS} )
+	vorbis? ( media-libs/libvorbis )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}/unix"
+
+#PYTHON_MODNAME="tkSnack.py"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/alsa-undef-sym.patch
+	"${FILESDIR}"/${P}-CVE-2012-6303-fix.patch
+	)
+
+src_prepare() {
+	# adds -install_name (soname on Darwin)
+	[[ ${CHOST} == *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${P}-darwin.patch )
+
+	sed \
+		-e "s:ar cr:$(tc-getAR) cr:g" \
+		-e "s:-O:${CFLAGS}:g" \
+		-i Makefile.in || die
+
+	cd .. || die
+
+	autotools-utils_src_prepare
+
+	sed \
+		-e 's|^\(#define roundf(.*\)|//\1|' \
+		-i generic/jkFormatMP3.c || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--includedir="${EPREFIX}"/usr/include
+		)
+
+	use alsa && myconf+=( --enable-alsa )
+	use threads && myconf+=( --enable-threads )
+
+	use vorbis && \
+		myconf+=( --with-ogg-include="${EPREFIX}"/usr/include ) && \
+		myconf+=( --with-ogg-lib="${EPREFIX}"/usr/$(get_libdir) )
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use python ; then
+		cd "${S}"/../python || die
+		distutils-r1_src_install
+	fi
+
+	cd "${S}"/.. || die
+
+	dohtml doc/*
+
+	if use examples ; then
+		docinto examples
+		sed -i -e 's/wish[0-9.]+/wish/g' demos/tcl/* || die
+		dodoc -r demos/tcl
+
+		use python && dodoc -r demos/python
+	fi
+}