Adding automake dependency (bug #99819)

(Portage version: 2.0.51.22-r2)

4 files changed, 13 insertions, 67 deletions

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index 80ca14453fc7..a270f458e657 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/pkgconfig
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.34 2005/07/31 08:04:55 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.35 2005/08/04 03:41:11 leonardop Exp $
+
+  03 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  pkgconfig-0.18.1-r1.ebuild:
+  Add automake dependency as per bug #99819.
 
   31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   pkgconfig-0.17.2-r1.ebuild:
diff --git a/dev-util/pkgconfig/files/digest-pkgconfig-0.18.1 b/dev-util/pkgconfig/files/digest-pkgconfig-0.18.1
deleted file mode 100644
index 3140497ca61d..000000000000
--- a/dev-util/pkgconfig/files/digest-pkgconfig-0.18.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c4feb6cd3c68d677cedcbdc572da68cb pkgconfig-0.18.1.tar.bz2 717083
diff --git a/dev-util/pkgconfig/pkgconfig-0.18.1-r1.ebuild b/dev-util/pkgconfig/pkgconfig-0.18.1-r1.ebuild
index 8f00eccc0e90..27126ebc9bc9 100644
--- a/dev-util/pkgconfig/pkgconfig-0.18.1-r1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.18.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.18.1-r1.ebuild,v 1.1 2005/07/25 12:46:18 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.18.1-r1.ebuild,v 1.2 2005/08/04 03:41:11 leonardop Exp $
 
 inherit eutils flag-o-matic gnome.org
 
@@ -11,10 +11,11 @@ HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="hardened"
 
-DEPEND=""
+# automake dependency is necessary (bug #99819)
+DEPEND="=sys-devel/automake-1.7*"
 
 S=${WORKDIR}/${MY_P}
 
@@ -29,23 +30,13 @@ src_unpack() {
 	# Fix compilation-time tests. See bug #98651.
 	epatch ${FILESDIR}/${MY_P}-checks.patch
 
-	einfo "Running autoconf"
-	autoconf || die "Autoconf failed"
-	einfo "Running automake"
-	WANT_AUTOMAKE=1.7 automake || die "Autoconf failed"
-
-}
-
-src_compile() {
-
-	econf || die "./configure step failed"
-	emake || die "Compilation failed"
-
+	export WANT_AUTOMAKE=1.7
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
 }
 
 src_install() {
+	make install DESTDIR="${D}" || die "Installation failed"
 
-	make install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog NEWS README
-
 }
diff --git a/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild
deleted file mode 100644
index bf37b2dc9b79..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.18.1.ebuild,v 1.3 2005/07/18 10:27:06 leonardop Exp $
-
-inherit eutils flag-o-matic gnome.org
-
-MY_PN="pkg-config"
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Package config system that manages compile/link flags for libraries"
-HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="hardened"
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Set the default search path correctly
-	epatch ${FILESDIR}/${MY_P}-pc_path.patch
-	# Fix compilation-time tests. See bug #98651.
-	epatch ${FILESDIR}/${MY_P}-checks.patch
-
-	einfo "Running autoconf"
-	autoconf || die "Autoconf failed"
-	einfo "Running automake"
-	WANT_AUTOMAKE=1.7 automake || die "Autoconf failed"
-}
-
-src_compile() {
-	local myconf="--enable-indirect-deps"
-
-	econf ${myconf} || die "./configure step failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README
-}