diff options
author | Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2021-04-02 12:32:24 +0200 |
---|---|---|
committer | Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2021-04-02 12:32:46 +0200 |
commit | fd5d1210d5a4bdf1875ab628bc654edd4e68fb25 (patch) | |
tree | 4cfe98c0cfd8a46c764f8cc0acfe0651a00d2f9f | |
parent | .github/workflows: always use the latest version of repoman (diff) | |
download | sci-fd5d1210d5a4bdf1875ab628bc654edd4e68fb25.tar.gz sci-fd5d1210d5a4bdf1875ab628bc654edd4e68fb25.tar.bz2 sci-fd5d1210d5a4bdf1875ab628bc654edd4e68fb25.zip |
dev-lang/tk: import 8.5, removed from ::gentoo
dep of media-gfx/brlcad
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
-rw-r--r-- | dev-lang/tk/Manifest | 1 | ||||
-rw-r--r-- | dev-lang/tk/files/tk-8.4.15-aqua.patch | 11 | ||||
-rw-r--r-- | dev-lang/tk/files/tk-8.5.11-fedora-xft.patch | 13 | ||||
-rw-r--r-- | dev-lang/tk/files/tk-8.5.13-multilib.patch | 12 | ||||
-rw-r--r-- | dev-lang/tk/files/tk-8.5.14-conf.patch | 16 | ||||
-rw-r--r-- | dev-lang/tk/files/tk-8.6.8-libieee.patch | 15 | ||||
-rw-r--r-- | dev-lang/tk/metadata.xml | 11 | ||||
-rw-r--r-- | dev-lang/tk/tk-8.5.17-r1.ebuild | 128 |
8 files changed, 207 insertions, 0 deletions
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest new file mode 100644 index 000000000..68d0a397e --- /dev/null +++ b/dev-lang/tk/Manifest @@ -0,0 +1 @@ +DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f diff --git a/dev-lang/tk/files/tk-8.4.15-aqua.patch b/dev-lang/tk/files/tk-8.4.15-aqua.patch new file mode 100644 index 000000000..9e6f59d12 --- /dev/null +++ b/dev-lang/tk/files/tk-8.4.15-aqua.patch @@ -0,0 +1,11 @@ +--- unix/Makefile.in ++++ unix/Makefile.in +@@ -468,7 +468,7 @@ + + AQUA_HDRS = $(MAC_OSX_DIR)/tkMacOSX.h $(GENERIC_DIR)/tkIntXlibDecls.h + +-AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(XLIB_DIR)/xbytes.h ++AQUA_XLIB_HDRS = + + AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h + diff --git a/dev-lang/tk/files/tk-8.5.11-fedora-xft.patch b/dev-lang/tk/files/tk-8.5.11-fedora-xft.patch new file mode 100644 index 000000000..08bfbf759 --- /dev/null +++ b/dev-lang/tk/files/tk-8.5.11-fedora-xft.patch @@ -0,0 +1,13 @@ +--- unix/configure.in.old 2010-09-02 20:12:14.000000000 +0200 ++++ unix/configure.in 2011-02-17 13:32:22.719116636 +0100 +@@ -530,8 +530,8 @@ + XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" + if test "$found_xft" = "no" ; then + found_xft=yes +- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" +- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" ++ XFT_CFLAGS=`pkg-config --cflags xft freetype2 2>/dev/null` || found_xft="no" ++ XFT_LIBS=`pkg-config --libs xft freetype2 2>/dev/null` || found_xft="no" + fi + AC_MSG_RESULT([$found_xft]) + dnl make sure that compiling against Xft header file doesn't bomb diff --git a/dev-lang/tk/files/tk-8.5.13-multilib.patch b/dev-lang/tk/files/tk-8.5.13-multilib.patch new file mode 100644 index 000000000..5ba9c19c9 --- /dev/null +++ b/dev-lang/tk/files/tk-8.5.13-multilib.patch @@ -0,0 +1,12 @@ +diff -Naur unix/configure.in unix/configure.in +--- unix/configure.in 2005-06-30 01:43:10.000000000 +0900 ++++ unix/configure.in 2005-07-02 23:22:16.000000000 +0900 +@@ -393,7 +393,7 @@ + TCL_STUB_FLAGS="-DUSE_TCL_STUBS" + fi + +-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' ++TK_LIBRARY='$(libdir)/tk$(VERSION)' + PRIVATE_INCLUDE_DIR='$(includedir)' + HTML_DIR='$(DISTDIR)/html' + TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)' diff --git a/dev-lang/tk/files/tk-8.5.14-conf.patch b/dev-lang/tk/files/tk-8.5.14-conf.patch new file mode 100644 index 000000000..5f8274f9e --- /dev/null +++ b/dev-lang/tk/files/tk-8.5.14-conf.patch @@ -0,0 +1,16 @@ + unix/tcl.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index 3974753..9c36eb5 100644 +--- unix/tcl.m4 ++++ unix/tcl.m4 +@@ -1420,7 +1420,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + # get rid of the warnings. + #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" + +- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' ++ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${@}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" diff --git a/dev-lang/tk/files/tk-8.6.8-libieee.patch b/dev-lang/tk/files/tk-8.6.8-libieee.patch new file mode 100644 index 000000000..6bc8fa11a --- /dev/null +++ b/dev-lang/tk/files/tk-8.6.8-libieee.patch @@ -0,0 +1,15 @@ +--- unix/tcl.m4 ++++ unix/tcl.m4 +@@ -2470,12 +2470,9 @@ + #-------------------------------------------------------------------- + # On a few very rare systems, all of the libm.a stuff is + # already in libc.a. Set compiler flags accordingly. +- # Also, Linux requires the "ieee" library for math to work +- # right (and it must appear before "-lm"). + #-------------------------------------------------------------------- + + AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm") +- AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"]) + + #-------------------------------------------------------------------- + # Interactive UNIX requires -linet instead of -lsocket, plus it diff --git a/dev-lang/tk/metadata.xml b/dev-lang/tk/metadata.xml new file mode 100644 index 000000000..354c72665 --- /dev/null +++ b/dev-lang/tk/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">tcl</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lang/tk/tk-8.5.17-r1.ebuild b/dev-lang/tk/tk-8.5.17-r1.ebuild new file mode 100644 index 000000000..8f7e78d7f --- /dev/null +++ b/dev-lang/tk/tk-8.5.17-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib prefix toolchain-funcs virtualx + +MY_P="${PN}${PV/_beta/b}" + +DESCRIPTION="Tk Widget Set" +HOMEPAGE="http://www.tcl.tk/" +SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" + +LICENSE="tcltk" +SLOT="0/8.5" +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" +IUSE="debug threads truetype aqua xscreensaver" +RESTRICT="!test? ( test )" + +RDEPEND=" + !aqua? ( + media-libs/fontconfig + media-libs/freetype:2 + x11-libs/libX11 + x11-libs/libXt + truetype? ( x11-libs/libXft ) + xscreensaver? ( x11-libs/libXScrnSaver ) + ) + ~dev-lang/tcl-${PV}:0=" +DEPEND="${RDEPEND} + !aqua? ( x11-base/xorg-proto )" + +SPARENT="${WORKDIR}/${MY_P}" +S="${SPARENT}"/unix + +src_prepare() { + eapply \ + "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ + "${FILESDIR}"/${PN}-8.5.13-multilib.patch + + eapply "${FILESDIR}"/${PN}-8.4.15-aqua.patch + eprefixify Makefile.in + + # Bug 125971 + eapply "${FILESDIR}"/${PN}-8.5.14-conf.patch + + # Bug 648570 + eapply "${FILESDIR}"/${PN}-8.6.8-libieee.patch + + # Make sure we use the right pkg-config, and link against fontconfig + # (since the code base uses Fc* functions). + sed \ + -e 's/FT_New_Face/XftFontOpen/g' \ + -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ + -e 's:xft freetype2:xft freetype2 fontconfig:' \ + -i configure.in || die + rm -f configure || die + + sed \ + -e '/chmod/s:555:755:g' \ + -i Makefile.in || die + + tc-export CC + + default + eautoconf +} + +src_configure() { + local mylibdir=$(get_libdir) + + econf \ + --with-tcl="${EPREFIX}/usr/${mylibdir}" \ + $(use_enable threads) \ + $(use_enable aqua) \ + $(use_enable truetype xft) \ + $(use_enable xscreensaver xss) \ + $(use_enable debug symbols) +} + +src_test() { + virtx emake test +} + +src_install() { + #short version number + local v1=$(ver_cut 1-2) + local mylibdir=$(get_libdir) + + S= default + + # normalize $S path, bug #280766 (pkgcore) + local nS="$(cd "${S}"; pwd)" + + # fix the tkConfig.sh to eliminate refs to the build directory + # and drop unnecessary -L inclusion to default system libdir + + sed \ + -e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \ + -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ + -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \ + -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \ + -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ + -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die + if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then + sed \ + -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ + -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ + -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die + fi + + # install private headers + insinto /usr/${mylibdir}/tk${v1}/include/unix + doins "${S}"/*.h + insinto /usr/${mylibdir}/tk${v1}/include/generic + doins "${SPARENT}"/generic/*.h + rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die + + # install symlink for libraries + dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) + dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a + + dosym wish${v1} /usr/bin/wish + + dodoc "${SPARENT}"/{ChangeLog*,README,changes} +} |