build the magic subdir sep from the rest of the subdirs #81974

Package-Manager: portage-2.0.51.22-r1

2 files changed, 16 insertions, 13 deletions

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index c61bcd33b721..b743ee787f9a 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,7 +1,7 @@
 MD5 5173afd9d8a51dd24b27504105b70f19 ChangeLog 10479
 MD5 ffbd8f0ba222731195c067f3254570f2 file-4.12.ebuild 2070
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 4c06f28154a089f52dd918cad652ecb5 file-4.13.ebuild 2018
+MD5 b87aec57bfd8619c711bc8218a946508 file-4.13.ebuild 2232
 MD5 f0f2d2181cac822f0c4d4675fb1ff38c files/cracklib.magic 360
 MD5 407c20e1fb3186144d6c7d2788714163 files/digest-file-4.13 61
 MD5 d336b3490362624aec2e30679c44a198 files/digest-file-4.12 61
diff --git a/sys-apps/file/file-4.13.ebuild b/sys-apps/file/file-4.13.ebuild
index c4ab8335ada9..4ae711e0c8db 100644
--- a/sys-apps/file/file-4.13.ebuild
+++ b/sys-apps/file/file-4.13.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2005/04/24 17:46:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.13.ebuild,v 1.3 2005/05/21 04:48:24 vapier Exp $
 
-inherit flag-o-matic gnuconfig eutils distutils libtool toolchain-funcs
+inherit flag-o-matic 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/"
@@ -11,23 +11,25 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="python build"
 
-DEPEND="virtual/libc
-	!build? ( python? ( virtual/python ) )"
+DEPEND="!build? ( python? ( virtual/python ) )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
+	# the magic and src subdir sometimes don't get along #81974
+	sed -i -e '/^SUBDIRS/s:magic::' Makefile.in
 
 	# This tweaks the output format for mips binaries so things like 
 	# libtool don't barf all over the place when trying to parse it.
-	epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-4.xx-mips-gentoo.patch
 
 	# 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
+	tc-is-cross-compiler && epatch "${FILESDIR}"/${P}-cross-compile.patch
 
 	# misc updates
 	cat "${FILESDIR}"/*.magic >> magic/magic.mime
@@ -42,23 +44,24 @@ src_unpack() {
 
 src_compile() {
 	# file command segfaults on hppa -  reported by gustavo@zacarias.com.ar
-	[[ ${ARCH} == hppa ]] && filter-flags "-mschedule=8000"
+	[[ ${ARCH} == hppa ]] && filter-flags -mschedule=8000
 
 	econf --datadir=/usr/share/misc || die
-
 	emake || die "emake failed"
+	emake -C magic || die "emake magic failed"
 
 	use python && cd python && distutils_src_compile
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" install -C magic || die "make magic 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
+		rm -r "${D}"/usr/share/man "${D}"/usr/lib/*.a
 	fi
 }