4 files changed, 86 insertions, 3 deletions
diff --git a/dev-tcltk/tclx/ChangeLog b/dev-tcltk/tclx/ChangeLog
index 7f4def32144b..8d1b99e61fe9 100644
--- a/dev-tcltk/tclx/ChangeLog
+++ b/dev-tcltk/tclx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tclx
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.40 2009/08/05 20:10:09 mescalinum Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.41 2010/04/02 09:22:48 jlec Exp $
+
+*tclx-8.4-r2 (02 Apr 2010)
+
+  02 Apr 2010; Justin Lecher <jlec@gentoo.org> +tclx-8.4-r2.ebuild,
+  +files/tclx-8.4-ldflags.patch:
+  Imported from prefix overlay, ldflags respectation patch
 
   05 Aug 2009; Federico Ferri <mescalinum@gentoo.org> tclx-8.4-r1.ebuild:
   disable tests wrt bug 279283
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index e00cc240963f..702a5622905b 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tclx-8.3-varinit.patch 386 RMD160 4a697796894cd6573573330843c6a9312aa15e0f SHA1 21862a18f92ce64c2bc61ab3c42c4138e45b33e1 SHA256 7415da5026eab39fa272bd2e0b145cc6030f3a32a95fefc72d0ec9977f364cab
 AUX tclx-8.3.5-configure.patch 448 RMD160 59315bde21bc3ce96dfeed15e1d9b19a6a619f28 SHA1 605c9c51144463ec9260a1d9fdcd2e86c47dde1e SHA256 01ef10236ee23aaf868c5cd92416ca9e7db1fda103400f63acda0073f56b3dc2
+AUX tclx-8.4-ldflags.patch 360 RMD160 51ba902323403238c50363e5f9f62fb1ade4b3ce SHA1 1a8bcd558d168f6f6080ecd135879583e9d17217 SHA256 dc57432b561d42726fa9f8bbe58eb4c4fd7fb1ec29e4e9ccc5e6e3b874000944
 AUX tclx-8.4-relid.patch 1262 RMD160 3fa5e4bead6f725c9fb84aa44b8a4c87aecea1cc SHA1 b24406143e3a1ee5fb6fa376f86770a11f9d3072 SHA256 5c3af1c3e2842516049d1b639469c92f621f6ea97821c06b0ad097eb2fdb1e01
 AUX tclx-8.4-varinit.patch 399 RMD160 b433cfba4b8e83aa893548a37ef63c094a338df7 SHA1 dfde76f190557869129d94dc8da419f6029846f1 SHA256 3770fea219c9639c53f6380453850e3191b52cc2ff48896aff8658d737df0624
 DIST tcl8.4.6-src.tar.gz 3448711 RMD160 c282a1ce3b71d6b91b0b59fbc323d6ce05cba66f SHA1 d21495ca04419fc3b1594b96b19116040c33a3f0 SHA256 b34feacc62442512b8893de06f3fa05e8686a054fe684fb0b848bbdfad782f78
@@ -8,5 +12,13 @@ DIST tclx8.4.tar.bz2 313595 RMD160 96c10fdebfe97f4d2c59b61d1116ca0b3efddf7b SHA1
 DIST tk8.4.6-src.tar.gz 3230760 RMD160 e619afbe971730e94a2c180853ed1ac0166dcffa SHA1 a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88 SHA256 e93c2ce25059c355ec78b500f01ee1628d534e2f6e81bd95e39b8363c0711bb5
 EBUILD tclx-8.3.5.ebuild 1980 RMD160 ff3aba331bf5a66a19f4cea7ff951eee9356e845 SHA1 b43a6cd8a92666b75ba29a8f0630fad3ed197aa7 SHA256 740006de0ecf877355e6b6bc8b92ad7375fff428bef56ce71d8a3b1841dee5ce
 EBUILD tclx-8.4-r1.ebuild 958 RMD160 4bb84ee4db8968897580e53262e9500502234cc5 SHA1 183d8c919dffff2938df3a1381f49caed917d0cb SHA256 ca1d9bfcd42806e02805022c5418f959044184a3e7430468606e2ad641167b71
-MISC ChangeLog 5549 RMD160 8766ba3bf85d1cd53c7f38ee4d6696adf648ff48 SHA1 5dab4338901b6fb120dbffa45313494b41057881 SHA256 91848ac7985dd00b6bab2e2b83cd1cd0658fad288668e32f57ad81d63e48169f
+EBUILD tclx-8.4-r2.ebuild 1237 RMD160 4cf1c6138f79613ed6d4ba3315e964cc7477f888 SHA1 4a7adb37ec129f4799fa4de382225e68e6692b27 SHA256 084bd2399acb4206d2e36974fbaf4822ad50f5be42a6b8d3bc053cf31219a945
+MISC ChangeLog 5732 RMD160 c55d11d9b7508b11e70eca480ceb185501da8b5d SHA1 8aad6ed473cb3f84463d1713682565ec05859566 SHA256 9cac0417338922e2d7bc09dbc03e327fceab3fc440d3b83b8278f8f553200bc3
 MISC metadata.xml 425 RMD160 e228c917c6a30690e8f8f9607036f441d6a1210c SHA1 71f9166f6262809784e926d44a78faaa99a68ea0 SHA256 869bce48c0a21c79321e1fb631b9998ddfb1b89fb9b4f5907b7b03ff0bcfed40
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku1t20ACgkQgAnW8HDreRae7ACfQCyaYKFvEvh8jp2msDGHrhMg
+DO4AnikGfk3ETEv/6q2nfxPNdNK65r2/
+=FOxc
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclx/files/tclx-8.4-ldflags.patch b/dev-tcltk/tclx/files/tclx-8.4-ldflags.patch
new file mode 100644
index 000000000000..d6ef567a1522
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index b812bbe..069337c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -123,7 +123,7 @@ OBJEXT		= @OBJEXT@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= @SHLIB_LD@ $(LDFLAGS)
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
diff --git a/dev-tcltk/tclx/tclx-8.4-r2.ebuild b/dev-tcltk/tclx/tclx-8.4-r2.ebuild
new file mode 100644
index 000000000000..274564fb8219
--- /dev/null
+++ b/dev-tcltk/tclx/tclx-8.4-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.4-r2.ebuild,v 1.1 2010/04/02 09:22:48 jlec Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="A set of extensions to TCL"
+HOMEPAGE="http://tclx.sourceforge.net"
+SRC_URI="mirror://sourceforge/tclx/${PN}${PV}.tar.bz2"
+
+LICENSE="BSD"
+IUSE="tk threads"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND=">=dev-lang/tcl-8.4.6
+	tk? ( >=dev-lang/tk-8.4.6 )"
+
+S="${WORKDIR}"/${PN}${PV}
+
+# tests broken, bug #279283
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-relid.patch
+	epatch "${FILESDIR}"/${P}-varinit.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable tk) \
+		$(use_enable threads) \
+		--enable-shared \
+		--with-tcl="${EPREFIX}/usr/lib/" \
+		|| die "econf failed"
+
+	# adjust install_name on darwin
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i \
+			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
+				"${S}"/Makefile || die 'sed failed'
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog README
+	doman doc/*.[n3]
+}