diff options
| author |   John N. Laliberte <allanonjl@gentoo.org> | 2006-08-18 22:59:37 +0000 |
|---|---|---|
| committer | John N. Laliberte <allanonjl@gentoo.org> | 2006-08-18 22:59:37 +0000 |
| commit | 0f8074a5153ef4fb6fd638a66fad8f1f58be2885 (patch) | |
| tree | 6d827bb711b7a73a226ddcf7f3ae1c603cea90f4 /gnome-base | |
| parent | Add ~ia64 keyword. (diff) | |
| download | gentoo-2-0f8074a5153ef4fb6fd638a66fad8f1f58be2885.tar.gz gentoo-2-0f8074a5153ef4fb6fd638a66fad8f1f58be2885.tar.bz2 gentoo-2-0f8074a5153ef4fb6fd638a66fad8f1f58be2885.zip | |
preserve some macros, use eautoreconf, fixes #144350
(Portage version: 2.1.1_pre5-r1)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome-vfs/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild | 17 |
2 files changed, 14 insertions, 9 deletions
diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog index 1677e5430db6..a66c3fb1309e 100644 --- a/gnome-base/gnome-vfs/ChangeLog +++ b/gnome-base/gnome-vfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gnome-vfs # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.208 2006/08/16 14:22:21 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.209 2006/08/18 22:59:37 allanonjl Exp $ + + 18 Aug 2006; John N. Laliberte <allanonjl@gentoo.org> + gnome-vfs-1.0.5-r4.ebuild: + preserve some macros, use eautoreconf, fixes #144350 16 Aug 2006; Markus Rothe <corsair@gentoo.org> gnome-vfs-2.14.2.ebuild: Stable on ppc64 diff --git a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild index dcbcd944a07d..0a1cefac3bf4 100644 --- a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild +++ b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild,v 1.13 2006/08/15 14:28:11 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild,v 1.14 2006/08/18 22:59:37 allanonjl Exp $ -inherit eutils libtool toolchain-funcs +inherit eutils libtool toolchain-funcs autotools DESCRIPTION="GNOME Virtual File System" HOMEPAGE="http://www.gnome.org/" @@ -29,9 +29,9 @@ DEPEND="${RDEPEND} # gnome-common is for m4 macros needed for patches ... src_unpack() { - unpack ${A} - + unpack "${A}" cd "${S}" + # Add missing macros for charset conversion epatch "${FILESDIR}"/1.0/${P}-codeset.patch # Use GNOME2 Gconf keys for proxy settings @@ -53,11 +53,12 @@ src_unpack() { # CAN-2005-0706 (#84936) epatch "${FILESDIR}"/${PN}-2-CAN-2005-0706.patch - autoheader || die - aclocal -I /usr/share/aclocal/gnome-macros || die - autoconf || die + # preserve some macros + sed -n -e '/AC_DEFUN(XML_I18N_TOOLS_NEWER_THAN_0_9/,/# Like AC_CONFIG_HEADER,/p' aclocal.m4 > old_macros.m4 + + sed -n -e '/# Check whether LC_MESSAGES/,/dnl AM_PATH_GCONF/p' aclocal.m4 >> old_macros.m4 - elibtoolize + AT_M4DIR=". /usr/share/aclocal/gnome-macros" eautoreconf } src_compile() { |