Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tcl3d/
Date: Mon, 09 Sep 2019 12:32:07
Message-Id: 1568032302.1821068dacdf7f3406a66429ad6b2a99d589f571.tupone@gentoo
1 commit: 1821068dacdf7f3406a66429ad6b2a99d589f571
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 9 12:31:42 2019 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 9 12:31:42 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1821068d
7
8 dev-tcltk/tcl3d: rm old version, fix unzip dependency
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.16
11 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
12
13 dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild | 57 --------------------------------------
14 dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild | 5 ++--
15 2 files changed, 3 insertions(+), 59 deletions(-)
16
17 diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
18 deleted file mode 100644
19 index 349309c5a5a..00000000000
20 --- a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
21 +++ /dev/null
22 @@ -1,57 +0,0 @@
23 -# Copyright 1999-2016 Gentoo Foundation
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=5
27 -
28 -inherit flag-o-matic multilib toolchain-funcs
29 -
30 -DESCRIPTION="Tcl bindings to OpenGL and other 3D libraries"
31 -HOMEPAGE="http://www.tcl3d.org"
32 -SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip"
33 -
34 -LICENSE="BSD"
35 -SLOT="0"
36 -KEYWORDS="~amd64"
37 -IUSE="debug"
38 -
39 -RDEPEND="
40 - dev-games/ode
41 - dev-lang/tk:0=
42 - dev-lang/tcl:0=
43 - media-libs/libsdl
44 - media-libs/ftgl
45 - virtual/opengl
46 - x11-libs/libXmu
47 -"
48 -DEPEND="${RDEPEND}
49 - >=dev-lang/swig-1.3.19"
50 -
51 -S="${WORKDIR}/${PN}"
52 -
53 -src_prepare() {
54 - TCL_VERSION=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
55 - einfo "Configuring for Tcl ${TCL_VERSION[0]}.${TCL_VERSION[1]}"
56 - sed -i \
57 - -e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${TCL_VERSION[0]}':' \
58 - -e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${TCL_VERSION[1]}':' \
59 - config_Linux* || die
60 -
61 - # fix libSDL link
62 - sed -i \
63 - -e 's:-lSDL-1\.2:-lSDL:g' \
64 - tcl3dSDL/Makefile || die
65 -}
66 -
67 -src_compile() {
68 - append-flags -mieee-fp -ffloat-store -fPIC
69 - use debug || append-flags -DNDEBUG
70 -
71 - emake \
72 - INSTDIR="/usr" OPT="${CFLAGS}" CC="$(tc-getCC) -c" \
73 - CXX="$(tc-getCXX) -c" LD="$(tc-getLD)" \
74 - WRAP_FTGL=1 WRAP_SDL=1 WRAP_GL2PS=0 WRAP_ODE=1
75 -}
76 -
77 -src_install() {
78 - emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr$(get_libdir)" install
79 -}
80
81 diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
82 index 1b077585124..0de3fa70cff 100644
83 --- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
84 +++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
85 @@ -1,4 +1,4 @@
86 -# Copyright 1999-2018 Gentoo Foundation
87 +# Copyright 1999-2019 Gentoo Authors
88 # Distributed under the terms of the GNU General Public License v2
89
90 EAPI=6
91 @@ -25,7 +25,8 @@ RDEPEND="dev-lang/tcl:0=
92 truetype? ( media-libs/ftgl )
93 sdl? ( media-libs/libsdl )"
94 DEPEND="${RDEPEND}
95 - >=dev-lang/swig-1.3.38:0="
96 + >=dev-lang/swig-1.3.38:0=
97 + app-arch/unzip"
98
99 S="${WORKDIR}/${PN}"
100 PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" )