Fix collision by adding !app-mobilephone/smstools blocking dependency atom (#261110).

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 16 insertions, 8 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index 88166984cdf9..5dd6c5334e70 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.87 2009/02/28 09:44:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.88 2009/03/06 18:56:13 mrness Exp $
+
+  06 Mar 2009; Alin Năstac <mrness@gentoo.org> gnokii-0.6.22-r2.ebuild,
+  gnokii-0.6.26-r2.ebuild, gnokii-0.6.27-r2.ebuild:
+  Fix collision by adding !app-mobilephone/smstools blocking dependency atom
+  (#261110).
 
 *gnokii-0.6.27-r2 (28 Feb 2009)
 
diff --git a/app-mobilephone/gnokii/gnokii-0.6.22-r2.ebuild b/app-mobilephone/gnokii/gnokii-0.6.22-r2.ebuild
index f3f389d8dcc8..629088e9fc00 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.22-r2.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.22-r2.ebuild,v 1.9 2009/02/19 15:49:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.22-r2.ebuild,v 1.10 2009/03/06 18:56:13 mrness Exp $
 
 WANT_AUTOMAKE="none"
 
@@ -17,7 +17,8 @@ IUSE="nls bluetooth ical irda sms postgres mysql usb X debug"
 
 RESTRICT="test" #test fails; maybe it will work in the future, but till then...
 
-RDEPEND="X? ( >=x11-libs/gtk+-2.8.19 )
+RDEPEND="!app-mobilephone/smstools
+	X? ( >=x11-libs/gtk+-2.8.19 )
 	bluetooth? ( >=net-wireless/bluez-libs-2.25 )
 	sms? ( >=dev-libs/glib-2.10.3
 		   postgres? ( >=virtual/postgresql-server-8.0 )
diff --git a/app-mobilephone/gnokii/gnokii-0.6.26-r2.ebuild b/app-mobilephone/gnokii/gnokii-0.6.26-r2.ebuild
index 9bfd72ef2b23..b5726b2327a7 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.26-r2.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.26-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.26-r2.ebuild,v 1.3 2008/08/31 07:13:53 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.26-r2.ebuild,v 1.4 2009/03/06 18:56:13 mrness Exp $
 
 WANT_AUTOMAKE="none"
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="nls bluetooth ical irda sms postgres mysql usb X debug"
 
-RDEPEND="sys-apps/pcsc-lite
+RDEPEND="!app-mobilephone/smstools
+	sys-apps/pcsc-lite
 	X? ( >=x11-libs/gtk+-2.8.19 )
 	bluetooth? ( >=net-wireless/bluez-libs-2.25 )
 	sms? ( >=dev-libs/glib-2.10.3
diff --git a/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild b/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild
index ba7bd5a2540f..f7f39a46ed73 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild,v 1.1 2009/02/28 09:44:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild,v 1.2 2009/03/06 18:56:13 mrness Exp $
 
 inherit eutils linux-info autotools
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls bluetooth ical irda sms postgres mysql usb X debug"
 
-RDEPEND="sys-apps/pcsc-lite
+RDEPEND="!app-mobilephone/smstools
+	sys-apps/pcsc-lite
 	X? ( >=x11-libs/gtk+-2 )
 	bluetooth? ( || ( net-wireless/bluez >=net-wireless/bluez-libs-2.25 ) )
 	sms? ( >=dev-libs/glib-2