dev-tcltk/itcl: Correct LDPATH to new location

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

3 files changed, 76 insertions, 5 deletions

diff --git a/dev-tcltk/itcl/ChangeLog b/dev-tcltk/itcl/ChangeLog
index ef0ed30c67b6..4ee437f74286 100644
--- a/dev-tcltk/itcl/ChangeLog
+++ b/dev-tcltk/itcl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/itcl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/ChangeLog,v 1.58 2013/01/13 12:23:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/ChangeLog,v 1.59 2013/01/13 12:40:56 jlec Exp $
+
+*itcl-4.0.0-r2 (13 Jan 2013)
+
+  13 Jan 2013; Justin Lecher <jlec@gentoo.org> +itcl-4.0.0-r2.ebuild:
+  Correct LDPATH to new location
 
 *itcl-4.0.0-r1 (13 Jan 2013)
 
diff --git a/dev-tcltk/itcl/Manifest b/dev-tcltk/itcl/Manifest
index bc74d1af1c50..e3fa502ce7d0 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -8,13 +8,14 @@ DIST itcl4.0.0.tar.gz 409850 SHA256 facbe365c6bc769429255e253f456a5c78ad5c13da72
 EBUILD itcl-3.4.1.ebuild 1134 SHA256 31b855fd4c5dd2f5bb634af0a39a15e948b41eb088afc5a97d6b828cb22404cd SHA512 59043800340af163c32f9d4b0ce4bb955bbf8c44b1946b11b8296a5d30ed908f785b640c0db8ee8903acac03a25ba58341131f9f1c40374828f8c16f24dc0625 WHIRLPOOL 1f76a3d6bf3021f40d20bc24f2697606fa22e0a6e52a4bfd541915bf1ff63756a69b1838985387a2497a9b8027a6afe635358eea8bfcad159eaaee67f0344ffa
 EBUILD itcl-3.4_beta1.ebuild 1360 SHA256 ce7c8908260832521dc92d78f57a91779bc0e098383d38be1a1e796545c38fd9 SHA512 b945159ac4c37ac07692a9bafbcc783f779eb3d22c523fbaad959c59283f4a9f7b90e63753375fe3635412658e1d068d895847e6071298cee61661c11061e74f WHIRLPOOL 82045f6b1d08c6c2a4d1bf5bbe5761fe5a7abebfe4cd8bbdccd81ed356cbebc5a5ef661677de2b78093e3958298a60d61e892aa837163cbd4ac87466bd07d40c
 EBUILD itcl-4.0.0-r1.ebuild 1741 SHA256 4cba9dc987188a9a81c94f6b016133618b8c442da3a3c48719fd24bed355fc22 SHA512 0eb7b40ccc779dc730db965f06200b0491a214a1a965ce76941bb1a42a5daac8bb586364d8a684a3b1950e1940f0fda6f4b309b235061590292c00fe301db203 WHIRLPOOL e6d166726e41a5326c35cdbe94ee813e9569fd9d09c3f5bd1da0aeb2d268ad17712b254ec58e8e10aa33afd714100e5ceb4cfba7703d485c67439c5ace18d155
+EBUILD itcl-4.0.0-r2.ebuild 1741 SHA256 8b69b4ee2223ce4350675eb7c7b0881459c1fee75da4debc3ce77795aa7134d6 SHA512 df4f5c50124cdb7f5b28b55704a7b19e70268bb22c6f1085ec917899a9bb13cf0be05ddad9761ab65bf15cf34059d43e725503e15b6fe9972326be319f48bd67 WHIRLPOOL e6d22eaf5749f13757ea8adff24a0166e923f078aa53ca2eab9708f81b94e74ded83cfad5003081eef5498b45c9b6cce8af827502eed31289122f90ec83afdfd
 EBUILD itcl-4.0.0.ebuild 1395 SHA256 f103b60efdf77cb16ec0e06f4c3ae6812a44baa2c02c29497ae0cb195a2b4fc5 SHA512 481ce2ffc0a66fb5ee49f3bc0cc83a4d790cb353c9175d595fca17e2d8b642a43ce16a91769038d7d2dca61faab746922832cfe245b78a6110d3f38e55f539f6 WHIRLPOOL 5b0de15d4e505bb2ac1d4d5e118ecfca5b7f3c415622f8a521aa38cdc60a06df5f8421c9c8fc1e1b9244fb889591cab4011cae9a0aaef98bf7d4171cadd20472
