bump to version 8.5.7

(Portage version: 2.2_rc28/cvs/Linux x86_64)

3 files changed, 8 insertions, 108 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 77b2bd6c541f..c0a06fd41a65 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.115 2009/02/25 15:17:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.116 2009/04/17 19:14:15 mescalinum Exp $
+
+*tk-8.5.7 (17 Apr 2009)
+
+  17 Apr 2009; Federico Ferri <mescalinum@gentoo.org> -tk-8.5.1.ebuild,
+  -tk-8.5.6.ebuild, +tk-8.5.7.ebuild:
+  bump to version 8.5.7
 
   25 Feb 2009; Raúl Porcel <armin76@gentoo.org> tk-8.4.19-r1.ebuild,
   tk-8.5.6.ebuild:
diff --git a/dev-lang/tk/tk-8.5.1.ebuild b/dev-lang/tk/tk-8.5.1.ebuild
deleted file mode 100644
index a680a481252f..000000000000
--- a/dev-lang/tk/tk-8.5.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.1.ebuild,v 1.1 2008/02/16 04:43:32 matsuu Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit autotools eutils multilib toolchain-funcs
-
-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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug threads truetype"
-
-RDEPEND="x11-libs/libX11
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	truetype? ( x11-libs/libXft )
-	x11-libs/libXt
-	x11-proto/xproto"
-
-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 ""
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_compile() {
-	tc-export CC
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
-	econf \
-		--with-tcl=/usr/${mylibdir} \
-		$(use_enable threads) \
-		$(use_enable truetype xft) \
-		$(use_enable debug symbols) || die
-
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# 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\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		"${D}"/usr/${mylibdir}/tkConfig.sh || die
-
-	# 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 "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-	dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	dosym wish${v1} /usr/bin/wish
-
-	cd "${S}"
-	dodoc ChangeLog* README changes
-}
diff --git a/dev-lang/tk/tk-8.5.6.ebuild b/dev-lang/tk/tk-8.5.7.ebuild
index a609392e698e..3054a3b7f2c6 100644
--- a/dev-lang/tk/tk-8.5.6.ebuild
+++ b/dev-lang/tk/tk-8.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.6.ebuild,v 1.2 2009/02/25 15:17:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.7.ebuild,v 1.1 2009/04/17 19:14:15 mescalinum Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest