gentoo resync : 14.07.2018

6 files changed, 289 insertions, 0 deletions

diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
new file mode 100644
index 000000000000..68454ee8b48a
--- /dev/null
+++ b/dev-tcltk/tcl3d/Manifest
@@ -0,0 +1,7 @@
+AUX tcl3d-0.5.0-include-tk-dir-and-permissive.patch 2544 BLAKE2B c982924cffd60db538428d225a23023bcedbd3a9bf5e1087815d3a8fbe49d4f2be3f4dd3aadee3274a85f11a9c2d0e442bd739a0da3a415c15ac32eb8a116abe SHA512 ff5bb6df033cfa1ce9d01305cf3346653cc9ff6c144e19609b8cacc659993f0df0a8e0db741e0733e7c3f44aff6ed7f02596e382bd2b813980a8fbbfbbb376e6
+DIST tcl3d-src-0.4.0.zip 1501305 BLAKE2B 61fe35df0bf5624ef5fbd7fa029b8ad7a23ed6304bd5da8b8bb035b94ad6311ad3868793b7ea5a464d990cfaee98af88ef6d398dddbdba4e89d894005e5ce9ed SHA512 a8a525693bc45e9fb9e2167e2121d300ff60534f2bced33bb068a1075cfd8e8281dd97bd7fb432b9d6a95cdb37fc3da03c82dd1ee20e368fb8ac249ea54c30a5
+DIST tcl3d-src-0.5.0.zip 3936271 BLAKE2B 97bd3815c05254162d8af4b2029dd2ac4218ed4bfb94e19a6454f41c12953b48f616444e466dda5359433f84a9284a2e20316b6c97b0e3a20deada47f583510c SHA512 24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dbbbbfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29
+EBUILD tcl3d-0.4.0-r1.ebuild 1333 BLAKE2B d07d4f56b7cea8ef7f5d03211be9a3a5bbd5e9a3e0d71b4dcff726a29ceb7fd85eaf372f820edd88987200adfbd285793bc6a47e343d39cb308c8186b2bf6e3d SHA512 541ab991db6ee8c54838abe091d6574cfa45afc7529d0a6bc2da58370369f0b11bc633ea8ef216a4910a35d4a43e9b6b2b2ebba93bde29e70b01975780a87646
+EBUILD tcl3d-0.4.0.ebuild 1332 BLAKE2B 2d958e54233102755773f21b394acf30c79c6489df5bed1bfea5ab657223eb667465a8fda07f5ec1d48a35a0528dd03822233786ba97086f7059e4f4e592d28f SHA512 7bcb8c5cadb7720734b3b8bf69417840f7af75d300b53c822609207efe1f82ab428c41872218dc0d2efbf20b2df701398c908c2da0d073695a0fbdaaf276bd93
+EBUILD tcl3d-0.5.0.ebuild 1596 BLAKE2B 235282d16ec37e5bb50ef2fb0a1b789365a723915a47c8c85b9ed595ba307e76abcfa1b979b4114a2afd1ff4b299e91f6d93644ca66152435e37461c72961b7f SHA512 329a86fa856a055bf1a68b9e9c650ccf15da85491a1c64b733009c0bb01af05c2e892fc69890625980e714b5facf205dfc3778361c3dab43fdf7f8511b052899
+MISC metadata.xml 1103 BLAKE2B b5528e54e960a114a53f560125ffdb30e45bf2dd2e9376a3d296d1734a40a8782b9e10e64cd50a80cd38b0f72cad7afe651c053c636f553f3c881cfc56a1f394 SHA512 8b5a1142c700c1319ce44617f1f4fe81475df16d3be90f5a8774c72cabab5fce196821d95d957bed2009454295edd868ad03c67fe0b8b8953f3338b197c53fa7
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
new file mode 100644
index 000000000000..58efa18acdb2
--- /dev/null
+++ b/dev-tcltk/tcl3d/files/tcl3d-0.5.0-include-tk-dir-and-permissive.patch
@@ -0,0 +1,72 @@
+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
new file mode 100644
index 000000000000..851c8cbb0582
--- /dev/null
+++ b/dev-tcltk/tcl3d/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tcltk@gentoo.org</email>
+	<name>Gentoo Tcltk Project</name>
+</maintainer>
+<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:
+
+Tcl3D core module
+tcl3dOgl 	Enhanced Togl widget, a Tk widget for displaying OpenGL content.
+	Wrapper for core OpenGL functionality (GL Version 3.0, GLU Version 1.2) and OpenGL extensions.
+	Tcl3D utility library: Math functions, standard shapes, stop watch, demo support.
+
+Tcl3D optional modules
+tcl3dCg 	Wrapper for NVidia's Cg shading language. *
+tcl3dSDL 	Wrapper for the Simple DirectMedia Library.
+tcl3dFTGL 	Wrapper for the OpenGL Font Rendering Library.
+tcl3dGl2ps 	Wrapper for the OpenGL To Postscript library. *
+tcl3dOde 	Wrapper for the Open Dynamics Engine.
+tcl3dOsg    Wrapper for OpenSceneGraph
+tcl3dGauges 	Tcl3D package for displaying gauges.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild b/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..c424262b15bb
--- /dev/null
+++ b/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib 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"
+IUSE="debug"
+
+RDEPEND="
+	dev-games/ode
+	dev-lang/tk:0=
+	dev-lang/tcl:0=
+	media-libs/libsdl
+	media-libs/ftgl
+	virtual/opengl
+	x11-libs/libXmu
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.19"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	TCL_VERSION=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
+	einfo "Configuring for Tcl ${TCL_VERSION[0]}.${TCL_VERSION[1]}"
+	sed -i \
+		-e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${TCL_VERSION[0]}':' \
+		-e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${TCL_VERSION[1]}':' \
+		config_Linux* || die
+
+	# fix libSDL link
+	sed -i \
+		-e 's:-lSDL-1\.2:-lSDL:g' \
+		tcl3dSDL/Makefile || die
+}
+
+src_compile() {
+	append-flags -mieee-fp -ffloat-store -fPIC
+	use debug || append-flags -DNDEBUG
+
+	emake \
+		INSTDIR="/usr" OPT="${CFLAGS}" CC="$(tc-getCC) -c" \
+		CXX="$(tc-getCXX) -c" LD="$(tc-getLD)" \
+		WRAP_FTGL=1 WRAP_SDL=1 WRAP_GL2PS=0 WRAP_ODE=1
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr/$(get_libdir)" install
+}
diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
new file mode 100644
index 000000000000..349309c5a5ad
--- /dev/null
+++ b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib 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"
+IUSE="debug"
+
+RDEPEND="
+	dev-games/ode
+	dev-lang/tk:0=
+	dev-lang/tcl:0=
+	media-libs/libsdl
+	media-libs/ftgl
+	virtual/opengl
+	x11-libs/libXmu
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.19"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	TCL_VERSION=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
+	einfo "Configuring for Tcl ${TCL_VERSION[0]}.${TCL_VERSION[1]}"
+	sed -i \
+		-e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${TCL_VERSION[0]}':' \
+		-e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${TCL_VERSION[1]}':' \
+		config_Linux* || die
+
+	# fix libSDL link
+	sed -i \
+		-e 's:-lSDL-1\.2:-lSDL:g' \
+		tcl3dSDL/Makefile || die
+}
+
+src_compile() {
+	append-flags -mieee-fp -ffloat-store -fPIC
+	use debug || append-flags -DNDEBUG
+
+	emake \
+		INSTDIR="/usr" OPT="${CFLAGS}" CC="$(tc-getCC) -c" \
+		CXX="$(tc-getCXX) -c" LD="$(tc-getLD)" \
+		WRAP_FTGL=1 WRAP_SDL=1 WRAP_GL2PS=0 WRAP_ODE=1
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr$(get_libdir)" install
+}
diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
new file mode 100644
index 000000000000..e9a64f8be868
--- /dev/null
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+DEPEND="
+	>=dev-lang/swig-1.3.38:0=
+	dev-lang/tk:0=
+	dev-lang/tcl:0=
+	dev-games/ode
+	dev-games/openscenegraph
+	media-libs/libsdl
+	media-libs/ftgl
+	virtual/opengl
+	x11-libs/libXmu
+"
+
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" )
+
+src_prepare() {
+	default
+
+	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]}':' \
+		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
+
+	# 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)" \
+		WRAP_FTGL=1 \
+		WRAP_SDL=1 \
+		WRAP_GL2PS=0 \
+		WRAP_ODE=1
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr/$(get_libdir)" install
+}