version bumped

Package-Manager: portage-2.1.4.4

3 files changed, 115 insertions, 12 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 8a8040458d90..542694f2891b 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.109 2008/03/07 22:17:31 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.110 2008/10/26 09:15:00 mescalinum Exp $
+
+*tk-8.5.5 (26 Oct 2008)
+
+  26 Oct 2008; Federico Ferri <mescalinum@gentoo.org> +tk-8.5.5.ebuild:
+  version bumped
 
   07 Mar 2008; Christoph Mende <angelos@gentoo.org> tk-8.4.18.ebuild:
   Stable on amd64, bug #210326
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 468dca7e274c..1abcf6f6f824 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX remove-control-v-8.4.9.diff 522 RMD160 393f14c68f75795bc10e94d00a2e4d470ab50e4d SHA1 e45327e49545a8ef6132bec7303ef0b19a06e794 SHA256 f82a147821e6eb4cda3674568450903de864c99d73cae6062b56c391e7290bba
 AUX tk-8.4.11-multilib.patch 896 RMD160 29152dde424c41555e132c1b279ccc7ab279e27f SHA1 7f6e6d808e2016b1283d45fa001482c7a76a66a7 SHA256 1f15653e3f68fdd6b32b985514d6b2bae7a3a6c717a326c85082394095376636
 AUX tk-8.4.15-tclm4-soname.patch 533 RMD160 78caf459d2d06e769e01de5009cb63d8e1c19a62 SHA1 4c4614dc2a7f99ccdf1c1b0cfccd15ec74269333 SHA256 7b885a3307007613e32d15bd2ec144590079e291c0ee5315ed3425f066e784cc
@@ -11,15 +8,10 @@ AUX tk-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884
 DIST tk8.4.15-src.tar.gz 3340313 RMD160 8facb8033ce811097a3568373581687a749dda2d SHA1 832b39fc3e64dcbbfff4fc192e33d3fc8ef76c43 SHA256 2205bb0b0172f5553565f9f323ccf4bc122875084abc21a46f86ac560b9cd935
 DIST tk8.4.18-src.tar.gz 3363853 RMD160 9c01ba85575a230231793a9885457c98046e41bb SHA1 c1032f3cacd40406065fc1f46ecd217f50329273 SHA256 1757b0daff8a8bb962e612691236ae838e353521e7184464a5d32225905eac18
 DIST tk8.5.1-src.tar.gz 3759545 RMD160 5e1196db5415771e5a7bf38425cacd7cb0ee1cd8 SHA1 3280ca4572f19c5dd379380e9a02d382127f3378 SHA256 d25126147f5fa8423de35cefd07b37583cf9c281a396f49450de42251e095fe7
+DIST tk8.5.5-src.tar.gz 3774605 RMD160 4dd1a2693e216e56a9a039397e8ba11d5f33c5a3 SHA1 6fd70e43a7ce19038321542c153df2fb2f448feb SHA256 f6b7a52056996ce6c0d2ad7438d36e6d36c92e0ab9b326c4a8f14be5dbe50b1a
 EBUILD tk-8.4.15-r1.ebuild 3282 RMD160 046af5794309296edb2e132e8fe58a27bd4ceb31 SHA1 c5967f59102ecfec481e3073ae8ba2202e9f8a8a SHA256 0dd4adff78b47783129e1d57973eaf371f0cf8cc61b1ae737176b149e6ddab7e
 EBUILD tk-8.4.18.ebuild 3226 RMD160 b83bab1ab6ebc102aeab35a8ba8a144a3c4fb428 SHA1 8b172d6b6fe7e082903635700d29844179a1accb SHA256 1610f4aac4a9d61c823075b61fa96a722236fc3b33d6c64ede8f0e95483095e2
 EBUILD tk-8.5.1.ebuild 2832 RMD160 a336782e53eecbcf7a3deea85ca9337be3efc8b9 SHA1 5b66b8931006d5decbe2839f82c95f7d5867236d SHA256 3cc7d680ffe4539e7766b1afd72fc4c5de33512553e9b8af075251a70156a296
-MISC ChangeLog 15158 RMD160 e341207670456f7d9aa313382f0cf3eb6d4ac684 SHA1 162982b60330a3fb63080cc7e47d2b3cc8428303 SHA256 eb3cf24bb204a377cef1b8a112e87bc8f3773adef6abc0b6f7021e3daba4717d
+EBUILD tk-8.5.5.ebuild 2836 RMD160 28ce3198fa11930f45c3eb61e26be8031f5fd101 SHA1 956b7d4e8d7d6bc3ebfc7eda7506daade9dd4ba3 SHA256 61f29882d457600d16a071dc6a653d13a9a8cb03a9c54e4a3cd1463cfe7d0c3b
+MISC ChangeLog 15276 RMD160 f3ba6e603c689bbcf2017294c2cd4d345d68e581 SHA1 9a938c9d8f4f78ad0969bae20e22c386f6cc5796 SHA256 24db5de343f916f69508b7d0e9e46ea91c69ca7be81007346951833e61229e46
 MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH0b8BKhnDs22gwa8RAieSAKCUWUIMX6wQQZ8UMoIgl1kUqepTNgCg+z6P
-HnEhyz8++WuR6sOzcR1k+NI=
-=LKhX
------END PGP SIGNATURE-----
diff --git a/dev-lang/tk/tk-8.5.5.ebuild b/dev-lang/tk/tk-8.5.5.ebuild
new file mode 100644
index 000000000000..fcd9d6fc8c02
--- /dev/null
+++ b/dev-lang/tk/tk-8.5.5.ebuild
@@ -0,0 +1,106 @@
+# 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.5.ebuild,v 1.1 2008/10/26 09:15:00 mescalinum 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
+}