fixed automake dependency as per bug #148801

Package-Manager: portage-2.1.2_pre1

3 files changed, 25 insertions, 24 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index a5e7ce24d571..2d6792ff9904 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/gpgme
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.100 2006/08/14 09:35:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.101 2006/09/23 22:23:30 dragonheart Exp $
+
+  23 Sep 2006; Daniel Black <dragonheart@gentoo.org> gpgme-0.3.14-r1.ebuild:
+  fixed automake dependency as per bug #148801 thanks Patrick Lauer
 
   14 Aug 2006; Daniel Black <dragonheart@gentoo.org> gpgme-1.0.2.ebuild,
   gpgme-1.0.3.ebuild:
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 8145d761b031..32113bf7e35c 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -18,10 +18,10 @@ DIST gpgme-1.0.2.tar.gz 833949 RMD160 444d6fa0e721ae099912692172dd9f2f40d8de33 S
 DIST gpgme-1.0.3.tar.gz 837866 RMD160 cc8dc465c733eea8d7f0297127f9f97dd0876a53 SHA1 632436ff5c66405d9704983411aa031f29006dce SHA256 376796ba50ee251af63c1fe2aa17603aaac04b64527ba3bc89e4fa023322282f
 DIST gpgme-1.1.0.tar.gz 862122 RMD160 f29903597e74ae637001a73ba9ae4cfd20802bf2 SHA1 2b4f6a8eb4bbc3bc8ad049840c8cbe695ad379f9 SHA256 a481bc118d8f6f55ef11be0ce3ac9b9834e992ab2381648626add502a910e2a1
 DIST gpgme-1.1.2.tar.gz 881432 RMD160 ae30dc9a3e1f482206cf7cf76aae7c9b9e25b4a8 SHA1 336d94e3bf2facedd06c52bd016bce647667c347 SHA256 644f7391887d9d63462d4137c21f333409ce0ccdd52daab9806a98ca6dfbecc5
-EBUILD gpgme-0.3.14-r1.ebuild 2436 RMD160 fafa8b391d9f36bf26bb4a69973a9a1d363b9eb7 SHA1 fa17cec8dcfb0705fd55818a1609e9a759474d1d SHA256 20baadd19e4c7b1e6485ea2425ffed4f821c1d2fe260911d742defc1bc6f8907
-MD5 01c6d97b40dda97420a63cb2499101a5 gpgme-0.3.14-r1.ebuild 2436
-RMD160 fafa8b391d9f36bf26bb4a69973a9a1d363b9eb7 gpgme-0.3.14-r1.ebuild 2436
-SHA256 20baadd19e4c7b1e6485ea2425ffed4f821c1d2fe260911d742defc1bc6f8907 gpgme-0.3.14-r1.ebuild 2436
+EBUILD gpgme-0.3.14-r1.ebuild 2397 RMD160 b3a31d38320dd14359c909a4db351409416968d5 SHA1 abd35218ffc3bb2ff53dfe1ecbc816b8c2da6b15 SHA256 aece25217efa45f8628eb96721347872218b967dd132d1b5f4fd54ffcd71b446
+MD5 49e10e322d4cb0de764491d47c108143 gpgme-0.3.14-r1.ebuild 2397
+RMD160 b3a31d38320dd14359c909a4db351409416968d5 gpgme-0.3.14-r1.ebuild 2397
+SHA256 aece25217efa45f8628eb96721347872218b967dd132d1b5f4fd54ffcd71b446 gpgme-0.3.14-r1.ebuild 2397
 EBUILD gpgme-1.0.2.ebuild 1909 RMD160 2155c2bdc4c0c982bff12c56f667b6afedb00bcc SHA1 4e3cd6ae88c1b68576aadc4d1b1adacdaad64103 SHA256 c304df03ddd60c104b94ce93145cb8cc899e9f74ef87b1adf0feb8a11c921653
 MD5 1dc1318d08d7bfe54a81f7895d64ab5f gpgme-1.0.2.ebuild 1909
 RMD160 2155c2bdc4c0c982bff12c56f667b6afedb00bcc gpgme-1.0.2.ebuild 1909
@@ -38,10 +38,10 @@ EBUILD gpgme-1.1.2-r1.ebuild 1213 RMD160 d91c6e07b277fc0916530e66bac5a7184506e60
 MD5 e6b99e65b8e02eb9195c21c01a42981c gpgme-1.1.2-r1.ebuild 1213
 RMD160 d91c6e07b277fc0916530e66bac5a7184506e606 gpgme-1.1.2-r1.ebuild 1213
 SHA256 3f51150db53e2ec3b69ac254588c47f16229b3755e57a5646234a3dc765d1410 gpgme-1.1.2-r1.ebuild 1213
