Version Bump

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

4 files changed, 128 insertions, 12 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 6f69d1d74d0d..a5329049f05f 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.154 2011/03/23 19:05:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.155 2011/10/04 17:08:05 jlec Exp $
+
+*tk-8.5.10 (04 Oct 2011)
+
+  04 Oct 2011; Justin Lecher <jlec@gentoo.org> +tk-8.5.10.ebuild, metadata.xml:
+  Version Bump
 
   23 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> tk-8.5.9-r1.ebuild:
   ppc64 stable wrt #353854
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 4ff977cd8913..4583df1184be 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX remove-control-v-8.4.9.diff 522 RMD160 393f14c68f75795bc10e94d00a2e4d470ab50e4d SHA1 e45327e49545a8ef6132bec7303ef0b19a06e794 SHA256 f82a147821e6eb4cda3674568450903de864c99d73cae6062b56c391e7290bba
 AUX tk-8.4-lastevent.patch 1095 RMD160 5e03fcb59320898429a3c1d438916eb0a65eeefc SHA1 433e2718f8eaa124ae87f53a276bb2208602fd6d SHA256 73bdd40b9e04ad705ac8956ea96967aaee5ac8ee9588a43e5c1bf30d50c0996d
@@ -12,24 +12,24 @@ AUX tk-CVE-2007-4851.patch 405 RMD160 bfc884fbe1f0f2facb892ff0100f59dae0fe5256 S
 AUX tk-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 DIST tk8.4.18-src.tar.gz 3363853 RMD160 9c01ba85575a230231793a9885457c98046e41bb SHA1 c1032f3cacd40406065fc1f46ecd217f50329273 SHA256 1757b0daff8a8bb962e612691236ae838e353521e7184464a5d32225905eac18
 DIST tk8.4.19-src.tar.gz 3362694 RMD160 c963297655740ad4b29a99c489c35a64e5e817ce SHA1 56d09be8a7670b2686d76b7526ff24b0240ca120 SHA256 d056fe6c204ac31539616e1069522dd5864a580b64e521fe1a49bc895ca8699f
+DIST tk8.5.10-src.tar.gz 3807862 RMD160 304fdfa1498cb7bd4161e9a570476de215900ad5 SHA1 385df857b84b2cdac197639fcfde1a007ab60a3c SHA256 f6ac59a3414a0989c9ca30237b3c14ceee95733eb486739ffc271c8055e37c9f
 DIST tk8.5.7-src.tar.gz 3779867 RMD160 8ff412f84ffb76b9b0da5a32f7404c37a5337003 SHA1 b5def6871e53c78354ac01b27abd523bb4295158 SHA256 d9366ed397c4bde96550ec9d30a8fcf67878cf26937cae93e580726a87d7af30
 DIST tk8.5.8-src.tar.gz 3789533 RMD160 494a0d217ce6a81c10afb91b344c6110dd0986b0 SHA1 ea13b9d0bf611c7671c488bc0b5f3f739ad7e399 SHA256 9737da5c30e631281062b6acbb4753840f9e95657c78e37657d9c520589ab2d4
 DIST tk8.5.9-src.tar.gz 3825659 RMD160 8b3f1381fecf88fd2272690ec6786ec180ecb2fd SHA1 161a133e0b653d5fdf6fcff47bdbf768d73f3238 SHA256 f46b33d41e71ef533140f1814961f0dc22d62aac316df4a4fd3357e1fd788b83
 EBUILD tk-8.4.18-r1.ebuild 3250 RMD160 5e4a4e2a1bf9d627e3ac943e79fc4559cc3ddedc SHA1 f4715a9d04c9dd7806cf1fcceb360d4cd939e5b5 SHA256 5b5715bce0583871983cf59b9b0f02cd918c4788760b1308408e7c677d67a1fc
 EBUILD tk-8.4.18.ebuild 3172 RMD160 92277145a90076904705c1793f8edacedf4dbed6 SHA1 f4053271122a5ead05d4ab9e193af286da7a862f SHA256 66950b70f7d997a27ce641af9ecc0d78001b57cf05c6b8d7dc5b396827323b90
 EBUILD tk-8.4.19-r1.ebuild 3262 RMD160 c9fe9b3b572d4b0e1933bd095a9fba8c850a3d19 SHA1 32826f74e838ec3ad09bdf54811cb2c75f59d6f2 SHA256 4853aa1c968cc14c369e105bfce4f4c5b3b28fdee97757dbb49681ad65d0390e
