Add USE=zlib support and handle cross-compiling #362941.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

3 files changed, 110 insertions, 5 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index 0b1f34640c26..ba25b9728bfd 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.198 2011/05/21 06:37:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.199 2011/06/06 23:50:24 vapier Exp $
+
+*file-5.07-r2 (06 Jun 2011)
+
+  06 Jun 2011; Mike Frysinger <vapier@gentoo.org> +file-5.07-r2.ebuild:
+  Add USE=zlib support and handle cross-compiling #362941.
 
 *file-5.07-r1 (21 May 2011)
 
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index f92b2819f53d..700b8d7679e9 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -8,13 +8,14 @@ DIST file-5.07.tar.gz 597347 RMD160 6d45c8550b8457a437f5acd5a39e6de86bfe1541 SHA
 EBUILD file-5.05.ebuild 1402 RMD160 7b3b5daa77fdd8e601f266072aeb21f5bb378786 SHA1 b4277c4778b9fcab8143495deebe8879d2958da9 SHA256 e8a4103ca1171305c4c3f8a1db297981e136e4b12f4431872c09ea94276d59e8
 EBUILD file-5.06.ebuild 1411 RMD160 699f5b233fdfa31254a9da9942a78836416ca14b SHA1 676c3bf1e72e418d3ed850a66de04e917e5df9bd SHA256 da1411c6d02631df60cb366aa50c319985556962f3f5111018f6e21c329f0c56
 EBUILD file-5.07-r1.ebuild 1462 RMD160 387803c1ed49cbdc725997ac2d9cfe518ef07aa6 SHA1 bb656169d1cc3dc633f85bf7ea9f4b5392a192d8 SHA256 793ee74c25ecaa0b1d1165790ed8b9859364e10b3ed54309cf98555695216e91
+EBUILD file-5.07-r2.ebuild 2464 RMD160 8dd17ac7456a37ac197f8bc51859b9e3d0f96a6c SHA1 70af640acb1a25e392eb89c5a1f242272cbd718f SHA256 e1d81e4f0dc6a33aebe5e7593fadc954f4a5b182ca37bb90b58c1af8f14f6b32
 EBUILD file-5.07.ebuild 1411 RMD160 b369266b189f3d26d7cf09b0739954fdb3fcfeaa SHA1 a72acce15503961939ed351490b93fb3e3ca8fb3 SHA256 c1667db62e791a44f003489b02538c5502e1f8899908b0466191c239e47b5082
-MISC ChangeLog 23647 RMD160 04a72fd47a155315cf157e461593be830ec88318 SHA1 bb94c8756d99dfa824bf0fc809fca7dd645c157b SHA256 c81d976f3c1470bc478e5d88033ed9b8ebf4827ada7a410311e00b941bd4e404
+MISC ChangeLog 23805 RMD160 fa12aeff11e3ae347ddb380434dafe793ffcaa3b SHA1 27cda7970ff24bbc6396b30b8886aa724cd28a60 SHA256 96445a4b48c643f05347e3f6c8abdc79315c2afd26771e1f039e3a6fe10b37b9
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3XXWEACgkQXkR9YqOcLPHVxwD/a1VWb6DHx1tIIQ9HC6wbnTH/
-n21X1/FGaDoAmvjFX/sBAKcuUSSypkUBO8tzH7yzSu8OtKR+UUjpUYdH2DaABuKc
-=9ixq
+iF4EAREIAAYFAk3tZ8cACgkQaC/OocHi7JY7GQD+MtZXl+NVxbocDAixiZW+v8N5
+K978IH5V/NvuVdnxwLAA/ji14IeVwvAtr+S3kTsVkG1ZZowtJ+jWDjwtPwkQ8cAk
+=LVe/
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-5.07-r2.ebuild b/sys-apps/file/file-5.07-r2.ebuild
new file mode 100644
index 000000000000..f0166e8079ce
--- /dev/null
+++ b/sys-apps/file/file-5.07-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.07-r2.ebuild,v 1.1 2011/06/06 23:50:24 vapier Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit eutils distutils libtool flag-o-matic
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="ftp://ftp.astron.com/pub/file/"
+SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz
+	ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="python static-libs zlib"
+
+RDEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PYTHON_MODNAME="magic.py"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-zip-detect.patch #367417
+
+	elibtoolize
+	epunt_cxx
+
+	# dont let python README kill main README #60043
+	mv python/README{,.python}
+}
+
+usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
+
+wd() { echo ${WORKDIR}/build-${CHOST}; }
+do_configure() {
+	ECONF_SOURCE=${S}
+
+	mkdir "$(wd)"
+	pushd "$(wd)" >/dev/null
+
+	econf "$@"
+
+	popd >/dev/null
+}
+src_configure() {
+	# file uses things like strndup() and wcwidth()
+	append-flags -D_GNU_SOURCE
+
+	# 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
+		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" \
+		do_configure --disable-shared
+	fi
+
+	export ac_cv_header_zlib_h=$(usex zlib) ac_cv_lib_z_gzopen=$(usex zlib)
+	do_configure $(use_enable static-libs static)
+}
+
+do_make() {
+	emake -C "$(wd)" "$@" || die
+}
+src_compile() {
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		CHOST=${CBUILD} do_make -C src file
+		PATH=$(CHOST=${CBUILD} wd)/src:${PATH}
+	fi
+	do_make
+
+	use python && cd python && distutils_src_compile
+}
+
+src_install() {
+	do_make DESTDIR="${D}" install || die
+	dodoc ChangeLog MAINT README
+
+	use python && cd python && distutils_src_install
+	use static-libs || rm -f "${D}"/usr/lib*/libmagic.la
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}