From c65e85297168cf4bff1da593312b9d091edc8718 Mon Sep 17 00:00:00 2001
From: Ian Whyman <thev00d00@gentoo.org>
Date: Wed, 16 Oct 2013 19:34:37 +0000
Subject: Block python use on sys-apps/file #488270

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
---
 dev-python/python-magic/ChangeLog                    |  8 +++++++-
 dev-python/python-magic/python-magic-0.4.3.ebuild    | 20 --------------------
 dev-python/python-magic/python-magic-0.4.6-r1.ebuild | 20 ++++++++++++++++++++
 dev-python/python-magic/python-magic-0.4.6.ebuild    | 20 --------------------
 4 files changed, 27 insertions(+), 41 deletions(-)
 delete mode 100644 dev-python/python-magic/python-magic-0.4.3.ebuild
 create mode 100644 dev-python/python-magic/python-magic-0.4.6-r1.ebuild
 delete mode 100644 dev-python/python-magic/python-magic-0.4.6.ebuild

(limited to 'dev-python')

diff --git a/dev-python/python-magic/ChangeLog b/dev-python/python-magic/ChangeLog
index 3f0aa575f7d5..e8a3ec38fa7b 100644
--- a/dev-python/python-magic/ChangeLog
+++ b/dev-python/python-magic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-magic
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-magic/ChangeLog,v 1.4 2013/10/12 18:52:45 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-magic/ChangeLog,v 1.5 2013/10/16 19:34:37 thev00d00 Exp $
+
+*python-magic-0.4.6-r1 (16 Oct 2013)
+
+  16 Oct 2013; Ian Whyman <thev00d00@gentoo.org> +python-magic-0.4.6-r1.ebuild,
+  -python-magic-0.4.3.ebuild, -python-magic-0.4.6.ebuild:
+  Block python use on sys-apps/file #488270
 
 *python-magic-0.4.6 (12 Oct 2013)
 
diff --git a/dev-python/python-magic/python-magic-0.4.3.ebuild b/dev-python/python-magic/python-magic-0.4.3.ebuild
deleted file mode 100644
index e853481e80b1..000000000000
--- a/dev-python/python-magic/python-magic-0.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-magic/python-magic-0.4.3.ebuild,v 1.3 2013/09/05 18:46:42 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/file"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/python-magic/python-magic-0.4.6-r1.ebuild b/dev-python/python-magic/python-magic-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..d0747df66baf
--- /dev/null
+++ b/dev-python/python-magic/python-magic-0.4.6-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-magic/python-magic-0.4.6-r1.ebuild,v 1.1 2013/10/16 19:34:37 thev00d00 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+inherit distutils-r1
+
+DESCRIPTION="Access the libmagic file type identification library"
+HOMEPAGE="https://github.com/ahupp/python-magic"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/file[-python]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/python-magic/python-magic-0.4.6.ebuild b/dev-python/python-magic/python-magic-0.4.6.ebuild
deleted file mode 100644
index ea5214ee45ff..000000000000
--- a/dev-python/python-magic/python-magic-0.4.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-magic/python-magic-0.4.6.ebuild,v 1.1 2013/10/12 18:52:45 thev00d00 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/file"
-RDEPEND="${DEPEND}"
-- 
cgit v1.2.3-65-gdbad