| 1 |
commit: d98356d410f718368b93b8bd52995a771c5afcc4 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 3 09:28:13 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 3 09:28:26 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d98356d4 |
| 7 |
|
| 8 |
dev-lang/tk: Bump to version 8.6.9.1 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/tk/Manifest | 1 + |
| 14 |
dev-lang/tk/tk-8.6.9.1.ebuild | 145 ++++++++++++++++++++++++++++++++++++++++++ |
| 15 |
2 files changed, 146 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest |
| 18 |
index 60e3de59ad9..0eba5281bb3 100644 |
| 19 |
--- a/dev-lang/tk/Manifest |
| 20 |
+++ b/dev-lang/tk/Manifest |
| 21 |
@@ -2,3 +2,4 @@ DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40 |
| 22 |
DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f |
| 23 |
DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9 |
| 24 |
DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686 |
| 25 |
+DIST tk8.6.9.1-src.tar.gz 4364603 BLAKE2B 3d96637ceadc28977f8b4532be071907d64f11bd22881baf02aa6fa2778b607437edce8f1ed02e7011bcf78468128f7bfe81ee6dac9bd73a796e7fefae130dcf SHA512 b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92 |
| 26 |
|
| 27 |
diff --git a/dev-lang/tk/tk-8.6.9.1.ebuild b/dev-lang/tk/tk-8.6.9.1.ebuild |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..36af12eb46d |
| 30 |
--- /dev/null |
| 31 |
+++ b/dev-lang/tk/tk-8.6.9.1.ebuild |
| 32 |
@@ -0,0 +1,145 @@ |
| 33 |
+# Copyright 1999-2019 Gentoo Authors |
| 34 |
+# Distributed under the terms of the GNU General Public License v2 |
| 35 |
+ |
| 36 |
+EAPI=7 |
| 37 |
+ |
| 38 |
+inherit autotools multilib-minimal prefix toolchain-funcs 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.6" |
| 48 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 49 |
+IUSE="debug +threads truetype aqua xscreensaver" |
| 50 |
+ |
| 51 |
+RDEPEND=" |
| 52 |
+ !aqua? ( |
| 53 |
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] |
| 54 |
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
| 55 |
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] |
| 56 |
+ truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) |
| 57 |
+ xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) |
| 58 |
+ ) |
| 59 |
+ ~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]" |
| 60 |
+DEPEND="${RDEPEND} |
| 61 |
+ !aqua? ( x11-base/xorg-proto )" |
| 62 |
+ |
| 63 |
+# Not bumped to 8.6 |
| 64 |
+#RESTRICT=test |
| 65 |
+ |
| 66 |
+SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})" |
| 67 |
+S="${SPARENT}"/unix |
| 68 |
+ |
| 69 |
+PATCHES=( |
| 70 |
+ "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch |
| 71 |
+ "${FILESDIR}"/${PN}-8.5.13-multilib.patch |
| 72 |
+ "${FILESDIR}"/${PN}-8.4.15-aqua.patch |
| 73 |
+ "${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971 |
| 74 |
+) |
| 75 |
+ |
| 76 |
+src_prepare() { |
| 77 |
+ find \ |
| 78 |
+ "${SPARENT}"/compat/* \ |
| 79 |
+ -delete || die |
| 80 |
+ |
| 81 |
+ pushd "${SPARENT}" &>/dev/null || die |
| 82 |
+ default |
| 83 |
+ popd &>/dev/null || die |
| 84 |
+ eprefixify Makefile.in |
| 85 |
+ |
| 86 |
+ # Make sure we use the right pkg-config, and link against fontconfig |
| 87 |
+ # (since the code base uses Fc* functions). |
| 88 |
+ sed \ |
| 89 |
+ -e 's/FT_New_Face/XftFontOpen/g' \ |
| 90 |
+ -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ |
| 91 |
+ -e 's:xft freetype2:xft freetype2 fontconfig:' \ |
| 92 |
+ -i configure.in || die |
| 93 |
+ rm configure || die |
| 94 |
+ |
| 95 |
+ tc-export CC |
| 96 |
+ |
| 97 |
+ sed \ |
| 98 |
+ -e '/chmod/s:555:755:g' \ |
| 99 |
+ -i Makefile.in || die |
| 100 |
+ |
| 101 |
+ sed \ |
| 102 |
+ -e 's:-O[2s]\?::g' \ |
| 103 |
+ -i tcl.m4 || die |
| 104 |
+ |
| 105 |
+ mv configure.{in,ac} || die |
| 106 |
+ |
| 107 |
+ eautoconf |
| 108 |
+ |
| 109 |
+ multilib_copy_sources |
| 110 |
+} |
| 111 |
+ |
| 112 |
+multilib_src_configure() { |
| 113 |
+ if tc-is-cross-compiler ; then |
| 114 |
+ export ac_cv_func_strtod=yes |
| 115 |
+ export tcl_cv_strtod_buggy=1 |
| 116 |
+ fi |
| 117 |
+ |
| 118 |
+ local mylibdir=$(get_libdir) |
| 119 |
+ |
| 120 |
+ econf \ |
| 121 |
+ --with-tcl="${EPREFIX}/usr/${mylibdir}" \ |
| 122 |
+ $(use_enable threads) \ |
| 123 |
+ $(use_enable aqua) \ |
| 124 |
+ $(use_enable truetype xft) \ |
| 125 |
+ $(use_enable xscreensaver xss) \ |
| 126 |
+ $(use_enable debug symbols) |
| 127 |
+} |
| 128 |
+ |
| 129 |
+multilib_src_test() { |
| 130 |
+ virtx emake test |
| 131 |
+} |
| 132 |
+ |
| 133 |
+multilib_src_install() { |
| 134 |
+ #short version number |
| 135 |
+ local v1=$(ver_cut 1-2) |
| 136 |
+ local mylibdir=$(get_libdir) |
| 137 |
+ |
| 138 |
+ S= default |
| 139 |
+ |
| 140 |
+ # normalize $S path, bug #280766 (pkgcore) |
| 141 |
+ local nS="$(cd "${S}"; pwd)" |
| 142 |
+ |
| 143 |
+ # fix the tkConfig.sh to eliminate refs to the build directory |
| 144 |
+ # and drop unnecessary -L inclusion to default system libdir |
| 145 |
+ |
| 146 |
+ sed \ |
| 147 |
+ -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ |
| 148 |
+ -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
| 149 |
+ -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ |
| 150 |
+ -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ |
| 151 |
+ -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
| 152 |
+ -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ |
| 153 |
+ -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ |
| 154 |
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die |
| 155 |
+ if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then |
| 156 |
+ sed \ |
| 157 |
+ -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ |
| 158 |
+ -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ |
| 159 |
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die |
| 160 |
+ fi |
| 161 |
+ |
| 162 |
+ # install private headers |
| 163 |
+ insinto /usr/${mylibdir}/tk${v1}/include/unix |
| 164 |
+ doins "${S}"/*.h |
| 165 |
+ insinto /usr/${mylibdir}/tk${v1}/include/generic |
| 166 |
+ doins "${SPARENT}"/generic/*.h |
| 167 |
+ rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die |
| 168 |
+ |
| 169 |
+ # install symlink for libraries |
| 170 |
+ dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) |
| 171 |
+ dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a |
| 172 |
+ |
| 173 |
+ if multilib_is_native_abi; then |
| 174 |
+ dosym wish${v1} /usr/bin/wish |
| 175 |
+ dodoc "${SPARENT}"/{ChangeLog*,README,changes} |
| 176 |
+ fi |
| 177 |
+} |
Archives