[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2023-03-18 Thread Alfredo Tupone 
commit: 8d69281eb3a1fd8b67bfa735b73fb4e84253c850
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Sat Mar 18 16:45:49 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sat Mar 18 17:06:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d69281e

dev-tcltk/tcl3d: fix on musl

Closes: https://bugs.gentoo.org/831455
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tcl3d/{tcl3d-0.5.0.ebuild => tcl3d-0.5.0-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.5.0-r1.ebuild
similarity index 98%
rename from dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
rename to dev-tcltk/tcl3d/tcl3d-0.5.0-r1.ebuild
index 870f791b448b..b295909cdc56 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
@@ -51,6 +51,7 @@ src_configure() {
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

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/, dev-tcltk/tcl3d/files/

2023-01-17 Thread Alfredo Tupone 
commit: d6f8deb9c030e91f540e34615cdc04199333b50e
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Tue Jan 17 11:28:06 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Jan 17 11:28:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f8deb9

dev-tcltk/tcl3d: fix undeclared function

Closes: https://bugs.gentoo.org/880821
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tcl3d/files/tcl3d-0.5.0-implicit.patch | 10 ++
 dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild   |  7 +--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dev-tcltk/tcl3d/files/tcl3d-0.5.0-implicit.patch 
b/dev-tcltk/tcl3d/files/tcl3d-0.5.0-implicit.patch
new file mode 100644
index ..bdd02a0fbf50
--- /dev/null
+++ b/dev-tcltk/tcl3d/files/tcl3d-0.5.0-implicit.patch
@@ -0,0 +1,10 @@
+--- a/tcl3dOgl/swigfiles/tcl3dOgl.i2023-01-17 12:19:29.845765609 +0100
 b/tcl3dOgl/swigfiles/tcl3dOgl.i2023-01-17 12:21:51.336490329 +0100
+@@ -31,6 +31,7 @@
+ 
+ %{
+ #include 
++#include "Togl/togl.h"
+ %}
+ 
+ %init %{

diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index 7a07697e35ae..870f791b448b 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-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}
app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
-PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch"
+   "${FILESDIR}/${P}-implicit.patch"
+)
 
 src_prepare() {
sed -i \

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2021-10-27 Thread Alfredo Tupone 
commit: fc8e802cd093a18b6822a21ba4aaf8f6e382e805
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Wed Oct 27 20:15:46 2021 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Wed Oct 27 20:15:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8e802c

dev-tcltk/tcl3d: EAPI 7 and hopefully fix for #816825

Closes: https://bugs.gentoo.org/816825
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index f24710e3f1e..7a07697e35a 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -31,6 +31,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.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]}"
@@ -74,4 +83,6 @@ src_compile() {
 
 src_install() {
emake INSTDIR="${D}/usr" DESTDIR="${D}" 
INSTLIB="${D}/usr/$(get_libdir)" install
+   insinto /usr/$(get_libdir)/${PN}${PV}
+   doins pkgIndex.tcl
 }

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2020-12-25 Thread Alfredo Tupone 
commit: 092c90bb92aafc56f02992544bff648bc4bfc05c
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Fri Dec 25 17:46:45 2020 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Fri Dec 25 17:46:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=092c90bb

dev-tcltk/tcl3d: calling cc from environment

Closes: https://bugs.gentoo.org/748447
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index 8f84663373e..f24710e3f1e 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -67,6 +67,8 @@ src_compile() {
CXX="$(tc-getCXX) -c" \
LD="$(tc-getLD)" \
LDOUT="${LDFLAGS} -o" \
+   SHLIB_LD="$(tc-getCC) -shared" \
+   SHLIB_LDXX="$(tc-getCXX) -shared" \
${CONFIG_PLUGIN}
 }

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2020-10-13 Thread Alfredo Tupone 
commit: d7a078e7ed5d385a4c359496ee5ae07ab542f3df
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Tue Oct 13 07:29:01 2020 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Oct 13 07:29:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a078e7

dev-tcltk/tcl3d: respect LDFLAGS

Closes: https://bugs.gentoo.org/738858
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index 15495ba8827..8f84663373e 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-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,7 @@ src_compile() {
CC="$(tc-getCC) -c" \
CXX="$(tc-getCXX) -c" \
LD="$(tc-getLD)" \
+   LDOUT="${LDFLAGS} -o" \
${CONFIG_PLUGIN}
 }

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2019-09-11 Thread Alfredo Tupone 
commit: 3296ff25e3745d12fe7f92733d6872cb4f522bf0
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Wed Sep 11 10:22:19 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Wed Sep 11 10:22:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3296ff25

dev-tcltk/tcl3d: remove old version

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tcl3d/Manifest  |  1 -
 dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild | 57 ---
 2 files changed, 58 deletions(-)

diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
index 651bffad7d8..7df440c2bda 100644
--- a/dev-tcltk/tcl3d/Manifest
+++ b/dev-tcltk/tcl3d/Manifest
@@ -1,2 +1 @@
-DIST tcl3d-src-0.4.0.zip 1501305 BLAKE2B 
61fe35df0bf5624ef5fbd7fa029b8ad7a23ed6304bd5da8b8bb035b94ad6311ad3868793b7ea5a464d990cfaee98af88ef6d398dddbdba4e89d894005e5ce9ed
 SHA512 
a8a525693bc45e9fb9e2167e2121d300ff60534f2bced33bb068a1075cfd8e8281dd97bd7fb432b9d6a95cdb37fc3da03c82dd1ee20e368fb8ac249ea54c30a5
 DIST tcl3d-src-0.5.0.zip 3936271 BLAKE2B 
97bd3815c05254162d8af4b2029dd2ac4218ed4bfb94e19a6454f41c12953b48f616444e466dda5359433f84a9284a2e20316b6c97b0e3a20deada47f583510c
 SHA512 
24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29

diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
deleted file mode 100644
index c424262b15b..000
--- a/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2019-09-11 Thread Agostino Sarubbo 
commit: e514ba2459ea317c3882ea4693ab28d26061f005
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 11 08:43:25 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 11 08:43:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e514ba24

dev-tcltk/tcl3d: x86 stable wrt bug #693896

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index 82ee87f5e0c..15495ba8827 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -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=

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2019-09-11 Thread Agostino Sarubbo 
commit: 0f421bc2568f4dc03a61c66dc49fa1f873887cc8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 11 08:20:18 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 11 08:20:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f421bc2

dev-tcltk/tcl3d: amd64 stable wrt bug #693896

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index 0de3fa70cff..82ee87f5e0c 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -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=

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2019-09-09 Thread Alfredo Tupone 
commit: 1821068dacdf7f3406a66429ad6b2a99d589f571
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Mon Sep  9 12:31:42 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Mon Sep  9 12:31:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1821068d

dev-tcltk/tcl3d: rm old version, fix unzip dependency

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alfredo Tupone  gentoo.org>

 dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild | 57 --
 dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild |  5 ++--
 2 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
deleted file mode 100644
index 349309c5a5a..000
--- a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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 1b077585124..0de3fa70cff 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,8 @@ RDEPEND="dev-lang/tcl:0=
truetype? ( media-libs/ftgl )
sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
-   >=dev-lang/swig-1.3.38:0="
+   >=dev-lang/swig-1.3.38:0=
+   app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" )

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2018-09-26 Thread Alfredo Tupone 
commit: 57873ee92cd02014079d597b28c57b1054281ede
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Wed Sep 26 09:35:13 2018 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Wed Sep 26 09:35:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57873ee9

dev-tcltk/tcl3d: Fix missing RDEPEND and modularize

Closes: https://bugs.gentoo.org/619410
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-tcltk/tcl3d/metadata.xml   |  8 
 dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild | 39 --
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/dev-tcltk/tcl3d/metadata.xml b/dev-tcltk/tcl3d/metadata.xml
index 851c8cbb058..2b1fbebe51e 100644
--- a/dev-tcltk/tcl3d/metadata.xml
+++ b/dev-tcltk/tcl3d/metadata.xml
@@ -5,6 +5,14 @@
tc...@gentoo.org
Gentoo Tcltk Project
 
+
+   
+   Enable support for physics engine from dev-games/ode
+   
+   
+   Enable support for 3D toolkit from 
dev-games/openscenegraph
+   
+
 
 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.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index e9a64f8be86..1b077585124 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-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,26 +12,25 @@ 
SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip;
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug ode osg sdl truetype"
 
-DEPEND="
-   >=dev-lang/swig-1.3.38:0=
+RDEPEND="dev-lang/tcl: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/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="
 
 S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" )
 
-src_prepare() {
-   default
-
+src_configure() {
local _TCL_V=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
local _TCL_FV="${_TCL_V[0]}.${_TCL_V[1]}"
 
@@ -49,6 +48,13 @@ 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.
@@ -59,10 +65,7 @@ src_compile() {
CC="$(tc-getCC) -c" \
CXX="$(tc-getCXX) -c" \
LD="$(tc-getLD)" \
-   WRAP_FTGL=1 \
-   WRAP_SDL=1 \
-   WRAP_GL2PS=0 \
-   WRAP_ODE=1
+   ${CONFIG_PLUGIN}
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/, dev-tcltk/tcl3d/files/

2016-10-31 Thread Amy Winston 
commit: f5fb3bbbabcb12914894e6cd21dc84f929a11bc8
Author: Jonathan Vasquez  gmail  com>
AuthorDate: Mon Oct 24 01:26:47 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Mon Oct 31 14:19:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5fb3bbb

dev-tcltk/tcl3d version bump to 0.5.0 and added x86 support

Gentoo-Bug: 469304,514300

 dev-tcltk/tcl3d/Manifest   |  1 +
 ...tcl3d-0.5.0-include-tk-dir-and-permissive.patch | 72 ++
 dev-tcltk/tcl3d/metadata.xml   |  1 +
 dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild | 71 +
 4 files changed, 145 insertions(+)

diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
index a5c60e4..a1f72dd 100644
--- a/dev-tcltk/tcl3d/Manifest
+++ b/dev-tcltk/tcl3d/Manifest
@@ -1 +1,2 @@
 DIST tcl3d-src-0.4.0.zip 1501305 SHA256 
f98bee3c2ca0189780125b683481949e1499018ee56ad1d21b4e3e594e058496 SHA512 
a8a525693bc45e9fb9e2167e2121d300ff60534f2bced33bb068a1075cfd8e8281dd97bd7fb432b9d6a95cdb37fc3da03c82dd1ee20e368fb8ac249ea54c30a5
 WHIRLPOOL 
cbc1982df7a28b93249ff7877d0376b06b64261bb33f3df8c64b2c80600684529605b9eeff6f593c2e9f7c64c253066b226f0a0dae9cee21bec980f6782c
+DIST tcl3d-src-0.5.0.zip 3936271 SHA256 
a2ecccbdb9c87fd02a7b969cc02abbf43aa51e619bd79e08dbffb8e376b6957c SHA512 
24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29
 WHIRLPOOL 
b2a1f3d81be1bed6476652bc6fd4ed2dd3bd85a2b895c950a1298f6ed998b05f0ac02937233f352bf794818112e114f22b3d2123c99be7a6458e464ee33e1604

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 ..58efa18
--- /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.0 -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.0 -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/Makefile2010-09-30 16:20:28.0 -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 5ae050b..851c8cb 100644
--- a/dev-tcltk/tcl3d/metadata.xml
+++ b/dev-tcltk/tcl3d/metadata.xml
@@ -20,6 +20,7 @@ tcl3dSDL  Wrapper for the Simple DirectMedia Library.

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2016-10-31 Thread Amy Winston 
commit: 554c576bc9254c46eace4b25eafedc2f81ec634b
Author: Amy Winston  gentoo  org>
AuthorDate: Mon Oct 31 14:24:33 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Mon Oct 31 14:24:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554c576b

dev-tcltk/tcl3d: add missing dep bug #514300

Package-Manager: portage-2.2.28

 dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild | 1 +
 dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild| 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
index a5ccdf3..6aa4374 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
media-libs/libsdl
media-libs/ftgl
virtual/opengl
+   x11-libs/libXmu
 "
 DEPEND="${RDEPEND}
>=dev-lang/swig-1.3.19"

diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild 
b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
index d750c1b..6ae6d3a 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,6 +22,7 @@ RDEPEND="
media-libs/libsdl
media-libs/ftgl
virtual/opengl
+   x11-libs/libXmu
 "
 DEPEND="${RDEPEND}
>=dev-lang/swig-1.3.19"

[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/

2016-08-24 Thread Daniel Campbell 
commit: 62c242b56d5a4024e52982cb289a35b29195ce25
Author: Daniel Campbell  gentoo  org>
AuthorDate: Wed Aug 24 07:42:56 2016 +
Commit: Daniel Campbell  gentoo  org>
CommitDate: Wed Aug 24 07:43:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c242b5

dev-tcltk/tcl3d: Correct path typo, fixes #563400

Gentoo-Bug: 563400
Gentoo-Bug-URL: https://bugs.gentoo.org/563400

Package-Manager: portage-2.3.0

 dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild | 57 +++
 1 file changed, 57 insertions(+)

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 ..a5ccdf3
--- /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
+# $Id$
+
+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
+"
+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
+}