normalize $S path, bug #280766 (pkgcore)

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 117 insertions, 12 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 35cbbd9fe8ee..b2b574d2df89 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.129 2009/09/27 21:19:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.130 2009/10/06 19:25:35 mescalinum Exp $
+
+*tk-8.5.7-r1 (06 Oct 2009)
+
+  06 Oct 2009; Federico Ferri <mescalinum@gentoo.org> +tk-8.5.7-r1.ebuild:
+  normalize $S path, bug #280766 (pkgcore)
 
   27 Sep 2009; Markus Meier <maekke@gentoo.org> tk-8.5.7.ebuild:
   arm stable, bug #280845
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index b0d11ff695d8..3a484c7949dc 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-lastevent.patch 1095 RMD160 5e03fcb59320898429a3c1d438916eb0a65eeefc SHA1 433e2718f8eaa124ae87f53a276bb2208602fd6d SHA256 73bdd40b9e04ad705ac8956ea96967aaee5ac8ee9588a43e5c1bf30d50c0996d
 AUX tk-8.4.11-multilib.patch 896 RMD160 29152dde424c41555e132c1b279ccc7ab279e27f SHA1 7f6e6d808e2016b1283d45fa001482c7a76a66a7 SHA256 1f15653e3f68fdd6b32b985514d6b2bae7a3a6c717a326c85082394095376636
@@ -17,13 +14,7 @@ EBUILD tk-8.4.15-r1.ebuild 3282 RMD160 046af5794309296edb2e132e8fe58a27bd4ceb31
 EBUILD tk-8.4.18-r1.ebuild 3303 RMD160 f5007b262e910b40cd343242d4f33235b060fc37 SHA1 06994fb5eb3ae61bdf8725bd99c06f9a90408b35 SHA256 6f62f9b0a86d1ae111ad1a5821ab868a46f5e22370af9bfdf6b714f473cc5ae9
 EBUILD tk-8.4.18.ebuild 3223 RMD160 5b179591c7482cad7243d1e863d907fd96b6ceaa SHA1 2c4fef5d462d49f320cf7c24289d84b8813fd43e SHA256 4ae7b03503f7779b8dfd409f4035b61e4ee4df855d8f5b782d5024a3fc61edf6
 EBUILD tk-8.4.19-r1.ebuild 3315 RMD160 79e424465e160e1f1f50de167eeaeb0ee19c9ac9 SHA1 b07cafffe28ecb282f168c3db8652476b7026825 SHA256 74b253737807a407637ea33413844aef9dd08d6771fd6d01d65c6b60cfa88d78
+EBUILD tk-8.5.7-r1.ebuild 2924 RMD160 7d72ee64d40fbd59984efaf18e75307f9f11998a SHA1 10fb50db2098cf969e98940263a564119e23f290 SHA256 93af609d84ef1aaedae7965c03cfb402020efddba3dae8d5bcb70beb6ffa745a
 EBUILD tk-8.5.7.ebuild 2831 RMD160 8231c334760317233d2fd7e3d10f4aeb18f54a03 SHA1 37284339520115aab72ba691e19db72539760027 SHA256 d3eb48e1fbc9632794731c8addf097b0dad1834b8622356f31fa6648b54c2036
-MISC ChangeLog 17472 RMD160 9253b43e1da2fcf0ab5c4bdf7be30ccaf2e51311 SHA1 0b9f59df8b8caa2f57dcfa0a4398408244bfa19d SHA256 90231b649db9d26349907f7104b67a8e8adabb5ac8bc988701ca7243df298754
+MISC ChangeLog 17623 RMD160 7d755349ea87023afe47a1ba10683b5d525d4f1f SHA1 e0aba26817a9d07aff6835fcfb179bef947a4628 SHA256 681aebdd71c391a3537d1050627c303228f6c6344802cae0e1f608906d7987a1
 MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq/1vQACgkQkKaRLQcq0GIGEACfSu7qPu3cNPcGfm89RTROTDd6
-F10AoKhLWlKnJ9SOxWUGpcoIe0b7UViE
-=aZKf
------END PGP SIGNATURE-----
diff --git a/dev-lang/tk/tk-8.5.7-r1.ebuild b/dev-lang/tk/tk-8.5.7-r1.ebuild
new file mode 100644
index 000000000000..2f5d28df7807
--- /dev/null
+++ b/dev-lang/tk/tk-8.5.7-r1.ebuild
@@ -0,0 +1,109 @@
+# 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.7-r1.ebuild,v 1.1 2009/10/06 19:25:35 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 ~s390 ~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
+
+	# 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/usr/${mylibdir}," \
+		-e "s,^\(TK_SRC_DIR='\)${nS}',\1/usr/${mylibdir}/tk${v1}/include'," \
+		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1/usr/${mylibdir}," \
+		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/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
+}