From 15d16bb86b6973f6545eaa09723e143fef7d86cc Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 25 Feb 2012 07:09:43 +0000 Subject: Mutually exclusive with both module-init-tools and kmod (Portage version: 2.2.0_alpha87/cvs/Linux x86_64) --- sys-apps/modutils/ChangeLog | 8 ++++++-- sys-apps/modutils/modutils-2.4.27-r1.ebuild | 7 ++++--- sys-apps/modutils/modutils-2.4.27.ebuild | 7 ++++--- 3 files changed, 14 insertions(+), 8 deletions(-) (limited to 'sys-apps/modutils') diff --git a/sys-apps/modutils/ChangeLog b/sys-apps/modutils/ChangeLog index eb764dbd3482..dd4dc0c9b0b9 100644 --- a/sys-apps/modutils/ChangeLog +++ b/sys-apps/modutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/modutils -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.55 2011/04/24 21:31:35 ulm Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.56 2012/02/25 07:09:43 robbat2 Exp $ + + 25 Feb 2012; Robin H. Johnson modutils-2.4.27-r1.ebuild, + modutils-2.4.27.ebuild: + Mutually exclusive with both module-init-tools and kmod 24 Apr 2011; Ulrich Mueller modutils-2.4.27.ebuild, modutils-2.4.27-r1.ebuild: diff --git a/sys-apps/modutils/modutils-2.4.27-r1.ebuild b/sys-apps/modutils/modutils-2.4.27-r1.ebuild index dad57c562486..36c8b006e0f9 100644 --- a/sys-apps/modutils/modutils-2.4.27-r1.ebuild +++ b/sys-apps/modutils/modutils-2.4.27-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.27-r1.ebuild,v 1.5 2011/04/24 21:31:34 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.27-r1.ebuild,v 1.6 2012/02/25 07:09:43 robbat2 Exp $ inherit eutils @@ -13,7 +13,8 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="" -RDEPEND="!sys-apps/module-init-tools" +RDEPEND="!sys-apps/module-init-tools + !sys-apps/kmod" src_unpack() { unpack ${A} diff --git a/sys-apps/modutils/modutils-2.4.27.ebuild b/sys-apps/modutils/modutils-2.4.27.ebuild index fb8ed76f5eee..b3fb64cb0f2d 100644 --- a/sys-apps/modutils/modutils-2.4.27.ebuild +++ b/sys-apps/modutils/modutils-2.4.27.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.27.ebuild,v 1.12 2011/04/24 21:31:34 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.27.ebuild,v 1.13 2012/02/25 07:09:43 robbat2 Exp $ inherit eutils @@ -14,7 +14,8 @@ KEYWORDS="alpha -amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" IUSE="" DEPEND="virtual/libc - !sys-apps/module-init-tools" + !sys-apps/module-init-tools + !sys-apps/kmod" src_unpack() { unpack ${A} -- cgit v1.2.3-65-gdbad