commit: cffce8dea2ec09af76e9769a97e4a6efe56c7835 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Sep 6 09:18:40 2025 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sun Sep 7 08:07:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cffce8de
dev-tcltk/tcl3d: drop 0.5.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/43690 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-tcltk/tcl3d/Manifest | 1 - dev-tcltk/tcl3d/files/tcl3d-0.5.0-implicit.patch | 10 --- ...tcl3d-0.5.0-include-tk-dir-and-permissive.patch | 72 ----------------- dev-tcltk/tcl3d/metadata.xml | 8 -- dev-tcltk/tcl3d/tcl3d-0.5.0-r1.ebuild | 92 ---------------------- 5 files changed, 183 deletions(-) diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest index 47e3beda24e9..40addba53b40 100644 --- a/dev-tcltk/tcl3d/Manifest +++ b/dev-tcltk/tcl3d/Manifest @@ -1,2 +1 @@ DIST tcl3d-0.9.5.7z 1776479 BLAKE2B c6437073a36405cec8ffaece93e70996109de709c1bf8158a01e7fcc6b085e26ab361d30cbf09f0895761c220d83771beca26eff19f167c0c6c7a60b0965aa25 SHA512 deb21a48b672cc804723a4e8e8c01dee5ed706cb30011e59b532f791317a4620ab8363cf2db9aef802397439b515db54c46d2662513131d0771bc577cde17a11 -DIST tcl3d-src-0.5.0.zip 3936271 BLAKE2B 97bd3815c05254162d8af4b2029dd2ac4218ed4bfb94e19a6454f41c12953b48f616444e466dda5359433f84a9284a2e20316b6c97b0e3a20deada47f583510c SHA512 24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dbbbbfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29 diff --git a/dev-tcltk/tcl3d/files/tcl3d-0.5.0-implicit.patch b/dev-tcltk/tcl3d/files/tcl3d-0.5.0-implicit.patch deleted file mode 100644 index bdd02a0fbf50..000000000000 --- a/dev-tcltk/tcl3d/files/tcl3d-0.5.0-implicit.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tcl3dOgl/swigfiles/tcl3dOgl.i 2023-01-17 12:19:29.845765609 +0100 -+++ b/tcl3dOgl/swigfiles/tcl3dOgl.i 2023-01-17 12:21:51.336490329 +0100 -@@ -31,6 +31,7 @@ - - %{ - #include <tk.h> -+#include "Togl/togl.h" - %} - - %init %{ diff --git a/dev-tcltk/tcl3d/files/tcl3d-0.5.0-include-tk-dir-and-permissive.patch b/dev-tcltk/tcl3d/files/tcl3d-0.5.0-include-tk-dir-and-permissive.patch deleted file mode 100644 index 58efa18acdb2..000000000000 --- a/dev-tcltk/tcl3d/files/tcl3d-0.5.0-include-tk-dir-and-permissive.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -ru tcl3d/config_Linux tcl3d-m/config_Linux ---- tcl3d/config_Linux 2010-08-30 15:57:56.000000000 -0400 -+++ tcl3d-m/config_Linux 2016-10-30 13:28:34.080601812 -0400 -@@ -74,6 +74,8 @@ - TKINCDIR = $(TKDIR)/include - TCLLIBDIR = $(TCLDIR)/lib - TKLIBDIR = $(TKDIR)/lib -+TCLLIBINCDIR = $(TCLLIBDIR)/tcl$(TCLVERSION)/include -+TKLIBINCDIR = $(TCLLIBDIR)/tk$(TCLVERSION)/include - TCLSTUBLIBS = $(TKLIBDIR)/libtkstub$(TCLVERSION)$(LIBEXT) $(TCLLIBDIR)/libtclstub$(TCLVERSION)$(LIBEXT) - TCLSTDLIBS = $(TKLIBDIR)/libtk$(TCLVERSION)$(LIBEXT) $(TCLLIBDIR)/libtcl$(TCLVERSION)$(LIBEXT) - TCLSH = tclsh$(TCLVERSION) -@@ -84,7 +86,13 @@ - CPDIR = csh -f cpdir - MKDIR = mkdir -p - --INCL = -I. -I$(TCLINCDIR) -+INCL = \ -+ -I. \ -+ -I$(TCLINCDIR) \ -+ -I$(TCLLIBINCDIR)/generic \ -+ -I$(TCLLIBINCDIR)/unix \ -+ -I$(TKLIBINCDIR)/generic \ -+ -I$(TKLIBINCDIR)/unix - - ifdef WITH_STUBS - TCLLIBS = $(TCLSTUBLIBS) -diff -ru tcl3d/config_Linux64 tcl3d-m/config_Linux64 ---- tcl3d/config_Linux64 2010-12-30 16:06:48.000000000 -0500 -+++ tcl3d-m/config_Linux64 2016-10-30 13:08:33.326771912 -0400 -@@ -74,6 +74,8 @@ - TKINCDIR = $(TKDIR)/include - TCLLIBDIR = $(TCLDIR)/lib64 - TKLIBDIR = $(TKDIR)/lib64 -+TCLLIBINCDIR = $(TCLLIBDIR)/tcl$(TCLVERSION)/include -+TKLIBINCDIR = $(TCLLIBDIR)/tk$(TCLVERSION)/include - TCLSTUBLIBS = $(TKLIBDIR)/libtkstub$(TCLVERSION)$(LIBEXT) $(TCLLIBDIR)/libtclstub$(TCLVERSION)$(LIBEXT) - TCLSTDLIBS = $(TKLIBDIR)/libtk$(TCLVERSION)$(SHLIBEXT) $(TCLLIBDIR)/libtcl$(TCLVERSION)$(SHLIBEXT) - TCLSH = tclsh$(TCLVERSION) -@@ -84,7 +86,13 @@ - CPDIR = csh -f cpdir - MKDIR = mkdir -p - --INCL = -I. -I$(TCLINCDIR) -+INCL = \ -+ -I. \ -+ -I$(TCLINCDIR) \ -+ -I$(TCLLIBINCDIR)/generic \ -+ -I$(TCLLIBINCDIR)/unix \ -+ -I$(TKLIBINCDIR)/generic \ -+ -I$(TKLIBINCDIR)/unix - - ifdef WITH_STUBS - TCLLIBS = $(TCLSTUBLIBS) -diff -ru tcl3d/tcl3dOsg/Makefile tcl3d-m/tcl3dOsg/Makefile ---- tcl3d/tcl3dOsg/Makefile 2010-09-30 16:20:28.000000000 -0400 -+++ tcl3d-m/tcl3dOsg/Makefile 2016-10-30 13:12:53.367593401 -0400 -@@ -308,12 +308,13 @@ - OPT += /Od - endif - CFLAGS = $(OPT) $(PPDEFS) -I$(GL_INCDIR) -Iinclude $(INCL) -+CXXFLAGS = -fpermissive - - .SUFFIXES: # Delete the default suffixes. - .SUFFIXES: .cpp $(OBJEXT) .h # Install our own suffixes. - - .cpp$(OBJEXT): -- $(CXX) $(CFLAGS) $< -+ $(CXX) $(CFLAGS) $(CXXFLAGS) $< - - all: osg osganimation osgdb osgfx osgga osgmanipulator osgopenthreads \ - osgparticle osgsim osgshadow osgterrain osgtext osgutil osgviewer \ diff --git a/dev-tcltk/tcl3d/metadata.xml b/dev-tcltk/tcl3d/metadata.xml index 969f63152bd5..a369053cbccc 100644 --- a/dev-tcltk/tcl3d/metadata.xml +++ b/dev-tcltk/tcl3d/metadata.xml @@ -5,14 +5,6 @@ <email>[email protected]</email> <name>Gentoo Tcltk Project</name> </maintainer> -<use> - <flag name="ode"> - Enable support for physics engine from <pkg>dev-games/ode</pkg> - </flag> - <flag name="osg"> - Enable support for 3D toolkit from <pkg>dev-games/openscenegraph</pkg> - </flag> -</use> <longdescription> Tcl3D offers the 3D functionality of OpenGL and other 3D libraries at the Tcl scripting level. The Tcl3D package currently consists of the following modules: diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0-r1.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0-r1.ebuild deleted file mode 100644 index b295909cdc56..000000000000 --- a/dev-tcltk/tcl3d/tcl3d-0.5.0-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Tcl bindings to OpenGL and other 3D libraries" -HOMEPAGE="http://www.tcl3d.org"; -SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug ode osg sdl truetype" - -RDEPEND="dev-lang/tcl:0= - dev-lang/tk:0= - x11-libs/libXi - x11-libs/libXmu - virtual/opengl - virtual/glu - ode? ( dev-games/ode ) - osg? ( dev-games/openscenegraph ) - truetype? ( media-libs/ftgl ) - sdl? ( media-libs/libsdl )" -DEPEND="${RDEPEND} - >=dev-lang/swig-1.3.38:0= - app-arch/unzip" - -S="${WORKDIR}/${PN}" -PATCHES=( - "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" - "${FILESDIR}/${P}-implicit.patch" -) - -src_prepare() { - sed -i \ - -e '/\..$(DSEP)pkgIndex.tcl/d' \ - tcl3d*/Makefile \ - || die - - default -} - -src_configure() { - local _TCL_V=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') ) - local _TCL_FV="${_TCL_V[0]}.${_TCL_V[1]}" - - einfo "Configuring for Tcl ${_TCL_FV}" - sed -i \ - -e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${_TCL_V[0]}':' \ - -e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${_TCL_V[1]}':' \ - -e "s:lib64:$(get_libdir):" \ - config_Linux* || die - - # Fix libSDL link - sed -i -e 's:-lSDL-1\.2:-lSDL:g' tcl3dSDL/Makefile || die -} - -src_compile() { - append-flags -fPIC - use debug || append-flags -DNDEBUG - - # Configure wrapper - local CONFIG_PLUGIN="WRAP_GL2PS=" - use truetype || CONFIG_PLUGIN+=" WRAP_FTGL=" - use ode || CONFIG_PLUGIN+=" WRAP_ODE=" - use osg || CONFIG_PLUGIN+=" WRAP_OSG=" - use sdl || CONFIG_PLUGIN+=" WRAP_SDL=" - - # Restricting build to -j1 since it seems that if we build it in parallel, - # it fails with the "tcl3dOsg" project attempting to import glewdefs.i, - # and not finding it. - emake \ - -j1 \ - INSTDIR="/usr" \ - OPT="${CFLAGS}" \ - CC="$(tc-getCC) -c" \ - CXX="$(tc-getCXX) -c" \ - LD="$(tc-getLD)" \ - LDOUT="${LDFLAGS} -o" \ - SHLIB_LD="$(tc-getCC) -shared" \ - SHLIB_LDXX="$(tc-getCXX) -shared" \ - ${CONFIG_PLUGIN} -} - -src_install() { - emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr/$(get_libdir)" install - insinto /usr/$(get_libdir)/${PN}${PV} - doins pkgIndex.tcl -}
