Version Bump

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

5 files changed, 259 insertions, 3 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index aeaff12cd2f4..2c4fb900f98a 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.142 2012/01/04 20:44:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.143 2012/03/02 15:30:44 jlec Exp $
+
+  02 Mar 2012; Justin Lecher <jlec@gentoo.org> +tcl-8.5.11.ebuild:
+  Version Bump
+
+*tcl-8.5.11 (02 Mar 2012)
+
+  02 Mar 2012; Justin Lecher <jlec@gentoo.org> +tcl-8.5.11.ebuild:
+  Version Bump
 
   04 Jan 2012; Brent Baude <ranger@gentoo.org> tcl-8.5.10.ebuild:
   Marking tcl-8.5.10 ppc for bug 280934
diff --git a/dev-lang/tcl/tcl-8.5.11.ebuild b/dev-lang/tcl/tcl-8.5.11.ebuild
new file mode 100644
index 000000000000..463b16884ac8
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5.11.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild,v 1.1 2012/03/02 15:30:44 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug threads"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use threads ; then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling ${P} with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications"
+		ewarn "that compile against tcl. You use threading at"
+		ewarn "your own discretion."
+		ewarn ""
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
+
+	# Bug 354067
+	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
+
+	cd "${S}"/unix
+	eautoreconf
+}
+
+src_configure() {
+	# workaround stack check issues, bug #280934
+	if use hppa; then
+		append-cflags "-DTCL_NO_STACK_CHECK=1"
+	fi
+
+	tc-export CC
+
+	cd "${S}"/unix
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+src_compile() {
+	cd "${S}"/unix
+	emake || die
+}
+
+src_install() {
+	#short version number
+	local v1
+	v1=${PV%.*}
+
+	cd "${S}"/unix
+	S= emake DESTDIR="${D}" install || die
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+	sed -i \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
+		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	[[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] && sed -i \
+		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
+		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
+		"${ED}"/usr/${mylibdir}/tclConfig.sh
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins "${S}"/unix/*.h || die
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${S}"/generic/*.h || die
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) || die
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
+
+	dosym tclsh${v1} /usr/bin/tclsh || die
+
+	cd "${S}"
+	dodoc ChangeLog* README changes || die
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
+	ewarn "packages on your system that link with tcl after the upgrade"
+	ewarn "completes.  To perform this action, please run revdep-rebuild"
+	ewarn "in package app-portage/gentoolkit."
+	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
+	ewarn "upgrade them before this recompilation, too,"
+	ewarn
+}
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index a5329049f05f..56fb3319353a 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/tk
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.155 2011/10/04 17:08:05 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.156 2012/03/02 15:31:00 jlec Exp $
+
+*tk-8.5.11 (02 Mar 2012)
+
+  02 Mar 2012; Justin Lecher <jlec@gentoo.org> +tk-8.5.11.ebuild,
+  +files/tk-8.5.11-fedora-xft.patch:
+  Version Bump
 
 *tk-8.5.10 (04 Oct 2011)
 
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 000000000000..67640db085f1
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.5.11-fedora-xft.patch
@@ -0,0 +1,13 @@
+--- tk8.5.9/unix/configure.in.old	2010-09-02 20:12:14.000000000 +0200
++++ tk8.5.9/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/tk-8.5.11.ebuild b/dev-lang/tk/tk-8.5.11.ebuild
new file mode 100644
index 000000000000..0a9cc6c0fe80
--- /dev/null
+++ b/dev-lang/tk/tk-8.5.11.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.1 2012/03/02 15:31:00 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils multilib toolchain-funcs prefix
+
+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="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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? (
+		x11-libs/libX11
+		x11-libs/libXt
+		truetype? ( x11-libs/libXft )
+		xscreensaver? ( x11-libs/libXScrnSaver ) )
+	~dev-lang/tcl-${PV}"
+DEPEND="${RDEPEND}
+	!aqua? ( x11-proto/xproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fedora-xft.patch
+	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
+
+	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
+	eprefixify unix/Makefile.in
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
+
+	sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die
+
+	cd "${S}"/unix
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	cd "${S}"/unix
+
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+
+	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_compile() {
+	cd "${S}"/unix
+	emake || die
+}
+
+src_install() {
+	#short version number
+	local v1
+	v1=${PV%.*}
+
+	cd "${S}"/unix
+	S= emake DESTDIR="${D}" install || die
+
+	# normalize $S path, bug #280766 (pkgcore)
+	local nS="$(cd "${S}"; pwd)"
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+	sed -i \
+		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^\(TK_SRC_DIR='\)${nS}',\1${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \
+		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
+		"${ED}"/usr/${mylibdir}/tkConfig.sh || die
+
+	if [[ ${CHOST} != *-darwin* ]]; then
+		sed -i \
+				-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
+				-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
+				"${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tk${v1}/include/unix
+	doins "${S}"/unix/*.h || die
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${S}"/generic/*.h || die
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
+
+	# install symlink for libraries
+	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
+	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) || die
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a || die
+
+	dosym wish${v1} /usr/bin/wish || die
+
+	cd "${S}"
+	dodoc ChangeLog* README changes || die
+}