4 files changed, 3 insertions, 198 deletions
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index e6e5b932f843..8d0dfea0aca9 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -4,7 +4,5 @@ AUX snack-2.2.10-darwin.patch 1108 BLAKE2B 862cd6a36363b45c9a27af08fa4bf347fc3e1
 AUX snack-2.2.10-debian-args.patch 4593 BLAKE2B bebc3c5cab2fea2b3fdc1c1c1e419855e49f2457d2014b2aa0f8236a637489e8b79fdac50d0b3369b576eea9a0bb130d46854c79939e6d93711c520e83001810 SHA512 686218bb22c3c8b53dcb18e10025f1a602c06fe11989a6e46dc02022d581fd281c03d2cca0938c2bad5947f8819e3c631f90f0439a8f274742bef80755dbd20e
 AUX snack-2.2.10-test.patch 8755 BLAKE2B 942832c5c80ef1ab338829a21f296f759dd8a055da58b833e80f6f18d1e31f326b8dcfa85e96248afd24c3e9e80be1612a210a16c79630fe57e4a0a8b048f371 SHA512 3ffe1965b033fa77267c67c6222599c9a3fb72012886f3382c2940bb778b606fbe74a80ce6a4e77e26a95b1fb85e191186689eec8bcccfb5f08e059a97dc5a26
 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
-EBUILD snack-2.2.10-r6.ebuild 2006 BLAKE2B 9426dba6ce11ab44d01c1cb3150f7d1583ef37aeea9202524a4751b3d7d5257ba59911ee4a20a43c435a3559fb809e70238003e778fb0b1b05c3b6bee117ba0d SHA512 051af633d6bc065d55d1b2b060d58baf3d8f7d84e6e15ae2f57a6fa169ccce3809ea2e28c20dd15c992559c8d8f659529c55df4a4efc7aefed8e9639fc84d206
-EBUILD snack-2.2.10-r7.ebuild 1933 BLAKE2B 4159c4fb4dec4c69a02d9691657627d1890de8a65066fabbc2cd29ec12ca05b6dea28982f5aaec4ce7973035e28cbf9d147ede0ebcd2185a500603972ba816e3 SHA512 1d5274c315e98a917c491f0dd1d1c9e6eadcea5cd2f1f7f78399218ecb759aab7f00a634836a1aaa9c7cd3f41effe9943618f8f64952d2cd9214dbb793d5734d
-EBUILD snack-2.2.10-r8.ebuild 2107 BLAKE2B c95fbe1173ba7ac07bd438c8872b264c783a6c1b22dcdb9e13847ffcdfaabf2acf682160ec3bc483e1f1037c5493f6ba9422c258a95610dc64b45e57afb84957 SHA512 48f4c45dfb93e24761f09f635d73da93cd0069b173429f6d3164f70b08b69004706556194516001371026ebc032d153b9a0d973ca349d81899e79b5bc6687c43
+EBUILD snack-2.2.10-r8.ebuild 2130 BLAKE2B 9cae43ec45a7d78b8598213d8f3fe0ed5a0beb72c8e499e3ce960cfefa1845ea08bfd97c10e822bcf1c72eb9cac1bd52cfcad78c1c590618f6df78f4c26b8afd SHA512 e7a8539fc146f91fd3f109e438f9f3cf69627035efbf4d74d645681cbad198353b50a56953f6b1eccbd4692f181be52b90c6bf169198231e57f3fcd105ac726e
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/snack/snack-2.2.10-r6.ebuild b/dev-tcltk/snack/snack-2.2.10-r6.ebuild
deleted file mode 100644
index 20852e8f371a..000000000000
--- a/dev-tcltk/snack/snack-2.2.10-r6.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-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="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:0=
-	dev-lang/tk:0=
-	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
-}
diff --git a/dev-tcltk/snack/snack-2.2.10-r7.ebuild b/dev-tcltk/snack/snack-2.2.10-r7.ebuild
deleted file mode 100644
index eb87e0968a7d..000000000000
--- a/dev-tcltk/snack/snack-2.2.10-r7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit autotools 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="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-SLOT="0"
-IUSE="alsa examples python vorbis"
-
-RESTRICT="test" # Bug 78354
-
-DEPEND="
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	alsa? ( media-libs/alsa-lib )
-	python? ( ${PYTHON_DEPS} )
-	vorbis? ( media-libs/libvorbis )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}/unix"
-
-PATCHES=(
-	"${FILESDIR}"/alsa-undef-sym.patch
-	"${FILESDIR}"/${P}-CVE-2012-6303-fix.patch
-	)
-
-HTML_DOCS="${WORKDIR}/${PN}${PV}/doc/*"
-
-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 ..
-
-	default
-
-	sed \
-		-e 's|^\(#define roundf(.*\)|//\1|' \
-		-i generic/jkFormatMP3.c || die
-}
-
-src_configure() {
-	local myconf=""
-
-	use alsa && myconf+=" --enable-alsa"
-
-	if use vorbis; then
-		myconf+=" --with-ogg-include="${EPREFIX}"/usr/include"
-		myconf+=" --with-ogg-lib="${EPREFIX}"/usr/$(get_libdir)"
-	fi
-
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--includedir="${EPREFIX}"/usr/include \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		$myconf
-}
-
-src_compile() {
-	default
-}
-
-HTMML_DOCS=""
-
-src_install() {
-	default
-
-	if use python ; then
-		cd "${S}"/../python || die
-		distutils-r1_src_install
-	fi
-
-	cd "${S}"/.. || die
-
-	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
-}
diff --git a/dev-tcltk/snack/snack-2.2.10-r8.ebuild b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
index aa1a9c061749..f1916baefb5d 100644
--- a/dev-tcltk/snack/snack-2.2.10-r8.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
@@ -12,9 +12,10 @@ 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 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 IUSE="alsa examples python vorbis"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-lang/tcl:0=