Version bump.

Package-Manager: portage-2.1.2-r12

4 files changed, 83 insertions, 24 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index 2cc57fae3a40..3af21a8d14e7 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.125 2007/02/13 15:55:29 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.126 2007/03/02 16:49:59 vapier Exp $
+
+*file-4.20 (02 Mar 2007)
+
+  02 Mar 2007; Mike Frysinger <vapier@gentoo.org> +file-4.20.ebuild:
+  Version bump.
 
   13 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org> file-4.19.ebuild:
   Stable on MIPS; bug #165717
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 97b901a03d5b..dac7cf27e77a 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -25,17 +25,8 @@ AUX misc.magic 71 RMD160 047771fe06c524610e832fbb11a97e2c4915376b SHA1 b20abc4bf
 MD5 a952f0eca26a046e4b815529d2b734ef files/misc.magic 71
 RMD160 047771fe06c524610e832fbb11a97e2c4915376b files/misc.magic 71
 SHA256 d1eae7e2b67739581d9aa5cc57ea78368b9c82f02cf07422ab1ce2ad575b03b7 files/misc.magic 71
-DIST file-4.17.tar.gz 556270 RMD160 c5fd11659552f8ac3031badc7c94bb3c83a8e916 SHA1 e03710a3fcb95db6d0ee9cfcdf88c19a5e525ee4 SHA256 9c850183b6abef28deb0792d733b6f14a99606197daffa40d4208588f16e0bdf
-DIST file-4.18.tar.gz 536447 RMD160 27a1776f732f7be7650ec9437f1fb1edf4077bc4 SHA1 b733d3dd7e4ab4e16f52ef000163e92c99686c61 SHA256 5090d5123ea642842d04d3f93a821e1372e5d9e434c74c08ee2483cc150a6273
 DIST file-4.19.tar.gz 546805 RMD160 d8dbf2686eaef5bb1cb9467198acd3a4c5735ca7 SHA1 035c2ddf46e1a80e8ddec8e74601d9d2ee4f6ce3 SHA256 697250abdbcaf850728791a475a917d84287f7e2d67bab90021775db600c4d85
-EBUILD file-4.17-r1.ebuild 1499 RMD160 e41c4caa793c1899577e3f4c615810f70e2b1911 SHA1 7931d81320a2743ae4f9e7a70552ce2031ea5786 SHA256 15e58727f827e389f6498da510e18c18f8dcf1e9422e72f93d6855e35cb2b057
-MD5 a0e542c4f2ea801312612e146151542d file-4.17-r1.ebuild 1499
-RMD160 e41c4caa793c1899577e3f4c615810f70e2b1911 file-4.17-r1.ebuild 1499
-SHA256 15e58727f827e389f6498da510e18c18f8dcf1e9422e72f93d6855e35cb2b057 file-4.17-r1.ebuild 1499
-EBUILD file-4.18.ebuild 1368 RMD160 2e026e395d8c8a993bfc81629fe74b2946a7e122 SHA1 1dcc39b85fa254a6f36b05b322c2ee7941739998 SHA256 4ccfa5f415f348cf80ef1900f25aa712a2319bc12bea07017f13a32f0bf783f4
-MD5 8ab3aebc1c61d8c900c586d2aeddb68e file-4.18.ebuild 1368
-RMD160 2e026e395d8c8a993bfc81629fe74b2946a7e122 file-4.18.ebuild 1368
-SHA256 4ccfa5f415f348cf80ef1900f25aa712a2319bc12bea07017f13a32f0bf783f4 file-4.18.ebuild 1368
+DIST file-4.20.tar.gz 548412 RMD160 7fe44509cf9da1df7243ba3787163d50c2fb3193 SHA1 4d6e08696e7d5deaf0d3ebc67ec7f11b43efabc6 SHA256 dd199092f347f1a26c4a8e5f0f7c917f904b2f1e7fc325eb1c875e1470983f1d
 EBUILD file-4.19-r1.ebuild 1487 RMD160 26580dbe4c84f24e07691dd34e6984c39f232b55 SHA1 7871720547c6506aa0b38f2a130a5eb7eb38b39c SHA256 dcd64813e988219d2899139bd4562e189fe8100e0d893ad43d46d24f09119817
 MD5 68d41b148d77487ceb2fcfff0444787e file-4.19-r1.ebuild 1487
 RMD160 26580dbe4c84f24e07691dd34e6984c39f232b55 file-4.19-r1.ebuild 1487
@@ -44,30 +35,31 @@ EBUILD file-4.19.ebuild 1368 RMD160 afe96926cb31b625d77f0b155655e7ff0278573b SHA
 MD5 31608bb46cc53c56cdf3ed6eac024359 file-4.19.ebuild 1368
 RMD160 afe96926cb31b625d77f0b155655e7ff0278573b file-4.19.ebuild 1368
 SHA256 103654e856a1d0564ac1073601a2da420116cfd42b7d1b17403f79dc845aa242 file-4.19.ebuild 1368
