From ba82889912bc6073befe0e0f8bf246651d5bcc85 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Tue, 1 Nov 2005 07:21:50 +0000 Subject: Should call gnome2_omf_fix() _after_ automake. Use eautoreconf() from autotools eclass. (Portage version: 2.0.53_rc7) --- gnome-extra/libgda/ChangeLog | 6 +++++- gnome-extra/libgda/libgda-1.2.2-r1.ebuild | 17 +++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'gnome-extra') diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog index 44e5522169dc..ca8bfceaf599 100644 --- a/gnome-extra/libgda/ChangeLog +++ b/gnome-extra/libgda/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/libgda # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.82 2005/10/30 10:45:52 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.83 2005/11/01 07:21:50 azarah Exp $ + + 01 Nov 2005; Martin Schlemmer libgda-1.2.2-r1.ebuild: + Should call gnome2_omf_fix() _after_ automake. Use eautoreconf() from + autotools eclass. 30 Oct 2005; Simon Stelling libgda-1.2.2-r1.ebuild: stable on amd64 wrt bug 110467 diff --git a/gnome-extra/libgda/libgda-1.2.2-r1.ebuild b/gnome-extra/libgda/libgda-1.2.2-r1.ebuild index 1e176d53e4f0..f150a545f6ab 100644 --- a/gnome-extra/libgda/libgda-1.2.2-r1.ebuild +++ b/gnome-extra/libgda/libgda-1.2.2-r1.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/gnome-extra/libgda/libgda-1.2.2-r1.ebuild,v 1.8 2005/10/30 10:45:52 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.2.2-r1.ebuild,v 1.9 2005/11/01 07:21:50 azarah Exp $ -inherit eutils gnome2 +inherit autotools eutils gnome2 DESCRIPTION="Gnome Database Access Library" HOMEPAGE="http://www.gnome-db.org/" @@ -64,8 +64,6 @@ src_unpack() { unpack "${A}" cd "${S}" - gnome2_omf_fix doc/Makefile.in - # Fix syslog format string attack (bug #110467). epatch ${FILESDIR}/${PN}-1.2-syslog_format_fix.patch # Fix freetds API problems @@ -74,10 +72,9 @@ src_unpack() { # Fix compilation of the mdb provider epatch ${FILESDIR}/${PN}-1.2.1-mdb_fix.patch - export WANT_AUTOMAKE=1.9 - sed -n -e '/GTK_DOC_CHECK/,/dnl IT_PROG_INTLTOOL/p' aclocal.m4 > gtkdoc.m4 - aclocal -I . || die "aclocal failed" - libtoolize --copy --force - autoconf || die "autoconf failed" - automake || die "automake failed" + sed -n -e '/GTK_DOC_CHECK/,/dnl IT_PROG_INTLTOOL/p' \ + aclocal.m4 > gtkdoc.m4 + AT_M4DIR="." eautoreconf + + gnome2_omf_fix doc/Makefile.in } -- cgit v1.2.3-65-gdbad