diff options
Diffstat (limited to 'dev-tcltk')
| -rw-r--r-- | dev-tcltk/expect/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-tcltk/expect/expect-5.44.1.ebuild (renamed from dev-tcltk/expect/expect-5.43.0.ebuild) | 25 | ||||
| -rw-r--r-- | dev-tcltk/expect/files/expect-5.44.1-destdir.patch | 21 |
3 files changed, 44 insertions, 11 deletions
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 <mescalinum@gentoo.org> + +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; <ricmm@gentoo.org> expect-5.42.1-r1.ebuild: Drop to ~mips to match dependencies diff --git a/dev-tcltk/expect/expect-5.43.0.ebuild b/dev-tcltk/expect/expect-5.44.1.ebuild index f894dc4b8952..6548c11b7ef3 100644 --- a/dev-tcltk/expect/expect-5.43.0.ebuild +++ b/dev-tcltk/expect/expect-5.44.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# 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.43.0.ebuild,v 1.7 2007/04/07 14:45:30 jokey Exp $ +# $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.1" +WANT_AUTOCONF="2.5" inherit autotools eutils DESCRIPTION="tool for automating interactive applications" @@ -20,16 +20,11 @@ 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} +RESTRICT="test" 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 @@ -38,6 +33,16 @@ src_unpack() { -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 } @@ -78,7 +83,7 @@ src_test() { src_install() { dodir /usr/$(get_libdir) - make install INSTALL_ROOT="${D}" || die "make install failed" + make install DESTDIR="${D}" || die "make install failed" dodoc ChangeLog FAQ HISTORY NEWS README 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 + |