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

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 41 insertions, 20 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/Manifest b/dev-tcltk/itcl/Manifest
index e01e7a723920..f08de6b7c142 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST incrTcl-3.3.1_pre20090417.tar.gz 502592 RMD160 5197d5a0f0f14200ecc313089bffc11824093598 SHA1 6c067989154c2e58083959c73d5517109ffa2047 SHA256 e59301855c7ec4e8e763e8c4c4570ccd36bb27af2dc065a945abe6e8fd4c8776
 DIST itcl3.3.tar.gz 306364 RMD160 cd9feed78938add3a8f9163bc52a9aff49fe7773 SHA1 6210420f544d944747f333628468678e1209fd7a SHA256 7829b5ea39d0ed0eea43a071cd39e7477343d59e1d2ea9c810fa53e257fcb55c
 DIST itcl3.4b1.tar.gz 306342 RMD160 80c054ef7e15ffdf4d316384ba115fbc8efdc021 SHA1 8e1ba3ec2f3989598550992ca2bfeb5bc2976cc4 SHA256 dc99fcf6c00b00774dbfb94ccc437ea3e6315a198645b6d2acf8acba8fdb4608
-EBUILD itcl-3.3-r1.ebuild 859 RMD160 94f42287c0022ab35eaf617aa29c5cf5d8692027 SHA1 b69bbcbc22daa9d0372f397e89171f9541e6d9e8 SHA256 ea0c30bcee8e84c2c5427358acc7b0de8e2eef51a726f97f91638d279611158c
-EBUILD itcl-3.3.1_pre20090417-r1.ebuild 1017 RMD160 06172b3056dad5fdd98acf5ef8852720b642d0e9 SHA1 6618e763a9302a53c4a6edea641a8467af9a7442 SHA256 21e5880ca6f2f5e311994edfdef6bec233d3e0d313288404c8289f2e144a7017
-EBUILD itcl-3.3.1_pre20090417.ebuild 942 RMD160 4d85a7451b0d32e63348b34d442ab0098360c9ae SHA1 2a6f2a88b67e181bf1c7bd0ca868a4a484f83ebb SHA256 5c31d02d486e6b981d1c9c5fcfad5ad958a4da9ce4d1974c9eb533e6cb68446b
+EBUILD itcl-3.3-r1.ebuild 856 RMD160 3fe0d6e19929842eb38709deabebc0b6e6e19a05 SHA1 6766867673fef762683149a57313520d5049103e SHA256 141885e97cf3ccf536f18a3a982c30044276b621a825e864e675680f39030cfe
+EBUILD itcl-3.3.1_pre20090417-r1.ebuild 1133 RMD160 9c0d63e001741f184af032e7fd2198c2ef003507 SHA1 25b2a531f6501701ee02ab749a03c7bf117ab89f SHA256 cda821f43e5a2dcdc09fa8f4950ce5a9a61506b39d3123097c985e45b2d0f8db
+EBUILD itcl-3.3.1_pre20090417.ebuild 906 RMD160 c313ee71868c39a044c7d81788f907acb54ef858 SHA1 85024f121e883b9068c7ffd598ebedfafee715f6 SHA256 138af42d96a27b78657572f2a307c16e8762fd2983b7bb5f541b3d25a177ee70
 EBUILD itcl-3.4_beta1.ebuild 1267 RMD160 861ac5eac126f58af92c4bea9fa15e2b99e91809 SHA1 027a60bd6df714449d607d66194bda87b0d670fa SHA256 8e293113ee1c20df80f0329b38da25669b42a5f1faedcf0134a54b575e48b16c
-MISC ChangeLog 5542 RMD160 741b8015f8a8311fdf39eae7908e1b32f11bd46a SHA1 9cdccbc6e1c038a9bf4069738276f1ccf78df21a SHA256 b9db44b82b56182f44ddaa3d6f873c05a0268dc90d93b111c94ff042c2200858
+MISC ChangeLog 5735 RMD160 f63971cd0158a48750a6971b268d7a1c4d632c61 SHA1 49a1e2a13be5c97a2fd6bd412f411c0dcf05d9c2 SHA256 4ee91dad817db62d05a4f6054d61ab8140d8eab58843f316fa70587d43b333e4
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2r2D8ACgkQgAnW8HDreRZXhgCfb7ER8cT4esdHU+9VXxRJ14gz
+Eq4AoLOK0b2Ft+zDA4j38Pn0k+6Q4R3j
+=3T5q
+-----END PGP SIGNATURE-----
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
 }