Version bump, dropping keywords as status wrt other packages is untested

Package-Manager: portage-2.1.3.17

4 files changed, 135 insertions, 5 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 7abb2e083b93..9c9346a2b8c9 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.97 2007/09/23 01:19:14 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.98 2007/11/03 21:29:26 jokey Exp $
+
+*tk-8.5b (03 Nov 2007)
+
+  03 Nov 2007; Markus Ullmann <jokey@gentoo.org> +tk-8.5b.ebuild:
+  Version bump, dropping keywords as status wrt other packages is untested
 
   23 Sep 2007; Ferris McCormick <fmccor@gentoo.org> tk-8.4.15-r1.ebuild:
   Sparc stable --- security Bug #192539 --- has been running fine.
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 2b36dc09dc9e..3e1cfef9debd 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX remove-control-v-8.4.9.diff 522 RMD160 393f14c68f75795bc10e94d00a2e4d470ab50e4d SHA1 e45327e49545a8ef6132bec7303ef0b19a06e794 SHA256 f82a147821e6eb4cda3674568450903de864c99d73cae6062b56c391e7290bba
 MD5 3003fb2cb4a185ec54b8c94ec0606313 files/remove-control-v-8.4.9.diff 522
 RMD160 393f14c68f75795bc10e94d00a2e4d470ab50e4d files/remove-control-v-8.4.9.diff 522
@@ -29,6 +32,7 @@ SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/tk
 DIST tk8.4.15-src.tar.gz 3340313 RMD160 8facb8033ce811097a3568373581687a749dda2d SHA1 832b39fc3e64dcbbfff4fc192e33d3fc8ef76c43 SHA256 2205bb0b0172f5553565f9f323ccf4bc122875084abc21a46f86ac560b9cd935
 DIST tk8.4.9-src.tar.gz 3266500 RMD160 a9a2609d65094b2b6c5dabc702a6471f8d5eaa63 SHA1 3d677d4327f035ddd43992c134f47b6f927cb14a SHA256 ed6853d9ab3d1bd3246a6ae6cb79a669441be0c5131c4fc91073bdfe3f30cd15
 DIST tk8.5a6-src.tar.gz 3682249 RMD160 9cb6f2c7665eee8269a69805a3c9b45edd806cda SHA1 e26fd2f7490c04d78218a33644ca044b39aa59a4 SHA256 67f5022f31d7a8adea7d150caa5c7de56ea0051e287f67fcb15b82f7fd5b8fd6
+DIST tk8.5b2-src.tar.gz 3736725 RMD160 9c7b1e422c436a52568ea85b9f4e5a3964b0e4a8 SHA1 8924402f9822dd391207cf85ce384f915a79b3e1 SHA256 5250c3a36d1123055420be405c5a8713dd4768348e3ccd8234567c5b1812a0eb
 EBUILD tk-8.4.15-r1.ebuild 3283 RMD160 c1e94ab6c827f5b8ef778d4d6cb7e8589fd22aa9 SHA1 fe0f810eeaf467fab594d8c733c515a94269b2b1 SHA256 c40e45f026ee12e5cc1909bea990eb6fced7436467a7cfcc1d6b7ad5f4e5d88f
 MD5 5ca4e0c08fc6ad5b747a2faefe837941 tk-8.4.15-r1.ebuild 3283
 RMD160 c1e94ab6c827f5b8ef778d4d6cb7e8589fd22aa9 tk-8.4.15-r1.ebuild 3283
@@ -49,10 +53,14 @@ EBUILD tk-8.5_alpha6.ebuild 2755 RMD160 7a78e4570880eb68a23a4f8dcc58ca5ab2c7b8aa
 MD5 7a8192e758136f0264af75acc5a11de5 tk-8.5_alpha6.ebuild 2755
 RMD160 7a78e4570880eb68a23a4f8dcc58ca5ab2c7b8aa tk-8.5_alpha6.ebuild 2755
 SHA256 1a637c8c5dd6d8389a0bd475c0c380abbbbc01bf9a713eea0297655f5813990d tk-8.5_alpha6.ebuild 2755
