Block dev-python/python-magic when USE=python #492718 by Andrei Slavoiu.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 17 insertions, 10 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index b47aa1a99785..22298b45189c 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.245 2013/09/27 04:54:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.246 2013/11/28 19:53:24 vapier Exp $
+
+  28 Nov 2013; Mike Frysinger <vapier@gentoo.org> file-5.12-r1.ebuild,
+  file-5.15.ebuild, file-9999.ebuild:
+  Block dev-python/python-magic when USE=python #492718 by Andrei Slavoiu.
 
   27 Sep 2013; Tim Harder <radhermit@gentoo.org> -file-5.05.ebuild,
   -file-5.06.ebuild, -file-5.07.ebuild, -file-5.07-r1.ebuild,
diff --git a/sys-apps/file/file-5.12-r1.ebuild b/sys-apps/file/file-5.12-r1.ebuild
index 765823208cf6..32184a9fc01e 100644
--- a/sys-apps/file/file-5.12-r1.ebuild
+++ b/sys-apps/file/file-5.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild,v 1.10 2013/09/05 09:51:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild,v 1.11 2013/11/28 19:53:24 vapier Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
@@ -20,8 +20,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="python static-libs zlib"
 
-RDEPEND="zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
+DEPEND="zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
 
 PYTHON_MODNAME="magic.py"
 
diff --git a/sys-apps/file/file-5.15.ebuild b/sys-apps/file/file-5.15.ebuild
index db24c09c7ceb..ffe747b5812a 100644
--- a/sys-apps/file/file-5.15.ebuild
+++ b/sys-apps/file/file-5.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.15.ebuild,v 1.1 2013/09/27 04:50:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.15.ebuild,v 1.2 2013/11/28 19:53:24 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -24,9 +24,10 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="python static-libs zlib"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
+DEPEND="python? ( ${PYTHON_DEPS} )
 	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
 
 src_prepare() {
 	[[ ${PV} == "9999" ]] && eautoreconf
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index c636422d5666..edb1a5013cb8 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-9999.ebuild,v 1.3 2013/09/27 04:50:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-9999.ebuild,v 1.4 2013/11/28 19:53:24 vapier Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -24,9 +24,10 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="python static-libs zlib"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
+DEPEND="python? ( ${PYTHON_DEPS} )
 	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
 
 src_prepare() {
 	[[ ${PV} == "9999" ]] && eautoreconf