5 files changed, 69 insertions, 11 deletions
diff --git a/dev-tcltk/tclreadline/ChangeLog b/dev-tcltk/tclreadline/ChangeLog
index 680e5b692d05..f0b2084377ec 100644
--- a/dev-tcltk/tclreadline/ChangeLog
+++ b/dev-tcltk/tclreadline/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-tcltk/tclreadline
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclreadline/ChangeLog,v 1.17 2011/12/15 12:15:03 ago Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclreadline/ChangeLog,v 1.18 2012/11/04 19:52:08 jlec Exp $
+
+*tclreadline-2.1.0-r2 (04 Nov 2012)
+
+  04 Nov 2012; Justin Lecher <jlec@gentoo.org> tclreadline-2.1.0.ebuild,
+  tclreadline-2.1.0-r1.ebuild, +tclreadline-2.1.0-r2.ebuild,
+  +files/tclreadline-2.1.0-gold.patch:
+  Add fix for underlinking, #440648; pass all paths to configure for prefix
+  stability
 
   15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> tclreadline-2.1.0-r1.ebuild:
   Stable for AMD64, wrt bug #393825
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.1.0-gold.patch b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-gold.patch
new file mode 100644
index 000000000000..8cfb5b43a742
--- /dev/null
+++ b/dev-tcltk/tclreadline/files/tclreadline-2.1.0-gold.patch
@@ -0,0 +1,15 @@
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 68d78f1..03dbf06 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,6 +20,7 @@ include_HEADERS = tclreadline.h
+ INCLUDES = -I$(TCL_INCLUDE_DIR) -I$(READLINE_INCLUDE_DIR)
+ 
+ ## libtclreadline_la_LIBADD = $(LIBS)
++libtclreadline_la_LIBADD = -ltcl
+ libtclreadline_la_LDFLAGS = -release $(MAJOR).$(MINOR).$(PATCHLEVEL)
+ 
+ tclrldir = @TCLRL_DIR@
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0-r1.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0-r1.ebuild
index a66efb57f46f..4665d91d5e2f 100644
--- a/dev-tcltk/tclreadline/tclreadline-2.1.0-r1.ebuild
+++ b/dev-tcltk/tclreadline/tclreadline-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclreadline/tclreadline-2.1.0-r1.ebuild,v 1.4 2011/12/15 12:15:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclreadline/tclreadline-2.1.0-r1.ebuild,v 1.5 2012/11/04 19:52:08 jlec Exp $
 
 EAPI=4
 
@@ -10,10 +10,10 @@ DESCRIPTION="Readline extension to TCL"
 HOMEPAGE="http://tclreadline.sf.net/"
 SRC_URI="mirror://sourceforge/tclreadline/${P}.tar.gz"
 
-LICENSE="BSD"
-IUSE=""
 SLOT="0"
+LICENSE="BSD"
 KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+IUSE=""
 
 DEPEND="
 	dev-lang/tcl
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0-r2.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..be0b37d2560a
--- /dev/null
+++ b/dev-tcltk/tclreadline/tclreadline-2.1.0-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclreadline/tclreadline-2.1.0-r2.ebuild,v 1.1 2012/11/04 19:52:08 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib
+
+DESCRIPTION="Readline extension to TCL"
+HOMEPAGE="http://tclreadline.sf.net/"
+SRC_URI="mirror://sourceforge/tclreadline/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND="
+	dev-lang/tcl
+	sys-libs/readline"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gold.patch )
+
+src_configure() {
+	local myeconfargs=(
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+		--with-tcl-includes="${EPREFIX}/usr/include"
+		--with-readline-includes="${EPREFIX}/usr/include"
+		--with-readline-library="${EPREFIX}/usr/$(get_libdir)"
+		)
+	autotools-utils_src_configure
+}
diff --git a/dev-tcltk/tclreadline/tclreadline-2.1.0.ebuild b/dev-tcltk/tclreadline/tclreadline-2.1.0.ebuild
index a5d154ef901e..4896ed21f0eb 100644
--- a/dev-tcltk/tclreadline/tclreadline-2.1.0.ebuild
+++ b/dev-tcltk/tclreadline/tclreadline-2.1.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclreadline/tclreadline-2.1.0.ebuild,v 1.17 2011/12/12 08:53:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclreadline/tclreadline-2.1.0.ebuild,v 1.18 2012/11/04 19:52:08 jlec Exp $
 
 DESCRIPTION="Readline extension to TCL"
 HOMEPAGE="http://tclreadline.sf.net/"
 SRC_URI="mirror://sourceforge/tclreadline/${P}.tar.gz"
 
-IUSE=""
-LICENSE="BSD"
 SLOT="0"
+LICENSE="BSD"
 KEYWORDS="alpha ~amd64 ppc ~sparc x86"
+IUSE=""
 
 DEPEND="
-	>=dev-lang/tcl-8.3
+	dev-lang/tcl
 	sys-libs/readline"
 RDEPEND="${DEPEND}"