From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 39383138359 for ; Wed, 12 Aug 2020 08:43:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A104E0922; Wed, 12 Aug 2020 08:43:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1DA53E0922 for ; Wed, 12 Aug 2020 08:43:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A571234F29B for ; Wed, 12 Aug 2020 08:43:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 315F022B for ; Wed, 12 Aug 2020 08:43:25 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1597221779.e5ff96840edfa24dd7df366162cdf3673c529ab3.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/snack/files/, dev-tcltk/snack/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-tcltk/snack/files/snack2.2.10-seektell-fix.patch dev-tcltk/snack/snack-2.2.10-r9.ebuild X-VCS-Directories: dev-tcltk/snack/ dev-tcltk/snack/files/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: e5ff96840edfa24dd7df366162cdf3673c529ab3 X-VCS-Branch: master Date: Wed, 12 Aug 2020 08:43:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4e131373-366a-4dc2-8b33-3df4303a99c1 X-Archives-Hash: e167896ec9e614279cad0586c97b3018 commit: e5ff96840edfa24dd7df366162cdf3673c529ab3 Author: Alfredo Tupone gentoo org> AuthorDate: Wed Aug 12 08:42:59 2020 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Wed Aug 12 08:42:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5ff9684 dev-tcltk/snack: EAPI 7 and fixes Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Alfredo Tupone gentoo.org> .../snack/files/snack2.2.10-seektell-fix.patch | 12 +++ dev-tcltk/snack/snack-2.2.10-r9.ebuild | 119 +++++++++++++++++++++ 2 files changed, 131 insertions(+) diff --git a/dev-tcltk/snack/files/snack2.2.10-seektell-fix.patch b/dev-tcltk/snack/files/snack2.2.10-seektell-fix.patch new file mode 100644 index 00000000000..3519b12c85d --- /dev/null +++ b/dev-tcltk/snack/files/snack2.2.10-seektell-fix.patch @@ -0,0 +1,12 @@ +diff -up snack2.2.10/generic/jkSound.h.seektell snack2.2.10/generic/jkSound.h +--- snack2.2.10/generic/jkSound.h.seektell 2019-07-30 16:01:37.310992628 -0400 ++++ snack2.2.10/generic/jkSound.h 2019-07-30 16:02:29.859840865 -0400 +@@ -603,7 +603,7 @@ extern void Snack_RemoveOptions(int objc + + extern void SnackPauseAudio(); + +-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4 ++#if 1 || TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4 + #define TCL_SEEK Tcl_Seek + #define TCL_TELL Tcl_Tell + #else diff --git a/dev-tcltk/snack/snack-2.2.10-r9.ebuild b/dev-tcltk/snack/snack-2.2.10-r9.ebuild new file mode 100644 index 00000000000..8349e89b3bc --- /dev/null +++ b/dev-tcltk/snack/snack-2.2.10-r9.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_USE_SETUPTOOLS=no +DISTUTILS_OPTIONAL=yes + +inherit autotools distutils-r1 multilib toolchain-funcs virtualx + +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? ( test )" + +DEPEND=" + dev-lang/tcl:0= + dev-lang/tk:0= + alsa? ( media-libs/alsa-lib ) + python? ( ${PYTHON_DEPS} ) + vorbis? ( media-libs/libvorbis )" +RDEPEND="${DEPEND}" + +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +S="${WORKDIR}/${PN}${PV}/unix" + +PATCHES=( + "${FILESDIR}"/alsa-undef-sym.patch + "${FILESDIR}"/${P}-CVE-2012-6303-fix.patch + "${FILESDIR}"/${P}-debian-args.patch + "${FILESDIR}"/${P}-test.patch + "${FILESDIR}"/${PN}${PV}-seektell-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 + rm tests/{play,record}.test || die + if use python; then + cd python + distutils-r1_src_prepare + fi +} + +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 + if use python; then + cd ../python + distutils-r1_src_configure + fi +} + +src_compile() { + default + if use python; then + cd ../python + distutils-r1_src_compile + fi +} + +src_test() { + TCLLIBPATH=${S} virtx default | tee snack.testResult + grep -q FAILED snack.testResult && die +} + +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 +}