Fixed credits to Tim Harder

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 36 insertions, 29 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 43e4253c45dc..c4c280aecbd3 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,13 +1,13 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.67 2010/04/12 20:17:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.68 2010/04/13 07:51:21 jlec Exp $
 
 *expect-5.44.1.15 (12 Apr 2010)
 
   12 Apr 2010; Justin Lecher <jlec@gentoo.org> +expect-5.44.1.15.ebuild,
   +files/expect-5.44.1.15-gfbsd.patch,
   +files/expect-5.44.1.15-ldflags.patch, -files/expect-5.44.1-ldflags.patch:
-  Version Bump, per 313567, thanks Harald van Dijk for patches
+  Version Bump, per 313567, thanks Tim Harder for patches
 
   08 Apr 2010; Justin Lecher <jlec@gentoo.org> -expect-5.44.1.ebuild:
   Removed due to a upstream recall of this version, #313567
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 8dc1eed2a1c6..300bb193a747 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -15,14 +15,14 @@ DIST expect-5.43.0.tar.gz 525570 RMD160 223b78f39dca8cc7900d82230cf7db91e6770389
 DIST expect-5.44.1.15.tar.bz2 547655 RMD160 e992c650f546cc5fedaebc5f9617893a9f0905a9 SHA1 946c3591d16c216f409882f294378fc53e4f6c0a SHA256 c8565b869d67389995684b60553685168dd40135aa50022bd759f2d5e757d6f1
 EBUILD expect-5.42.1-r1.ebuild 3062 RMD160 37e2632986cfa482437551c2e8842fa773505d66 SHA1 21a51490a22cbcaac3ff158159af9583d34082e1 SHA256 e3315c6b5fd88d502bc53c735ca654308084a3cd4d0ba814b197f92ff4229183
 EBUILD expect-5.42.1-r2.ebuild 3182 RMD160 15ba15d1cf65267408c690390e8139576dc71509 SHA1 cce29a75c72bb943f3d55f2715c7eb1baffcbc4b SHA256 f9b02c01b8473854790f4f153ddf48b9ed63db4b3d76145001eda1c99e658553
-EBUILD expect-5.43.0.ebuild 3541 RMD160 0a9309f8707f4b3af96efe595fc26cf11b203d4c SHA1 ea1607517c769490e976ff3191de0914414348d4 SHA256 fd457236e9f6396133dc1e8ff52ec04466e04ba62b6b0dfa044bddf799ed974f
+EBUILD expect-5.43.0.ebuild 3827 RMD160 8f28af2177faa40db3d1b586a923a193fd7c7749 SHA1 316e3ae0384a13f33825d9255473ff7f4f3fd8a2 SHA256 ab3f6168c1de3bd6ff2b13dc1f9c9c504cb3beac3f723caaa884b001db3bccdb
 EBUILD expect-5.44.1.15.ebuild 3070 RMD160 332afa2b1e307a5bb2a53272ab978dde37ad5933 SHA1 7eba4878bcbab9f978cc3816586ae50074bd1aa2 SHA256 547715f6e7888a86b1c87ec30463a97c617ec15cbc592b29fecc637d6119761b
-MISC ChangeLog 9669 RMD160 990cf127ab294a3c40180127ff66fda726c922d4 SHA1 dcbdd9536823f3ad3b007003e9b4effe74ac92ea SHA256 e54119bea7ab140ca70db1f246bf591eecfed1ff2e568ac6beae44292b6d9d70
+MISC ChangeLog 9664 RMD160 98d630667ab70b19135c8daee6fafec0801283a7 SHA1 c64721ed600e50fda178dd1c95ac30183a9807db SHA256 8a5beec11a53062f4885af8f895795b7de7da5bc06c74b1b9f9a652c66bff953
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvDgNMACgkQgAnW8HDreRaZrgCgibfxx3oUq7QDCRQt2lCE6WAs
-i3UAoJWwiZitcxsNb9AVKim6tNqHHeyJ
-=4i12
+iEYEARECAAYFAkvEIn8ACgkQgAnW8HDreRYy/ACcCUHmuw9/iSnbAXHQillxa279
+VMIAnjqgAJcZqRnX/dgJwkMdbsm4BT8O
+=RxWc
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.43.0.ebuild b/dev-tcltk/expect/expect-5.43.0.ebuild
index 5a0e9fbda2f9..7aca4e47d5a6 100644
--- a/dev-tcltk/expect/expect-5.43.0.ebuild
+++ b/dev-tcltk/expect/expect-5.43.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0.ebuild,v 1.20 2009/09/27 14:56:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0.ebuild,v 1.21 2010/04/13 07:51:21 jlec Exp $
+
+EAPI="3"
 
 WANT_AUTOCONF="2.1"
