Fix env.d file's LDPATH points to wrong directory, #363793

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 27 insertions, 16 deletions

diff --git a/dev-tcltk/itcl/ChangeLog b/dev-tcltk/itcl/ChangeLog
index 3f5538361c92..8dbcd4cfee50 100644
--- a/dev-tcltk/itcl/ChangeLog
+++ b/dev-tcltk/itcl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/itcl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/ChangeLog,v 1.46 2011/01/16 10:35:55 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/ChangeLog,v 1.47 2011/04/18 06:20:41 jlec Exp $
+
+  18 Apr 2011; Justin Lecher <jlec@gentoo.org> itcl-3.3-r1.ebuild,
+  itcl-3.3.1_pre20090417.ebuild, itcl-3.3.1_pre20090417-r1.ebuild:
+  Fix env.d file's LDPATH points to wrong directory, #363793
 
   18 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
   itcl-3.3.1_pre20090417.ebuild:
diff --git a/dev-tcltk/itcl/itcl-3.3-r1.ebuild b/dev-tcltk/itcl/itcl-3.3-r1.ebuild
index dd875a875c08..805b76e4dc3f 100644
--- a/dev-tcltk/itcl/itcl-3.3-r1.ebuild
+++ b/dev-tcltk/itcl/itcl-3.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.3-r1.ebuild,v 1.6 2006/05/24 20:15:44 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.3-r1.ebuild,v 1.7 2011/04/18 06:20:41 jlec Exp $
 
 inherit eutils
 
@@ -15,6 +15,7 @@ LICENSE="BSD"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 
 DEPEND="dev-lang/tcl"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -26,11 +27,11 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die "econf failed"
+	econf
 	emake CFLAGS_DEFAULT="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc CHANGES ChangeLog INCOMPATIBLE README TODO
 }
diff --git a/dev-tcltk/itcl/itcl-3.3.1_pre20090417-r1.ebuild b/dev-tcltk/itcl/itcl-3.3.1_pre20090417-r1.ebuild
index 4028f5b2905b..34a5481d7c5f 100644
--- a/dev-tcltk/itcl/itcl-3.3.1_pre20090417-r1.ebuild
+++ b/dev-tcltk/itcl/itcl-3.3.1_pre20090417-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.3.1_pre20090417-r1.ebuild,v 1.1 2010/04/02 09:30:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.3.1_pre20090417-r1.ebuild,v 1.2 2011/04/18 06:20:41 jlec Exp $
+
+EAPI="3"
 
 inherit eutils
 
@@ -16,12 +18,11 @@ LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 DEPEND="dev-lang/tcl"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}/${PN}"
 
 src_compile() {
-	econf || die "econf failed"
-
 	# adjust install_name on darwin
 	if [[ ${CHOST} == *-darwin* ]]; then
 		sed -i \
@@ -33,6 +34,10 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc ../{CHANGES,ChangeLog,INCOMPATIBLE,README,TODO}
+	cat >> "${T}"/34${PN} <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}3.4/"
+	EOF
+	doenvd "${T}"/34${PN} || die
 }
diff --git a/dev-tcltk/itcl/itcl-3.3.1_pre20090417.ebuild b/dev-tcltk/itcl/itcl-3.3.1_pre20090417.ebuild
index 6852962bf5da..93cd95e537cd 100644
--- a/dev-tcltk/itcl/itcl-3.3.1_pre20090417.ebuild
+++ b/dev-tcltk/itcl/itcl-3.3.1_pre20090417.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.3.1_pre20090417.ebuild,v 1.7 2010/06/18 05:38:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.3.1_pre20090417.ebuild,v 1.8 2011/04/18 06:20:41 jlec Exp $
 
 inherit eutils multilib versionator
 
@@ -16,19 +16,20 @@ LICENSE="BSD"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 
 DEPEND="dev-lang/tcl"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}/${PN}"
 
 src_compile() {
-	econf || die "econf failed"
+	econf
 	emake CFLAGS_DEFAULT="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc ../{CHANGES,ChangeLog,INCOMPATIBLE,README,TODO}
 	cat >> "${T}"/34${PN} <<- EOF
-	LDPATH="/usr/$(get_libdir)/${PN}$(get_version_component_range 1-2)/"
+	LDPATH="/usr/$(get_libdir)/${PN}3.4/"
 	EOF
 	doenvd "${T}"/34${PN} || die
 }