Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/tk/
Date: Wed, 31 Mar 2021 19:59:45
Message-Id: 1617220773.d8ea7781476ed7ddeabd9358649bb6d19789bf2d.asturm@gentoo
1 commit: d8ea7781476ed7ddeabd9358649bb6d19789bf2d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 30 12:45:22 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 31 19:59:33 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ea7781
7
8 dev-lang/tk: Drop 8.5.17-r1, EAPI5--
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-lang/tk/Manifest | 1 -
14 dev-lang/tk/tk-8.5.17-r1.ebuild | 127 ----------------------------------------
15 2 files changed, 128 deletions(-)
16
17 diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
18 index d61cb3f94de..acc2f5b2ecf 100644
19 --- a/dev-lang/tk/Manifest
20 +++ b/dev-lang/tk/Manifest
21 @@ -1,4 +1,3 @@
22 -DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f
23 DIST tk8.6.10-src.tar.gz 4444764 BLAKE2B f56647e005778c802352aee0257c0a8f5e0014c9d21362592f08030252d83141cca385f0fb95c0e7e930016255c3b2cef49a65064e056a877214b7d7a1a01246 SHA512 d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5
24 DIST tk8.6.11-src.tar.gz 4496914 BLAKE2B c3050a48d5cb3bd3095b2c439b3d33992551f953a981bf23eedbf774368b383abc77fb3156aa4bcaae658d0706495cff03536ab8258f9d824ff8f4325b36cc38 SHA512 2e11490f2f51ef7e723661dd91c95622234fb97850e80d8ecd564be8c28f7c8fb0334a97cf8267af9d68f63e4adea887a1a4eec8d2e807d6a970b5912f99d3f2
25 DIST tk8.6.11.1-src.tar.gz 4496008 BLAKE2B d7bae2fa535411ad8620ec81cdc0b34a1206fed82f50dbd98d3977af46ac43f794166cb7029f274f7903228c62ce83dfbd56cea06669ff1e382b185d733b0792 SHA512 e2a1d27ba63601731d43c4c4e2b658771a14afd97ef8231f8bc7854e762b83a42f23b8db600e4b4a4a14ae6fc97378d0b9a9a180ae09308b9d12436ec2b176c4
26
27 diff --git a/dev-lang/tk/tk-8.5.17-r1.ebuild b/dev-lang/tk/tk-8.5.17-r1.ebuild
28 deleted file mode 100644
29 index 8d2d501f43f..00000000000
30 --- a/dev-lang/tk/tk-8.5.17-r1.ebuild
31 +++ /dev/null
32 @@ -1,127 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=5
37 -
38 -inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
39 -
40 -MY_P="${PN}${PV/_beta/b}"
41 -
42 -DESCRIPTION="Tk Widget Set"
43 -HOMEPAGE="http://www.tcl.tk/"
44 -SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
45 -
46 -LICENSE="tcltk"
47 -SLOT="0/8.5"
48 -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
49 -IUSE="debug threads truetype aqua xscreensaver"
50 -RESTRICT="!test? ( test )"
51 -
52 -RDEPEND="
53 - !aqua? (
54 - media-libs/fontconfig
55 - media-libs/freetype:2
56 - x11-libs/libX11
57 - x11-libs/libXt
58 - truetype? ( x11-libs/libXft )
59 - xscreensaver? ( x11-libs/libXScrnSaver )
60 - )
61 - ~dev-lang/tcl-${PV}:0="
62 -DEPEND="${RDEPEND}
63 - !aqua? ( x11-base/xorg-proto )"
64 -
65 -SPARENT="${WORKDIR}/${MY_P}"
66 -S="${SPARENT}"/unix
67 -
68 -src_prepare() {
69 - epatch \
70 - "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
71 - "${FILESDIR}"/${PN}-8.5.13-multilib.patch
72 -
73 - epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
74 - eprefixify Makefile.in
75 -
76 - # Bug 125971
77 - epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
78 -
79 - # Bug 648570
80 - epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch
81 -
82 - # Make sure we use the right pkg-config, and link against fontconfig
83 - # (since the code base uses Fc* functions).
84 - sed \
85 - -e 's/FT_New_Face/XftFontOpen/g' \
86 - -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
87 - -e 's:xft freetype2:xft freetype2 fontconfig:' \
88 - -i configure.in || die
89 - rm -f configure || die
90 -
91 - sed \
92 - -e '/chmod/s:555:755:g' \
93 - -i Makefile.in || die
94 -
95 - tc-export CC
96 -
97 - eautoconf
98 -}
99 -
100 -src_configure() {
101 - local mylibdir=$(get_libdir)
102 -
103 - econf \
104 - --with-tcl="${EPREFIX}/usr/${mylibdir}" \
105 - $(use_enable threads) \
106 - $(use_enable aqua) \
107 - $(use_enable truetype xft) \
108 - $(use_enable xscreensaver xss) \
109 - $(use_enable debug symbols)
110 -}
111 -
112 -src_test() {
113 - Xemake test
114 -}
115 -
116 -src_install() {
117 - #short version number
118 - local v1=$(get_version_component_range 1-2)
119 - local mylibdir=$(get_libdir)
120 -
121 - S= default
122 -
123 - # normalize $S path, bug #280766 (pkgcore)
124 - local nS="$(cd "${S}"; pwd)"
125 -
126 - # fix the tkConfig.sh to eliminate refs to the build directory
127 - # and drop unnecessary -L inclusion to default system libdir
128 -
129 - sed \
130 - -e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
131 - -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
132 - -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
133 - -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
134 - -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
135 - -e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
136 - -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
137 - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
138 - if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
139 - sed \
140 - -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
141 - -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
142 - -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
143 - fi
144 -
145 - # install private headers
146 - insinto /usr/${mylibdir}/tk${v1}/include/unix
147 - doins "${S}"/*.h
148 - insinto /usr/${mylibdir}/tk${v1}/include/generic
149 - doins "${SPARENT}"/generic/*.h
150 - rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
151 -
152 - # install symlink for libraries
153 - dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
154 - dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
155 -
156 - dosym wish${v1} /usr/bin/wish
157 -
158 - dodoc "${SPARENT}"/{ChangeLog*,README,changes}
159 -}