diff options
| -rw-r--r-- | dev-lang/tk/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-lang/tk/files/tk-8.5.13-conf.patch | 25 | ||||
| -rw-r--r-- | dev-lang/tk/metadata.xml | 2 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.5.13-r1.ebuild | 123 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.5.13.ebuild | 5 |
5 files changed, 160 insertions, 6 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index 234ca277aa98..c9cbc7268885 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/tk -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.177 2012/12/05 08:51:37 ulm Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.178 2013/01/09 16:36:07 jlec Exp $ + +*tk-8.5.13-r1 (09 Jan 2013) + + 09 Jan 2013; Justin Lecher <jlec@gentoo.org> tk-8.5.13.ebuild, + +tk-8.5.13-r1.ebuild, +files/tk-8.5.13-conf.patch, metadata.xml: + Fix build system so that autoconf will always be executed and sanitize sed so + that tclConfig.sh will be sane, #449134 05 Dec 2012; Ulrich Müller <ulm@gentoo.org> tk-8.4.19-r1.ebuild, tk-8.5.10-r1.ebuild, tk-8.5.11-r1.ebuild, tk-8.5.13.ebuild: diff --git a/dev-lang/tk/files/tk-8.5.13-conf.patch b/dev-lang/tk/files/tk-8.5.13-conf.patch new file mode 100644 index 000000000000..b77b8b3ad34a --- /dev/null +++ b/dev-lang/tk/files/tk-8.5.13-conf.patch @@ -0,0 +1,25 @@ + 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 +--- a/unix/tcl.m4 ++++ b/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" +@@ -1452,7 +1452,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + SHLIB_CFLAGS="-fPIC" + SHLIB_SUFFIX=".so" + +- SHLIB_LD='${CC} -shared' ++ SHLIB_LD='${CC} ${CFLAGS} -shared' + DL_OBJS="" + DL_LIBS="-ldl" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" diff --git a/dev-lang/tk/metadata.xml b/dev-lang/tk/metadata.xml index 815cc916f2b6..70ac40499556 100644 --- a/dev-lang/tk/metadata.xml +++ b/dev-lang/tk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>tcltk</herd> + <herd>tcltk</herd> </pkgmetadata> diff --git a/dev-lang/tk/tk-8.5.13-r1.ebuild b/dev-lang/tk/tk-8.5.13-r1.ebuild new file mode 100644 index 000000000000..702f6ac1accb --- /dev/null +++ b/dev-lang/tk/tk-8.5.13-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13-r1.ebuild,v 1.1 2013/01/09 16:36:07 jlec Exp $ + +EAPI=4 + +inherit autotools eutils multilib prefix toolchain-funcs versionator 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" +KEYWORDS="~alpha ~amd64 ~arm ~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" +IUSE="debug threads truetype aqua xscreensaver" + +RDEPEND=" + !aqua? ( + media-libs/fontconfig + x11-libs/libX11 + x11-libs/libXt + truetype? ( x11-libs/libXft ) + xscreensaver? ( x11-libs/libXScrnSaver ) + ) + ~dev-lang/tcl-${PV}" +DEPEND="${RDEPEND} + !aqua? ( x11-proto/xproto )" + +SPARENT="${WORKDIR}/${MY_P}" +S="${SPARENT}"/unix + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ + "${FILESDIR}"/${P}-multilib.patch + + epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch + eprefixify Makefile.in + + # Bug 125971 + epatch "${FILESDIR}"/${P}-conf.patch + + # Bug 354067 : the same applies to tcl, since the patch is about tcl.m4, just + # copy the tcl patch + epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.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 + + tc-export CC + + 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() { + Xemake test +} + +src_install() { + #short version number + local v1=$(get_version_component_range 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} +} diff --git a/dev-lang/tk/tk-8.5.13.ebuild b/dev-lang/tk/tk-8.5.13.ebuild index 03269c9c0729..d49444ea8367 100644 --- a/dev-lang/tk/tk-8.5.13.ebuild +++ b/dev-lang/tk/tk-8.5.13.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild,v 1.3 2012/12/05 08:51:37 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild,v 1.4 2013/01/09 16:36:07 jlec Exp $ EAPI=4 -inherit autotools eutils multilib toolchain-funcs prefix inherit autotools eutils multilib prefix toolchain-funcs virtualx MY_P="${PN}${PV/_beta/b}" |