summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-07-14 15:24:01 +0000
committerMike Frysinger <vapier@gentoo.org>2004-07-14 15:24:01 +0000
commit4ff1b78bab88c11a8d620a8c935f7a8e88f32a05 (patch)
tree4dd734558bcbe53ace157da53e945e9eb07c1cd7 /sys-apps
parentdon't assign S=${WORKDIR}/${P}, trim trailing whitespace (diff)
downloadhistorical-4ff1b78bab88c11a8d620a8c935f7a8e88f32a05.tar.gz
historical-4ff1b78bab88c11a8d620a8c935f7a8e88f32a05.tar.bz2
historical-4ff1b78bab88c11a8d620a8c935f7a8e88f32a05.zip
link with proper libmagic #54401
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/file/ChangeLog6
-rw-r--r--sys-apps/file/Manifest32
-rw-r--r--sys-apps/file/file-4.09.ebuild13
3 files changed, 34 insertions, 17 deletions
diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index 217c1bc3d59b..7c27a89654cd 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,10 @@
# 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.51 2004/07/12 16:08:52 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.52 2004/07/14 15:24:01 vapier Exp $
+
+ 14 Jul 2004; Mike Frysinger <vapier@gentoo.org> file-4.09.ebuild:
+ Make sure when building the python component we link against the current
+ libmagic.so and not the system one found in /usr/lib #54401 by tyarling.
12 Jul 2004; <solar@gentoo.org> file-4.08.ebuild, file-4.09.ebuild:
remove the unneeded lib/*.a cruft from a stage1 build
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index b90c5f128899..299c7a251a6d 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,22 +1,32 @@
-MD5 c710b5a9e0d43592b6076e41894fecf2 file-4.07-r1.ebuild 1616
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b500631ea9a110818fa94a27be40521e ChangeLog 7499
MD5 cb23301c27d4a9fd31c6b5100e41a18c file-3.41.ebuild 997
-MD5 605c72d3a6c8eb460232237356134a72 file-4.07.ebuild 1564
MD5 720ff71d900c2c319fdc992a6abf8474 file-4.02.ebuild 1000
-MD5 9668aa36be3c878e958d7d719c1336bb file-4.09.ebuild 1743
MD5 a5c87f7115785296946c86229f165385 file-4.06.ebuild 1696
-MD5 fb8f9b7dac31afef3b3a1880cf47b120 ChangeLog 7279
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c710b5a9e0d43592b6076e41894fecf2 file-4.07-r1.ebuild 1616
+MD5 605c72d3a6c8eb460232237356134a72 file-4.07.ebuild 1564
MD5 66a8f934dca9edff5b2a469cc7a6a727 file-4.08.ebuild 1550
-MD5 ea5caf65874cda8c3f3d5baace9c73f8 files/digest-file-4.07-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 6dae6316fdd7d14527d2579c9a1ed7a2 file-4.09.ebuild 1825
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 aff834708f034a4995abba4192e79583 files/file-3.39-gentoo.diff 4673
+MD5 aff834708f034a4995abba4192e79583 files/file-3.41-mips-gentoo.diff 4673
+MD5 8f6cec8c0754678a2817139182637eac files/file-4.xx-mips-gentoo.diff 13035
MD5 ea5caf65874cda8c3f3d5baace9c73f8 files/digest-file-4.07 61
+MD5 ea5caf65874cda8c3f3d5baace9c73f8 files/digest-file-4.07-r1 61
+MD5 8153e3726c4dad50b53c76eaf32b4833 files/file-4.07-gentoo.diff 648
MD5 9ab14ea35a2db2864bb6e92d1ca87f17 files/digest-file-4.08 61
MD5 655e5c463709e244970b23b64aaf8bf7 files/digest-file-4.09 61
-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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD4DBQFA9VB6HTu7gpaalycRAnCWAKCCSjuk/Juny5zb1PoCblJDPPk0oQCXa8m6
+HhQ9AZm7MVwRVUPN2szZcA==
+=PjTC
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-4.09.ebuild b/sys-apps/file/file-4.09.ebuild
index b8754e3e6a64..a45d938d02c7 100644
--- a/sys-apps/file/file-4.09.ebuild
+++ b/sys-apps/file/file-4.09.ebuild
@@ -1,6 +1,6 @@
# 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.09.ebuild,v 1.9 2004/07/12 16:08:52 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.09.ebuild,v 1.10 2004/07/14 15:24:01 vapier Exp $
inherit flag-o-matic gnuconfig eutils
use python && inherit distutils
@@ -26,13 +26,16 @@ src_unpack() {
# 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
+ if use mips ; then
+ epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.diff
+ gnuconfig_update
+ fi
+
+ # make sure python links against the current libmagic #54401
+ sed -i "/library_dirs/s:'\.\./src':'../src/.libs':" python/setup.py
}
src_compile() {
- # If running mips64, we need updated configure data
- use mips && gnuconfig_update
-
# file command segfaults on hppa - reported by gustavo@zacarias.com.ar
[ ${ARCH} = "hppa" ] && filter-flags "-mschedule=8000"