dev-tcltk/tclreadline: Add fix for underlinking, #440648; pass all paths to configure for prefix stability

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

6 files changed, 84 insertions, 14 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/Manifest b/dev-tcltk/tclreadline/Manifest
index c15cc0045f30..9f7e6b61f0c0 100644
--- a/dev-tcltk/tclreadline/Manifest
+++ b/dev-tcltk/tclreadline/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX tclreadline-2.1.0-gold.patch 437 SHA256 1478b5e5c28075b184982c51bcfe4a2d35a689834ca4702415082434894540a9 SHA512 8e34f47ee5286a92fc424bebe08c2f2266032b31fc08e3d00c65ca18efd0d44fb961ed62f63e7fadfe52b052e535019d49d74147c71fc16d741473bdeeb845db WHIRLPOOL b142bb7f5427f845646841c7773edd816aef2e4a557a32ccba155e6fc3a746f23087aaff64bad5e0f058883e560c2de8fdb3753b3a8514e66bfa3eb2da569afd
 DIST tclreadline-2.1.0.tar.gz 160541 SHA256 def2325e45e2b7f30b04ad5078481740596599622c253043c503c2285f5672e7 SHA512 bd67a65fe2ec708834fb67fabf2e36e778a6aeeb7a7b69cda298f9e18acc9e03f3a379f81ff7d2d289bfbf1093bc86fecbf96fe5d04a2ca954899cc7df6fe4bf WHIRLPOOL 89680ffcfea123d2032e4948788164d57e7fa90c05b16d838edbd0fd8916b34f934acd785ae8bc5313f4391779f3b15b31924ef8c4e925f6443a3022b00de036
-EBUILD tclreadline-2.1.0-r1.ebuild 592 SHA256 2fa3b37fe2db8750aa61fd7837af3e95b9187185ab11ac7f9c209411ffd932b0 SHA512 23d98075e0e7e5b6e1220059ff52465a57d36271a8951edd40edc15a8b7f8fbb356b28c90346a3439f398c99813b0b595ead5edb47df0b6fcb5006140cb764d3 WHIRLPOOL 90c5e0383a7864052930d97bd7f7e1f8d25562d00a2e4d5a824289998d56c60e39d1008ea971d4befeb8846ac94a4dd464258e7b4bd696a9215783d8ee8f4fcd
-EBUILD tclreadline-2.1.0.ebuild 618 SHA256 a55ad1a74a1450609b6aa7c73214d1bbec9a3307d26f4e4acbb9b22080fc3ba7 SHA512 43ddf9db0509e05c73c4452e4e575dc6210989f763d648fa77557b82c5a3fddb213a4a077b44c035bdb2fe9527b0ce92e1f497e1370e3a62890eb2fa796c95ac WHIRLPOOL 9e7a60b55e6e207f4bc20c748fde7a5cce73081ae9b33a556a8644722a6591ca5dbedf333c02f630ea37eae154718064293ca5a65155aa4d810780affc696409
-MISC ChangeLog 2141 SHA256 71a9cfea1597d22791a11a38329de0eb62c50d7e7210502520365dcff4fd7462 SHA512 9b95326e0b745889efdf783122411ad13c9ac926f05e06718bfe90e39cbb70f7fabc26f1c2aa666173d5605d78ec317c060fd75f58734fe94c0cbfa32ec2f018 WHIRLPOOL 5d9e65a8f640e1fef5324f906b3dd9ca642e2948fbbf347748053688f9c6161c2355bdb637ac66a81fed52a542826c7b1cbe2f362ce183d972ec262135891b78
+EBUILD tclreadline-2.1.0-r1.ebuild 593 SHA256 c9e32a381ad8c9a36170fa033fac9753d9aef8eb8b55c2c8b7a477ddc82d2b4f SHA512 143a1a548c5269507930b3a75bde414cea34024a573dc9f82aa8aaea2c89542c22f6e8999399d6f094086b40c6224ae94e29a4fd3c2281e0d992f3a839781651 WHIRLPOOL f4f53f70cbfc6b082c605fc8ed1237221c3a79a8052e5aa13235a4d2e9355bd3f9d0190dce3e49f71c5ea634720a47bac8165de5f12204d605dbd9e28121f3a1
+EBUILD tclreadline-2.1.0-r2.ebuild 924 SHA256 e5bf5a3639dd9b15b483ee756270d23928b5d6b3c2575a173ff8c715d00cdc17 SHA512 492c1eaaf3779697d2c9b092f31053f73f8d5c471aeed096b7f75f3059fde3f7c3f8985d043145c1e6fad1ec277af33b9d685faabe52536ccdf616131701edc9 WHIRLPOOL 978dcd4be67192903bfc70b355589d76ca2af065ab98a40571d2e2715ea9942ccf958218e769b69a13334792d3c8ad6e7f471bed906cf92d5874383151faca62
+EBUILD tclreadline-2.1.0.ebuild 612 SHA256 5581de9e9229d916356df398b9c664c682d5ecf7d8b0f314a751635fe8b9955a SHA512 a03c6ead5e8cde09f1e965cdf1e8c3af45ee726354925ace0e9ce2b81153d718276d34b9d3fc0ab56ac31d6fb6b7d6ea90556b7570144779ee965acd4ac9a8d1 WHIRLPOOL aeb6962b75bfb654c7496b1b9f013c9b60f5aae998aacf8c81d6e8d6e5467202469ba6ba792ab1cd428652edec1ba1cbee49a9f4274023a24c82eff9ddf2b188
+MISC ChangeLog 2441 SHA256 888d61036a53140a1bd7aa78dbc3ef11f25ebf5a839be681316278715d91fd65 SHA512 484220e7eef9f5915499d1bc112118fa15e95c1efd5a0f31b039baaca2fe0290711dd0f83eb2a23d20044d4489c6ea850ee635d64cfea21c8e64fe26004eab3f WHIRLPOOL c8ce7fa27f9b914a9e19940fa877f40a37f4d2821858616b04e2bafc4ec57fc007645c686c5cd4b8e62f79d4b327cfb6d3cc90eb09f764704e45b04ff36b1a7a
 MISC metadata.xml 159 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029 SHA512 7072291f336a01c6b6b0da289ab72b58c47062f94a06fed23a4982b776b5711df68662a3d8ff3a6954e2699817bda9780e01920056e29164944ead4d0fe815b6 WHIRLPOOL cb245ca2202ce7a680a703d76cf8dcb11e7627fddcc3c0bd9127855263f0e3d48db44511c2257ae793a0cb1d4a7764ffba5ceb992ff1a351d8f8a7ab96307683
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlCWx2kACgkQgAnW8HDreRZrWgCeI0qZI7Yh1rUPFbb+VEmS9r+c
+WGMAoJ44urM+zPsabTWSmDBQDeYOdcP9
+=+8jP
+-----END PGP SIGNATURE-----
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}"