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

[Lars Wendler]

commit:     d9c4c032da482c3f36178124984efe8106677bcb
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 17:38:19 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 17:39:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c4c032

sys-apps/file: Bump to version 5.26

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

 sys-apps/file/Manifest                               |  1 +
 sys-apps/file/{file-9999.ebuild => file-5.26.ebuild} | 10 ++++------
 sys-apps/file/file-9999.ebuild                       |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 7f31e74..7a10ce1 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -2,3 +2,4 @@ DIST file-5.22.tar.gz 732556 SHA256 
c4e3a8e44cb888c5e4b476e738503e37fb9de3b25a38
 DIST file-5.23.tar.gz 737618 SHA256 
2c8ab3ff143e2cdfb5ecee381752f80a79e0b4cfe9ca4cc6e1c3e5ec15e6157c SHA512 
30c4177819bc453854da644122ef5c1b7a9cba9b5ff6ee8e02eb889064203d75ce59cf3b08a41653e72f5567d442062fd65bb08c1670d294d36f10004ab28d5f
 WHIRLPOOL 
a222f85317e99929affb5daa3baf4090eadce92fb1f390ee26ccfbfa289309f602075ac0b45205417126979229188b27be553595b03180fb34989381d0b4bddc
 DIST file-5.24.tar.gz 737911 SHA256 
802cb3de2e49e88ef97cdcb52cd507a0f25458112752e398445cea102bc750ce SHA512 
9b804bbba1a77e183dbd68d4e2380d1d7e8a4dbdc6992adabab0e6fee4689f3ea8d262e5645224f4c97d7aaf988fe55c2a143c776111d9107e519692b81e6e8d
 WHIRLPOOL 
cd9efe3b4ae6a2276f431d4d22f959ab26511515d530ee7a698b547d30d89ee10854f1e7f758be068e06c7d40bc27b04ec6e92640faf1a0eb4be17344b713df5
 DIST file-5.25.tar.gz 739485 SHA256 
3735381563f69fb4239470b8c51b876a80425348b8285a7cded8b61d6b890eca SHA512 
4a5176a7e80df2bb7e45916490433d22eb98a442d49d04146afcbdcf92ff619ea3e73e95c8991e6b6a0628efb9d127bfa4aafc1cae523f8261ca693bc5e13402
 WHIRLPOOL 
70c682ff05e58487a551cd98091e27272baa41e034157bec93ac4d69b2f3e93caed40f37d64ef698527124e86ba4a5cb5975abacfd9eb30e4d3583262e5f0b0b
+DIST file-5.26.tar.gz 773061 SHA256 
2ef32b4ec936b0ff7b59a021dce56086a716663b6df1138c7ea597d396bf50cf SHA512 
e3251dde54f200b6bcade5db97fda25e73efcb2629ff5c464601c82190e12290b89eb942d820d43aa67ef37be3c0f2db00e7e5c303c083e4a8d1c49499b907dd
 WHIRLPOOL 
f8922b8cbfe153347f793e34ba7be1c3e36e55800e22fcb675f971bcc2094781a0784d887ece32760e2586fe6c459f56ce605610225f6746dacd70a922ac9e10

diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-5.26.ebuild
similarity index 87%
copy from sys-apps/file/file-9999.ebuild
copy to sys-apps/file/file-5.26.ebuild
index e158399..594df4a 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-5.26.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 DISTUTILS_OPTIONAL=1
 
 inherit eutils distutils-r1 libtool toolchain-funcs multilib-minimal
@@ -25,9 +25,7 @@ SLOT="0"
 IUSE="python static-libs zlib"
 
 DEPEND="python? ( ${PYTHON_DEPS} )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r21
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
        python? ( !dev-python/python-magic )"
 
@@ -80,7 +78,7 @@ multilib_src_compile() {
 }
 
 src_compile() {
-       if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+       if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; 
then
                emake -C "${WORKDIR}"/build/src file
                PATH="${WORKDIR}/build/src:${PATH}"
        fi

diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index e158399..88b9d2e 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 DISTUTILS_OPTIONAL=1
 
 inherit eutils distutils-r1 libtool toolchain-funcs multilib-minimal