[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/

[Lars Wendler]

commit:     060647cd95b37f5545ed8082c94352f91352fcf9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 14:12:58 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May  2 14:12:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060647cd

sys-apps/file: USE="python" requires dev-python/setuptools (bug #581610)

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-apps/file/file-5.26-r1.ebuild | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/sys-apps/file/file-5.26-r1.ebuild 
b/sys-apps/file/file-5.26-r1.ebuild
index ff3216a..fb300b3 100644
--- a/sys-apps/file/file-5.26-r1.ebuild
+++ b/sys-apps/file/file-5.26-r1.ebuild
@@ -24,21 +24,26 @@ LICENSE="BSD-2"
 SLOT="0"
 IUSE="python static-libs zlib"
 
-DEPEND="python? ( ${PYTHON_DEPS} )
+DEPEND="python? ( ${PYTHON_DEPS}
+               dev-python/setuptools )
        zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
        python? ( !dev-python/python-magic )"
 
+PATCHES=(
+       "${FILESDIR}"/${P}-header-define.patch
+       "${FILESDIR}"/${P}-nes-magic.patch
+       "${FILESDIR}"/${P}-php-magic.patch
+       "${FILESDIR}"/${P}-msoffice-magic.patch
+       "${FILESDIR}"/${P}-stdin-rpm.patch
+       "${FILESDIR}"/${P}-tests-fatal.patch
+       "${FILESDIR}"/${P}-stdin-test.patch
+       "${FILESDIR}"/${P}-compress-1.patch
+       "${FILESDIR}"/${P}-compress-2.patch
+)
+
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-header-define.patch
-       epatch "${FILESDIR}"/${P}-nes-magic.patch
-       epatch "${FILESDIR}"/${P}-php-magic.patch
-       epatch "${FILESDIR}"/${P}-msoffice-magic.patch
-       epatch "${FILESDIR}"/${P}-stdin-rpm.patch
-       epatch "${FILESDIR}"/${P}-tests-fatal.patch
-       epatch "${FILESDIR}"/${P}-stdin-test.patch
-       epatch "${FILESDIR}"/${P}-compress-1.patch
-       epatch "${FILESDIR}"/${P}-compress-2.patch
+       epatch "${PATCHES[@]}"
        [[ ${PV} == "9999" ]] && eautoreconf
        elibtoolize