summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2012-03-06 21:24:43 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2012-03-06 21:24:43 +0000
commit6c977a26b4e79aec603c6bd577bc5f3837eec9ce (patch)
treeabe9e5585e574c15325d6de84bcdea372b7f469a /sys-apps/moreutils
parentMarking avfs-1.0.0 ppc for bug 400503 (diff)
downloadgentoo-2-6c977a26b4e79aec603c6bd577bc5f3837eec9ce.tar.gz
gentoo-2-6c977a26b4e79aec603c6bd577bc5f3837eec9ce.tar.bz2
gentoo-2-6c977a26b4e79aec603c6bd577bc5f3837eec9ce.zip
Fix build failure when using -doc. Bug #400675. Restore stable amd64 keywords
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/moreutils')
-rw-r--r--sys-apps/moreutils/ChangeLog5
-rw-r--r--sys-apps/moreutils/moreutils-0.45-r1.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/sys-apps/moreutils/ChangeLog b/sys-apps/moreutils/ChangeLog
index d3e000f36419..c179d544d5a9 100644
--- a/sys-apps/moreutils/ChangeLog
+++ b/sys-apps/moreutils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/moreutils
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.38 2012/03/06 21:12:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.39 2012/03/06 21:24:43 hwoarang Exp $
+
+ 06 Mar 2012; Markos Chandras <hwoarang@gentoo.org> moreutils-0.45-r1.ebuild:
+ Fix build failure when using -doc. Bug #400675. Restore stable amd64 keywords
06 Mar 2012; Markos Chandras <hwoarang@gentoo.org> moreutils-0.45-r1.ebuild:
Revert stable amd64 keywords because of bug #400675
diff --git a/sys-apps/moreutils/moreutils-0.45-r1.ebuild b/sys-apps/moreutils/moreutils-0.45-r1.ebuild
index bd4d040b72d7..19c6b7dc505b 100644
--- a/sys-apps/moreutils/moreutils-0.45-r1.ebuild
+++ b/sys-apps/moreutils/moreutils-0.45-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.45-r1.ebuild,v 1.5 2012/03/06 21:12:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.45-r1.ebuild,v 1.6 2012/03/06 21:24:43 hwoarang Exp $
EAPI=4
inherit eutils toolchain-funcs prefix
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 ~x86 ~x86-linux"
IUSE="+doc +perl"
RDEPEND="
@@ -54,6 +54,8 @@ src_install() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
# sys-process is more advanced than parallel from moreutils, rename it
- mv -vf "${ED}"usr/share/man/man1/{,${PN}_}parallel.1 || die
+ if use doc; then
+ mv -vf "${ED}"usr/share/man/man1/{,${PN}_}parallel.1 || die
+ fi
mv -vf "${ED}"usr/bin/{,${PN}_}parallel || die
}