Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

4 files changed, 121 insertions, 5 deletions

diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
index 3e90dd46e295..345ea61f37ef 100644
--- a/dev-tcltk/tcl3d/Manifest
+++ b/dev-tcltk/tcl3d/Manifest
@@ -1,4 +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.5.0.ebuild 1889 BLAKE2B 218d4bf66cdc3094d946562aa41bb583b140e14da70fc374d19a263d86704ae81f8a42d681bc4e04b765f0ff2fd45db1ba93279942f2c2907df6899d03c1c00a SHA512 1437b9d6b6bb4fc1ad165cb0ff3fda92f802629f53c450a59b379657dc8585a3a436b1e6fe74da51353ceb3c22796277e42dba72447b230b1293566d7e353c8e
+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 1878 BLAKE2B 785ced313466891f52fb0a06e17fee11abcafb98737da5d5b2efc3121c7ffa92e13ffb1c09794258c2a55ce9479d692faf9edec8d9b8361f2c1bd34adf8f8e1f SHA512 b39e5086385319f9c9f70a515229444ab8d1bd3f93f7d1f971cf1f87bf55a0edcbf3531d099f93d96c1c8381a3aae181c700a68dd9f845eac1be371918ea3aab
 MISC metadata.xml 1311 BLAKE2B 72c200e646b9fddd4b20a266d7d66e967f918e467d413a063af6076cc0fb786b38bf0b61c9ce288f3215b0ec30485cbed4ad3ad35bad48f48c09936eff6f90da SHA512 291f517e0690cb71786359156418f3622ac8e5e86f8d8d33377b967d85bddd4c05fa49dccee56bc2ff719b2ebe45b497304fa5262ec193832b6c3c8f9ca09943
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
index 15495ba8827c..1b0775851245 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug ode osg sdl truetype"
 
 RDEPEND="dev-lang/tcl:0=
@@ -25,8 +25,7 @@ RDEPEND="dev-lang/tcl:0=
 	truetype? ( media-libs/ftgl )
 	sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.38:0=
-	app-arch/unzip"
+	>=dev-lang/swig-1.3.38:0="
 
 S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" )