Force use of automake 1.10 with eautomake on 0.23; drop eautomake on 0.24.

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

4 files changed, 23 insertions, 11 deletions

diff --git a/sys-fs/lsscsi/ChangeLog b/sys-fs/lsscsi/ChangeLog
index 7cb97f3b824c..277d6695e873 100644
--- a/sys-fs/lsscsi/ChangeLog
+++ b/sys-fs/lsscsi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/lsscsi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lsscsi/ChangeLog,v 1.47 2011/01/08 18:25:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lsscsi/ChangeLog,v 1.48 2011/01/08 19:14:46 flameeyes Exp $
+
+  08 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> lsscsi-0.23.ebuild,
+  lsscsi-0.24.ebuild:
+  Force use of automake 1.10 with eautomake on 0.23; drop eautomake on 0.24.
 
   08 Jan 2011; Brent Baude <ranger@gentoo.org> lsscsi-0.23.ebuild:
   Marking lsscsi-0.23 ppc for bug 351077
diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index 60665f771338..421ad3d266f9 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST lsscsi-0.19.tgz 193924 RMD160 445696f0824836ce445f6f35964ad6be562c30f8 SHA1 aadc43483707103df55b8e763f0dc67b14440f89 SHA256 71a719c329794c5dc261474a3d57ee91842e420bd46027ae452a00e1895c12bf
 DIST lsscsi-0.21.tgz 125239 RMD160 d0514f3e8a63824f2b5183d76f5fe2f2896e48da SHA1 14a3c79489cc5eecda14fc24f9c25f1c23a6125d SHA256 c33d1d08385f5ffa6fd2f65a4998c565add4ed3988fe176eeac36b7e2bd2a42a
 DIST lsscsi-0.22.tgz 128527 RMD160 08dd1b40d3fcbf266562551d1f40a18723e53431 SHA1 bad411b440a9eead1d32f6da8cda1a4e02223c40 SHA256 9741051f47db1cb03b491cccebd3ba3d0acb95dc8dd34ff78048cacebaf31107
@@ -6,7 +9,14 @@ DIST lsscsi-0.24.tgz 123431 RMD160 a24b1983cf92cf18913b95d04f650990cba237b5 SHA1
 EBUILD lsscsi-0.19.ebuild 600 RMD160 84537ec18976c761d8cfafb3cd7aa1b6ae946e7d SHA1 eae8bf1cffc3fd678ae30dae7e544083dd47904e SHA256 689f64ca0ff46caed9e7f9dd560274890c8a31300bb3eebb6e314b36ccde9fb4
 EBUILD lsscsi-0.21.ebuild 597 RMD160 7a61c15158d4a9bb971bc758621005b575728fb0 SHA1 a2c7b4993107d72c8faa1bb0411f5d5c9e834020 SHA256 6f2a84211852beb5e119c41d35828ffad163eca9d0dc6d1d7be0b8591ec872e5
 EBUILD lsscsi-0.22.ebuild 602 RMD160 2e329c371669109692a820784dc1060cabba6156 SHA1 5a572c8829c4eae8de7e128b129ef97deb45903a SHA256 34a09bcaf00503dfe323031839ac56895ee57abc5f817b2804d736b25f148b5f
-EBUILD lsscsi-0.23.ebuild 683 RMD160 9c2ec36fe03133fac2655d02146beeab3e0f076c SHA1 d1771f0d0c8fd605f96240e8f95c8d72a363cc20 SHA256 894ad9e0252d5b17191370d8de40168ddc953b24ed739fe87b11a660374e489e
-EBUILD lsscsi-0.24.ebuild 684 RMD160 2ae448de935bc4f770e6c189ad65345b270d749d SHA1 f4b2c02ceceda5e50655d091026e8f303860b15e SHA256 a6d62ab3bac922a6fe39ae8b5d918c0ac9a3d65f530bdaec2323faae45ade14e
-MISC ChangeLog 5264 RMD160 6b568926acd25a38baafdf4c33253bc10d18379e SHA1 f9b90bf737183aec89f0b9a93046d402619bfe53 SHA256 416bbff1c38513da6c3171e1af96530de11e9e0fe9d930c8272c75b47bdaf2fb
+EBUILD lsscsi-0.23.ebuild 706 RMD160 64b5700cd683a9dbda38a21104421d12752c5ceb SHA1 9212fce2bd44ef467156b281f13e162a9ed5fb0d SHA256 c48bad29eb365dd75bad634890611a1f23dcb362fb154f6d8c9adec6f6dbce43
+EBUILD lsscsi-0.24.ebuild 622 RMD160 246b76bc34fb27ea703a54c5a87dde3cb922388b SHA1 e06b7b02a66bbda992d03e330b6f8bcb683c120f SHA256 1292fdcf2bef017899190745ca9cbbc9331609b6625049e717618756fe8d1d5a
+MISC ChangeLog 5443 RMD160 7aede63228f3bfd9b6095b8cfeeafaf0e58f6414 SHA1 74666aabc1b573ce4fc5657d044036e88a66ee00 SHA256 991ebb6ae5148ae65f4f9c7d34ef707dfb4e0b975048ebdd24b68f186a2b42c2
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0ot5sACgkQAiZjviIA2Xj5TgCgpC9JpeTuarA1zN/zDgXxHiBG
+ZaQAoOn4j49rwf7rd6kYvSmTtNo9awHc
+=4PmC
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/lsscsi/lsscsi-0.23.ebuild b/sys-fs/lsscsi/lsscsi-0.23.ebuild
index c1fd8458e2d4..6260509f53c9 100644
--- a/sys-fs/lsscsi/lsscsi-0.23.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.23.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lsscsi/lsscsi-0.23.ebuild,v 1.2 2011/01/08 18:25:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lsscsi/lsscsi-0.23.ebuild,v 1.3 2011/01/08 19:14:46 flameeyes Exp $
 
 EAPI="2"
 
+WANT_AUTOMAKE=1.10
+
 inherit autotools toolchain-funcs
 
 DESCRIPTION="SCSI sysfs query tool"
diff --git a/sys-fs/lsscsi/lsscsi-0.24.ebuild b/sys-fs/lsscsi/lsscsi-0.24.ebuild
index d288234f32ce..e2a4d97db1bb 100644
--- a/sys-fs/lsscsi/lsscsi-0.24.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.24.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lsscsi/lsscsi-0.24.ebuild,v 1.1 2011/01/08 02:58:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lsscsi/lsscsi-0.24.ebuild,v 1.2 2011/01/08 19:14:46 flameeyes Exp $
 
 EAPI="2"
 
-inherit autotools toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="SCSI sysfs query tool"
 HOMEPAGE="http://sg.danny.cz/scsi/lsscsi.html"
@@ -17,10 +17,6 @@ IUSE=""
 
 DEPEND=">=sys-fs/sysfsutils-1.2.0"
 
-src_prepare() {
-	eautomake || die "automake failed"
-}
-
 src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS CREDITS ChangeLog NEWS README