-MISC ChangeLog 7093 SHA256 5e814586a35d82f3fb24f1c24739328931b85426976a3dda2fc24d33c2eced16 SHA512 574b7a7122ae61ca8de0cd2d2e3de7070ba6977c4d98bc89ed7ca61bf7138f396bf90600ce4349d3d5b1ff424fee0b1db1ce28de657d5abfe80f9076accc213d WHIRLPOOL 8748c4bb76337a37d20d768b5d73d4c4965f12efb629ee613389433099a5b85643d128d751397cb47bd30fd8770dc022be4036c645273e6ef206afeeca7fccb2
+MISC ChangeLog 7227 SHA256 bef699b388b592b583a0669906dbfb43746da54dbca94ecbbec0ccbab6115d55 SHA512 125592779bb6cdbe7495504c9bb440128f7e4f3eae3eca01d1682b42c65a5119c8eb3baff904a6894bcf8d70cf63f468f06053719b2ffb8455f812da3b18e9cd WHIRLPOOL 3d79822953cdd2bbc567d8edee3a4812710ea33d416474456c3d0c0935e97062e307970a5755f0c334280a8f52ad30f4d61220c89e5bae26121978430e323789
 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlDypz8ACgkQgAnW8HDreRaMIACgtSS/9+nQhQMFmnm/XhK1ILn8
-O7kAnjnCxAUHUwB/wI/7WemPLM1tQoTH
-=Ud92
+iEYEAREKAAYFAlDyq1kACgkQgAnW8HDreRb4oACffq8QSDue0DT3ZIBjfzAOC2Pr
+eoEAoJfG0XUh9GReP42IbF3u13mZM7T/
+=Q8T2
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/itcl/itcl-4.0.0-r2.ebuild b/dev-tcltk/itcl/itcl-4.0.0-r2.ebuild
new file mode 100644
index 000000000000..9d7ac123c3f4
--- /dev/null
+++ b/dev-tcltk/itcl/itcl-4.0.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-4.0.0-r2.ebuild,v 1.1 2013/01/13 12:40:56 jlec Exp $
+
+EAPI=4
+
+inherit eutils multilib versionator
+
+MY_P="${PN}${PV}"
+TCL_VER="8.6.0"
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/tcl/Tcl/${TCL_VER}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/tcl-8.6"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+# somehow broken
+RESTRICT=test
+
+src_configure() {
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--disable-rpath
+}
+
+src_compile() {
+	# 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
+
+	sed 's:-pipe::g' -i Makefile || die
+
+	emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	sed \
+		-e "/BUILD_LIB_SPEC/s:-L${S}::g" \
+		-e "/BUILD_STUB_LIB_SPEC/s:-L${S}::g" \
+		-e "/BUILD_STUB_LIB_PATH/s:${S}:${EPREFIX}/usr/$(get_libdir)/${MY_P}/:g" \
+		-e "/INCLUDE_SPEC/s:${S}/generic:${EPREFIX}/usr/include:g" \
+		-e "s:${S}:${EPREFIX}/usr/$(get_libdir)/${MY_P}/:g" \
+		-i "${ED}"/usr/$(get_libdir)/${MY_P}/itclConfig.sh || die
+
+	cat >> "${T}"/34${PN} <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}$(get_version_component_range 1-3)/"
+	EOF
+	doenvd "${T}"/34${PN}
+}