-inherit autotools eutils versionator
+inherit autotools eutils multilib versionator
 
 DESCRIPTION="tool for automating interactive applications"
 HOMEPAGE="http://expect.nist.gov/"
@@ -11,7 +13,7 @@ SRC_URI="http://expect.nist.gov/src/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="X doc"
 
 # We need dejagnu for src_test, but dejagnu needs expect
@@ -23,10 +25,11 @@ RDEPEND="${DEPEND}"
 NON_MICRO_V=${PN}-$(get_version_component_range 1-2)
 S=${WORKDIR}/${NON_MICRO_V}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/"${P}"-multilib.patch
+src_prepare() {
+	# fix install_name on darwin
+	[[ ${CHOST} == *-darwin* ]] && \
+		epatch "${FILESDIR}"/${P}-darwin.patch
+epatch "${FILESDIR}"/"${P}"-multilib.patch
 
 	#fix the rpath being set to /var/tmp/portage/...
 	epatch "${FILESDIR}"/expect-5.39.0-libdir.patch
@@ -34,8 +37,8 @@ src_unpack() {
 	#Removes references to functions that Tcl 8.5 no longer exposes.
 	epatch "${FILESDIR}"/"${P}"-avoid-tcl-internals-1.patch
 
-	sed -i 's#/usr/local/bin#/usr/bin#' expect.man
-	sed -i 's#/usr/local/bin#/usr/bin#' expectk.man
+	sed -i "s#/usr/local/bin#${EPREFIX}/usr/bin#" expect.man
+	sed -i "s#/usr/local/bin#${EPREFIX}/usr/bin#" expectk.man
 	#stops any example scripts being installed by default
 	sed -i \
 		-e '/^install:/s/install-libraries //' \
@@ -51,31 +54,35 @@ src_unpack() {
 	# fix implicit missing declarations (bug 204878)
 	epatch "${FILESDIR}"/"${P}"-missing-includes.patch
 
+#	epatch "${FILESDIR}"/"${P}"-ldflags.patch
+
 	eautoconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	local tcl_version
-	local tcl_hdir
-	tcl_version=$(echo 'puts [set tcl_version]' | tclsh)
-	tcl_hdir="/usr/$(get_libdir)/tcl${tcl_version}/include"
+	tcl_version="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
+	TCL_HDIR="${EPREFIX}/usr/$(get_libdir)/tcl${tcl_version}/include"
 
 	#configure needs to find the file tclConfig.sh is
-	myconf="--with-tcl=/usr/$(get_libdir) --with-tclinclude=$tcl_hdir"
+	myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${TCL_HDIR}"
 
 	if use X ; then
 		#--with-x is enabled by default
 		#configure needs to find the file tkConfig.sh and tk.h
 		#tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude
-		myconf="$myconf --with-tk=/usr/$(get_libdir)"
+		myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir)"
 	else
 		#configure knows that tk depends on X so just disable X
 		myconf="$myconf --without-x"
 	fi
 
-	econf $myconf --enable-shared || die "econf failed"
-	emake TCLHDIRDASHI="-I${tcl_hdir}/generic -I${tcl_hdir}/unix" \
+	econf $myconf --enable-shared
+}
+
+src_compile() {
+	emake TCLHDIRDASHI="-I${TCL_HDIR}/generic -I${TCL_HDIR}/unix" \
 		|| die "emake failed"
 }
 
@@ -90,21 +97,21 @@ src_install() {
 	dodir /usr/$(get_libdir)
 	make install INSTALL_ROOT="${D}" || die "make install failed"
 
-	dodoc ChangeLog FAQ HISTORY NEWS README
+	dodoc ChangeLog FAQ HISTORY NEWS README || die
 
 	local lib_basename="lib${NON_MICRO_V/-/}"
-	rm "${D}/usr/$(get_libdir)/${NON_MICRO_V/-/}/${lib_basename}.a"
+	rm "${ED}/usr/$(get_libdir)/${NON_MICRO_V/-/}/${lib_basename}.a"
 
 	# bug #182278 - /usr/lib/expect.so symlink
-	ln -s "${lib_basename}.so" "${D}/usr/$(get_libdir)/lib${PN}.so"
+	ln -s "${lib_basename}.so" "${ED}/usr/$(get_libdir)/lib${PN}.so"
 
 	#install examples if 'doc' is set
 	if use doc ; then
 		docinto examples
 		local scripts=$(make -qp | \
 		                sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
-		exeinto /usr/share/doc/${PF}/examples
-		doexe ${scripts}
+		insinto /usr/share/doc/${PF}/examples
+		doins ${scripts} || die
 		local scripts_manpages=$(make -qp | \
 		       sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
 		for m in ${scripts_manpages}; do