Should call gnome2_omf_fix() _after_ automake. Use eautoreconf() from autotools eclass.

Package-Manager: portage-2.0.53_rc7

3 files changed, 24 insertions, 13 deletions

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 <azarah@gentoo.org> libgda-1.2.2-r1.ebuild:
+  Should call gnome2_omf_fix() _after_ automake. Use eautoreconf() from
+  autotools eclass.
 
   30 Oct 2005; Simon Stelling <blubb@gentoo.org> libgda-1.2.2-r1.ebuild:
   stable on amd64 wrt bug 110467
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index f2ea8a14fa00..de58bea6d59e 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,4 +1,7 @@
-MD5 112a1a7966b5ca0d707c24f6a6747646 ChangeLog 12533
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3ab3fdcd35e730dcfd4d68813fd0d2ea ChangeLog 12703
 MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
 MD5 46b8c0b40219635d47ca4583d42dc814 files/digest-libgda-1.0.2 66
 MD5 907142ea1e11bcf5b01f25dfa2fd2b54 files/digest-libgda-1.0.3 66
@@ -21,5 +24,12 @@ MD5 efe942efcc3bbe2a6ae347a7e6808a57 libgda-0.2.96-r2.ebuild 3487
 MD5 016ec893635c15e43c7159e1f1d92b33 libgda-1.0.2.ebuild 2893
 MD5 3d8fafea6831dfad58db40dbdef7e9a4 libgda-1.0.3.ebuild 2755
 MD5 eceac9d80b6e54f4091a9a3026c32fec libgda-1.0.4.ebuild 2939
-MD5 2ae6880dad03e541519a4a291ec8b07f libgda-1.2.2-r1.ebuild 2368
+MD5 9c1b481e13a0195ca518975b071c3a68 libgda-1.2.2-r1.ebuild 2248
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZxhk1ZcsMnZjRyIRAqMPAJ9AYCZwETc/umltqfth3OAneIpVbgCfTpt1
+dxYh07VXGSh13ssaeBJ7CN4=
+=9ROj
+-----END PGP SIGNATURE-----
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
 }