Version bump.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 83 insertions, 22 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index 0c189e00a6c9..f973b865ed7b 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/file
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.177 2009/10/05 18:19:20 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.178 2010/01/25 02:54:39 vapier Exp $
+
+*file-5.04 (25 Jan 2010)
+
+  25 Jan 2010; Mike Frysinger <vapier@gentoo.org> +file-5.04.ebuild:
+  Version bump.
 
   05 Oct 2009; Raúl Porcel <armin76@gentoo.org> file-5.03.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #284347
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 3dca29bbc827..7815497ddff1 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,24 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX file-4.15-libtool.patch 561 RMD160 f2b9f4c93f199ab3145d70816b3c624349af97a0 SHA1 6e2c1cd8dee4d022c35a056e94a4030af1f4b1fa SHA256 badb8261dad5df39bac1d6a6da1668eb8a2ff0b01c2c80baa8abfe07fd99681d
-AUX file-4.21-disable-regex.patch 645 RMD160 7038707815a1b8138a8bcff2249b8e2a1da2a94b SHA1 02e57e29a86adf0c36b935bc29bc386c7183c2df SHA256 cd53443c5bc81bbc38d3928a1f6cfd1f5022953a69cebd2a2c73a3759b5cbbfc
-AUX file-5.00-localization.patch 3014 RMD160 c421f942e861f496f32000bf9d22f561a4337faf SHA1 1a2a3f0449418e0b107385a0e79d9a1416d7a873 SHA256 067d76f13d165267977b09908adab3a041a9e8c2af2b7bbc9a1f80a29553586f
-AUX file-5.00-short-read.patch 4299 RMD160 8cfb2f4e10427fe28c54288a9ef2d657844b24a6 SHA1 761d4be123c1303df925b8559c8b5365816311ee SHA256 0ac90591b5bc5604119ae771794ba6840e08fa3dbbf8572f332f54c1b72f1dc7
-DIST file-4.21.tar.gz 549938 RMD160 c8cfee27ba7a033bae355e458921eac39913b1e0 SHA1 4a919572fed1896212c2d7f41f841845efc1287a SHA256 6f5644d56cc603138533158076a6cb41cd33c33d27e5310cb76cb6576151ca67
-DIST file-4.23.tar.gz 563704 RMD160 29153a3fb18b2d8f7da9fd66712fbd6ed4ea49f2 SHA1 83a90894a6b89f80207b9fcf0e382a627e4c5f0b SHA256 2fad96e6475b7a67e1e96f05e825b779686fd0cb3f041a10ca6622a4d9f7d147
-DIST file-4.25.tar.gz 582227 RMD160 c877a223a1dbdfd38c6f5ac385b533e8c5223fe1 SHA1 0d4a0b678a4c13fbc38cd0ea633ef4df60d74f22 SHA256 abcd5bc7f9a604b5966463eac4a3f54de180a08adb513d902bb44152ebad6c8a
-DIST file-4.26.tar.gz 584803 RMD160 e8b84e01d1f43faedfe676afc92c2cba4a01ecdf SHA1 412cdac5cd778d867e2d91a01b09858be1998ec3 SHA256 682f7de5c12d35ff2d9e2ec3c6a753bd5a01e0f7f3110501be0bafef1d5e9654
-DIST file-5.00.tar.gz 600905 RMD160 840170735f4b7478093da46fee521df9b1082bdc SHA1 e58033dfefa44782aa34155751ce88c86c4c1244 SHA256 289bc067d7a2a7e52437428bd0e79df9030028fd13c26e9772ebf1dfc8d9d5c9
-DIST file-5.01.tar.gz 614967 RMD160 69b84996e6eb2fc74d63adf9020b21ee3a07fadd SHA1 0f9759beeb94b85d14123a30a801249f74f902e6 SHA256 3201431a5fecdf88b8058ba292f11d6b37859a2c956e4da0509ff571c8f4932c
-DIST file-5.02.tar.gz 615293 RMD160 d2bdd94914417b8f32f3882da427503a9c7152fd SHA1 d3449480ee28b926a373a9c13ff3de981b3c5814 SHA256 827234e4a13faa33d8c8d63695b443329ac924336cacbca64b4b3009b7ce111c
 DIST file-5.03.tar.gz 616266 RMD160 bf9fcf85e40dc4ec9cdcdc806107dc88207c6e5b SHA1 f659a4e1fa96fbdc99c924ea8e2dc07319f046c1 SHA256 1edab47f9ef2ec5c021204f07566b11e5c2b3ae207af98137a021ac6e9bd95bb
