summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-06-22 13:39:53 +0000
committerJustin Lecher <jlec@gentoo.org>2015-06-22 13:39:53 +0000
commite71fce79400b293d087dcdff409593cccfe2a3e3 (patch)
tree61f3a2472605604a27edbda43759897b8b14e0d1 /dev-tcltk/expect
parentAdd fix for format-security, bug #520588 (diff)
downloadgentoo-2-e71fce79400b293d087dcdff409593cccfe2a3e3.tar.gz
gentoo-2-e71fce79400b293d087dcdff409593cccfe2a3e3.tar.bz2
gentoo-2-e71fce79400b293d087dcdff409593cccfe2a3e3.zip
Bump to EAPI=5
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'dev-tcltk/expect')
-rw-r--r--dev-tcltk/expect/ChangeLog5
-rw-r--r--dev-tcltk/expect/expect-5.45.ebuild16
2 files changed, 11 insertions, 10 deletions
diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 3b780284ce83..afdec11f4915 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-tcltk/expect
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.96 2015/06/22 13:35:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.97 2015/06/22 13:39:53 jlec Exp $
+
+ 22 Jun 2015; Justin Lecher <jlec@gentoo.org> expect-5.45.ebuild:
+ Bump to EAPI=5
22 Jun 2015; Justin Lecher <jlec@gentoo.org>
+files/expect-5.45-format-security.patch, expect-5.45.ebuild:
diff --git a/dev-tcltk/expect/expect-5.45.ebuild b/dev-tcltk/expect/expect-5.45.ebuild
index abef40db37f2..1b1d2a66a834 100644
--- a/dev-tcltk/expect/expect-5.45.ebuild
+++ b/dev-tcltk/expect/expect-5.45.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.8 2015/06/22 13:35:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.9 2015/06/22 13:39:53 jlec Exp $
-EAPI="3"
+EAPI=5
inherit autotools eutils
@@ -30,7 +30,7 @@ src_prepare() {
-e 's/^SCRIPT_LIST[[:space:]]*=/_&/' \
-e 's/^SCRIPTS[[:space:]]*=/_&/' \
-e 's/^SCRIPTS_MANPAGES[[:space:]]*=/_&/' \
- Makefile.in
+ Makefile.in || die
epatch "${FILESDIR}"/${PN}-5.45-gfbsd.patch
epatch "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
@@ -62,25 +62,23 @@ 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
- emake test || die
+ emake test
}
expect_make_var() {
touch pkgIndex.tcl-hand
printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f -
- rm -f pkgIndex.tcl-hand
+ rm -f pkgIndex.tcl-hand || die
}
src_install() {
- emake install DESTDIR="${D}" || die
- dodoc ChangeLog FAQ HISTORY NEWS README
+ default
if use doc ; then
docinto examples
dodoc \
example/README \
$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
- $(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES)) \
- || die
+ $(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
fi
}