jlec        15/03/13 08:31:25

  Modified:             ChangeLog
  Added:                tk-8.6.4.ebuild
  Removed:              tk-8.5.16.ebuild tk-8.6.1.ebuild tk-8.6.2.ebuild
  Log:
  Version Bump; drop old
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
B9D4F231BD1558AB!)

Revision  Changes    Path
1.212                dev-lang/tk/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.212&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.212&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.211&r2=1.212

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- ChangeLog   12 Mar 2015 10:26:40 -0000      1.211
+++ ChangeLog   13 Mar 2015 08:31:25 -0000      1.212
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.211 2015/03/12 
10:26:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.212 2015/03/13 
08:31:25 jlec Exp $
+
+*tk-8.6.4 (13 Mar 2015)
+
+  13 Mar 2015; Justin Lecher <[email protected]> +tk-8.6.4.ebuild,
+  -tk-8.5.16.ebuild, -tk-8.6.1.ebuild, -tk-8.6.2.ebuild:
+  Version Bump; drop old
 
   12 Mar 2015; Agostino Sarubbo <[email protected]> tk-8.5.17.ebuild:
   Stable for amd64, wrt bug #543022



1.1                  dev-lang/tk/tk-8.6.4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.6.4.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.6.4.ebuild?rev=1.1&content-type=text/plain

Index: tk-8.6.4.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.6.4.ebuild,v 1.1 2015/03/13 
08:31:25 jlec Exp $

EAPI=5

inherit autotools eutils multilib multilib-minimal 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/8.6"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-2.10.92[${MULTILIB_USEDEP}]
                >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
                >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
                truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
                xscreensaver? ( 
>=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
        )
        ~dev-lang/tcl-${PV}[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
        !aqua? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )"

# Not bumped to 8.6
#RESTRICT=test

SPARENT="${WORKDIR}/${MY_P}"
S="${SPARENT}"/unix

src_prepare() {
        find \
                "${SPARENT}"/compat/* \
                -delete || die

        epatch \
                "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
                "${FILESDIR}"/${PN}-8.5.13-multilib.patch

        epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
        eprefixify Makefile.in

        # Bug 125971
        epatch "${FILESDIR}"/${PN}-8.5.14-conf.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

        sed \
                -e 's:-O[2s]\?::g' \
                -i tcl.m4 || die

        mv configure.{in,ac} || die

        eautoconf

        multilib_copy_sources
}

multilib_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)
}

multilib_src_test() {
        Xemake test
}

multilib_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

        if multilib_is_native_abi; then
                dosym wish${v1} /usr/bin/wish
                dodoc "${SPARENT}"/{ChangeLog*,README,changes}
        fi
}




Reply via email to