summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/fhist/ChangeLog6
-rw-r--r--dev-util/fhist/fhist-1.16.ebuild21
-rw-r--r--dev-util/fhist/fhist-1.19.ebuild15
3 files changed, 21 insertions, 21 deletions
diff --git a/dev-util/fhist/ChangeLog b/dev-util/fhist/ChangeLog
index eb35eee93992..470480b094ac 100644
--- a/dev-util/fhist/ChangeLog
+++ b/dev-util/fhist/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/fhist
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/ChangeLog,v 1.26 2011/09/25 12:35:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/ChangeLog,v 1.27 2011/10/07 15:03:15 jlec Exp $
+
+ 07 Oct 2011; Justin Lecher <jlec@gentoo.org> fhist-1.16.ebuild,
+ fhist-1.19.ebuild:
+ Move parallel make blocking to global space, #358567 & #356671
25 Sep 2011; Fabian Groffen <grobian@gentoo.org> fhist-1.19.ebuild:
Drop *-macos keywords, libexplain is a too Linux-specific hell to port (1.16
diff --git a/dev-util/fhist/fhist-1.16.ebuild b/dev-util/fhist/fhist-1.16.ebuild
index 5adc5a46970f..f455891a79b9 100644
--- a/dev-util/fhist/fhist-1.16.ebuild
+++ b/dev-util/fhist/fhist-1.16.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/fhist-1.16.ebuild,v 1.5 2011/06/12 20:04:44 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/fhist-1.16.ebuild,v 1.6 2011/10/07 15:03:15 jlec Exp $
DESCRIPTION="File history and comparison tools"
HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
@@ -17,25 +17,28 @@ DEPEND="${RDEPEND}
test? ( app-arch/sharutils )
sys-devel/bison"
+MAKEOPTS+=" -j1"
+
src_compile() {
- econf || die "econf failed"
- # bug #295744
- emake -j1 || die "emake failed"
+ econf
+ emake || die "emake failed"
}
src_test() {
- emake -j1 sure || die "src_test failed"
+ emake sure || die "src_test failed"
}
src_install () {
- emake -j1 RPM_BUILD_ROOT="${D}" NLSDIR="${D}/usr/share/locale" \
+ emake \
+ RPM_BUILD_ROOT="${D}" \
+ NLSDIR="${D}/usr/share/locale" \
install || die "make install failed"
- dodoc lib/en/*.txt
- dodoc lib/en/*.ps
+ dodoc lib/en/*.txt || die
+ dodoc lib/en/*.ps || die
# remove duplicate docs etc.
rm -r "${D}"/usr/share/fhist
- dodoc MANIFEST README
+ dodoc MANIFEST README || die
}
diff --git a/dev-util/fhist/fhist-1.19.ebuild b/dev-util/fhist/fhist-1.19.ebuild
index 4f884b773a03..6a971fb35328 100644
--- a/dev-util/fhist/fhist-1.19.ebuild
+++ b/dev-util/fhist/fhist-1.19.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/fhist-1.19.ebuild,v 1.5 2011/09/25 12:35:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/fhist-1.19.ebuild,v 1.6 2011/10/07 15:03:15 jlec Exp $
-EAPI="4"
+EAPI=4
inherit eutils
@@ -23,15 +23,8 @@ DEPEND="${RDEPEND}
sys-devel/bison
test? ( app-arch/sharutils )"
+MAKEOPTS+=" -j1"
+
src_prepare() {
epatch "${FILESDIR}"/${PV}-ldflags.patch
}
-
-src_compile() {
- emake -j1
-}
-
-src_install () {
- emake -j1 DESTDIR="${D}" install
- dodoc README
-}