From d6bbcbb99d41079a81ff3990d5cbe151b93343ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 4 Jan 2007 14:36:47 +0000 Subject: [PATCH] Fix broken autotools handling. Package-Manager: portage-2.1.2_rc4-r5 --- dev-db/mysqlnavigator/ChangeLog | 8 ++++++-- dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild | 12 +++++++----- dev-db/unixODBC/ChangeLog | 8 ++++++-- dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild | 11 ++++------- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dev-db/mysqlnavigator/ChangeLog b/dev-db/mysqlnavigator/ChangeLog index b95dd5576f15..2e3d7dad853d 100644 --- a/dev-db/mysqlnavigator/ChangeLog +++ b/dev-db/mysqlnavigator/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysqlnavigator -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlnavigator/ChangeLog,v 1.23 2006/11/23 20:00:20 vivo Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlnavigator/ChangeLog,v 1.24 2007/01/04 14:35:01 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò + mysqlnavigator-1.4.2.ebuild: + Fix broken autotools handling. 23 Nov 2006; Francesco Riosa mysqlnavigator-1.4.2.ebuild: diff --git a/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild b/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild index 3bb151f93509..e41ae6d720ad 100644 --- a/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild +++ b/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.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/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild,v 1.16 2006/11/23 20:00:20 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild,v 1.17 2007/01/04 14:35:01 flameeyes Exp $ -inherit eutils qt3 +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +inherit eutils qt3 autotools IUSE="" DESCRIPTION="Advanced Qt based front end to mysql" @@ -34,11 +37,10 @@ src_unpack() { export CXXFLAGS="${CXXFLAGS} -DUSE_OLD_FUNCTIONS=1" sed "s|^CXXFLAGS=\".*\"$|CXXFLAGS=\"${CXXFLAGS}\"|g" configure.in #force changes in - autoreconf + eautoreconf } src_compile() { - libtoolize --copy --force myconf="--with-mysql-includes=/usr/include/mysql" econf ${myconf} || die "econf failed" emake -DUSE_OLD_FUNCTIONS=1 diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog index cf907781ee79..3353a2b7670e 100644 --- a/dev-db/unixODBC/ChangeLog +++ b/dev-db/unixODBC/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/unixODBC -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.61 2006/12/02 17:55:52 chtekk Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.62 2007/01/04 14:36:47 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò + unixODBC-2.2.11-r1.ebuild: + Fix broken autotools handling. 02 Dec 2006; Luca Longinotti unixODBC-2.2.11-r1.ebuild: diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild index a063772226b2..a50283ea6c57 100644 --- a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild +++ b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild @@ -1,6 +1,6 @@ -# 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/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.17 2006/12/02 17:55:52 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.18 2007/01/04 14:36:47 flameeyes Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -31,11 +31,8 @@ src_unpack() { # braindead check in configure fails - hackish approach epatch "${FILESDIR}/${P}-configure.in.patch" epatch "${FILESDIR}/${P}-Makefile.am.patch" - autotools_set_versions - aclocal --force && \ - libtoolize --copy --force && \ - automake && \ - autoconf || die "autotools failed" + + eautoreconf } src_compile() { -- 2.26.2