From 4dedcc901121125813fad6499dfcb7d0cee35da1 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Mon, 3 Jan 2005 16:37:13 +0000 Subject: [PATCH] Adding block to avoid file collision with prism54-firmware --- net-wireless/prism54/ChangeLog | 6 +++++- net-wireless/prism54/prism54-20040208.ebuild | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/net-wireless/prism54/ChangeLog b/net-wireless/prism54/ChangeLog index 88217bc4d310..054cf3f9bda9 100644 --- a/net-wireless/prism54/ChangeLog +++ b/net-wireless/prism54/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/prism54 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54/ChangeLog,v 1.7 2005/01/02 19:50:54 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54/ChangeLog,v 1.8 2005/01/03 16:37:13 genstef Exp $ + + 03 Jan 2005; Stefan Schweizer + prism54-20040208.ebuild: + Adding block to avoid file collision with prism54-firmware 02 Jan 2005; Daniel Drake prism54-20040208.ebuild: Change virtual/kernel to virtual/linux-sources diff --git a/net-wireless/prism54/prism54-20040208.ebuild b/net-wireless/prism54/prism54-20040208.ebuild index 589a60eaf94a..2f69fb698c87 100644 --- a/net-wireless/prism54/prism54-20040208.ebuild +++ b/net-wireless/prism54/prism54-20040208.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54/prism54-20040208.ebuild,v 1.7 2005/01/02 19:50:54 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54/prism54-20040208.ebuild,v 1.8 2005/01/03 16:37:13 genstef Exp $ MY_P=${P/prism54-/prism54-cvs} DESCRIPTION="Driver for Intersil Prism GT / Prism Duette wireless chipsets" @@ -16,7 +16,8 @@ SLOT="0" KEYWORDS="~x86" IUSE="pcmcia" -DEPEND="virtual/linux-sources" +DEPEND="virtual/linux-sources + !net-wireless/prism54-firmware" RDEPEND=">=sys-apps/hotplug-20030805-r2 net-wireless/wireless-tools pcmcia? ( sys-apps/pcmcia-cs )" -- 2.26.2