Version bump to fix #101298 by PIERRE Benoît / #101639 by Preston Crow / #102520 by Daniel Drake.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 66 insertions, 23 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index 56fb80263d59..98eaa624ea25 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,29 +1,17 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.86 2005/08/18 04:10:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.87 2005/08/18 22:27:24 vapier Exp $
 
-  18 Aug 2005; Mike Frysinger <vapier@gentoo.org> file-4.14.ebuild:
-  Mask until #101298 / #101639 / #102520 get sorted out.
+*file-4.15 (18 Aug 2005)
 
-  09 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> file-4.13.ebuild:
-  Stable on mips.
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org> +file-4.15.ebuild:
+  Version bump to fix up #101298 by PIERRE Benoît / #101639 by Preston 
+  Crow / #102520 by Daniel Drake.
 
   24 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
   +files/file-4.14-gcc2.patch, file-4.14.ebuild:
   Fix building with gcc2.
 
-  20 Jul 2005; Markus Rothe <corsair@gentoo.org> file-4.13.ebuild:
-  Stable on ppc64
-
-  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> file-4.13.ebuild:
-  Stable on alpha.
-
-  18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> file-4.13.ebuild:
-  Stable on sparc
-
-  18 Jul 2005; Joseph Jezak <josejx@gentoo.org> file-4.13.ebuild:
-  Marked ppc stable.
-
 *file-4.14 (17 Jul 2005)
 
   17 Jul 2005; Mike Frysinger <vapier@gentoo.org> +file-4.14.ebuild:
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 4d3f436e4a48..d2b549eecf95 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 403a2da89ff42315ad1f3003be6a94e0 file-4.14.ebuild 2388
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 c6073a11ea3fcb5cc0d1625a54aad8d4 file-4.12.ebuild 2081
+MD5 5c11ddad240c78d7d4afb5577a4b5550 file-4.15.ebuild 1359
 MD5 38fb58232bdc578cad8b10acd16069b7 file-4.13.ebuild 2296
-MD5 76bd58ae5bdd783b5ef7d17e2c7eac71 ChangeLog 11285
+MD5 d565d5003ccb755877835667dbf91f7b ChangeLog 10919
 MD5 f856a50dada76a4ca5cee58fbd04e76b files/file-4.13-cross-compile.patch 964
 MD5 a952f0eca26a046e4b815529d2b734ef files/misc.magic 71
 MD5 407c20e1fb3186144d6c7d2788714163 files/digest-file-4.13 61
 MD5 7a96e5548d52493366ab39f1c6ae9237 files/file-4.13-ia64.patch 530
 MD5 13c1a487996e5e26560f9feaae56e811 files/file-4.14-gcc2.patch 494
-MD5 c2aadc08e97769242f12a7a286104a7f files/digest-file-4.14 61
+MD5 56c4aa931e56a129d1c631c52a3b6d67 files/digest-file-4.15 61
 MD5 d336b3490362624aec2e30679c44a198 files/digest-file-4.12 61
 MD5 f0f2d2181cac822f0c4d4675fb1ff38c files/cracklib.magic 360
 MD5 66df8eecd30769daeb3f643dc6432db3 files/file-4.xx-mips-gentoo.patch 5578
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDBApmgIKl8Uu19MoRArr9AJ9SBXddBYyWOuC+P2I+swSCTCv4cwCfc72p
-Dm06GVrBvYvfW8ig2tJoPoQ=
-=cU+Y
+iD8DBQFDBQtlgIKl8Uu19MoRAkqXAJ9O/OxnzE5DxQ22HCQGFXT5VKk/dQCfdomZ
+3pJxO6w07Pg/1baUciBrtfE=
+=ZokM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-4.15.ebuild b/sys-apps/file/file-4.15.ebuild
new file mode 100644
index 000000000000..af354180b64a
--- /dev/null
+++ b/sys-apps/file/file-4.15.ebuild
@@ -0,0 +1,54 @@
+# 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.15.ebuild,v 1.1 2005/08/18 22:27:24 vapier Exp $
+
+inherit distutils libtool
+
+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 ~x86"
+IUSE="python build"
+
+DEPEND="!build? ( python? ( virtual/python ) )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+
+	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() {
+	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
+	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.15 b/sys-apps/file/files/digest-file-4.15
new file mode 100644
index 000000000000..e534cb0de2d5
--- /dev/null
+++ b/sys-apps/file/files/digest-file-4.15
@@ -0,0 +1 @@
+MD5 09a6603dadbe06e577e98a2547201fab file-4.15.tar.gz 546522