diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2007-10-09 17:53:30 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2007-10-09 17:53:30 +0000 |
| commit | 8b78c1e0ba0405b5e9151fc204f4c8586039ca87 (patch) | |
| tree | cea30fc69c7c292d7b1e816a6666b91b67b83c22 /app-editors/emacs-cvs | |
| parent | version bump (diff) | |
| download | gentoo-2-8b78c1e0ba0405b5e9151fc204f4c8586039ca87.tar.gz gentoo-2-8b78c1e0ba0405b5e9151fc204f4c8586039ca87.tar.bz2 gentoo-2-8b78c1e0ba0405b5e9151fc204f4c8586039ca87.zip | |
Fix makeinfo version regexp.
(Portage version: 2.1.3.12)
Diffstat (limited to 'app-editors/emacs-cvs')
3 files changed, 19 insertions, 2 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index f541be5d71c8..ab4f1ffb04e4 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.157 2007/10/06 17:37:13 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.158 2007/10/09 17:53:29 ulm Exp $ + + 09 Oct 2007; Ulrich Mueller <ulm@gentoo.org> + +files/emacs-cvs-22.1.50_p20070829-makeinfo-regexp.patch, + emacs-cvs-22.1.50_p20070829-r1.ebuild: + Fix makeinfo version regexp. *emacs-cvs-22.1.50_p20070829-r1 (06 Oct 2007) diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild index 74b2541073e3..4b8e2735a99e 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild,v 1.1 2007/10/06 17:37:13 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r1.ebuild,v 1.2 2007/10/09 17:53:29 ulm Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="latest" @@ -71,6 +71,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch" + epatch "${FILESDIR}/${P}-makeinfo-regexp.patch" # ALSA is detected and used even if not requested by the USE=alsa flag. # So remove the automagic check use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch" diff --git a/app-editors/emacs-cvs/files/emacs-cvs-22.1.50_p20070829-makeinfo-regexp.patch b/app-editors/emacs-cvs/files/emacs-cvs-22.1.50_p20070829-makeinfo-regexp.patch new file mode 100644 index 000000000000..6e0c2aa9f945 --- /dev/null +++ b/app-editors/emacs-cvs/files/emacs-cvs-22.1.50_p20070829-makeinfo-regexp.patch @@ -0,0 +1,11 @@ +--- configure.in 12 Sep 2007 07:03:30 -0000 1.474 ++++ configure.in 15 Sep 2007 19:45:32 -0000 1.475 +@@ -1347,7 +1347,7 @@ + dnl By this stage, configure has already checked for egrep and set EGREP, + dnl or exited with an error if no egrep was found. + if test "$MAKEINFO" != "no" && \ +- test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[5-9]]|4\.[[6-9]])'`" = x; then ++ test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[6-9]]|4\.[[1-5]][[0-9]]+)'`" = x; then + MAKEINFO=no + fi + |