From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3AB73138216 for ; Mon, 2 May 2016 14:13:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22DEAE07F2; Mon, 2 May 2016 14:13:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C4E73E07F2 for ; Mon, 2 May 2016 14:13:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 36D1F340A2B for ; Mon, 2 May 2016 14:13:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0A73338 for ; Mon, 2 May 2016 14:13:37 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1462198378.060647cd95b37f5545ed8082c94352f91352fcf9.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/file/file-5.26-r1.ebuild X-VCS-Directories: sys-apps/file/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 060647cd95b37f5545ed8082c94352f91352fcf9 X-VCS-Branch: master Date: Mon, 2 May 2016 14:13:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b125a991-a5b3-49f9-88e9-483fbc7687c6 X-Archives-Hash: 97d33f9d3940a404bd69084711985a58 commit: 060647cd95b37f5545ed8082c94352f91352fcf9 Author: Lars Wendler gentoo org> AuthorDate: Mon May 2 14:12:58 2016 +0000 Commit: Lars Wendler gentoo 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 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