Bump alsa-lib requirement so that users won't try to merge this with older versions...

Package-Manager: portage-2.1.2_rc3-r4

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index eb46e57cd8fdbc146cc0521904c18fe96a1f6467..0e0d163d81680e899083fe7705bb729a7304bea0 100644 (file)
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.177 2006/12/11 19:44:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.178 2006/12/13 10:27:34 flameeyes Exp $
+
+  13 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-utils-1.0.14_rc1.ebuild:
+  Bump alsa-lib requirement so that users won't try to merge this with older
+  versions of it, bug #157925.
 
 *alsa-utils-1.0.14_rc1 (11 Dec 2006)
 

diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 0353e0712c86f6b83933c15a2ef6010b650d44b4..9b678ca83312ec2d1fe5154e60fad21ae0719038 100644 (file)
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -42,14 +42,14 @@ EBUILD alsa-utils-1.0.13.ebuild 2563 RMD160 44eb415165b5d17ce147768e3247545e566e
 MD5 c47a123246f61e8c331e913ea5a44242 alsa-utils-1.0.13.ebuild 2563
 RMD160 44eb415165b5d17ce147768e3247545e566eaf42 alsa-utils-1.0.13.ebuild 2563
 SHA256 b0eabea66f13368b9dbd1fe532062e6530586130077738907788728bc62d6e44 alsa-utils-1.0.13.ebuild 2563
-EBUILD alsa-utils-1.0.14_rc1.ebuild 2582 RMD160 28490a45cc6f7fc42b6963a3762d6d2d436b6311 SHA1 b0db74e1c223372ece66f2a0d65da34cb3978910 SHA256 3b3f7d3455704ecaa8444d9bf44e9d5e67e1fd0a1e32f551680f4860469d587e
-MD5 63a8725e219f5fc3e27eb8333a382235 alsa-utils-1.0.14_rc1.ebuild 2582
-RMD160 28490a45cc6f7fc42b6963a3762d6d2d436b6311 alsa-utils-1.0.14_rc1.ebuild 2582
-SHA256 3b3f7d3455704ecaa8444d9bf44e9d5e67e1fd0a1e32f551680f4860469d587e alsa-utils-1.0.14_rc1.ebuild 2582
-MISC ChangeLog 26332 RMD160 efcd305715fdecafe38866cb8df31991fb2e8a29 SHA1 8a88222eb6a8416a862bf048682a9010e313ff9a SHA256 7bd614c6a9c9305b6bebe9c61eed7817081594ae839aea5e9250d4ab01d43a79
-MD5 4818a95eb52e162d85a5c6f9d73059be ChangeLog 26332
-RMD160 efcd305715fdecafe38866cb8df31991fb2e8a29 ChangeLog 26332
-SHA256 7bd614c6a9c9305b6bebe9c61eed7817081594ae839aea5e9250d4ab01d43a79 ChangeLog 26332
+EBUILD alsa-utils-1.0.14_rc1.ebuild 2586 RMD160 9568d6f43fdd8aae498c19af5b8a4850a2ebe78b SHA1 90e25547b9ba9565c4933b256c07169c6449a3bd SHA256 bd6fef1f84d65bc8a0b457b44958774cc192a94a6e6de697d72f98acc0e09465
+MD5 78caa6d2797ed29c4d03ff02ab436c72 alsa-utils-1.0.14_rc1.ebuild 2586
+RMD160 9568d6f43fdd8aae498c19af5b8a4850a2ebe78b alsa-utils-1.0.14_rc1.ebuild 2586
+SHA256 bd6fef1f84d65bc8a0b457b44958774cc192a94a6e6de697d72f98acc0e09465 alsa-utils-1.0.14_rc1.ebuild 2586
+MISC ChangeLog 26526 RMD160 f1610544aa24a10b357eb49e9d6800a54f298ca5 SHA1 646d5dbff67d9649d0661e60f1017e8a67d0282d SHA256 d47c84f5b73691a91c800a0ee6570608511dfab451ce093a4d8cf11e2a7054f4
+MD5 f4038ff80bf38e50905efcdc639cf36c ChangeLog 26526
+RMD160 f1610544aa24a10b357eb49e9d6800a54f298ca5 ChangeLog 26526
+SHA256 d47c84f5b73691a91c800a0ee6570608511dfab451ce093a4d8cf11e2a7054f4 ChangeLog 26526
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -72,7 +72,7 @@ SHA256 1a28d2f5f3186283c68d15b4893b297a550cfe99eb416389fed13d8298c46ae3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFfbUeAiZjviIA2XgRAolYAJ9u6L/ALHOhtkg5AcAdWJVL6xflUgCeMTAc
-DvBPLF+1t0kVOGzecx3Lv20=
-=6jLv
+iD8DBQFFf9WkAiZjviIA2XgRAoBkAKCu2uJtRAchLzaXoaOM78Bv1jQz4ACdGLJi
+Dv03V5GryLnSTscwEZQVOmM=
+=hFs9
 -----END PGP SIGNATURE-----

diff --git a/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild
index 34cf5b4528b27f2d208116eba3259e8a66ae977d..eac1005eb9ba4a5e9d759eba21a0825e89a81ab1 100644 (file)
--- a/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild,v 1.1 2006/12/11 19:44:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild,v 1.2 2006/12/13 10:27:34 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -17,7 +17,7 @@ IUSE="nls"
 
 DEPEND=">=sys-libs/ncurses-5.1
        dev-util/dialog
-       >=media-libs/alsa-lib-1.0.12"
+       >=media-libs/alsa-lib-1.0.14_rc1"
 RDEPEND="${DEPEND}
        sys-apps/pciutils"