Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
Date: Mon, 02 May 2016 14:13:45
Message-Id: 1462198378.060647cd95b37f5545ed8082c94352f91352fcf9.polynomial-c@gentoo
1 commit: 060647cd95b37f5545ed8082c94352f91352fcf9
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 2 14:12:58 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon May 2 14:12:58 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060647cd
7
8 sys-apps/file: USE="python" requires dev-python/setuptools (bug #581610)
9
10 Package-Manager: portage-2.2.28
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/file/file-5.26-r1.ebuild | 25 +++++++++++++++----------
14 1 file changed, 15 insertions(+), 10 deletions(-)
15
16 diff --git a/sys-apps/file/file-5.26-r1.ebuild b/sys-apps/file/file-5.26-r1.ebuild
17 index ff3216a..fb300b3 100644
18 --- a/sys-apps/file/file-5.26-r1.ebuild
19 +++ b/sys-apps/file/file-5.26-r1.ebuild
20 @@ -24,21 +24,26 @@ LICENSE="BSD-2"
21 SLOT="0"
22 IUSE="python static-libs zlib"
23
24 -DEPEND="python? ( ${PYTHON_DEPS} )
25 +DEPEND="python? ( ${PYTHON_DEPS}
26 + dev-python/setuptools )
27 zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
28 RDEPEND="${DEPEND}
29 python? ( !dev-python/python-magic )"
30
31 +PATCHES=(
32 + "${FILESDIR}"/${P}-header-define.patch
33 + "${FILESDIR}"/${P}-nes-magic.patch
34 + "${FILESDIR}"/${P}-php-magic.patch
35 + "${FILESDIR}"/${P}-msoffice-magic.patch
36 + "${FILESDIR}"/${P}-stdin-rpm.patch
37 + "${FILESDIR}"/${P}-tests-fatal.patch
38 + "${FILESDIR}"/${P}-stdin-test.patch
39 + "${FILESDIR}"/${P}-compress-1.patch
40 + "${FILESDIR}"/${P}-compress-2.patch
41 +)
42 +
43 src_prepare() {
44 - epatch "${FILESDIR}"/${P}-header-define.patch
45 - epatch "${FILESDIR}"/${P}-nes-magic.patch
46 - epatch "${FILESDIR}"/${P}-php-magic.patch
47 - epatch "${FILESDIR}"/${P}-msoffice-magic.patch
48 - epatch "${FILESDIR}"/${P}-stdin-rpm.patch
49 - epatch "${FILESDIR}"/${P}-tests-fatal.patch
50 - epatch "${FILESDIR}"/${P}-stdin-test.patch
51 - epatch "${FILESDIR}"/${P}-compress-1.patch
52 - epatch "${FILESDIR}"/${P}-compress-2.patch
53 + epatch "${PATCHES[@]}"
54 [[ ${PV} == "9999" ]] && eautoreconf
55 elibtoolize