From 24fc9692897be08b3c081b32a60d12c4b1b1136b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 21 Mar 2015 09:42:39 +0000 Subject: [PATCH] EAPI bump, bug #543160. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- sys-apps/file/ChangeLog | 8 ++- sys-apps/file/Manifest | 33 +++++----- sys-apps/file/file-5.22-r1.ebuild | 105 ++++++++++++++++++++++++++++++ sys-apps/file/file-9999.ebuild | 12 ++-- 4 files changed, 137 insertions(+), 21 deletions(-) create mode 100644 sys-apps/file/file-5.22-r1.ebuild diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog index e2d56887f762..23bba8ad545c 100644 --- a/sys-apps/file/ChangeLog +++ b/sys-apps/file/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/file # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.309 2015/02/05 22:41:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.310 2015/03/21 09:42:37 mgorny Exp $ + +*file-5.22-r1 (21 Mar 2015) + + 21 Mar 2015; Michał Górny +file-5.22-r1.ebuild, + file-9999.ebuild: + EAPI bump, bug #543160. 05 Feb 2015; Mike Frysinger file-5.22.ebuild: Mark arm64/m68/s390/sh stable. diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index 35d98047f857..f2771ed408dc 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -2,24 +2,27 @@ Hash: SHA256 DIST file-5.22.tar.gz 732556 SHA256 c4e3a8e44cb888c5e4b476e738503e37fb9de3b25a38c143e214bfc12109fc0b SHA512 e9f1648c3b490bac642a2a9e01d31a8bd49c3e2a1feea1b25869aa1d5e37aa99bbf3fdc5d301618a8b97aec046f10e400a57f8a1d0dd61d3583830aaf3fcbda8 WHIRLPOOL de9ce9305fd824d85128617e196fe6b02ea470b63eb2a35d31e857f7cf91e09f85166aaa72695aaf4a7516413b3a146db85588e7da65f32b131a477b3dece176 +EBUILD file-5.22-r1.ebuild 2784 SHA256 3ad07487ec1783edee2b066e199129c16c94f00beec8db5177665711df4ea476 SHA512 8c9a9b8a2c2ad8bec066c24573a130ecd533dd8cbaefdb2c180eae9ae8514a6c8cc1b192c2fef3aabecd1ab245c46f6225d667c470ea5fa5c60c3702d929143a WHIRLPOOL 3988d6db4bfe0d361275190347ce7e96d924240732bf3a2adcbc275e08f746ce5c9fd17f174e259944b0985b1995db448d316d8e7dff2339a34327623ddd3228 EBUILD file-5.22.ebuild 2780 SHA256 1dd5a55593be24b0099c7c844542fcf219ebc725671f2ad24431f98c6322c285 SHA512 42f7ab075df875569e8bea2afa955a3643457c0e53e8d5083a73c53d4348fb2599e9ba53e11c7a283d7e5be703bd27537a0767827d4258e618bb8fb5c4d91d0c WHIRLPOOL dbe97301a0b4db401dd18666631b0d1e9dd06a004d38004b4d2b5145583f2831339dab7c70a14f6430a42cdb7792be6c44816533410fa86b52e7e4796f33f05f -EBUILD file-9999.ebuild 2634 SHA256 5f194ef3766ed7c49b7966a57ec605bfaf125858e71b430a8d1cfe776d2967e1 SHA512 fb37b82bd9f430f50c8129e71556c27e8bb2b36c591622d5ee4cf17ce714e73e4ded7af8ce3419d655d6bed2c5b517d7afef1bf4649d0a72bcd5efb884142cb4 WHIRLPOOL 3ac36ec49c8a01f74d2a20dec8572d0fa0b0bf6ab2e7d8e2457686a1600272a7d7d933fa6a6ae34bd2fa9fe19f9f2b880149c22e826dea5720eecf2d7e8b6311 -MISC ChangeLog 37362 SHA256 5e1838c7ce04ab2b51be3faf0f67e5a542d9109dc37eebb0d2f406479cd0cf77 SHA512 460ac6212405b5cc1014c34c46aac13bdf4e32d0b8133737194fd326a22fda03fdf8bb4c028f138acdeabedda1efec46906ee03048ab491d61921926d6fdd691 WHIRLPOOL 66b1bbe16dfbb8ba9ea4e07a2fafc1a5d26b5a2ec902d34dce708362ae5156d43cc7fab888f36ebe0aa300d94ca15498bfe5e0105da8cde0dfc7120ec2a2591f +EBUILD file-9999.ebuild 2781 SHA256 95a8f4bd3c549f9b3dccf37a07da51317e209fb0730d0b669a5e5cba4ca7a63a SHA512 6e645e0da6bc89931c754eda5ecd23ccad56458971d5d846e6150788473970a330a589dfd666d7d086f132c47bffa158b4042d5a20f9b9a8b287ea0660e8f6de WHIRLPOOL 8c6b8c9f9f2614bdf0b5791bdf80f49baf96db4e90ec73270c03101794f08ac8203bf5c31070c1c0ed5dc591552ae96d8e95652ab9ed76086cfe4a9384b3e998 +MISC ChangeLog 37510 SHA256 942e02689ce46fbd6d5894143b56bf680b4dd24844afa63ce34d3f65d7a069f2 SHA512 212f5957dc9d85420ec961318380ced8f97d58b5611718a0e052e3ef2588b5c6fe7d2768d94bf114fcbb883a42e7e3ef7665a6938baa62d4d66311f25221c966 WHIRLPOOL be57ee771ab43a931d5e7ba9551fa2c4e898f2010b5bc20c9700cab2081e8423f383f4280a31a702a23d888d08a460dc7fa833ced383c7aafca7b36388f2f041 MISC metadata.xml 227 SHA256 ecd74a3d9a250a8c5c597b45fd334ab26335074b687bc12f5a6fea32ef9f0690 SHA512 bf2e56b14ac89961c21f5eba6bf90e4f21fd001b88963bcf4c21d0ec63f7b860611bd8883b8760c2bc81dde2a9669456123033ca54337441016379f80e6029cf WHIRLPOOL 22c14f95d7a544f0c11e11136811724ebe69dc0c607073307a28446b1ebeb4ab8838180947a4f496f41648522e34b5dab71680c330a0085b774dbc9ea23ff647 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU0/G2AAoJEPGu1DbS6WIAnVYP/2tUT/EMfX2ZvDusORgfFuNj -yeqGFQPb6qDfJTztQ0ZiHK/GJDW3ZRge2iKft+kvKkWnbCUwtlhJS1p9FZYJ9SVN -Cxq0Fe5crzUdKcT9byYNQGG4wzkouqe9YEOp54sQqdu3xNSDiZL88qPsvrqUr1aQ -Xp5NI7psJUHI5ZzYDrxUll3/nFeEY9XFJDAy1sIS0iwIdRMhbITlJhkT86gbQbNv -25vGe9PfNLTHiBctIawHiTamZPBhtNUSMT03O1YM4mHROqNg+At5cIrHmJy7chWn -XC1jRI/Ukt1wEZkM5vTGae+MulG8PTmVK8rs56kZfn8c9U1t26WPlDH1RRk2rOrp -/DuHc107lqf0bih54+Ba29HorzD2O15u8bS8BKnvFpGMaunaFlJJPGsKC5GkpGkI -DBPo35BcOSk3029O0ydtq+/GpqLSU0vIztYBwmoI6rDqzvIpBtDgcny/IafTIu3H -AgwF+M/i15PUrnII5Kp5/veda1t+26xqgVW2WHo/hJgwrx1CsOo3sitQkpwwv48C -+/BIv20OYyFiMwZ8GsdrZC0iUaUAARorJ2CaOAS6vLSOkjZ4Yj/8z1WNXXP1ghVM -Um1Xfwt/s66wthrGuv8J1ni6wqUka8imJ5eppI8tEFbNZojVyKBCfyYTg2fUv51Z -0akj76qhi5e9Gfjss2OX -=HnwE +iQJ8BAEBCABmBQJVDT0PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODocP/0lOkMqFntYsNKaYhK7bx42l +h8giu3Sm5CBd8/Tf4xRJuCCKaDfGdLt+Vn8ku+aXkEXhQ/czWq9DScEqbS9G+NRf +j21o1W/QbQvfIe6fahQ2+XfSe5P5CuynTVYDqDE4D9GU1+6fKK9lRUBiW4rha6/P +l6vHyvLa28iWGa/UFwKCT9HN3l/lx+pVYrkCs6mT86J79LH2MsFNE+g1TT6fVqSG +dPqU3ojwwlHkEF6o2MqDf2rfn8lKBtv/EfT3FGx0h0dBPFVzWFAzHeC869JVttxR +9YHnzWyJ4Q8vpIZkzHpbw3HZBg4lHz2knrjg4NbNWYbu198w2ycnMY4v1hgPgRbI +CH30f7k5uNr6vtA/Fi8B8Apmw8h1P9lrM+uoPvOMzmuH+ea/CY885RUG+hS0c5W/ ++ZQWKkgRpuAWzB82Z/s3zs8deD7qJi9g6jtRSU0pkC2o0mZX9QYXyNGbpJv+qn0f +dx/MSuO1Lc2z5BVimwB+uXbeTHcMFPwLyMLGW/xuks6mneiDXQynEP/YTBCgoI2J +WIVi2QGht8YQTc3Usx19svcr5JEP9qfQwQf5j9EZNtLq4WHKtMfBblxyDrw5Y/kT +Ah4JokG/9vHCUpLBGq5yOm17klF4gS85Pk6q01xMfAVdn1bp9q+FpGHXREDK1UOw +1cLbDQyMds8zylnfiEqj +=ygq/ -----END PGP SIGNATURE----- diff --git a/sys-apps/file/file-5.22-r1.ebuild b/sys-apps/file/file-5.22-r1.ebuild new file mode 100644 index 000000000000..d34355b64f86 --- /dev/null +++ b/sys-apps/file/file-5.22-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.22-r1.ebuild,v 1.1 2015/03/21 09:42:37 mgorny Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +DISTUTILS_OPTIONAL=1 + +inherit eutils distutils-r1 libtool toolchain-funcs multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://github.com/glensc/file.git" + inherit autotools git-r3 +else + SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz + ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +fi + +DESCRIPTION="identify a file's format by scanning binary data for patterns" +HOMEPAGE="http://www.darwinsys.com/file/" + +LICENSE="BSD-2" +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(-)] )" +RDEPEND="${DEPEND} + python? ( !dev-python/python-magic )" + +src_prepare() { + [[ ${PV} == "9999" ]] && eautoreconf + elibtoolize + + # don't let python README kill main README #60043 + mv python/README{,.python} +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + ac_cv_header_zlib_h=$(usex zlib) \ + ac_cv_lib_z_gzopen=$(usex zlib) + econf \ + $(use_enable static-libs static) +} + +src_configure() { + # when cross-compiling, we need to build up our own file + # because people often don't keep matching host/target + # file versions #362941 + if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then + mkdir -p "${WORKDIR}"/build + cd "${WORKDIR}"/build + tc-export_build_env BUILD_C{C,XX} + ECONF_SOURCE=${S} \ + ac_cv_header_zlib_h=no \ + ac_cv_lib_z_gzopen=no \ + CHOST=${CBUILD} \ + CFLAGS=${BUILD_CFLAGS} \ + CXXFLAGS=${BUILD_CXXFLAGS} \ + CPPFLAGS=${BUILD_CPPFLAGS} \ + LDFLAGS="${BUILD_LDFLAGS} -static" \ + CC=${BUILD_CC} \ + CXX=${BUILD_CXX} \ + econf --disable-shared + fi + + multilib-minimal_src_configure +} + +multilib_src_compile() { + if multilib_is_native_abi ; then + emake + else + emake -C src libmagic.la + fi +} + +src_compile() { + if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then + emake -C "${WORKDIR}"/build/src file + PATH="${WORKDIR}/build/src:${PATH}" + fi + multilib-minimal_src_compile + + use python && cd python && distutils-r1_src_compile +} + +multilib_src_install() { + if multilib_is_native_abi ; then + default + else + emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" + fi +} + +multilib_src_install_all() { + dodoc ChangeLog MAINT README + + use python && cd python && distutils-r1_src_install + prune_libtool_files +} diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild index 3c312917d598..aacae27b58d3 100644 --- a/sys-apps/file/file-9999.ebuild +++ b/sys-apps/file/file-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-9999.ebuild,v 1.8 2014/09/07 18:55:10 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-9999.ebuild,v 1.9 2015/03/21 09:42:37 mgorny Exp $ -EAPI="4" -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy2_0 ) +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) DISTUTILS_OPTIONAL=1 inherit eutils distutils-r1 libtool toolchain-funcs multilib-minimal @@ -25,7 +25,9 @@ SLOT="0" IUSE="python static-libs zlib" DEPEND="python? ( ${PYTHON_DEPS} ) - zlib? ( sys-libs/zlib )" + 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(-)] )" RDEPEND="${DEPEND} python? ( !dev-python/python-magic )" -- 2.26.2