diff options
| -rw-r--r-- | app-editors/fe/ChangeLog | 8 | ||||
| -rw-r--r-- | app-editors/fe/fe-1.8.ebuild | 23 | ||||
| -rw-r--r-- | app-editors/fe/files/fe-1.6-nostrip.patch | 11 | ||||
| -rw-r--r-- | app-editors/fe/files/fe-1.8-makefile.patch | 16 |
4 files changed, 33 insertions, 25 deletions
diff --git a/app-editors/fe/ChangeLog b/app-editors/fe/ChangeLog index fe2c667ef062..cc2cd84085e8 100644 --- a/app-editors/fe/ChangeLog +++ b/app-editors/fe/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/fe -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/fe/ChangeLog,v 1.7 2008/07/28 18:25:56 ulm Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/fe/ChangeLog,v 1.8 2011/08/27 19:12:54 ulm Exp $ + + 27 Aug 2011; Ulrich Mueller <ulm@gentoo.org> -files/fe-1.6-nostrip.patch, + fe-1.8.ebuild, +files/fe-1.8-makefile.patch: + Fix parallel make issue, bug 380865. EAPI bump. 28 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml: Add USE flag description to metadata wrt GLEP 56. diff --git a/app-editors/fe/fe-1.8.ebuild b/app-editors/fe/fe-1.8.ebuild index 466c197c7da3..6751bf30a008 100644 --- a/app-editors/fe/fe-1.8.ebuild +++ b/app-editors/fe/fe-1.8.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/fe/fe-1.8.ebuild,v 1.4 2008/02/24 17:17:01 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/fe/fe-1.8.ebuild,v 1.5 2011/08/27 19:12:54 ulm Exp $ + +EAPI=4 inherit eutils @@ -17,15 +19,12 @@ DEPEND="sys-libs/ncurses sendmail? ( virtual/mta )" RDEPEND="${DEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-1.6-nostrip.patch" +src_prepare() { + epatch "${FILESDIR}/${P}-makefile.patch" } -src_compile() { - econf $(use_enable sendmail) || die "econf failed" - emake || die "emake failed" +src_configure() { + econf $(use_enable sendmail) } src_install() { @@ -33,8 +32,8 @@ src_install() { prefix="${D}"/usr \ datadir="${D}"/usr/share \ MANDIR="${D}"/usr/share/man \ - install || die "emake install failed" + install - dodoc NEWS README || die "dodoc failed" - dohtml fe.html || die "dohtml failed" + dodoc NEWS README + dohtml fe.html } diff --git a/app-editors/fe/files/fe-1.6-nostrip.patch b/app-editors/fe/files/fe-1.6-nostrip.patch deleted file mode 100644 index a13b0a2bf5f1..000000000000 --- a/app-editors/fe/files/fe-1.6-nostrip.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fe-1.6-orig/Makefile.in 2004-02-17 00:56:01.000000000 +0100 -+++ fe-1.6/Makefile.in 2007-12-16 10:42:51.000000000 +0100 -@@ -40,7 +40,7 @@ - - install: all - $(INSTALL) -m 755 -d $(BINDIR) -- $(INSTALL_PROGRAM) -s fe $(BINDIR)/fe -+ $(INSTALL_PROGRAM) fe $(BINDIR)/fe - $(INSTALL) -m 755 -d $(MANDIR)/man1 - $(INSTALL_DATA) fe.1 $(MANDIR)/man1/fe.1 - make install-po diff --git a/app-editors/fe/files/fe-1.8-makefile.patch b/app-editors/fe/files/fe-1.8-makefile.patch new file mode 100644 index 000000000000..73f7e09020da --- /dev/null +++ b/app-editors/fe/files/fe-1.8-makefile.patch @@ -0,0 +1,16 @@ +diff -Nur fe-1.8-orig/Makefile.in fe-1.8/Makefile.in +--- fe-1.8-orig/Makefile.in 2007-08-31 20:47:09.000000000 +0200 ++++ fe-1.8/Makefile.in 2011-08-27 21:07:43.000000000 +0200 +@@ -40,10 +40,10 @@ + + install: all + $(INSTALL) -m 755 -d $(BINDIR) +- $(INSTALL_PROGRAM) -s fe $(BINDIR)/fe ++ $(INSTALL_PROGRAM) fe $(BINDIR)/fe + $(INSTALL) -m 755 -d $(MANDIR)/man1 + $(INSTALL_DATA) fe.1 $(MANDIR)/man1/fe.1 +- make install-po ++ $(MAKE) install-po + + .c.o: + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< |