From 798d78d2b750127676aec4e2c4f262069a669eed Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 17 Dec 2010 22:25:42 +0000 Subject: Punt old version with known bugs. Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64 --- dev-tcltk/expect/ChangeLog | 7 +- dev-tcltk/expect/Manifest | 13 +-- dev-tcltk/expect/expect-5.42.1-r1.ebuild | 102 -------------------- dev-tcltk/expect/expect-5.42.1-r2.ebuild | 106 --------------------- .../files/expect-5.42.1-missing-includes.patch | 33 ------- .../expect/files/expect-5.42.1-multilib.patch | 11 --- 6 files changed, 10 insertions(+), 262 deletions(-) delete mode 100644 dev-tcltk/expect/expect-5.42.1-r1.ebuild delete mode 100644 dev-tcltk/expect/expect-5.42.1-r2.ebuild delete mode 100644 dev-tcltk/expect/files/expect-5.42.1-missing-includes.patch delete mode 100644 dev-tcltk/expect/files/expect-5.42.1-multilib.patch (limited to 'dev-tcltk/expect') diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog index 4fd8e466ff0c..26cf3196bcc2 100644 --- a/dev-tcltk/expect/ChangeLog +++ b/dev-tcltk/expect/ChangeLog @@ -1,6 +1,11 @@ # 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.81 2010/09/20 07:27:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.82 2010/12/17 22:25:42 vapier Exp $ + + 17 Dec 2010; Mike Frysinger -expect-5.42.1-r1.ebuild, + -expect-5.42.1-r2.ebuild, -files/expect-5.42.1-missing-includes.patch, + -files/expect-5.42.1-multilib.patch: + Punt old version with known bugs. 20 Sep 2010; Mike Frysinger expect-5.44.1.15.ebuild, +files/expect-5.44.1.15-headers.patch: diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest index a9464d540177..742a9db268f4 100644 --- a/dev-tcltk/expect/Manifest +++ b/dev-tcltk/expect/Manifest @@ -2,8 +2,6 @@ Hash: SHA256 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 AUX expect-5.43.0-avoid-tcl-internals-1.patch 3376 RMD160 2a99f4496dbbb7b1575189fe284e847851b4bedf SHA1 e85341cfd075dc27c9f79c86ac6c035e82203a15 SHA256 2dbfcf569e766d6e5d2b6bc83a7556c0cb189a7da334e07b7201bb0b764fb610 AUX expect-5.43.0-missing-includes.patch 1767 RMD160 9f5e3f92da5f651111220abd6a2571aaf247210c SHA1 02c957d9d0b5d110412ae9a77d8d7ff4c377312e SHA256 28f0a57901a714f52a29b829f01e934a45fd3b71aead7b7946a024719495f68b AUX expect-5.43.0-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b SHA1 b59faccf8a0e8c538126d68c5eed181d789f45d7 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002 @@ -12,20 +10,17 @@ AUX expect-5.44.1.15-headers.patch 1669 RMD160 33d25a4bd9a00eacc6c16b40a467217c0 AUX expect-5.44.1.15-ldflags.patch 360 RMD160 07385db6345811c5f43316e508ea6e2677662197 SHA1 366ecf4a44558819fac92a6f7800961997d060d5 SHA256 2e9d3a614edc020044480ba78802696880be638f5b5dcb0fff02c632e0e738d2 AUX expect-5.44.1.15_with-tk-no.patch 3471 RMD160 704da66e65df54f66567c62f7e98efea39a21737 SHA1 571d894e59267cd812d727ad3b6f5a4c7b4b98ab SHA256 41e889fc40d1a501285fe0acb1324d8be016654ee92b2a9dcdfe7bd2f3df06a0 AUX expect.m4 20468 RMD160 b06e075db9afed2b0a59d9b5721f874d74acdef5 SHA1 14d4cfc26131f8231af0bfa126722b123573aac4 SHA256 6b60f18a68792050c1cb8745508fd1595eb2789fd780195af0492e344d00faca -DIST expect-5.42.1.tar.gz 524882 RMD160 d354d5d3ffa941d89e668fb4ad1ccbb59be4f341 SHA1 84ca72f0abd2b7a31ee332049b34575a286e8f27 SHA256 a2b64dbca4dc127dfcb6d7e16dd3c08ef8bba2056104ce89819d3e6f0e1df430 DIST expect-5.43.0.tar.gz 525572 RMD160 2cc91f5bd42c7429550747c590085edb9a517a59 SHA1 854440d937c1d05103bf2d02f911005b739fa1e9 SHA256 4c9decec3c5541806f1758706fe649193d5c8afa2913a79361d9fa5f2c993ba1 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-r1.ebuild 3820 RMD160 49a753c043884ebebe8018b964de122f111f7d78 SHA1 8bd6235c2e20d34664973bc4aec95f567f8d29c7 SHA256 de5dcecfa85e53ae9166711673bfba1bf308439b523e49faf7baae279fe1f25a EBUILD expect-5.43.0.ebuild 3539 RMD160 9b361ac2065c322c017271b7931c4c809bdcd9db SHA1 5d8a4211466e0d49d777afb1e11a5f305787788f SHA256 b68fcde292800697bb761562efc4682ac6fa8c77b6a807f639bbf404a9d3bac9 EBUILD expect-5.44.1.15.ebuild 3077 RMD160 a984991171fb2662029554156bbb3ddebb282d8e SHA1 8f6f0c2020a944df630cdfe05047ba471dafe7e9 SHA256 3b6b9a147161c2c9fda5230f91b00a5419a6d415cd284892225c5efad3fcb909 -MISC ChangeLog 11472 RMD160 b79f9b00e22e2dcfcc73e87cc4c646f557db61ee SHA1 f91ef77b85732d380102cddd2ab1045c82d81efe SHA256 db46ad6154f2fad6b1ded48dd24e43c9c13de476bdd4fe025609bbe50db7654b +MISC ChangeLog 11697 RMD160 e7baa1966d46396fba251795f36701e8014b3e80 SHA1 7c6e38bd0212936270fe7b73c47945928c3c1089 SHA256 34855ad6d9d01a2bb1a6fd9748cd3ffd60b39f55cf45e5898e151e3bead77d53 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iF4EAREIAAYFAkyXDOMACgkQTwhj9JtAlp5kaQD/WJ9VLOX5QZJBTwSvVfS/2fME -aHRR7bpmpjkUV8wX93ABAKUjMJ4J0Idbtj6BVg12FRjq1Xg76ToFeGC8CHffxhTE -=U6ok +iF4EAREIAAYFAk0L4x8ACgkQTwhj9JtAlp4oAAD/cjF2I7qF9xvVQUqXM1QeFC17 +VHyu24GwDlyiIg1FD2oA/jm709QjFUoFT1Eub5cNvsEhwc0v6j/msf2UIsaYG1p2 +=XjxF -----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 deleted file mode 100644 index 11d7f2d6933a..000000000000 --- a/dev-tcltk/expect/expect-5.42.1-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2008 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.13 2008/03/10 00:21:05 ricmm Exp $ - -WANT_AUTOCONF="2.1" -inherit autotools eutils - -DESCRIPTION="tool for automating interactive applications" -HOMEPAGE="http://expect.nist.gov/" -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" -IUSE="X doc" - -# We need dejagnu for src_test, but dejagnu needs expect -# to compile/run, so we cant add dejagnu to DEPEND :/ -DEPEND=">=dev-lang/tcl-8.2 - X? ( >=dev-lang/tk-8.2 )" -RDEPEND="${DEPEND}" - -NON_MICRO_V=${P%.[0-9]} -S=${WORKDIR}/${NON_MICRO_V} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-multilib.patch - - # fix the rpath being set to /var/tmp/portage/... - epatch ${FILESDIR}/expect-5.39.0-libdir.patch - - sed -i 's#/usr/local/bin#/usr/bin#' expect.man - sed -i 's#/usr/local/bin#/usr/bin#' expectk.man - #stops any example scripts being installed by default - sed -i \ - -e '/^install:/s/install-libraries //' \ - -e 's/^SCRIPTS_MANPAGES = /_&/' \ - Makefile.in - eautoconf -} - -src_compile() { - local myconf - local tclv - local tkv - # Find the version of tcl/tk that has headers installed. - # This will be the most recently merged, not necessarily the highest - # version number. - tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/') - #tkv isn't really needed, included for symmetry and the future - #tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/') - - #configure needs to find the files tclConfig.sh and tclInt.h - myconf="--with-tcl=/usr/$(get_libdir) --with-tclinclude=/usr/$(get_libdir)/tcl${tclv}/include/generic" - - 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)" - 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 || die "emake failed" -} - -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 - make check || die "make check failed" -} - -src_install() { - dodir /usr/$(get_libdir) - 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} - - #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} - local scripts_manpages=$(make -qp | \ - sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1) - for m in ${scripts_manpages}; do - dodoc example/${m}.man - done - dodoc example/README - fi -} diff --git a/dev-tcltk/expect/expect-5.42.1-r2.ebuild b/dev-tcltk/expect/expect-5.42.1-r2.ebuild deleted file mode 100644 index a67ae00d9f61..000000000000 --- a/dev-tcltk/expect/expect-5.42.1-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# 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.42.1-r2.ebuild,v 1.1 2009/06/07 17:01:04 mescalinum Exp $ - -WANT_AUTOCONF="2.1" -inherit autotools eutils - -DESCRIPTION="tool for automating interactive applications" -HOMEPAGE="http://expect.nist.gov/" -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" -IUSE="X doc" - -# We need dejagnu for src_test, but dejagnu needs expect -# to compile/run, so we cant add dejagnu to DEPEND :/ -DEPEND=">=dev-lang/tcl-8.2 - X? ( >=dev-lang/tk-8.2 )" -RDEPEND="${DEPEND}" - -NON_MICRO_V=${P%.[0-9]} -S=${WORKDIR}/${NON_MICRO_V} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-multilib.patch - - # fix the rpath being set to /var/tmp/portage/... - epatch ${FILESDIR}/expect-5.39.0-libdir.patch - - sed -i 's#/usr/local/bin#/usr/bin#' expect.man - sed -i 's#/usr/local/bin#/usr/bin#' expectk.man - #stops any example scripts being installed by default - sed -i \ - -e '/^install:/s/install-libraries //' \ - -e 's/^SCRIPTS_MANPAGES = /_&/' \ - Makefile.in - - # fix implicit missing declarations (bug 204878) - epatch "${FILESDIR}"/"${P}"-missing-includes.patch - - eautoconf -} - -src_compile() { - local myconf - local tclv - local tkv - # Find the version of tcl/tk that has headers installed. - # This will be the most recently merged, not necessarily the highest - # version number. - tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/') - #tkv isn't really needed, included for symmetry and the future - #tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/') - - #configure needs to find the files tclConfig.sh and tclInt.h - myconf="--with-tcl=/usr/$(get_libdir) --with-tclinclude=/usr/$(get_libdir)/tcl${tclv}/include/generic" - - 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)" - 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 || die "emake failed" -} - -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 - make check || die "make check failed" -} - -src_install() { - dodir /usr/$(get_libdir) - 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} - - #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} - local scripts_manpages=$(make -qp | \ - sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1) - for m in ${scripts_manpages}; do - dodoc example/${m}.man - done - dodoc example/README - fi -} diff --git a/dev-tcltk/expect/files/expect-5.42.1-missing-includes.patch b/dev-tcltk/expect/files/expect-5.42.1-missing-includes.patch deleted file mode 100644 index ec4ce5184eb2..000000000000 --- a/dev-tcltk/expect/files/expect-5.42.1-missing-includes.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN work.orig/expect-5.42/exp_glob.c work/expect-5.42/exp_glob.c ---- work.orig/expect-5.42/exp_glob.c 2009-06-02 00:07:02.429807485 -0400 -+++ work/expect-5.42/exp_glob.c 2009-06-02 00:09:05.039817979 -0400 -@@ -11,6 +11,7 @@ - - */ - -+#include - #include "expect_cf.h" - #include "tcl.h" - #include "exp_int.h" -diff -urN work.orig/expect-5.42/exp_main_exp.c work/expect-5.42/exp_main_exp.c ---- work.orig/expect-5.42/exp_main_exp.c 2009-06-02 00:07:02.429807485 -0400 -+++ work/expect-5.42/exp_main_exp.c 2009-06-02 00:08:09.867365455 -0400 -@@ -9,6 +9,7 @@ - - #include "expect_cf.h" - #include -+#include - #include "tcl.h" - #include "expect_tcl.h" - -diff -urN work.orig/expect-5.42/pty_termios.c work/expect-5.42/pty_termios.c ---- work.orig/expect-5.42/pty_termios.c 2009-06-02 00:07:02.449818499 -0400 -+++ work/expect-5.42/pty_termios.c 2009-06-02 00:08:41.878505396 -0400 -@@ -8,6 +8,7 @@ - */ - - #include -+#include - #include - - #if defined(SIGCLD) && !defined(SIGCHLD) diff --git a/dev-tcltk/expect/files/expect-5.42.1-multilib.patch b/dev-tcltk/expect/files/expect-5.42.1-multilib.patch deleted file mode 100644 index 9257537349d5..000000000000 --- a/dev-tcltk/expect/files/expect-5.42.1-multilib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- expect-5.42/configure.in.orig 2004-12-21 03:02:36.095170881 -0800 -+++ expect-5.42/configure.in 2004-12-21 03:03:08.987170537 -0800 -@@ -1141,7 +1141,7 @@ - fi - - EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}${DBGX}" --EXP_LIB_SPEC="-L\${INSTALL_ROOT}\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}${DBGX}" -+EXP_LIB_SPEC="-L\${libdir} -lexpect${EXP_LIB_VERSION}${DBGX}" - EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}${DBGX}.a - - # The TCL_SHARED_LIB_SUFFIX macro below relies on the DBGX macro, -- cgit v1.2.3-65-gdbad