| 1 |
commit: b7aa3f39473224c01db14ff6ed623ec2ca7bf93c |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 2 20:31:14 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 2 20:35:53 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7aa3f39 |
| 7 |
|
| 8 |
sys-apps/file: Sync live ebuild. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 11 |
|
| 12 |
sys-apps/file/file-9999.ebuild | 37 +++++++++++++++++++++++-------------- |
| 13 |
1 file changed, 23 insertions(+), 14 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild |
| 16 |
index 05427c55cb7..4f3a87f8bf9 100644 |
| 17 |
--- a/sys-apps/file/file-9999.ebuild |
| 18 |
+++ b/sys-apps/file/file-9999.ebuild |
| 19 |
@@ -1,19 +1,19 @@ |
| 20 |
# Copyright 1999-2017 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
-EAPI="5" |
| 24 |
+EAPI=6 |
| 25 |
|
| 26 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) |
| 27 |
DISTUTILS_OPTIONAL=1 |
| 28 |
|
| 29 |
-inherit eutils distutils-r1 libtool toolchain-funcs multilib-minimal |
| 30 |
+inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal |
| 31 |
|
| 32 |
if [[ ${PV} == "9999" ]] ; then |
| 33 |
EGIT_REPO_URI="https://github.com/glensc/file.git" |
| 34 |
inherit autotools git-r3 |
| 35 |
else |
| 36 |
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" |
| 37 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 38 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 39 |
fi |
| 40 |
|
| 41 |
DESCRIPTION="identify a file's format by scanning binary data for patterns" |
| 42 |
@@ -34,19 +34,22 @@ RDEPEND="${DEPEND} |
| 43 |
python? ( !dev-python/python-magic )" |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
+ default |
| 47 |
+ |
| 48 |
[[ ${PV} == "9999" ]] && eautoreconf |
| 49 |
elibtoolize |
| 50 |
|
| 51 |
# don't let python README kill main README #60043 |
| 52 |
- mv python/README{,.python} |
| 53 |
+ mv python/README{,.python} || die |
| 54 |
} |
| 55 |
|
| 56 |
multilib_src_configure() { |
| 57 |
- ECONF_SOURCE=${S} \ |
| 58 |
- econf \ |
| 59 |
- --enable-fsect-man5 \ |
| 60 |
- $(use_enable static-libs static) \ |
| 61 |
+ local myeconfargs=( |
| 62 |
+ --enable-fsect-man5 |
| 63 |
+ $(use_enable static-libs static) |
| 64 |
$(use_enable zlib) |
| 65 |
+ ) |
| 66 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 67 |
} |
| 68 |
|
| 69 |
src_configure() { |
| 70 |
@@ -54,8 +57,8 @@ src_configure() { |
| 71 |
# because people often don't keep matching host/target |
| 72 |
# file versions #362941 |
| 73 |
if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then |
| 74 |
- mkdir -p "${WORKDIR}"/build |
| 75 |
- cd "${WORKDIR}"/build |
| 76 |
+ mkdir -p "${WORKDIR}"/build || die |
| 77 |
+ cd "${WORKDIR}"/build || die |
| 78 |
tc-export_build_env BUILD_C{C,XX} |
| 79 |
ECONF_SOURCE=${S} \ |
| 80 |
ac_cv_header_zlib_h=no \ |
| 81 |
@@ -77,7 +80,7 @@ multilib_src_compile() { |
| 82 |
if multilib_is_native_abi ; then |
| 83 |
emake |
| 84 |
else |
| 85 |
- cd src |
| 86 |
+ cd src || die |
| 87 |
emake magic.h #586444 |
| 88 |
emake libmagic.la |
| 89 |
fi |
| 90 |
@@ -91,20 +94,26 @@ src_compile() { |
| 91 |
fi |
| 92 |
multilib-minimal_src_compile |
| 93 |
|
| 94 |
- use python && cd python && distutils-r1_src_compile |
| 95 |
+ if use python ; then |
| 96 |
+ cd python || die |
| 97 |
+ distutils-r1_src_compile |
| 98 |
+ fi |
| 99 |
} |
| 100 |
|
| 101 |
multilib_src_install() { |
| 102 |
if multilib_is_native_abi ; then |
| 103 |
default |
| 104 |
else |
| 105 |
- emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" |
| 106 |
+ emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" |
| 107 |
fi |
| 108 |
} |
| 109 |
|
| 110 |
multilib_src_install_all() { |
| 111 |
dodoc ChangeLog MAINT README |
| 112 |
|
| 113 |
- use python && cd python && distutils-r1_src_install |
| 114 |
+ if use python ; then |
| 115 |
+ cd python || die |
| 116 |
+ distutils-r1_src_install |
| 117 |
+ fi |
| 118 |
prune_libtool_files |
| 119 |
} |
Archives