From 275ff4b2ce30b8c35fc553278b1fa4a04d3b248d Mon Sep 17 00:00:00 2001 From: Federico Ferri Date: Sun, 26 Oct 2008 12:38:08 +0000 Subject: version bump 5.44.1 Package-Manager: portage-2.1.4.4 --- dev-tcltk/expect/ChangeLog | 9 +- dev-tcltk/expect/Manifest | 7 +- dev-tcltk/expect/expect-5.43.0.ebuild | 102 -------------------- dev-tcltk/expect/expect-5.44.1.ebuild | 107 +++++++++++++++++++++ dev-tcltk/expect/files/expect-5.44.1-destdir.patch | 21 ++++ 5 files changed, 140 insertions(+), 106 deletions(-) delete mode 100644 dev-tcltk/expect/expect-5.43.0.ebuild create mode 100644 dev-tcltk/expect/expect-5.44.1.ebuild create mode 100644 dev-tcltk/expect/files/expect-5.44.1-destdir.patch (limited to 'dev-tcltk/expect') diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog index 33bd0a18cbba..1b0032979521 100644 --- a/dev-tcltk/expect/ChangeLog +++ b/dev-tcltk/expect/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-tcltk/expect # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.46 2008/03/10 00:21:05 ricmm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.47 2008/10/26 12:38:08 mescalinum Exp $ + +*expect-5.44.1 (26 Oct 2008) + + 26 Oct 2008; Federico Ferri + +files/expect-5.44.1-destdir.patch, -expect-5.43.0.ebuild, + +expect-5.44.1.ebuild: + version bump 5.44.1 09 Mar 2008; expect-5.42.1-r1.ebuild: Drop to ~mips to match dependencies diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest index 0f96621b2e22..a1e5891e8faf 100644 --- a/dev-tcltk/expect/Manifest +++ b/dev-tcltk/expect/Manifest @@ -1,8 +1,9 @@ AUX expect-5.39.0-libdir.patch 480 RMD160 e58373778379907bf68ce6e61acce5dad4852421 SHA1 f438e6899688f0b3d5bdb854246483ec29848c9a SHA256 971ac5bd88e393d1029ab248c1071529337baf0b50445c53e35f49fdb7c6365a AUX expect-5.42.1-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b SHA1 b59faccf8a0e8c538126d68c5eed181d789f45d7 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002 +AUX expect-5.44.1-destdir.patch 1072 RMD160 b5dcc02f39215616e790b79088ee197ea74af7f6 SHA1 a662f32614cf37a40991e80cea8d43646ca72947 SHA256 41102ebbd7da6eccea0a88c29e5b5a1ce7039effdf8c271fe09d9bbe3fe55f0e DIST expect-5.42.1.tar.gz 524882 RMD160 d354d5d3ffa941d89e668fb4ad1ccbb59be4f341 SHA1 84ca72f0abd2b7a31ee332049b34575a286e8f27 SHA256 a2b64dbca4dc127dfcb6d7e16dd3c08ef8bba2056104ce89819d3e6f0e1df430 -DIST expect-5.43.0.tar.gz 525570 RMD160 223b78f39dca8cc7900d82230cf7db91e6770389 SHA1 4da64b7c50cea22ac87fcf0f8f98f786793ee785 SHA256 d11a77e680ddc0244370b46f117f0b28a6571db842885bee3b7c15372c1ca079 +DIST expect-5.44.1.tar.gz 623422 RMD160 5f206d9e5b9bb73c97bb7fc0d7df7318d4525a32 SHA1 b897c7626e7dde0fd090a572389a5e2a95056de8 SHA256 e41a6b82d67150f0dc38faa5c96715d93b68d3e55be40a585737cc4f59c4fd8f EBUILD expect-5.42.1-r1.ebuild 3062 RMD160 37e2632986cfa482437551c2e8842fa773505d66 SHA1 21a51490a22cbcaac3ff158159af9583d34082e1 SHA256 e3315c6b5fd88d502bc53c735ca654308084a3cd4d0ba814b197f92ff4229183 -EBUILD expect-5.43.0.ebuild 3094 RMD160 0288f0a7a4f387a41d0f4b61d1c193bd812efad5 SHA1 f396338990d64098b8c56d080aa774fe54dd871d SHA256 6fc7a4d0cb941ed954bf4e5f28e32b4c7dfa85c13392fe272801919ea409f1e0 -MISC ChangeLog 6590 RMD160 76f46822c9b5e230435e4e774e776febcf66faba SHA1 7f1e8577b0747adf862c87c0ae1c271cedd9086e SHA256 5198721f4b149e10e92c466e244eb1a14b3dfbe7eb2c0d5a058eebeab01bb20a +EBUILD expect-5.44.1.ebuild 3307 RMD160 a546a1710b30ada120b1a356fb9ffd38a546183c SHA1 00f42e50a752b3b74ac27e820a81a8aaa5710afb SHA256 20c1a611eb361e60d349c777a1c0bc6278938582eca7b41962cc2ea99ed5d52e +MISC ChangeLog 6788 RMD160 ee45fb74adca32a75c987b83180857971627347d SHA1 cd0542e7ee81991043ec97b08442666fabb87ffd SHA256 5e8dc9297f713fde085cdcc6259ef68b9caf8f9dcc8c9f49c2843981f83b6814 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 diff --git a/dev-tcltk/expect/expect-5.43.0.ebuild b/dev-tcltk/expect/expect-5.43.0.ebuild deleted file mode 100644 index f894dc4b8952..000000000000 --- a/dev-tcltk/expect/expect-5.43.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# 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.7 2007/04/07 14:45:30 jokey 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 ~sparc-fbsd ~x86 ~x86-fbsd" -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}"/${PN}-5.42.1-multilib.patch - - # fix the rpath being set to /var/tmp/portage/... - epatch "${FILESDIR}"/${PN}-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.44.1.ebuild b/dev-tcltk/expect/expect-5.44.1.ebuild new file mode 100644 index 000000000000..6548c11b7ef3 --- /dev/null +++ b/dev-tcltk/expect/expect-5.44.1.ebuild @@ -0,0 +1,107 @@ +# 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.44.1.ebuild,v 1.1 2008/10/26 12:38:08 mescalinum Exp $ + +WANT_AUTOCONF="2.5" +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 ~sparc-fbsd ~x86 ~x86-fbsd" +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}" + +RESTRICT="test" + +src_unpack() { + unpack ${A} + cd "${S}" + + 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 + + #they forgot to include expect.m4 (now it's in expect cvs) + cp "${FILESDIR}/expect.m4" . + #configure broken for testsuite + sed -i -e 's/^AC_CONFIG_SUBDIRS(testsuite)$//' configure.in + #fixes "TCL_REG_BOSONLY undeclared" error due to a change in tcl8.5 + sed -i -e 's/^#include "tcl.h"/#include "tclInt.h"/' exp_inter.c + #slacky destdir support in Makefile + epatch "${FILESDIR}/${P}-destdir.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 DESTDIR="${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.44.1-destdir.patch b/dev-tcltk/expect/files/expect-5.44.1-destdir.patch new file mode 100644 index 000000000000..1fc8aac58d1f --- /dev/null +++ b/dev-tcltk/expect/files/expect-5.44.1-destdir.patch @@ -0,0 +1,21 @@ +--- Makefile.in.orig 2008-10-26 13:15:44.000000000 +0100 ++++ Makefile.in 2008-10-26 13:16:25.000000000 +0100 +@@ -256,14 +256,14 @@ install-doc: doc + @mkdir -p $(DESTDIR)$(mandir)/man3 + @echo "Installing documentation in $(DESTDIR)$(mandir)" + # install Expectk man page if present +- $(INSTALL_DATA) $(srcdir)/expectk.man $(mandir)/man1/expectk.1 ; \ ++ $(INSTALL_DATA) $(srcdir)/expectk.man $(DESTDIR)$(mandir)/man1/expectk.1 ; \ + # install Expect man page +- $(INSTALL_DATA) $(srcdir)/expect.man $(mandir)/man1/expect.1 ++ $(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(mandir)/man1/expect.1 + # install man page for Expect and Expectk libraries +- $(INSTALL_DATA) $(srcdir)/libexpect.man $(mandir)/man3/libexpect.3 ++ $(INSTALL_DATA) $(srcdir)/libexpect.man $(DESTDIR)$(mandir)/man3/libexpect.3 + -for i in $(SCRIPT_MANPAGE_LIST) ; do \ + if [ -f $(srcdir)/example/$$i.man ] ; then \ +- $(INSTALL_DATA) $(srcdir)/example/$$i.man $(mandir)/man1/$$i.1 ; \ ++ $(INSTALL_DATA) $(srcdir)/example/$$i.man $(DESTDIR)$(mandir)/man1/$$i.1 ; \ + else true; fi ; \ + done + -- cgit v1.2.3-65-gdbad