Version bump, closes bug #87496.

Package-Manager: portage-2.0.51.19

6 files changed, 130 insertions, 7 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index 4f2ae39ec96d..3f6230db73d9 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/file
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.77 2004/12/13 23:51:26 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.78 2005/04/01 19:25:14 chainsaw Exp $
+
+*file-4.13 (01 Apr 2005)
+
+  01 Apr 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/file-4.13-cross-compile.patch, +file-4.13.ebuild:
+  Version bump, closes bug #87496.
 
   13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
   +files/file-4.12-cross-compile.patch, file-4.12.ebuild:
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 32f3f39abd43..5d80800d8ac6 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,7 +1,20 @@
-MD5 9fb5c3d48dddf5c9b43afca89570d93e ChangeLog 10308
-MD5 fbd714d15c6cf1e49f8784e7007a86b3 file-4.12.ebuild 2081
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 fbf0a97e1b6bdc8a0436bd737bee446c file-4.13.ebuild 2094
+MD5 5173afd9d8a51dd24b27504105b70f19 ChangeLog 10479
+MD5 b8eda3fa30d242f1adf76f171eee4e2e file-4.12.ebuild 2083
+MD5 f856a50dada76a4ca5cee58fbd04e76b files/file-4.13-cross-compile.patch 964
 MD5 f0f2d2181cac822f0c4d4675fb1ff38c files/cracklib.magic 360
-MD5 d336b3490362624aec2e30679c44a198 files/digest-file-4.12 61
+MD5 407c20e1fb3186144d6c7d2788714163 files/digest-file-4.13 61
 MD5 f856a50dada76a4ca5cee58fbd04e76b files/file-4.12-cross-compile.patch 964
+MD5 d336b3490362624aec2e30679c44a198 files/digest-file-4.12 61
 MD5 04e04c973cb0c88d19b0028d8ed05007 files/file-4.xx-mips-gentoo.diff 4694
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFCTaEJp5vW4rUFj5oRAnkNAKC+dd9wTLDDnxIV1U7L4FC7r5TiJQCdG/nL
+dya5tYpViIe0yMKXZz0Npz4=
+=KfVE
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-4.12.ebuild b/sys-apps/file/file-4.12.ebuild
index 6069c0c53035..ce2d5054ca94 100644
--- a/sys-apps/file/file-4.12.ebuild
+++ b/sys-apps/file/file-4.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.12.ebuild,v 1.12 2005/02/07 22:03:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.12.ebuild,v 1.13 2005/04/01 19:25:14 chainsaw Exp $
 
 inherit flag-o-matic gnuconfig eutils distutils libtool toolchain-funcs
 
diff --git a/sys-apps/file/file-4.13.ebuild b/sys-apps/file/file-4.13.ebuild
new file mode 100644
index 000000000000..aa9114a72178
--- /dev/null
+++ b/sys-apps/file/file-4.13.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.13.ebuild,v 1.1 2005/04/01 19:25:14 chainsaw Exp $
+
+inherit flag-o-matic gnuconfig eutils distutils libtool toolchain-funcs
+
+DESCRIPTION="Program to 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="python build"
+
+DEPEND="virtual/libc
+	!build? ( python? ( virtual/python ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# (12 Oct 2003) <kumba@gentoo.org>
+	# This patch is for MIPS only.  It slightly changes the 'file' output
+	# on MIPS machines to a specific format so that other programs can
+	# recognize things.
+	use mips && epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.diff
+
+	# The build process tries to run the compiled file ... not a good
+	# thing if file was cross compiled ;)
+	tc-is-cross-compiler && epatch ${FILESDIR}/${P}-cross-compile.patch
+
+	# misc updates
+	cat "${FILESDIR}"/*.magic >> magic/magic.mime
+	uclibctoolize
+
+	# 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 command segfaults on hppa -  reported by gustavo@zacarias.com.ar
+	[[ ${ARCH} == hppa ]] && filter-flags "-mschedule=8000"
+
+	econf --datadir=/usr/share/misc || die
+
+	emake || die "emake failed"
+
+	use python && cd python && distutils_src_compile
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	if ! use build ; then
+		dodoc ChangeLog MAINT README
+		use python && cd python && distutils_src_install
+	else
+		rm -rf ${D}/usr/share/man ${D}/usr/lib/*.a
+	fi
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}
diff --git a/sys-apps/file/files/digest-file-4.13 b/sys-apps/file/files/digest-file-4.13
new file mode 100644
index 000000000000..4a752095c31f
--- /dev/null
+++ b/sys-apps/file/files/digest-file-4.13
@@ -0,0 +1 @@
+MD5 2bfc0f878ee22e50441b68df2ccbb984 file-4.13.tar.gz 420851
diff --git a/sys-apps/file/files/file-4.13-cross-compile.patch b/sys-apps/file/files/file-4.13-cross-compile.patch
new file mode 100644
index 000000000000..b2b7d3c80707
--- /dev/null
+++ b/sys-apps/file/files/file-4.13-cross-compile.patch
@@ -0,0 +1,30 @@
+--- file-4.10/magic/Makefile.in.orig	2004-07-24 14:38:55.000000000 -0600
++++ file-4.10/magic/Makefile.in	2004-07-28 12:16:23.000000000 -0600
+@@ -490,10 +490,10 @@
+ 	done >> $@
+ 
+ magic.mgc: magic
+-	$(top_builddir)/src/file -C -m magic
++	/usr/bin/file -C -m magic
+ 
+ magic.mime.mgc: magic.mime
+-	$(top_builddir)/src/file -C -m $(srcdir)/magic.mime
++	/usr/bin/file -C -m $(srcdir)/magic.mime
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- file-4.10/magic/Makefile.am.orig	2004-07-24 14:38:55.000000000 -0600
++++ file-4.10/magic/Makefile.am	2004-07-28 12:18:15.000000000 -0600
+@@ -16,10 +16,10 @@
+ 	done >> $@
+ 
+ magic.mgc: magic
+-	$(top_builddir)/src/file -C -m magic
++	/usr/bin/file -C -m magic
+ 
+ magic.mime.mgc: magic.mime
+-	$(top_builddir)/src/file -C -m $(srcdir)/magic.mime
++	/usr/bin/file -C -m $(srcdir)/magic.mime
+ 
+ magic_FRAGMENTS = \
+ Magdir/acorn \