gentoo auto-resync : 28:09:2024 - 01:25:57

5 files changed, 80 insertions, 17 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index ecb462e07a63..089aede23bfd 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index daec15175f7f..f55e4e9b99c1 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -11,5 +11,5 @@ AUX snack-2.2.10-test.patch 12933 BLAKE2B 05229781961d9431cb029d317918a5a267f9b2
 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-r13.ebuild 2816 BLAKE2B eabe3e3add388cf0f607e5e263c5d50406bc7ceba62b5b64b5e6491b79def4fb3353202db34a00ac2751deda19d177920d5f075ee87cdf8a6fc6aaf0ff74d13b SHA512 1a5099c11e5949576e496d4f8a6fd033c6c8eca3add3781c5f669b13642de42f08a770930dbf24224d3f62365c7fb142911cef67377bed46e75ff662f05b9977
+EBUILD snack-2.2.10-r13.ebuild 2857 BLAKE2B 8dc2250b60bc605d642a5c23ee0f1f15d52e2b88f0aaa31350abf07000ff9bedf5147b14929ada476e94d77985d5429e3e368aa8d6f68590216214903db5008b SHA512 6e3bb998ca2843d911818f96e5f024baafb613b871a548054dcbd62977b41b9cee4cb73506d765d05c7427c4f28ad196569573806d27352c7bf17bc58cc42416
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
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
 }
diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
index 587a699a65cf..a5bc9f4198fe 100644
--- a/dev-tcltk/tcl3d/Manifest
+++ b/dev-tcltk/tcl3d/Manifest
@@ -1,5 +1,7 @@
 AUX tcl3d-0.5.0-implicit.patch 225 BLAKE2B 1a2a484e3d390e92f9889772e926b0529fa5adaf00e817c3d20a02cba33f00ea3f5f6f4a5c8a8ebe958a799fc1e78ad5d31d831f82ecaa31420c4dfec29abe91 SHA512 fc5fabaee860b0e89af47c6070f0394fe247a86f484292d657b96d3d762b451036b56983d6352719e141d4e0c17bdcec97ddee898adc55de36e712789736e581
 AUX tcl3d-0.5.0-include-tk-dir-and-permissive.patch 2544 BLAKE2B c982924cffd60db538428d225a23023bcedbd3a9bf5e1087815d3a8fbe49d4f2be3f4dd3aadee3274a85f11a9c2d0e442bd739a0da3a415c15ac32eb8a116abe SHA512 ff5bb6df033cfa1ce9d01305cf3346653cc9ff6c144e19609b8cacc659993f0df0a8e0db741e0733e7c3f44aff6ed7f02596e382bd2b813980a8fbbfbbb376e6
+DIST tcl3d-0.9.5.7z 1776479 BLAKE2B c6437073a36405cec8ffaece93e70996109de709c1bf8158a01e7fcc6b085e26ab361d30cbf09f0895761c220d83771beca26eff19f167c0c6c7a60b0965aa25 SHA512 deb21a48b672cc804723a4e8e8c01dee5ed706cb30011e59b532f791317a4620ab8363cf2db9aef802397439b515db54c46d2662513131d0771bc577cde17a11
 DIST tcl3d-src-0.5.0.zip 3936271 BLAKE2B 97bd3815c05254162d8af4b2029dd2ac4218ed4bfb94e19a6454f41c12953b48f616444e466dda5359433f84a9284a2e20316b6c97b0e3a20deada47f583510c SHA512 24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dbbbbfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29
 EBUILD tcl3d-0.5.0-r1.ebuild 2218 BLAKE2B f54db5a1ba21bf40a377307c323bfd0aa23b121466939434b24589cddfcaf12d9f2a9b42c4549f523cb4692b5fcb1de165ca189791b6cb542a171a55c75149b8 SHA512 0a0168633431580a4ea75ed3a2273a55ee6b79c9a93db12b55e3e722dc321d284f3453be9f3decc577d75f71cdc13f1fd59a915014dcbfb33f823421e472e58c
+EBUILD tcl3d-0.9.5.ebuild 1214 BLAKE2B cbbd5b924eca9e6077f4813cd805cdf36fd11ec856b0b5d2504d95a917dd48c74cf92e7cf4c4bff8cac54423721ecd4e4c1df246524b4b4488fc53d8780986e8 SHA512 05a922c01942947b7253af4b718a7d508699e2fdabe5b0c4f0cee639d6216559e03ac175cf078d8e86fe30a8b62391fe34c633687001aa48e135e4abb47f7dac
 MISC metadata.xml 1312 BLAKE2B 4201d0bb5484fa80df0439ea9e4b8a91823c7c47690bf10d525331edeb43f8799c33eb71d2e1305d84e1b916fa10ea3906104bd13f6c169f3c02279555491e9a SHA512 8269b94e36e04835c1deb69ece8ba04801a8e9daf08fd8f18fbc2a42687b9ceedf8f8fa5e525f10699a32c98de07a6944c70a3bbc9d5f673f8868bf5b090e3e2
diff --git a/dev-tcltk/tcl3d/tcl3d-0.9.5.ebuild b/dev-tcltk/tcl3d/tcl3d-0.9.5.ebuild
new file mode 100644
index 000000000000..1f2e0538bf28
--- /dev/null
+++ b/dev-tcltk/tcl3d/tcl3d-0.9.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake unpacker
+
+DESCRIPTION="Tcl bindings to OpenGL and other 3D libraries"
+HOMEPAGE="http://www.tcl3d.org"
+SRC_URI="https://www.tcl3d.org/download/distributions/${P}.7z"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sdl truetype"
+
+RDEPEND="dev-lang/tcl:0=
+	dev-lang/tk:0=
+	x11-libs/libX11
+	virtual/opengl
+	virtual/glu
+	truetype? ( media-libs/ftgl )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig
+	app-arch/p7zip
+"
+
+src_prepare() {
+	sed -i \
+		-e "s|FTGLGlyph|FTGlyph|" \
+		tcl3dFTGL/swigfiles/ftgl.i \
+		|| die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local _TCL_V=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
+	local _TCL_FV="${_TCL_V[0]}.${_TCL_V[1]}"
+
+	local tkPath=/usr/$(get_libdir)/tk${_TCL_FV}/include
+
+	append-cppflags -I${tkPath}/generic -I${tkPath}/unix \
+		$(pkg-config freetype2 --cflags) \
+		$(pkg-config sdl --cflags)
+
+	local mycmakeargs=(
+		-Wno-dev
+		-DTCL3D_BUILD_OGL=Yes
+		-DTCL3D_BUILD_GAUGES=Yes
+		-DTCL3D_BUILD_GL2PS=Yes
+		-DTCL3D_BUILD_FTGL=$(usex truetype)
+		-DTCL3D_BUILD_SDL=$(usex sdl)
+	)
+	cmake_src_configure
+}