From dd74d09eb43e389f193298602d8348921453d726 Mon Sep 17 00:00:00 2001 From: Markus Ullmann Date: Sat, 7 Apr 2007 14:45:30 +0000 Subject: [PATCH] Fix bug #160160 Package-Manager: portage-2.1.2.3 --- dev-tcltk/expect/ChangeLog | 6 ++++- dev-tcltk/expect/Manifest | 34 +++++++++++++++--------- dev-tcltk/expect/expect-5.42.1-r1.ebuild | 14 +++++----- dev-tcltk/expect/expect-5.43.0.ebuild | 14 +++++----- 4 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog index 1231201bc5ee..1f50bcc16441 100644 --- a/dev-tcltk/expect/ChangeLog +++ b/dev-tcltk/expect/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-tcltk/expect # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.43 2007/01/18 04:00:10 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.44 2007/04/07 14:45:30 jokey Exp $ + + 07 Apr 2007; Markus Ullmann expect-5.42.1-r1.ebuild, + expect-5.43.0.ebuild: + Fix bug #160160 18 Jan 2007; Ryan Hill expect-5.42.1-r1.ebuild, expect-5.43.0.ebuild: diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest index dd231f6e255e..0b75bbd77411 100644 --- a/dev-tcltk/expect/Manifest +++ b/dev-tcltk/expect/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX expect-5.39.0-libdir.patch 480 RMD160 e58373778379907bf68ce6e61acce5dad4852421 SHA1 f438e6899688f0b3d5bdb854246483ec29848c9a SHA256 971ac5bd88e393d1029ab248c1071529337baf0b50445c53e35f49fdb7c6365a MD5 c458386d5502fab2b49da03d16fb108c files/expect-5.39.0-libdir.patch 480 RMD160 e58373778379907bf68ce6e61acce5dad4852421 files/expect-5.39.0-libdir.patch 480 @@ -22,22 +25,22 @@ EBUILD expect-5.40.0.ebuild 1745 RMD160 353de502ada069a48848dc510ce7c5a5467437d6 MD5 89f3d815808a0ee9a7a309a548e1a05e expect-5.40.0.ebuild 1745 RMD160 353de502ada069a48848dc510ce7c5a5467437d6 expect-5.40.0.ebuild 1745 SHA256 85735a974ca5eaa07937b88a0814426032cb7f26dee0087a6d885c8d1be3253c expect-5.40.0.ebuild 1745 -EBUILD expect-5.42.1-r1.ebuild 3098 RMD160 8fc101f5f369e8884c1e56bc41e16867e9c49315 SHA1 b9c8a766cdf83ffc3a4f1b2f7cb5a5b59c984ffd SHA256 8565fcac8c37da37b7c59bf6ae7e77c8bae4eda33bc2f73987cd40ee31729238 -MD5 b28977e4975cb12f4a817ffa8b6a0994 expect-5.42.1-r1.ebuild 3098 -RMD160 8fc101f5f369e8884c1e56bc41e16867e9c49315 expect-5.42.1-r1.ebuild 3098 -SHA256 8565fcac8c37da37b7c59bf6ae7e77c8bae4eda33bc2f73987cd40ee31729238 expect-5.42.1-r1.ebuild 3098 +EBUILD expect-5.42.1-r1.ebuild 3062 RMD160 aa21fca0a0a373b91531ac1040ce96a4d4e05fa4 SHA1 0108e46851d75ca1b6e9d896acb09714dc2705ee SHA256 3ceb2efd4255716118b12135421584d1cc5b7ae07932fa398b6a2acb0b9b8818 +MD5 060629f9353fc3876b706385a7e3cd62 expect-5.42.1-r1.ebuild 3062 +RMD160 aa21fca0a0a373b91531ac1040ce96a4d4e05fa4 expect-5.42.1-r1.ebuild 3062 +SHA256 3ceb2efd4255716118b12135421584d1cc5b7ae07932fa398b6a2acb0b9b8818 expect-5.42.1-r1.ebuild 3062 EBUILD expect-5.42.1.ebuild 2974 RMD160 763f32a19d7e6e28be68be9dca359f955f574995 SHA1 e41552648fc9fe74ee2368c0cec5767fcfa7e9ae SHA256 811bfb7c52c6c3e531dc3368942bc64fa6cea30c0355e2d87e4ba3179d73fdea MD5 7eabf15c1fb1f43657a24e45b0a2bab4 expect-5.42.1.ebuild 2974 RMD160 763f32a19d7e6e28be68be9dca359f955f574995 expect-5.42.1.ebuild 2974 SHA256 811bfb7c52c6c3e531dc3368942bc64fa6cea30c0355e2d87e4ba3179d73fdea expect-5.42.1.ebuild 2974 -EBUILD expect-5.43.0.ebuild 3130 RMD160 e02a23753f08aef2c8ad21fe8e0ecb07b2288d88 SHA1 9b299c81a0720962f7a4ac38cbe04b66b3dbc5fe SHA256 ec1cde7910795eaf77def198be3b3bff164f832c846b0342874d27e51dc983b1 -MD5 829f3f19db41b9537df27aabf862a28c expect-5.43.0.ebuild 3130 -RMD160 e02a23753f08aef2c8ad21fe8e0ecb07b2288d88 expect-5.43.0.ebuild 3130 -SHA256 ec1cde7910795eaf77def198be3b3bff164f832c846b0342874d27e51dc983b1 expect-5.43.0.ebuild 3130 -MISC ChangeLog 6195 RMD160 c99ced600c91c6aefc3b6ac662ed8015c9847973 SHA1 e13e565826a3d8a9fd1400698c22bfd54fa79e07 SHA256 47980f51eb314a00595f8b1709a2aeff78b259acc136d0296069a4bb45524fbd -MD5 c2a1dc8f68e56b612b8ebe369e6b40bb ChangeLog 6195 -RMD160 c99ced600c91c6aefc3b6ac662ed8015c9847973 ChangeLog 6195 -SHA256 47980f51eb314a00595f8b1709a2aeff78b259acc136d0296069a4bb45524fbd ChangeLog 6195 +EBUILD expect-5.43.0.ebuild 3094 RMD160 0288f0a7a4f387a41d0f4b61d1c193bd812efad5 SHA1 f396338990d64098b8c56d080aa774fe54dd871d SHA256 6fc7a4d0cb941ed954bf4e5f28e32b4c7dfa85c13392fe272801919ea409f1e0 +MD5 7088626363b7130f4efb1c7109160d83 expect-5.43.0.ebuild 3094 +RMD160 0288f0a7a4f387a41d0f4b61d1c193bd812efad5 expect-5.43.0.ebuild 3094 +SHA256 6fc7a4d0cb941ed954bf4e5f28e32b4c7dfa85c13392fe272801919ea409f1e0 expect-5.43.0.ebuild 3094 +MISC ChangeLog 6308 RMD160 e152ad0430b848c8ca3be843e37425fb4282a76e SHA1 986439d25bd4794fe2ae35b72140a76fcd5501cc SHA256 ccf53dc570461be6cc7f95730d0f422f0c4757f03f3ebb789e82944936cd8305 +MD5 f2c5f404d468c2ee98b99fdb4af682ad ChangeLog 6308 +RMD160 e152ad0430b848c8ca3be843e37425fb4282a76e ChangeLog 6308 +SHA256 ccf53dc570461be6cc7f95730d0f422f0c4757f03f3ebb789e82944936cd8305 ChangeLog 6308 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a metadata.xml 158 @@ -60,3 +63,10 @@ SHA256 cb3ba9544df60e7a0a14dc4ad404ba3175f10df257ecb730400bd2b686935209 files/di MD5 c9e2ea4997fcaee0b3ee27d539c4cd85 files/digest-expect-5.43.0 241 RMD160 4a8fd8e281e7babf601e27c306e963f749f216b7 files/digest-expect-5.43.0 241 SHA256 624ec0715c6c0f0eabbb9d039d7988673ca7afeac3de518fe1cc205c8a4e2fb7 files/digest-expect-5.43.0 241 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGF66Tz974XjDVpbkRAoNOAJ9X2OafrEeBjDx/mYYyDu54k+ixyQCgxxz/ +6iASt3D34lsJVNVNZEoex60= +=GIud +-----END PGP SIGNATURE----- diff --git a/dev-tcltk/expect/expect-5.42.1-r1.ebuild b/dev-tcltk/expect/expect-5.42.1-r1.ebuild index 1bb132fa10db..69d278bf723c 100644 --- a/dev-tcltk/expect/expect-5.42.1-r1.ebuild +++ b/dev-tcltk/expect/expect-5.42.1-r1.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.42.1-r1.ebuild,v 1.10 2007/01/18 04:00:10 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.42.1-r1.ebuild,v 1.11 2007/04/07 14:45:30 jokey Exp $ -inherit eutils +WANT_AUTOCONF="2.1" +inherit autotools eutils DESCRIPTION="tool for automating interactive applications" HOMEPAGE="http://expect.nist.gov/" @@ -15,10 +16,9 @@ IUSE="X doc" # We need dejagnu for src_test, but dejagnu needs expect # to compile/run, so we cant add dejagnu to DEPEND :/ -RDEPEND=">=dev-lang/tcl-8.2 +DEPEND=">=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 )" -DEPEND="${RDEPEND} - =sys-devel/autoconf-2.1*" +RDEPEND="${DEPEND}" NON_MICRO_V=${P%.[0-9]} S=${WORKDIR}/${NON_MICRO_V} @@ -38,7 +38,7 @@ src_unpack() { -e '/^install:/s/install-libraries //' \ -e 's/^SCRIPTS_MANPAGES = /_&/' \ Makefile.in - WANT_AUTOCONF=2.1 autoconf + eautoconf } src_compile() { @@ -73,7 +73,7 @@ src_test() { # we need dejagnu to do tests ... but dejagnu needs # expect ... so don't do tests unless we have dejagnu type -p runtest || return 0 - WANT_AUTOCONF=2.1 make check || die "make check failed" + make check || die "make check failed" } src_install() { diff --git a/dev-tcltk/expect/expect-5.43.0.ebuild b/dev-tcltk/expect/expect-5.43.0.ebuild index 64cc821b5078..f894dc4b8952 100644 --- a/dev-tcltk/expect/expect-5.43.0.ebuild +++ b/dev-tcltk/expect/expect-5.43.0.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2007 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.6 2007/01/18 04:00:10 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0.ebuild,v 1.7 2007/04/07 14:45:30 jokey Exp $ -inherit eutils +WANT_AUTOCONF="2.1" +inherit autotools eutils DESCRIPTION="tool for automating interactive applications" HOMEPAGE="http://expect.nist.gov/" @@ -15,10 +16,9 @@ IUSE="X doc" # We need dejagnu for src_test, but dejagnu needs expect # to compile/run, so we cant add dejagnu to DEPEND :/ -RDEPEND=">=dev-lang/tcl-8.2 +DEPEND=">=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 )" -DEPEND="${RDEPEND} - =sys-devel/autoconf-2.1*" +RDEPEND="${DEPEND}" NON_MICRO_V=${P%.[0-9]} S=${WORKDIR}/${NON_MICRO_V} @@ -38,7 +38,7 @@ src_unpack() { -e '/^install:/s/install-libraries //' \ -e 's/^SCRIPTS_MANPAGES = /_&/' \ Makefile.in - WANT_AUTOCONF=2.1 autoconf + eautoconf } src_compile() { @@ -73,7 +73,7 @@ src_test() { # we need dejagnu to do tests ... but dejagnu needs # expect ... so don't do tests unless we have dejagnu type -p runtest || return 0 - WANT_AUTOCONF=2.1 make check || die "make check failed" + make check || die "make check failed" } src_install() { -- 2.26.2