-EBUILD file-4.21-r1.ebuild 1517 RMD160 c661bb10e963dea795377adbaf4769ffcec36a86 SHA1 a89df1f7817dbcf041791ba6739d5018f6c7ce9d SHA256 02c3731f857edb67c3e7c0294d5bb85a0ca1a5fd1da4538c2d79f82ab3b94a41
-EBUILD file-4.23.ebuild 1459 RMD160 f993d6a1806e144bd9ce088412cd7509aeabfb78 SHA1 e3981b2cf77c68661911e9ee45aabacd03289799 SHA256 136f17cb4c4fa4e9b95bcd5bc1c7d1d01fdbafa3c51317f0656818885411c989
-EBUILD file-4.25.ebuild 1471 RMD160 740d209a58b57890900cbc76b88a3e737a159050 SHA1 c766724eeaa5a324da707656f0c012ed88cd91b1 SHA256 fe1d539efbb1aa0b76a72d9bb1cb33b4937fa4ed89234bcbe5479ab7602539f9
-EBUILD file-4.26.ebuild 1471 RMD160 6ef9416ea87d2d6f600a7e6abde7847c87ef45d6 SHA1 aabcc05b9e540720bfc73734535769b4349d90c4 SHA256 d4404550f1e0e2979fe8dc1f17a0f58e806ed6a8230f88c906d278309a4fa663
-EBUILD file-5.00-r1.ebuild 1636 RMD160 3ee50986f2993f861a293dc54b99fb1e5fdab05c SHA1 b8718db37485065584925b6cfe552ac7e8d43417 SHA256 96ed4752350a61c08487cd0274f569c507a6a86e38745365e8daf6f1d2c55d58
-EBUILD file-5.00-r2.ebuild 1680 RMD160 c332f873f00c3c80862afcda41058562514b6ad9 SHA1 ce30052ccc223db606d752fc565b3f85f5f77602 SHA256 313795aff0edb1bc494d1e95bb8da2f14f0d16b92e0c4fc1e87f1d3564a1e2d6
-EBUILD file-5.00.ebuild 1471 RMD160 d71a9f569fd2a3d49806420501c49e26c5c12b04 SHA1 48399ddce617473755b85cb8285e51568edcb5e2 SHA256 b9d9e17cbdc8952d6a9944be0e15ecb273e431dd8ef1167501fe70f445643d02
-EBUILD file-5.01.ebuild 1539 RMD160 124e4dbceb0a81e9ae61ee3bf932a3b3b58848d5 SHA1 59701d7febe66ae7a1a8acbd79d7f2ea43e5e53f SHA256 17cfeaeb45d905ab9d1c9d33a170ebd1688d83532e692625fadf341c259d14e2
-EBUILD file-5.02.ebuild 1539 RMD160 3a16211f7d6dc8022b9cfdc83212223f1adbb431 SHA1 f2df0cff70ac620ce5e28f5be49c400d1674d27e SHA256 c105ce5bb36e01629ccebad2f14fe5dabd295aecca61688c72196b1dc280b1c6
+DIST file-5.04.tar.gz 621361 RMD160 2ee0dc535a4fb6f06950f81882772cc34f981984 SHA1 56ddf7135471aa656334ed8fefe1112bcccc2cc3 SHA256 4c9e6e7994e74cb3386374ae91b055d26ac96b9d3e82fd157ae2d62e87a4260c
 EBUILD file-5.03.ebuild 1626 RMD160 6d4403ba32e3d80586f1d0905133520af8e3a682 SHA1 44fc7b1f368dc3d8445c4d819c28c3b47ec78f64 SHA256 104673bc6e3e0d20f867104b91b2ef5c0703b9de1a0cc2a132c0bc9eadb756d4
-MISC ChangeLog 21079 RMD160 0c3bc2b23ac677b1ef2f3d863372a03f4d32e5f2 SHA1 7a50239f98e38fc91f4684fa64285be99a1c13ba SHA256 5ac2bd853e2c7458cbb99e32b06b2e041a53c36b93099698ea681a07c6b82e7f
+EBUILD file-5.04.ebuild 1637 RMD160 f54c60ae3338f692205160dc8977bc248cd8a56e SHA1 80fee245dd257a74713e5da143b10bb4d473a411 SHA256 3b3b17d23a6345c44a08688426a3764994fa704220d3e64d53a0d7e587314a01
+MISC ChangeLog 21190 RMD160 eb7b6fd1ad1ca1fa7cb5b4a289f8b0fa020bdbdb SHA1 23958ee88fd297c03e749fb65399b88d66136e84 SHA256 f34416c3aa9616b48000e566185f2a5bb6003a12ca45feefe36ceae4ad93b908
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAktdB/AACgkQTwhj9JtAlp6TxgD/ZhCiczFgaZsvehdH8EHagaOX
+xJAFKwb5ytUj1NwUOysA/R/w1BH0k+w+CoGuc31VeCZiwcRiktU0isGbdNUQrUD9
+=3coQ
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-5.04.ebuild b/sys-apps/file/file-5.04.ebuild
new file mode 100644
index 000000000000..e23905cee13f
--- /dev/null
+++ b/sys-apps/file/file-5.04.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.04.ebuild,v 1.1 2010/01/25 02:54:39 vapier Exp $
+
+DISTUTILS_DISABLE_PYTHON_DEPENDENCY="1"
+
+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"
+
+DEPEND="python? ( virtual/python )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-4.15-libtool.patch #99593
+
+	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}
+
+	# only one data file, so put it into /usr/share/misc/
+#	sed -i '/^pkgdatadir/s:/@PACKAGE@::' $(find -name Makefile.in)
+}
+
+src_compile() {
+	# file uses things like strndup() and wcwidth()
+	append-flags -D_GNU_SOURCE
+
+	econf || die
+	emake || die
+
+	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
+}