summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-05-19 17:51:36 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-05-19 17:51:36 +0000
commitbb70eaa7e80b46d6c2b01d8d2bf0a313f1466480 (patch)
tree3c0471a6c6e20a8d71cdacb1806fe98760052465 /sys-apps/nawk
parent keyword ~amd64-fbsd, bug #419555 (diff)
downloadgentoo-2-bb70eaa7e80b46d6c2b01d8d2bf0a313f1466480.tar.gz
gentoo-2-bb70eaa7e80b46d6c2b01d8d2bf0a313f1466480.tar.bz2
gentoo-2-bb70eaa7e80b46d6c2b01d8d2bf0a313f1466480.zip
block freebsd-ubin since they collide
(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-apps/nawk')
-rw-r--r--sys-apps/nawk/ChangeLog5
-rw-r--r--sys-apps/nawk/nawk-20121220-r2.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-apps/nawk/ChangeLog b/sys-apps/nawk/ChangeLog
index 29a26fd3a1ff..ea47edfb1628 100644
--- a/sys-apps/nawk/ChangeLog
+++ b/sys-apps/nawk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/nawk
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/ChangeLog,v 1.10 2013/05/19 17:49:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/ChangeLog,v 1.11 2013/05/19 17:51:36 aballier Exp $
+
+ 19 May 2013; Alexis Ballier <aballier@gentoo.org> nawk-20121220-r2.ebuild:
+ block freebsd-ubin since they collide
19 May 2013; Alexis Ballier <aballier@gentoo.org> nawk-20121220-r2.ebuild:
keyword ~amd64-fbsd, bug #419555
diff --git a/sys-apps/nawk/nawk-20121220-r2.ebuild b/sys-apps/nawk/nawk-20121220-r2.ebuild
index a042a2749efe..281bdf4a15ce 100644
--- a/sys-apps/nawk/nawk-20121220-r2.ebuild
+++ b/sys-apps/nawk/nawk-20121220-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/nawk-20121220-r2.ebuild,v 1.2 2013/05/19 17:49:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nawk/nawk-20121220-r2.ebuild,v 1.3 2013/05/19 17:51:36 aballier Exp $
EAPI="4"
@@ -15,7 +15,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos"
IUSE=""
-RDEPEND="app-admin/eselect-awk"
+RDEPEND="app-admin/eselect-awk
+ !sys-freebsd/freebsd-ubin"
DEPEND="${RDEPEND}
virtual/yacc"