+EBUILD tk-8.5.10.ebuild 3228 RMD160 e02f4dc2790b5a8fff1460bd50c3fa68a665d079 SHA1 f287bb48c5a4890eb1f8b918ef39453a1b417738 SHA256 694f68d0d291e6067167b8930c1994ef7083f866a66ea35b3c3623b17b41a8ad
 EBUILD tk-8.5.7-r1.ebuild 2880 RMD160 445ae6825eb80c09dade8b9eb834697662be1ab1 SHA1 89ec94ed94dbd33245b451c319beeb0037878afd SHA256 efd70fe2b92b24ce91ccc8b03e99f20dc830f8ebe7bf4a2bbd6836de8eb24e15
 EBUILD tk-8.5.7.ebuild 2776 RMD160 ac64048b9fd4113d5fc5bc4f888156e32901617b SHA1 766e18f181acd1d269bd38062ae2c0c2b4909c62 SHA256 8201c25e9a294908c000bd4e897f7a9e61d28b0df2b0fbc39e50e5ccec8d647b
 EBUILD tk-8.5.8-r1.ebuild 3226 RMD160 1d9f7270b8628a1c480138e31ff65700fed000a4 SHA1 e9cd361427b09d027faaa4403ce9dcf7d226b24e SHA256 9885d6d414455e63bc284f13884091ba4b88a822efd61a18da8bb47cad971fc1
 EBUILD tk-8.5.9-r1.ebuild 3225 RMD160 16883f5abf8d9f0dfb912603a14e3b8564f023e1 SHA1 a8c56641d215fcb96b536609bb8959077707a37b SHA256 dba430898da54a61ad6fa7dacb6b747db57c35cd8eff225a173951b43402ccfd
-MISC ChangeLog 20530 RMD160 cef19f75f8a9dd6343a7c8f56ab4c5b5902b3d8f SHA1 c14b3536920c0073a5b5a19967b760c2ae5c24b4 SHA256 9a708fc4da3dde45855226b18fb3262910ff84597454d83709bcb37b48c8b758
-MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
+MISC ChangeLog 20646 RMD160 95487b7fb3aa4c24564dc10ce57384970763fb62 SHA1 fbf89e48dfbd270219c066286abd7016c684965c SHA256 e7d973b0a37d5de19d07ba71d1abe318eff3b80425ec1fac78fc5703447d49f7
+MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk2KRJgACgkQIiMqcbOVdxRQhwP/aW725Btz915ll1ucqzZ16gm+
-3aYQ91wKHfPmtrYaSfupoZk2hgyMpHnXNRyNPqZ/myvtejWkUZ19fuHj1Y3DPyg1
-arlFKbCEb8wG80+zaN0Z5bXegXAhF45TzFnRsqJxomsCXcYYlRZajT/JI9NXvjRC
-f7O2tX0JiUqQNjpchus=
-=reGH
+iEYEAREKAAYFAk6LPXoACgkQgAnW8HDreRbirACcDJ6nnqOFWNCMI4MjT7F7wBM+
+bdQAn3V8QurTX5lKioQmkx1ZJ20dAKMq
+=n7R/
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/tk/metadata.xml b/dev-lang/tk/metadata.xml
index 173251e809e0..815cc916f2b6 100644
--- a/dev-lang/tk/metadata.xml
+++ b/dev-lang/tk/metadata.xml
@@ -1,6 +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.10.ebuild b/dev-lang/tk/tk-8.5.10.ebuild
new file mode 100644
index 000000000000..2307f131b963
--- /dev/null
+++ b/dev-lang/tk/tk-8.5.10.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.10.ebuild,v 1.1 2011/10/04 17:08:05 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}"/${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
+}