-MISC ChangeLog 13148 RMD160 436f275a7d0de4ddf55c1a9ea18005517ec705c1 SHA1 6ee2a86b059664d9ac4cb1b1fa93b0e9d5080329 SHA256 0cdebd6f42dbf8b4739ec636f7e99d4b1e3df7dfc2ef192c6d267e919592b6a3
-MD5 332cbedf04bee103b71bfc32b19f6237 ChangeLog 13148
-RMD160 436f275a7d0de4ddf55c1a9ea18005517ec705c1 ChangeLog 13148
-SHA256 0cdebd6f42dbf8b4739ec636f7e99d4b1e3df7dfc2ef192c6d267e919592b6a3 ChangeLog 13148
+EBUILD tk-8.5b.ebuild 2682 RMD160 2a397c89029ccd4ca67b4fb82724837bac5874b5 SHA1 46ddc45d3312c4efe81086786f8baa271acee149 SHA256 607ee45e09680e83597d280540c34d82eadb5c4e90d14e93a62fa8b9f90585c9
+MD5 37dcd3aef2ed4a6efe7a228d24ecef44 tk-8.5b.ebuild 2682
+RMD160 2a397c89029ccd4ca67b4fb82724837bac5874b5 tk-8.5b.ebuild 2682
+SHA256 607ee45e09680e83597d280540c34d82eadb5c4e90d14e93a62fa8b9f90585c9 tk-8.5b.ebuild 2682
+MISC ChangeLog 13313 RMD160 d0747ef4816ec9368461e616428648221a1ad458 SHA1 3b8059e908a1cc657023f97053bc3f7198727538 SHA256 b9706fc8247d694758ecc1f71f79e6e40580fc1b79cb4d342111fffd0747d8f5
+MD5 19af817676e6843bc3910356ae2478c1 ChangeLog 13313
+RMD160 d0747ef4816ec9368461e616428648221a1ad458 ChangeLog 13313
+SHA256 b9706fc8247d694758ecc1f71f79e6e40580fc1b79cb4d342111fffd0747d8f5 ChangeLog 13313
 MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
 MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
 RMD160 117cc289391c0477579de68e7347628756673eac metadata.xml 159
@@ -72,3 +80,13 @@ SHA256 79e640e65a7160e693689bd7e0b624bdf465cbd8e617a43564d4c96a604058c1 files/di
 MD5 366a6c0da47597d083a77990bea08dee files/digest-tk-8.5_alpha6-r1 238
 RMD160 1f1d655ee375de1977bb993e80db48bb6e1e1bd5 files/digest-tk-8.5_alpha6-r1 238
 SHA256 79e640e65a7160e693689bd7e0b624bdf465cbd8e617a43564d4c96a604058c1 files/digest-tk-8.5_alpha6-r1 238
+MD5 e4836aec062af944b0bf91f8e7c563af files/digest-tk-8.5b 238
+RMD160 b9372cc1886ce691c1b0cb7377f19b3808c7f482 files/digest-tk-8.5b 238
+SHA256 b32b40dc63de119804b190ecef6d5472e60722fede79d97f22e84d9332ea0319 files/digest-tk-8.5b 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHLOhBz974XjDVpbkRAuSNAKDebx8c8FRadZGQLv4AgXz+QeP19wCfeDgE
+6eThaond7fmbzkgJc//STSo=
+=cQjh
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tk/files/digest-tk-8.5b b/dev-lang/tk/files/digest-tk-8.5b
new file mode 100644
index 000000000000..e105cf7f4ed5
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.5b
@@ -0,0 +1,3 @@
+MD5 69e736155e0e9b9823e836b9930b2b20 tk8.5b2-src.tar.gz 3736725
+RMD160 9c7b1e422c436a52568ea85b9f4e5a3964b0e4a8 tk8.5b2-src.tar.gz 3736725
+SHA256 5250c3a36d1123055420be405c5a8713dd4768348e3ccd8234567c5b1812a0eb tk8.5b2-src.tar.gz 3736725
diff --git a/dev-lang/tk/tk-8.5b.ebuild b/dev-lang/tk/tk-8.5b.ebuild
new file mode 100644
index 000000000000..d47aa06a1eb1
--- /dev/null
+++ b/dev-lang/tk/tk-8.5b.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5b.ebuild,v 1.1 2007/11/03 21:29:26 jokey Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit autotools eutils multilib toolchain-funcs
+
+MY_P="${PN}${PV/b/b2}"
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug threads"
+
+RDEPEND="x11-libs/libX11
+	~dev-lang/tcl-${PV}"
+DEPEND="${RDEPEND}
+	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 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
+}