Version bump.

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

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index c5da6d269947444a6e991615443bfcf6e05523b5..dce9c7d2167e0c3047e5a3de495eeb98ff9c7f01 100644 (file)
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,12 @@
 # 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.207 2011/08/09 13:37:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.208 2011/09/16 20:52:51 vapier Exp $
+
+*file-5.09 (16 Sep 2011)
+
+  16 Sep 2011; Mike Frysinger <vapier@gentoo.org> +file-5.09.ebuild,
+  +files/file-5.09-cdf-arraycount.patch:
+  Version bump.
 
   09 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> file-5.07-r3.ebuild:
   ppc/ppc64 stable wrt #377723

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index b8ca61ce33e9b3f0c8426a470e83db9253c97288..db1824ed9f1e69d6c59fe86b16a52ccbdf4fa37c 100644 (file)
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,9 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX file-5.07-postscript-detect.patch 386 RMD160 25f6abd9a370883365d4ab7df0f208b5724d7b99 SHA1 4619728cd9cde329b2f7ca060fff8f093360d6ec SHA256 dc81bc4751e5e79259b00e82b3e12015c4ec8bd9545d9289245894f8c562418e
 AUX file-5.07-zip-detect.patch 547 RMD160 6faa21497953a7a74ded03ba9e3d1e76e989787a SHA1 aad401c2b4b538bcdf045680c40222dfbedba99f SHA256 a2b86483f3326b56d20473b66b216e553ab50b2c3d9781b12feb09065743269a
+AUX file-5.09-cdf-arraycount.patch 518 RMD160 5d44aa13cd981345f1c2b2159ef3b77818c3eca6 SHA1 1182903f7872c5d1ffc0718614ee375ad02582e8 SHA256 81e997baed1377c8b52c4edd89f382889576e606668b86f4aede07a1193cb7d4
 DIST file-5.05.tar.gz 596636 RMD160 3107c10d25a88a3a0648b4b98da9441f810170a9 SHA1 b681e13849135c16f0445b42d95ce499910d242b SHA256 5cb47845d91848e2b8eb58935766f93d8a2ecf665b33be7317f1849d3c46e1b7
 DIST file-5.06.tar.gz 600720 RMD160 d9337ecc1fb836f0d7278edf376b9f86e2b37735 SHA1 ad7cd2334a4e386c7647c69fba3cc8ec6b76c6ca SHA256 34d3d28c8ce231b171abec9ae94be31935e34ead2fed9f6b09b99ec580762401
 DIST file-5.07.tar.gz 597347 RMD160 6d45c8550b8457a437f5acd5a39e6de86bfe1541 SHA1 056caa20857ecda26cae259b43f2a1eeb65ada6c SHA256 c968bfe97d87f9f564728a894d57be2c6bba9a2006763fffff85c5f72a9a3c2f
 DIST file-5.08.tar.gz 605337 RMD160 6935583f01ec1a877a504204b1df6d935cef2d1b SHA1 8bc5aa450d98968f7debe695dc6279fd5bf955b2 SHA256 dd2f18f5f344fe89938fcaf5959808fb98e4ff20c2e30f24f234e27946e3a555
+DIST file-5.09.tar.gz 607422 RMD160 12375ee02d11f19d987f20ff7fbd4443fbddc156 SHA1 461fd5d1e609e941e857ce9dc6277238e46c5bdc SHA256 6aae1f32fac1a4655ba204f48b174f7c7eb55c4c95cd2f7250bd3e60953c21aa
 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
@@ -11,5 +16,13 @@ EBUILD file-5.07-r2.ebuild 2464 RMD160 8dd17ac7456a37ac197f8bc51859b9e3d0f96a6c
 EBUILD file-5.07-r3.ebuild 2515 RMD160 59996157ea1760a2058157c426b7827e353e12c0 SHA1 65b18f6db0fb37d459d1ceb72f87831de5f685bf SHA256 a598a73293a9622075e776d6a957d18ef9b0d376818cd73b808e4325af28bb64
 EBUILD file-5.07.ebuild 1411 RMD160 b369266b189f3d26d7cf09b0739954fdb3fcfeaa SHA1 a72acce15503961939ed351490b93fb3e3ca8fb3 SHA256 c1667db62e791a44f003489b02538c5502e1f8899908b0466191c239e47b5082
 EBUILD file-5.08.ebuild 2411 RMD160 bf31b135e4d2537d72375a4d1d0df07abb874767 SHA1 f407241e2fd07d012e5ad9cd3cf9d2aa3de165c6 SHA256 76425143ae1dd155270ec4d0e4d18810088349fe8bf6b970b67d48e9c19ec262
-MISC ChangeLog 24861 RMD160 b3f912d0ae26a30e32d357cdec6567fee65f077f SHA1 7de2e943d4790008f60a8c0a0a8d31ee805dc6cb SHA256 9a450970825d42b8ee80b07a2c9d648f742ef47391579ebb1c3fbe9a31b85591
+EBUILD file-5.09.ebuild 2446 RMD160 457948d0ed11b37bf4a39667a5569898bc62a0d2 SHA1 73930ae1b7411cd4b720a3a7b5821c4c4b4c635a SHA256 aef81ffa3910ded9d5a5dfd2550d31fa8b0f10219904777d84c4d2330d058ca4
+MISC ChangeLog 25010 RMD160 8f4e0a722f3b39320366a516e48ebdffd0a8f0a7 SHA1 575a5f309dcad2be6046cabceb2cf47d8509a9e9 SHA256 195b37911544e5d5eeb3436714d606c9d237ed4dac28f0b7304fa63d1174ff72
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5ztyoACgkQaC/OocHi7JZuVAD9EGmQwPvFB4Ir3vbX+OVmc3Do
+ptaDysaSIu4ehB5fRz8A/1lWuPOLbCGrlrGEZPqAdsdom+efr4y5bsp5opSn1v3S
+=tYab
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/file/file-5.09.ebuild b/sys-apps/file/file-5.09.ebuild
new file mode 100644 (file)
index 0000000..5e02b78
--- /dev/null
+++ b/sys-apps/file/file-5.09.ebuild
@@ -0,0 +1,98 @@
+# 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.09.ebuild,v 1.1 2011/09/16 20:52:51 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="BSD-2"
+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() {
+       elibtoolize
+
+       epatch "${FILESDIR}"/${P}-cdf-arraycount.patch
+
+       # 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
+}

diff --git a/sys-apps/file/files/file-5.09-cdf-arraycount.patch b/sys-apps/file/files/file-5.09-cdf-arraycount.patch
new file mode 100644 (file)
index 0000000..f1815c0
--- /dev/null
+++ b/sys-apps/file/files/file-5.09-cdf-arraycount.patch
@@ -0,0 +1,26 @@
+http://mx.gw.com/pipermail/file/2011/000856.html
+
+--- a/src/cdf.c
++++ b/src/cdf.c
+@@ -57,10 +57,6 @@
+ 
+ #include "cdf.h"
+ 
+-#ifndef __arraycount
+-#define __arraycount(a) (sizeof(a) / sizeof(a[0]))
+-#endif
+-
+ #ifdef CDF_DEBUG
+ #define DPRINTF(a) printf a, fflush(stdout)
+ #else
+--- a/src/cdf.h
++++ b/src/cdf.h
+@@ -317,5 +317,8 @@
+ void cdf_dump_summary_info(const cdf_header_t *, const cdf_stream_t *);
+ #endif
+ 
++#ifndef __arraycount
++#define __arraycount(a) (sizeof(a) / sizeof(a[0]))
++#endif
+ 
+ #endif /* _H_CDF_ */