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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 120AE15808B for ; Fri, 27 Sep 2024 21:53:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DB67E2A24; Fri, 27 Sep 2024 21:53:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6A75E2A24 for ; Fri, 27 Sep 2024 21:53:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 135EC3430D6 for ; Fri, 27 Sep 2024 21:53:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42DD0ACC for ; Fri, 27 Sep 2024 21:53:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1727473948.5a08510f2cea7739b59c4575faff6e3b82ba8be3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/snack/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-tcltk/snack/snack-2.2.10-r13.ebuild X-VCS-Directories: dev-tcltk/snack/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5a08510f2cea7739b59c4575faff6e3b82ba8be3 X-VCS-Branch: master Date: Fri, 27 Sep 2024 21:53:05 +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: 34103ef6-8900-434d-bba3-eb8ae42ac14a X-Archives-Hash: 2534b314ee20a4637f971567db48a44a commit: 5a08510f2cea7739b59c4575faff6e3b82ba8be3 Author: Sam James gentoo org> AuthorDate: Fri Sep 27 21:51:36 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 27 21:52:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a08510f dev-tcltk/snack: misc tweaks * Drop Python 3.9 (noop) * Fix variable order * Add missing dies * Pass -std=gnu89 earlier because sed adds CFLAGS literally not as a ref Signed-off-by: Sam James gentoo.org> dev-tcltk/snack/snack-2.2.10-r13.ebuild | 36 ++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dev-tcltk/snack/snack-2.2.10-r13.ebuild b/dev-tcltk/snack/snack-2.2.10-r13.ebuild index 2e42ff833080..5adf4d369e86 100644 --- a/dev-tcltk/snack/snack-2.2.10-r13.ebuild +++ b/dev-tcltk/snack/snack-2.2.10-r13.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=yes @@ -12,8 +12,8 @@ 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" - S="${WORKDIR}/${PN}${PV}/unix" + LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" @@ -26,14 +26,17 @@ DEPEND=" dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( ${PYTHON_DEPS} ) - vorbis? ( media-libs/libvorbis )" + vorbis? ( media-libs/libvorbis ) +" RDEPEND="${DEPEND}" -BDEPEND="python? ( - ${PYTHON_DEPS} - ${DISTUTILS_DEPS} -)" +BDEPEND=" + python? ( + ${PYTHON_DEPS} + ${DISTUTILS_DEPS} + ) +" -REQUIRED_USE=${PYTHON_REQUIRED_USE} +REQUIRED_USE="${PYTHON_REQUIRED_USE}" PATCHES=( "${FILESDIR}"/alsa-undef-sym.patch @@ -55,12 +58,15 @@ src_prepare() { # adds -install_name (soname on Darwin) [[ ${CHOST} == *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${P}-darwin.patch ) + # For Clang 16, bunch of -Wimplicit-int, etc + append-flags -std=gnu89 + sed \ -e "s:ar cr:$(tc-getAR) cr:g" \ -e "s|-O|${CFLAGS}|g" \ -i Makefile.in || die - cd .. + cd .. || die default @@ -69,15 +75,12 @@ src_prepare() { -i generic/jkFormatMP3.c || die rm tests/{play,record}.test || die if use python; then - cd python + cd python || die 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" @@ -92,9 +95,10 @@ src_configure() { --includedir="${EPREFIX}"/usr/include \ --with-tcl="${EPREFIX}"/usr/$(get_libdir) \ --with-tk="${EPREFIX}"/usr/$(get_libdir) \ - $myconf + ${myconf} + if use python; then - cd ../python + cd ../python || die distutils-r1_src_configure fi } @@ -102,7 +106,7 @@ src_configure() { src_compile() { default if use python; then - cd ../python + cd ../python || die distutils-r1_src_compile fi }