fix bug #182278

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

3 files changed, 19 insertions, 23 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 6c3c3b97361f..9a157990b114 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.56 2009/06/09 20:11:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.57 2009/08/08 00:10:24 mescalinum Exp $
+
+  08 Aug 2009; Federico Ferri <mescalinum@gentoo.org> expect-5.43.0.ebuild:
+  fix bug #182278
 
   09 Jun 2009; Alexis Ballier <aballier@gentoo.org> expect-5.43.0.ebuild:
   keyword ~x86-fbsd
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index e3d9b9a08544..38efa5107ff9 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX expect-5.39.0-libdir.patch 480 RMD160 e58373778379907bf68ce6e61acce5dad4852421 SHA1 f438e6899688f0b3d5bdb854246483ec29848c9a SHA256 971ac5bd88e393d1029ab248c1071529337baf0b50445c53e35f49fdb7c6365a
 AUX expect-5.42.1-missing-includes.patch 1031 RMD160 fbbf4d66eb9029e332fa6b4b73be2c96498025ff SHA1 67854b3950d2e71833ce45d9dc24beda34ddaf7e SHA256 22c393a04f1120b811fe366c0ab6a81500060414be2dd80fc9ba222b5710c493
 AUX expect-5.42.1-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b SHA1 b59faccf8a0e8c538126d68c5eed181d789f45d7 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002
@@ -14,13 +11,6 @@ DIST expect-5.42.1.tar.gz 524882 RMD160 d354d5d3ffa941d89e668fb4ad1ccbb59be4f341
 DIST expect-5.43.0.tar.gz 525570 RMD160 223b78f39dca8cc7900d82230cf7db91e6770389 SHA1 4da64b7c50cea22ac87fcf0f8f98f786793ee785 SHA256 d11a77e680ddc0244370b46f117f0b28a6571db842885bee3b7c15372c1ca079
 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 3384 RMD160 0f170913f1d38ecbd6276e003e0b995f928f0d44 SHA1 d92761e474d223465c4d5fa99f1a4b216c429a82 SHA256 28d585e980e22335f64716cabe89b30a70e9c1aa3643760dcd46660d7de106c0
-MISC ChangeLog 8222 RMD160 b2e5b84825c7a46ab126c2979dfbb75ce7745085 SHA1 d4a66962707db7a3382890f95c2a190325bd36d7 SHA256 3dc6a1bb19df4780aa3de2a8d4ab54f92ee8548f2441494b042b38d1f3456220
+EBUILD expect-5.43.0.ebuild 3557 RMD160 e8523ce9b45149dda5492a2426612c87c60e2c49 SHA1 7e57d8ca62187b90ae823163828d761e219b3a4a SHA256 fce195d05ba2978d6f2d792001b4cb2ab35eddb2bc10829ca52b91f902d602bb
+MISC ChangeLog 8319 RMD160 c602aaf69722aa108ac392e17240f419f152a8e8 SHA1 037af1c8c0cd7adc6ee3c1de9d5b8941ee085326 SHA256 44e5a62654ddd3971f66efb70bae4529af6b4c0a0dcd72f2988659c1a9bd1692
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkouwecACgkQvFcC4BYPU0q7FQCgvogbIu370kPwyzd8ETMjIPNP
-IkIAn2mUBPUSIz6U8nnAnzYvAk+gLRNz
-=etKy
------END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.43.0.ebuild b/dev-tcltk/expect/expect-5.43.0.ebuild
index 2279710eca9a..bd6b816b94b3 100644
--- a/dev-tcltk/expect/expect-5.43.0.ebuild
+++ b/dev-tcltk/expect/expect-5.43.0.ebuild
@@ -1,9 +1,9 @@
 # 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.12 2009/06/09 20:11:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0.ebuild,v 1.13 2009/08/08 00:10:24 mescalinum Exp $
 
 WANT_AUTOCONF="2.1"
-inherit autotools eutils
+inherit autotools eutils versionator
 
 DESCRIPTION="tool for automating interactive applications"
 HOMEPAGE="http://expect.nist.gov/"
@@ -20,19 +20,19 @@ DEPEND=">=dev-lang/tcl-8.2
 	X? ( >=dev-lang/tk-8.2 )"
 RDEPEND="${DEPEND}"
 
-NON_MICRO_V=${P%.[0-9]}
+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
+	cd "${S}"
+	epatch "${FILESDIR}"/"${P}"-multilib.patch
 
 	#fix the rpath being set to /var/tmp/portage/...
-	epatch ${FILESDIR}/expect-5.39.0-libdir.patch
+	epatch "${FILESDIR}"/expect-5.39.0-libdir.patch
 
 	#Removes references to functions that Tcl 8.5 no longer exposes.
-	epatch ${FILESDIR}/${P}-avoid-tcl-internals-1.patch
+	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
@@ -88,12 +88,15 @@ src_test() {
 
 src_install() {
 	dodir /usr/$(get_libdir)
-	make install INSTALL_ROOT=${D} || die "make install failed"
+	make install INSTALL_ROOT="${D}" || die "make install failed"
 
 	dodoc ChangeLog FAQ HISTORY NEWS README
 
-	local static_lib="lib${NON_MICRO_V/-/}.a"
-	rm ${D}/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib}
+	local lib_basename="lib${NON_MICRO_V/-/}"
+	rm "${D}/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"
 
 	#install examples if 'doc' is set
 	if use doc ; then