summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-01-07 13:03:16 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-01-07 13:03:16 +0000
commitffb206ddb0416d18936c4c2e0164134d257fb4bf (patch)
tree30e4e7f0c0d937e80aaae64b9245877e76adf0ae /sys-apps/miscfiles
parentamd64 stable wrt #289297 (diff)
downloadgentoo-2-ffb206ddb0416d18936c4c2e0164134d257fb4bf.tar.gz
gentoo-2-ffb206ddb0416d18936c4c2e0164134d257fb4bf.tar.bz2
gentoo-2-ffb206ddb0416d18936c4c2e0164134d257fb4bf.zip
Add blocker for freebsd-share colliding with it and keyword for -fbsd
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/miscfiles')
-rw-r--r--sys-apps/miscfiles/ChangeLog8
-rw-r--r--sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild8
2 files changed, 11 insertions, 5 deletions
diff --git a/sys-apps/miscfiles/ChangeLog b/sys-apps/miscfiles/ChangeLog
index 63c32d7de5cd..d7a1cc88d010 100644
--- a/sys-apps/miscfiles/ChangeLog
+++ b/sys-apps/miscfiles/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/miscfiles
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/ChangeLog,v 1.25 2009/10/17 22:43:08 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/ChangeLog,v 1.26 2010/01/07 13:03:16 aballier Exp $
+
+ 07 Jan 2010; Alexis Ballier <aballier@gentoo.org>
+ miscfiles-1.4.2-r1.ebuild:
+ Add blocker for freebsd-share colliding with it and keyword for -fbsd
*miscfiles-1.4.2-r1 (17 Oct 2009)
diff --git a/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild b/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild
index 84ba7875b1bc..f0abb55ab347 100644
--- a/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild,v 1.3 2009/10/17 22:43:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild,v 1.4 2010/01/07 13:03:16 aballier Exp $
inherit eutils
@@ -14,8 +14,10 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
LICENSE="GPL-2 unicode"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="minimal"
+# Collides with older versions/revisions
+RDEPEND="!<sys-freebsd/freebsd-share-7.2-r1"
src_unpack() {
unpack ${A}