-MISC ChangeLog 14998 RMD160 ba4452b02d9aa6894ab8fd01e5cd718c691ee113 SHA1 2c22a2ecd9f19025840578711b110b5e55fbe628 SHA256 4f8552b96b523a694d678f30b67d8d766fd29dcc1a4c1f5a0345c2afc9085b6a
-MD5 8f87d408637152a777727498253febec ChangeLog 14998
-RMD160 ba4452b02d9aa6894ab8fd01e5cd718c691ee113 ChangeLog 14998
-SHA256 4f8552b96b523a694d678f30b67d8d766fd29dcc1a4c1f5a0345c2afc9085b6a ChangeLog 14998
+EBUILD file-4.20.ebuild 1528 RMD160 380161f03bc798ecc54dbc22cb4344a0fc711cb2 SHA1 2a6ca819ef45ea4f935e0b4e23c0bdfac0861c26 SHA256 572f50bb1e239df1b5a7258e65348cb59408204f796ccecf11ddcab1a37148b3
+MD5 7d0082674a843908d458ba2ae892552a file-4.20.ebuild 1528
+RMD160 380161f03bc798ecc54dbc22cb4344a0fc711cb2 file-4.20.ebuild 1528
+SHA256 572f50bb1e239df1b5a7258e65348cb59408204f796ccecf11ddcab1a37148b3 file-4.20.ebuild 1528
+MISC ChangeLog 15111 RMD160 51c5b46c6a2c656d9a8d32332d2158b77f14e48d SHA1 b95a2d454263cd9dc72414f14839683db7e7003b SHA256 3adfba739f5922ba24721ffb0d8a02a1035d12b9b845febbca6f29b5e8e01c1b
+MD5 06806fa6febca49b0f3adcda49cb1daf ChangeLog 15111
+RMD160 51c5b46c6a2c656d9a8d32332d2158b77f14e48d ChangeLog 15111
+SHA256 3adfba739f5922ba24721ffb0d8a02a1035d12b9b845febbca6f29b5e8e01c1b ChangeLog 15111
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 ddbf41fdb2b8c638f96c372a752f212f files/digest-file-4.17-r1 229
-RMD160 3f1a53e0b9c1473833a06ca9a70d9ed103be2520 files/digest-file-4.17-r1 229
-SHA256 64609bf94d40e04a7181bdd7546d098db2cdacd0e2a392964ea8190cfb9a09e0 files/digest-file-4.17-r1 229
-MD5 95feac8c0d8166cac6d3d2d7a3e2b650 files/digest-file-4.18 229
-RMD160 242510e9a41647855a0906f2668e3ba91bf4e98c files/digest-file-4.18 229
-SHA256 513f44e92cb8636d765857e7510376303db301562fc9e31b54b3715b9e8209be files/digest-file-4.18 229
 MD5 448defd1880eceee616ce2ec9cc867c1 files/digest-file-4.19 229
 RMD160 d3860786831538a1c89e86dd98b75115afe865f2 files/digest-file-4.19 229
 SHA256 03615d11f17c1aa0b2abbe73afd5788082368c641678e2b36e320aecb4c90313 files/digest-file-4.19 229
 MD5 448defd1880eceee616ce2ec9cc867c1 files/digest-file-4.19-r1 229
 RMD160 d3860786831538a1c89e86dd98b75115afe865f2 files/digest-file-4.19-r1 229
 SHA256 03615d11f17c1aa0b2abbe73afd5788082368c641678e2b36e320aecb4c90313 files/digest-file-4.19-r1 229
+MD5 cf46bc0d91951491ed7f2ccb82dfaa29 files/digest-file-4.20 229
+RMD160 4e382c0ea74211e598cf448be49b8a6895d10399 files/digest-file-4.20 229
+SHA256 cb431c06735c262e4cacec6f006082fcee3d2adb694e09ebbbca95aad5524ce9 files/digest-file-4.20 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF1zkx8bi6rjpTunYRAkCqAKDjzTPwDAixTvDhoxRJv/GUYqgLdwCgtjDH
-3hSQc3FT+AeOS5X/gJbdiyQ=
-=lT+x
+iD8DBQFF6FYc8bi6rjpTunYRAuDxAJ9QhQSI5CdrvDKIfYb5Y6CD2uucRgCeLF61
+5d5N3kTBjihe2MO9xPAl1rA=
+=fQ3b
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-4.20.ebuild b/sys-apps/file/file-4.20.ebuild
new file mode 100644
index 000000000000..0f5b0e4b188c
--- /dev/null
+++ b/sys-apps/file/file-4.20.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.20.ebuild,v 1.1 2007/03/02 16:49:59 vapier Exp $
+
+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.gw.com/mirrors/pub/unix/file/${P}.tar.gz
+	ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="python"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-4.15-libtool.patch #99593
+	epatch "${FILESDIR}"/${PN}-4.19-init-file.patch #163948
+
+	elibtoolize
+	epunt_cxx
+
+	# make sure python links against the current libmagic #54401
+	sed -i "/library_dirs/s:'\.\./src':'../src/.libs':" python/setup.py
+
+	# dont let python README kill main README #60043
+	mv python/README{,.python}
+}
+
+src_compile() {
+	# file uses things like strndup() and wcwidth()
+	append-flags -D_GNU_SOURCE
+
+	econf --datadir=/usr/share/misc || die
+	emake || die "emake failed"
+
+	use python && cd python && distutils_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog MAINT README
+
+	use python && cd python && distutils_src_install
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}
diff --git a/sys-apps/file/files/digest-file-4.20 b/sys-apps/file/files/digest-file-4.20
new file mode 100644
index 000000000000..0ea629f25a7a
--- /dev/null
+++ b/sys-apps/file/files/digest-file-4.20
@@ -0,0 +1,3 @@
+MD5 709cfeea8b802f80d21da915658cd9fe file-4.20.tar.gz 548412
+RMD160 7fe44509cf9da1df7243ba3787163d50c2fb3193 file-4.20.tar.gz 548412
+SHA256 dd199092f347f1a26c4a8e5f0f7c917f904b2f1e7fc325eb1c875e1470983f1d file-4.20.tar.gz 548412