From 038c98389fa5a5efb22cffaa35ecdddfc9a38036 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Jan 2023 23:56:06 +0000 Subject: gentoo auto-resync : 15:01:2023 - 23:56:06 --- dev-tcltk/snack/Manifest | 2 +- dev-tcltk/snack/snack-2.2.10-r10.ebuild | 124 ------------------------------ dev-tcltk/snack/snack-2.2.10-r11.ebuild | 129 ++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+), 125 deletions(-) delete mode 100644 dev-tcltk/snack/snack-2.2.10-r10.ebuild create mode 100644 dev-tcltk/snack/snack-2.2.10-r11.ebuild (limited to 'dev-tcltk/snack') diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest index 23bd2de81593..cd53a4952391 100644 --- a/dev-tcltk/snack/Manifest +++ b/dev-tcltk/snack/Manifest @@ -8,5 +8,5 @@ AUX snack-2.2.10-test.patch 11984 BLAKE2B b3d3458aff3de62e3569f67af5c40c9f12311c AUX snack2.2.10-seektell-fix.patch 496 BLAKE2B a2e4e782788054c047596bd989241b9ecea3eeb2984c050888aced8289e77f30692386bcc437679bb5cc7a46f1616cbb3f4f64de017c343bcce2241b016d0cd5 SHA512 3e472dc7603426d35b23714435b3a8bfb6d54326eb1eaa54d8b79b4710035b3fed4e1f6a85ebad632950222c5cd55ac917dcb8cf2e87d0baa36124f8a3361fa8 AUX tcl-snack-2.2.10-python3.patch 12145 BLAKE2B eb33937789e0eab1316fdfcd472b5cf701a4072e498052cb2889e8c9e5a4502f193f386b83c96a2e98efcfca3dfeb389414e1b924b677ef68edfafe0e706048f SHA512 3480d83824e1d7e8250947d6f9d5a38704b302491980b7e8ad46a4d6790e3bdf9588b1d63048a9a5ed081c44b8f6c1dc42e79d3ad543f473b5469c711dc60394 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b -EBUILD snack-2.2.10-r10.ebuild 2613 BLAKE2B 54daad4b7c408ee511fbe65365f35c14d53e81ff75ff6b348aff7c237836fd284389c03691b75cb22b88cef7252573533eec87882acdb3237648502695f81c12 SHA512 f28f0ab42178e4e41322932b831b9932d3499ff7bd2645c86cb82f3453d0575db6ae5be9ac39c6c7708fba0d7f2ddfd459882c3ad1cbc108a6dc184aae395e88 +EBUILD snack-2.2.10-r11.ebuild 2702 BLAKE2B 3b9f16f4fdca3e15c8d125a4184fb5c2218bfc78f661923e4fd0bc3789826900e686881aba5a8f5b2870777733ceb05706b6066a75f7c8b1f0ab2df3ff667097 SHA512 ae31a56aabe08dbd8607255c4f561e2d6836b7bdb81f0e617467f0333b87a676876c2c0bf82daefd1fc2cec49aa9e5d8d70bdcf77bd95441f28580f29f0a62b0 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b diff --git a/dev-tcltk/snack/snack-2.2.10-r10.ebuild b/dev-tcltk/snack/snack-2.2.10-r10.ebuild deleted file mode 100644 index d05779192c34..000000000000 --- a/dev-tcltk/snack/snack-2.2.10-r10.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9,10} ) -DISTUTILS_OPTIONAL=yes - -inherit distutils-r1 flag-o-matic 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-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 - "${FILESDIR}"/tcl-${P}-python3.patch - "${FILESDIR}"/${P}-lto.patch - "${FILESDIR}"/${P}-configure-clang16.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() { - # For Clang 16, bunch of -Wimplicit-int, etc - append-flags -std=gnu89 - - 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 -} diff --git a/dev-tcltk/snack/snack-2.2.10-r11.ebuild b/dev-tcltk/snack/snack-2.2.10-r11.ebuild new file mode 100644 index 000000000000..ee85a588fdfc --- /dev/null +++ b/dev-tcltk/snack/snack-2.2.10-r11.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9,10} ) +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_OPTIONAL=yes + +inherit distutils-r1 flag-o-matic 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-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}" +BDEPEND="python? ( + ${PYTHON_DEPS} + ${DISTUTILS_DEPS} +)" + +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 + "${FILESDIR}"/tcl-${P}-python3.patch + "${FILESDIR}"/${P}-lto.patch + "${FILESDIR}"/${P}-configure-clang16.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() { + # For Clang 16, bunch of -Wimplicit-int, etc + append-flags -std=gnu89 + + 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 +} -- cgit v1.2.3