From: Andrew Savchenko <bircoph@gentoo.org>
Date: Sun, 19 Jun 2016 08:52:38 +0000 (+0300)
Subject: sci-physics/root: fix bug 586326
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4061d02628704ead1625fd9034ddbaafbf5a547b;p=gentoo.git

sci-physics/root: fix bug 586326

While bug itself is of questionable validity (see parent bug 586238),
affected dependencies have neither subslots nor multiple slots, thus
:= can be safely dropped.

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
---

diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild
index f81b9bad2f5b..ccb48984a24c 100644
--- a/sci-physics/root/root-5.34.26.ebuild
+++ b/sci-physics/root/root-5.34.26.ebuild
@@ -57,8 +57,8 @@ CDEPEND="
 		x11-libs/libXpm:0=
 		!minimal? (
 			|| (
-				media-libs/libafterimage:0=[gif,jpeg,png,tiff]
-				>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff]
+				media-libs/libafterimage[gif,jpeg,png,tiff]
+				>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff]
 			)
 			opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
 			qt4? (
@@ -88,7 +88,7 @@ CDEPEND="
 			mpi? ( virtual/mpi )
 		)
 		mysql? ( virtual/mysql )
-		odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+		odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 		oracle? ( dev-db/oracle-instantclient-basic:0= )
 		postgres? ( dev-db/postgresql:= )
 		pythia6? ( sci-physics/pythia:6= )
diff --git a/sci-physics/root/root-5.34.32.ebuild b/sci-physics/root/root-5.34.32.ebuild
index 659aee7058ce..b888d83cda80 100644
--- a/sci-physics/root/root-5.34.32.ebuild
+++ b/sci-physics/root/root-5.34.32.ebuild
@@ -52,8 +52,8 @@ CDEPEND="
 		x11-libs/libXext:0=
 		x11-libs/libXpm:0=
 		|| (
-			media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
-			>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
+			media-libs/libafterimage[gif,jpeg,png,tiff?]
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
 		)
 		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
 		qt4? (
@@ -81,7 +81,7 @@ CDEPEND="
 		mpi? ( virtual/mpi )
 	)
 	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic:0= )
 	postgres? ( dev-db/postgresql:= )
 	pythia6? ( sci-physics/pythia:6= )
diff --git a/sci-physics/root/root-6.02.05-r2.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild
index 59b81a535566..9a072ee54282 100644
--- a/sci-physics/root/root-6.02.05-r2.ebuild
+++ b/sci-physics/root/root-6.02.05-r2.ebuild
@@ -55,8 +55,8 @@ CDEPEND="
 		x11-libs/libXext:0=
 		x11-libs/libXpm:0=
 		|| (
-			media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
-			>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
+			media-libs/libafterimage[gif,jpeg,png,tiff?]
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
 		)
 		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
 		qt4? (
@@ -85,7 +85,7 @@ CDEPEND="
 		mpi? ( virtual/mpi )
 	)
 	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic:0= )
 	postgres? ( dev-db/postgresql:= )
 	pythia6? ( sci-physics/pythia:6= )
diff --git a/sci-physics/root/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild
index dea3114648f3..38e6f29e6ad0 100644
--- a/sci-physics/root/root-6.04.06.ebuild
+++ b/sci-physics/root/root-6.04.06.ebuild
@@ -49,8 +49,8 @@ CDEPEND="
 		x11-libs/libXext:0=
 		x11-libs/libXpm:0=
 		|| (
-			media-libs/libafterimage:0=[gif,jpeg,png,tiff?]
-			>=x11-wm/afterstep-2.2.11:0=[gif,jpeg,png,tiff?]
+			media-libs/libafterimage[gif,jpeg,png,tiff?]
+			>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
 		)
 		opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
 		qt4? (
@@ -79,7 +79,7 @@ CDEPEND="
 		mpi? ( virtual/mpi )
 	)
 	mysql? ( virtual/mysql )
-	odbc? ( || ( dev-db/libiodbc:0= dev-db/unixODBC:0= ) )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic:0= )
 	postgres? ( dev-db/postgresql:= )
 	pythia6? ( sci-physics/pythia:6= )