removed -j1 from emake. emerge -C file; MAKEOPTS=-j emerge file worked fine on an SMP box

4 files changed, 95 insertions, 14 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index c90f4e97e589..0f91408c543c 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.59 2004/09/09 13:40:54 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.60 2004/09/13 09:36:27 tigger Exp $
+
+*file-4.10-r1 (13 Sep 2004)
+
+  13 Sep 2004; Rob Holland <tigger@gentoo.org> +file-4.10-r1.ebuild:
+  removed -j1 from emake. emerge -C file; MAKEOPTS=-j emerge file worked fine on
+  an SMP box
 
   09 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> file-4.10.ebuild:
   Stable on sparc
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index b87a874201e9..ac64441eead5 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,24 +1,26 @@
-MD5 aa56828946656c9a8cd28ad8c236eb80 ChangeLog 8256
-MD5 cb23301c27d4a9fd31c6b5100e41a18c file-3.41.ebuild 997
-MD5 720ff71d900c2c319fdc992a6abf8474 file-4.02.ebuild 1000
-MD5 5044113cdbcefbc33943af5a5ce1e06c file-4.06.ebuild 1665
+MD5 0288d3934f5d2e4a5a90650484ec8edc file-4.10-r1.ebuild 2006
 MD5 bc885fe3857d9e8857f3344378892ef9 file-4.07-r1.ebuild 1604
+MD5 cb23301c27d4a9fd31c6b5100e41a18c file-3.41.ebuild 997
 MD5 c32338854415c421bedb779cdd25b42c file-4.07.ebuild 1552
-MD5 2d8842c2b759e9bc6ffa78466552a078 file-4.08.ebuild 1548
+MD5 720ff71d900c2c319fdc992a6abf8474 file-4.02.ebuild 1000
 MD5 eb4cb2253775db1f898c70dc341e9176 file-4.09.ebuild 2042
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 33cefab97f89a8bca6eb2d86d0386e53 file-4.10.ebuild 2045
+MD5 5044113cdbcefbc33943af5a5ce1e06c file-4.06.ebuild 1665
+MD5 aa56828946656c9a8cd28ad8c236eb80 ChangeLog 8256
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 2d8842c2b759e9bc6ffa78466552a078 file-4.08.ebuild 1548
+MD5 ea5caf65874cda8c3f3d5baace9c73f8 files/digest-file-4.07-r1 61
+MD5 8cf0ba615168e0a01ddd576d39b19efe files/digest-file-4.10-r1 61
+MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
+MD5 aff834708f034a4995abba4192e79583 files/file-3.39-gentoo.diff 4673
+MD5 2b50afc88e81450f52a964b98b7d0ef8 files/file-4.08-uclibc.patch 816
+MD5 8153e3726c4dad50b53c76eaf32b4833 files/file-4.07-gentoo.diff 648
+MD5 aff834708f034a4995abba4192e79583 files/file-3.41-mips-gentoo.diff 4673
 MD5 eabc698678353b52ea7d9bfb724d4e1e files/digest-file-3.41 268
 MD5 fd38ae2f761ce496f7caedf3226166ae files/digest-file-4.02 61
 MD5 50700bf6bff49778fd8c6083466a0813 files/digest-file-4.06 61
 MD5 ea5caf65874cda8c3f3d5baace9c73f8 files/digest-file-4.07 61
-MD5 ea5caf65874cda8c3f3d5baace9c73f8 files/digest-file-4.07-r1 61
 MD5 9ab14ea35a2db2864bb6e92d1ca87f17 files/digest-file-4.08 61
 MD5 655e5c463709e244970b23b64aaf8bf7 files/digest-file-4.09 61
-MD5 aff834708f034a4995abba4192e79583 files/file-3.39-gentoo.diff 4673
-MD5 aff834708f034a4995abba4192e79583 files/file-3.41-mips-gentoo.diff 4673
-MD5 8153e3726c4dad50b53c76eaf32b4833 files/file-4.07-gentoo.diff 648
-MD5 8f6cec8c0754678a2817139182637eac files/file-4.xx-mips-gentoo.diff 13035
-MD5 2b50afc88e81450f52a964b98b7d0ef8 files/file-4.08-uclibc.patch 816
-MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
 MD5 8cf0ba615168e0a01ddd576d39b19efe files/digest-file-4.10 61
+MD5 8f6cec8c0754678a2817139182637eac files/file-4.xx-mips-gentoo.diff 13035
diff --git a/sys-apps/file/file-4.10-r1.ebuild b/sys-apps/file/file-4.10-r1.ebuild
new file mode 100644
index 000000000000..4d66d0a298c4
--- /dev/null
+++ b/sys-apps/file/file-4.10-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.10-r1.ebuild,v 1.1 2004/09/13 09:36:27 tigger Exp $
+
+inherit flag-o-matic gnuconfig eutils distutils
+
+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="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+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
+
+	# uclibc support
+	epatch ${FILESDIR}/${PN}-4.08-uclibc.patch
+	epatch ${FILESDIR}/ltconfig-uclibc.patch
+
+	# gnuconfig_update should run for every arch/libc combo not just mips.
+	gnuconfig_update
+
+	# 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.10-r1 b/sys-apps/file/files/digest-file-4.10-r1
new file mode 100644
index 000000000000..0d666da7378f
--- /dev/null
+++ b/sys-apps/file/files/digest-file-4.10-r1
@@ -0,0 +1 @@
+MD5 c3cf1bda84a9d55896d4b7dd2caee68d file-4.10.tar.gz 368537