Depend on autoools eclass in stable version. Raised automake depend version to 1.5. Removed automake from DEPEND as autotools eclass takes care about this. Fixed bug #148273. Thank Ross and many others for report.

(Portage version: 2.1.1)

3 files changed, 17 insertions, 8 deletions

diff --git a/app-text/sgml-common/ChangeLog b/app-text/sgml-common/ChangeLog
index 766c7f2c077a..a8b3bc7aa40d 100644
--- a/app-text/sgml-common/ChangeLog
+++ b/app-text/sgml-common/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/sgml-common
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.40 2006/10/24 10:08:33 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.41 2006/10/30 13:55:24 pva Exp $
+
+  30 Oct 2006; Peter Volkov <pva@gentoo.org> sgml-common-0.6.3-r4.ebuild,
+  sgml-common-0.6.3-r5.ebuild:
+  Depend on autoools eclass in stable version. Raised automake depend version
+  to 1.5. Removed automake from DEPEND as autotools eclass takes care about
+  this. Fixed bug #148273. Thank Ross and many others for report.
 
   24 Oct 2006; Roy Marples <uberlord@gentoo.org>
   sgml-common-0.6.3-r5.ebuild:
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild
index af3987766bdc..f2a371b0321e 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild,v 1.32 2006/03/26 13:56:30 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r4.ebuild,v 1.33 2006/10/30 13:55:24 pva Exp $
+
+WANT_AUTOMAKE="1.5"
+inherit autotools
 
 DESCRIPTION="Base ISO character entities and utilities for SGML"
 HOMEPAGE="http://www.iso.ch/cate/3524030.html"
@@ -11,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND=">=sys-devel/automake-1.6"
+DEPEND=""
 RDEPEND=""
 
 src_unpack() {
@@ -20,7 +23,8 @@ src_unpack() {
 	# variable, and puts quotes around the CATALOG files.
 	cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in"
 	cd "${S}"
-	automake -a
+
+	eautomake
 }
 
 src_install() {
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
index b150002306f4..7cf2c7fa7cbe 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.7 2006/10/24 10:08:33 uberlord Exp $
-
-WANT_AUTOMAKE=1.4
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.8 2006/10/30 13:55:24 pva Exp $
 
+WANT_AUTOMAKE="1.5"
 inherit autotools eutils
 
 DESCRIPTION="Base ISO character entities and utilities for SGML"
@@ -15,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="=sys-devel/automake-1.4*"
+DEPEND=""
 RDEPEND=""
 
 src_unpack() {