-MISC ChangeLog 15482 RMD160 d88f3a9b0c26d5ef2eaee90d342241a21c0e33c7 SHA1 823d9226abce04428f820ab4a9cf5ec6c7089972 SHA256 b5b8397141cde99f892cbb80a1bbf96e1ce3aaeee3c95a236d4d2281f32e2c70
-MD5 267152426b50bb91d596bc63aef2c447 ChangeLog 15482
-RMD160 d88f3a9b0c26d5ef2eaee90d342241a21c0e33c7 ChangeLog 15482
-SHA256 b5b8397141cde99f892cbb80a1bbf96e1ce3aaeee3c95a236d4d2281f32e2c70 ChangeLog 15482
+MISC ChangeLog 15628 RMD160 0bdc531cec7b30b0c6cf0e594de7e8e32261c28e SHA1 451562bee4e7824fb8707214937f020fff971b24 SHA256 99ba465ba3697a04a6cbd087d8d740f721e42e45e25a597efa00ed4e928138c9
+MD5 bbce40e14386ffb6de8f8664b494350a ChangeLog 15628
+RMD160 0bdc531cec7b30b0c6cf0e594de7e8e32261c28e ChangeLog 15628
+SHA256 99ba465ba3697a04a6cbd087d8d740f721e42e45e25a597efa00ed4e928138c9 ChangeLog 15628
 MISC metadata.xml 314 RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a SHA1 ac00fbb2fc2f2de37d5dda93c775ef53f979eb28 SHA256 e80fd4c62ac2351fda3e7d6322e17edcb04fa5001d55e7b55bc19ece8ca89649
 MD5 ce0db60fd655ade98789a1643d4fdd9d metadata.xml 314
 RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a metadata.xml 314
@@ -64,7 +64,7 @@ SHA256 2f33bdd8584b0943156f8f0538da536f7de767916ed5b30599a6e10367cbb98a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFE4EV/mdTrptrqvGERAkMTAJ9cWlUAKEApnf5qON/Ulfw1yhkbTgCfaOIt
-pA62k4utCsoRzixMEsNz/ec=
-=iInB
+iD8DBQFFFbZpmdTrptrqvGERAr4sAKCGywQ+2kcf8bWrVuzLqcNXuLEQQACeP0XP
+dTV1auwzb2WMugOH6EOJjJ0=
+=pWL2
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild b/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild
index 50b640035335..1b17d374ec49 100644
--- a/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild,v 1.18 2005/08/14 13:39:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild,v 1.19 2006/09/23 22:23:30 dragonheart Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications."
 HOMEPAGE="http://www.gnupg.org/gpgme.html"
@@ -19,7 +19,7 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	sys-devel/libtool
 	sys-devel/gcc
 	sys-devel/autoconf
-	sys-devel/automake
+	=sys-devel/automake-1.6*
 	>=sys-apps/sed-4
 	>=app-crypt/gnupg-1.2.0"
 
@@ -31,8 +31,8 @@ RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gpgme3.m4.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/gpgme3.m4.patch
 	find . -name Makefile -o -name Makefile.in -exec rm {} \;
 	rm doc/gpgme.info-?
 
@@ -62,6 +62,8 @@ src_unpack() {
 	mv gpgme/gpgme{,3}-config.in
 	mv gpgme/gpgme{,3}.m4
 	# mv gpgme/gpgme{,3}.h
+	export WANT_AUTOMAKE="1.6"
+	eautoreconf
 }
 
 
@@ -71,16 +73,12 @@ src_compile() {
 	use doc \
 		&& myconf="${myconf} --enable-maintainer-mode"
 
-	if [ -x ${ROOT}usr/bin/gpg2 ]; then
+	if [ -x "${ROOT}"usr/bin/gpg2 ]; then
 		myconf="${myconf} --with-gpg=${ROOT}usr/bin/gpg2"
 	else
 		myconf="${myconf} --with-gpg=${ROOT}usr/bin/gpg"
 	fi
 
-	autoconf || die "autoconf failed"
-	aclocal || die "Aclocal failed"
-	automake || die "automake failed"
-
 	# For gnugpg-1.9+
 	# 		$(use_with smime gpgsm /usr/bin/gpgsm) 
 	#
@@ -95,6 +93,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS TODO VERSION
 }