From b9e6f3a81b938c12ef8cbe1a8654aaecfc1aaec4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 4 Jan 2007 18:27:03 +0000 Subject: [PATCH] Fix broken autotools handling. Package-Manager: portage-2.1.2_rc4-r5 --- sys-fs/hfsplusutils/ChangeLog | 8 +++++-- .../hfsplusutils/hfsplusutils-1.0.4-r1.ebuild | 22 +++++-------------- sys-fs/lufs/ChangeLog | 7 ++++-- sys-fs/lufs/files/digest-lufs-0.9.7-r3 | 2 ++ sys-fs/lufs/lufs-0.9.7-r3.ebuild | 18 +++++++-------- sys-fs/reiser4progs/ChangeLog | 8 +++++-- sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild | 14 +++++++----- 7 files changed, 42 insertions(+), 37 deletions(-) diff --git a/sys-fs/hfsplusutils/ChangeLog b/sys-fs/hfsplusutils/ChangeLog index d7f1e8e7b370..579976d029a3 100644 --- a/sys-fs/hfsplusutils/ChangeLog +++ b/sys-fs/hfsplusutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/hfsplusutils -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/ChangeLog,v 1.7 2006/09/23 22:15:17 josejx Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/ChangeLog,v 1.8 2007/01/04 18:23:05 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò + hfsplusutils-1.0.4-r1.ebuild: + Fix broken autotools handling. 23 Sep 2006; Joseph Jezak hfsplusutils-1.0.4-r1.ebuild: diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild index e8ed0ae869a0..044e77a5b1c8 100644 --- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild +++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild,v 1.11 2006/09/23 22:15:17 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild,v 1.12 2007/01/04 18:23:05 flameeyes Exp $ + +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" -WANT_AUTOMAKE=1.6 inherit autotools eutils libtool MY_P="hfsplus_${PV}" @@ -26,20 +28,8 @@ src_unpack() { epatch ${FILESDIR}/hfsplusutils-1.0.4-glob.patch epatch ${FILESDIR}/hfsplusutils-1.0.4-errno.patch epatch ${FILESDIR}/hfsplusutils-1.0.4-gcc4.patch - #let's avoid the Makefile.cvs since isn't working for us - export WANT_AUTOCONF=2.5 - export WANT_AUTOMAKE=1.6 - aclocal - autoconf - autoheader - automake -a - libtoolize --force --copy - elibtoolize -} -src_compile() { - econf || die - emake || die + eautoreconf } src_install() { diff --git a/sys-fs/lufs/ChangeLog b/sys-fs/lufs/ChangeLog index 0fec8c298d75..25865946f54c 100644 --- a/sys-fs/lufs/ChangeLog +++ b/sys-fs/lufs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/lufs -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.25 2006/06/29 07:57:42 genstef Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/ChangeLog,v 1.26 2007/01/04 18:25:13 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò lufs-0.9.7-r3.ebuild: + Fix broken autotools handling. 29 Jun 2006; Stefan Schweizer lufs-0.9.7-r3.ebuild: remove version from auto[conf,make} depend, thanks to Mike Auty diff --git a/sys-fs/lufs/files/digest-lufs-0.9.7-r3 b/sys-fs/lufs/files/digest-lufs-0.9.7-r3 index 54c98d3ea5f8..699b5c0b36f4 100644 --- a/sys-fs/lufs/files/digest-lufs-0.9.7-r3 +++ b/sys-fs/lufs/files/digest-lufs-0.9.7-r3 @@ -1 +1,3 @@ MD5 23f58fe232254a65df6eb4736a81d524 lufs-0.9.7.tar.gz 537772 +RMD160 d453c2393cd67b04c13dad04870432bb60fa5749 lufs-0.9.7.tar.gz 537772 +SHA256 2d91457906ee2ff1e26de82987019fe2efe22d9c3b6c7741b7ed8fffbae51411 lufs-0.9.7.tar.gz 537772 diff --git a/sys-fs/lufs/lufs-0.9.7-r3.ebuild b/sys-fs/lufs/lufs-0.9.7-r3.ebuild index 58dc359cdb11..799318a77334 100644 --- a/sys-fs/lufs/lufs-0.9.7-r3.ebuild +++ b/sys-fs/lufs/lufs-0.9.7-r3.ebuild @@ -1,8 +1,11 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r3.ebuild,v 1.8 2006/06/29 07:56:43 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lufs/lufs-0.9.7-r3.ebuild,v 1.9 2007/01/04 18:25:13 flameeyes Exp $ -inherit eutils +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit eutils autotools DESCRIPTION="User-mode filesystem implementation" HOMEPAGE="http://lufs.sourceforge.net/lufs/" @@ -27,16 +30,11 @@ src_unpack() { filesystems="ftpfs localfs sshfs" useq amd64 && filesystems="ftpfs localfs" + + eautoreconf } src_compile() { - local WANT_AUTOMAKE="1.7" WANT_AUTOCONF="2.5" - aclocal - automake - autoconf - - libtoolize --copy --force - einfo "Compiling for ${filesystems}" unset ARCH econf $(use_enable debug) || die diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog index 0052182b4b54..d21fc84617ea 100644 --- a/sys-fs/reiser4progs/ChangeLog +++ b/sys-fs/reiser4progs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/reiser4progs -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.26 2005/09/03 21:07:06 corsair Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.27 2007/01/04 18:27:03 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò + reiser4progs-1.0.5.ebuild: + Fix broken autotools handling. 03 Sep 2005; Markus Rothe reiser4progs-1.0.4_p1.ebuild: diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild index f4b2a32f418e..00c58dc39ee7 100644 --- a/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild +++ b/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild @@ -1,8 +1,11 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild,v 1.5 2006/08/20 21:23:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild,v 1.6 2007/01/04 18:27:03 flameeyes Exp $ -inherit toolchain-funcs +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit toolchain-funcs autotools MY_P=${PN}-${PV/_p/-} DESCRIPTION="reiser4progs: mkfs, fsck, etc..." @@ -22,8 +25,9 @@ S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} cd "${S}" - # bundled libtool sucks, so rebuild autotools #74817 - aclocal && libtoolize -c -f && autoconf && automake || die "autotools failed" + + eautoreconf + cat <<-EOF > run-ldconfig #!/bin/sh true -- 2.26.2