Fix for real multilib without symlink lib -> /usr/lib64, #392947; ebuild cleaning

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 25 insertions, 14 deletions

diff --git a/dev-tcltk/iwidgets/ChangeLog b/dev-tcltk/iwidgets/ChangeLog
index b81991e3253a..0b9e5193934a 100644
--- a/dev-tcltk/iwidgets/ChangeLog
+++ b/dev-tcltk/iwidgets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/iwidgets
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/ChangeLog,v 1.22 2011/06/23 15:16:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/ChangeLog,v 1.23 2011/12/05 17:49:15 jlec Exp $
+
+  05 Dec 2011; Justin Lecher <jlec@gentoo.org> iwidgets-4.0.1.ebuild,
+  iwidgets-4.0.1-r3.ebuild, metadata.xml:
+  Fix for real multilib without symlink lib -> /usr/lib64, #392947; ebuild
+  cleaning
 
 *iwidgets-4.0.1-r3 (23 Jun 2011)
 
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
index fc3feac2dce4..d330d1c6b36f 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild,v 1.1 2011/06/23 15:16:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild,v 1.2 2011/12/05 17:49:15 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils multilib
 
@@ -11,7 +11,8 @@ ITCL_MY_P="itcl3.2.1"
 
 DESCRIPTION="Widget collection for incrTcl/incrTk"
 HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
-SRC_URI="mirror://sourceforge/incrtcl/${MY_P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/incrtcl/${MY_P}.tar.gz
 	mirror://sourceforge/incrtcl/${ITCL_MY_P}_src.tgz"
 
 LICENSE="as-is BSD"
@@ -28,16 +29,19 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-path.patch
-	sed -i -e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
-		Makefile.in || die
+	sed \
+		-e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
+		-i Makefile.in || die
 
 	# Bug 115470
 	rm doc/panedwindow.n
 }
 
 src_configure() {
-	econf --with-itcl="${WORKDIR}/${ITCL_MY_P}" || die "configure failed"
-	# we don't need to compile anything
+	econf \
+		--with-itcl="${WORKDIR}/${ITCL_MY_P}" \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir)
 }
 
 src_compile() {
@@ -46,7 +50,7 @@ src_compile() {
 
 src_install() {
 	# parallel borks #177088
-	emake -j1 INSTALL_ROOT="${D}" install || die "emake install failed"
+	emake -j1 INSTALL_ROOT="${D}" install
 
 	dodoc CHANGES ChangeLog README
 
diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild
index 8371a1b822fa..a9aa74edb49f 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 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/iwidgets/iwidgets-4.0.1.ebuild,v 1.19 2010/12/07 19:57:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild,v 1.20 2011/12/05 17:49:15 jlec Exp $
 
 MY_P=${PN}${PV}
 ITCL_MY_PN="itcl"
@@ -9,7 +9,8 @@ ITCL_MY_P="${ITCL_MY_PN}${ITCL_MY_PV}"
 
 DESCRIPTION="Widget collection for incrTcl/incrTk"
 HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
-SRC_URI="mirror://sourceforge/incrtcl/${MY_P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/incrtcl/${MY_P}.tar.gz
 	mirror://sourceforge/incrtcl/${ITCL_MY_P}_src.tgz"
 
 LICENSE="as-is BSD"
@@ -17,7 +18,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
-DEPEND=">=dev-tcltk/itcl-3.2.1
+DEPEND="
+	>=dev-tcltk/itcl-3.2.1
 	>=dev-tcltk/itk-3.3-r1"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-tcltk/iwidgets/metadata.xml b/dev-tcltk/iwidgets/metadata.xml
index d9408d8ab078..815cc916f2b6 100644
--- a/dev-tcltk/iwidgets/metadata.xml
+++ b/dev-tcltk/iwidgets/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+	<herd>tcltk</herd>
 </pkgmetadata>