gnutls-2 is not compatible with libtasn1-3 so adjust deps accordingly

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 22 insertions, 18 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 9b3859d2eee6..10a95bf612bb 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.387 2012/10/19 19:28:47 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.388 2012/10/30 18:07:48 zerochaos Exp $
+
+  30 Oct 2012; Rick Farina <zerochaos@gentoo.org> gnutls-2.12.20.ebuild:
+  gnutls-2 is not compatible with libtasn1-3 so adjust deps accordingly
 
   19 Oct 2012; Dane Smith <c1pher@gentoo.org> -gnutls-2.12.18.ebuild,
   gnutls-2.12.20.ebuild, +files/gnutls-2.12.20-guile-parallelmake.patch,
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 2973f5366db5..10fb5328fdd9 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gnutls-2.12.20-AF_UNIX.patch 1041 SHA256 bd56d19bd1713ef3ddfca7768c2528aacb0c7425cd21f87d69b3d674504562a1 SHA512 a1564ace509fed3b0608ae66859979a364b173006fd43d77678dccb70577bbfd54953aa8c706aca77540ec28c3426a332e86c40722bbc7b4a23f9f50bee0478b WHIRLPOOL 9e27f8e7e82fdd53a11f1f7dfd10790f4d2c67d74bc68d9ce55718a57ef80d391f8fadab93f6186597c52ecedcef2d3f1ff16a77778aedd50545e5829e626baf
 AUX gnutls-2.12.20-glibc-2.16.patch 938 SHA256 9e0383563d5a358680aab3ddf1464d207fa9ea40baeb4d970017730abb7b97aa SHA512 d4216cc1ace84dfab32ac524cd7acc35b14f5c488d1b3716984894c5408667c82d0a4d494149c6a3c5805a6a901831d8df62d12de61d7b93d183520c9b6d93c3 WHIRLPOOL 71e268ab79ff0ad5d7bc0148b37a1070bc3b2ef09fe01e24eb060d04a6f2d03e209750a3853386f53f2d84c9843a6e66c49aab33fbdc6ef645ef2bb3c4882676
@@ -9,24 +9,24 @@ AUX gnutls-3.0.20-parallelmake.patch 1126 SHA256 00acad9ae1420d2d9179ecdf8af22ff
 AUX gnutls-3.1.3-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cffe9dfae0b94fcb1bedd68cf99d5546b4f00a8c37 SHA512 2c92817e1ac43e301f0c39edca0991e832a875204e9232106f660157f1db91ce942569ef16193f6b1e80038f3a000836f4ac2bb3d728d4bbb602e09f46ba5efd WHIRLPOOL d578f81a0d645c7430301aa35fb15cc4fde3acc044758f28d6046742053965c0b27c0a2d738794bfb6ce27164331b11387402413b40abac8d95192741f1d710c
 DIST gnutls-2.12.20.tar.bz2 7231438 SHA256 4884eafcc8383ed23209199bbc72ad04f4eb94955a50a594125ff34c6889c564 SHA512 49fde72d049ca75d3df15744519296a5eb982560d739cf9b41033b758564df59698be857bc86825f1ae2dc71b3479208701482bfc085f22e9ff197a65a00d7d1 WHIRLPOOL 5117604a66e9ef30c96b81f3bc09c87f623a0d9aa8e983595b169f178947499c27eb50767375bb9e9ae6684c7670d5532bdff3c5a71e7a4093648d990cc3c230
 DIST gnutls-3.1.3.tar.xz 4890796 SHA256 fcb236c663489d3dba5a3f41486810f3889eb4508403ebeeb58b79f0b34bce39 SHA512 aaef62ab0426975210ec037749c2feb0afdc35045a650e5c6cec9cf2fd27f948641f4af21029395f37d7044c2c1978bc035ce60d26fa5d6f48f9dff191739aa7 WHIRLPOOL aaa5e3b34c67a6882c05310e6acfe2c3fd97f8a8c7ad16f57ae3188c287047be978349928db23408ec3466c23340dcaa92d2f3c1462e730e90093e72734db2be
-EBUILD gnutls-2.12.20.ebuild 3585 SHA256 3989d9ec76df046c42e5e5c1cc2bde9646d8e3106df1c1ce9ebb5a0cbc03d3c4 SHA512 6486fc72b5ddc67a855a6c54ca7a0bbe41f8bd35b3ed75a1d5cfa9e9b3f2cc43a80ea0eaec4fc8bf07365f36cff7b40112048f5bb8ca982503c52de0f175fa1f WHIRLPOOL 590a66a7f397a0cc663cb8d92d14ae606a477830fa709d6b53bbfcd82d63cc7c1f56f9a5ca67032f32f867557c842e835bd8a815a87537316f145579e4b133b6
+EBUILD gnutls-2.12.20.ebuild 3610 SHA256 785c319b735c8536cb34683fa863a6768cd04900dd83f5d1bfbcd69a11549e55 SHA512 6aa65bd7b955de2d84119c1d78d2c112bae99f90ff568b30ec2fa6c31fd659a2b8df7ec3a37fa11697d32d14bc8a7e12c2177b002863d272ee2c751adc259275 WHIRLPOOL 2f5547bab0891526543100f41e54eab92fbd4244f087e4e4ffa6014a6e0489930ae246583807402f510b1a262f79f00839153cb8a76d95773e7354f8da743528
 EBUILD gnutls-3.1.3.ebuild 2927 SHA256 e759c04a3c3cfd38f73a59bd2d9109c8b594a165e1baa13061ab0bc3463b3ca7 SHA512 06ad978a891965533948ba2617a7f6a9529aaad7a4ba8809589059608dffba85af11052a11d3310b07849d34a4c8783749f0a8b50b1f48885304c5c7a25e071a WHIRLPOOL 753727ee8aa53e3284273b51b51808b085fd91dbbae26c75a4794fb5bebfde04c5ad544809b8994fe53f2307f20295060759d2af0be65957f8cddf3ef6faf738
-MISC ChangeLog 57645 SHA256 b358236460d1d54a8c7059e51dfa55d858fc7d964b3b6e30861a0437a6cd07b0 SHA512 4a0bcf93e78756dcf4c10525ed95551811eb16eff3050a16851c6f48ef0bd8661ae336cd385de75b8e10878da0e96c9233f9625c50badcd0b47bd4b19c2d6665 WHIRLPOOL a9b6fcc96261dfd5205249b79d7440525cae5d142097bf5fce37769c9b23a661e3ccff19921304071ac477af7ea763ce39c84031ee4d7845a8e108a9086ae357
+MISC ChangeLog 57794 SHA256 f02a1049189cb3cc651395958a0cc52f0602b720fc5d56d21217ef66c5557204 SHA512 caaff854da5c7f37fc23aa803a66ef59a298a09cbb7a2dce9bfe053b27988c91fd2feaacb763e7ee398edd9bbfa4104b81d16e9d8ebef9463d105e88df88c22c WHIRLPOOL 63e3bc36399d2852b6de5cca317cb088caffbfd1c22e0ddd9174b56ab0d6dab33a20dcfef8fceb6edbca5e3e265320a980bffda2159a0918d66aaff4cf96497d
 MISC metadata.xml 608 SHA256 358aeb9effbe98a9a7b7107b17a6d88d3c81365c2e87e5378a622d85e40d89eb SHA512 704b47d97a7decd410a31f71199b44b2bd6c6bd370dd6280120346426bfe568ab5e70f37404bc02c20c009d0f262d3c2629d289ef0c89556482d6a143a4e2f9c WHIRLPOOL f6f1528d14bb711e7da63c4960b865815ce3a242a13e64526bc01e74e48ebb8bd099895537921e94e8586eb12e7827dfc4dfdecc6e0c61946f167a624e24b991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQganpAAoJEEPsD3/icQSzuLEP/2tah5oiQHuB8kO4/85vCsWn
-j8kH/X/anreqPtGIk0AmF+rdKB0edhWSF5u/Jey64pPDddra3TkUOHVQJYSTUUp6
-A82N0qAfIFdd82vMNoisjvbETR0Qn89xl/ALbOcrazuKk6FnmuHNZPFdOUDBpMwN
-ZifDWbLkyR/G2Qot0UC/0mCRUyo6xCh0LgmCnXj1e3eC6wbwtIum2yl9VOEKeFI4
-MWFRqxKui72DN1lkQwjRueYvgjjEJBieZVtg/PR9LUEDAqQW0DzUF+5I2Q04GC3Z
-sbyWKREvvQKuc+ZJBovx85xsyUOPj8gowB0HqS7fsrxCx5Vmc++U0VJ69Jf8/djy
-iEu/FbjKBfPF5Z1H2E6ooPikeDbFwA5zIB/a/XiDq1sQZOAv8xOdUf9+0pD3P1RH
-9hto4AMBTHjPVf4thVa2sqRjVUSq1xfsJdw4BznGl9cAbn0B1JuIk7GflXxclLRM
-nr9GumQcgQZjPNAm4rUMaycUAWIpv9/DT6xpje/Jfg/PgytmJBoG4u97bEnsULEi
-T7tGjp5tHrAt64UdDKr/0kVqMjcJ5M5aYZOsmhqnPtgZ2xUSPOMb8oSNYwK/a0GI
-GBgaGvvoPa2Qg6YlWsffjfwJC/vRllMrRkfWEFiXrYfeWTPg4OffmFhpdh9usBz8
-osd2w1vvrjBETzyOBmbY
-=hG/c
+iQIcBAEBCgAGBQJQkBf7AAoJEKXdFCfdEflKOYcQAJ0rB/+N0NnZnVSE6/nih4w+
+rKt0mgfxqwKlC+e+9+dIMVyrXPqVJCUOQOlGNBiiykG/zemyCQ6jt6mLEo8V5oqG
+ZmAIitht1bC7GLm4XG1gj+XlruJkWeX74bqeAHXsc5+f3JWRut2ZZNMcujNDBlIs
+PoLqKweDffoBBZJusiTTknPoKi7m0m1gYZiX1kxoegOErvIvSWZ1fkpYWlGHGMRV
+l4oyCM1sa46APhJ1Xbg4sQJ5Py4q3gyvngJf03O/RZGvvQ+Dl9vw5QWCnv7Ndp9V
+wVqC/dTwUDPKOys430O5HJryrN8GNuJ3kX7QC+aV5znC3cCea170xJAnmDMMWNQH
+zRuP+swZICko+1t0lfK4rR291SHJWE9fYFf+B+N+gHG8ZJeYgjoMd/xP5ARCcdPo
+tqwX5rUeQcYRN7ENT24nJaVK1ADt0UTRo3iRk3za3UqNte3m9En45bbOB8lRuzwL
+TCNHvF5PUmdITL6XtGw0M+ACVX4plgLXmf/C16p00JsTd3elNULIUJ2wt/Dt5uP9
+xzZNoCFGN6smaKYIWaO9iG045wZ0BUAjWQr2G/p8ieWpiwynQc7rsgiyWzKM9WdU
+hP+7oz79RfOXDO6mPH2k9etmXS0q1gwateYT5kpckxj0Qemm0ovztpDT3IINIldj
+0YGoKpkIy2jIhvCX0GpL
+=juPN
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-2.12.20.ebuild b/net-libs/gnutls/gnutls-2.12.20.ebuild
index 965e29591d5e..4b471d992709 100644
--- a/net-libs/gnutls/gnutls-2.12.20.ebuild
+++ b/net-libs/gnutls/gnutls-2.12.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.20.ebuild,v 1.10 2012/10/19 19:28:47 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.20.ebuild,v 1.11 2012/10/30 18:07:48 zerochaos Exp $
 
 EAPI=4
 
@@ -30,6 +30,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd6
 IUSE="bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib"
 
 RDEPEND=">=dev-libs/libtasn1-0.3.4
+	<dev-libs/libtasn1-3
 	guile? ( >=dev-scheme/guile-1.8[networking] )
 	nettle? ( >=dev-libs/nettle-2.1[gmp] )
 	!nettle? ( >=dev-libs/libgcrypt-1.4.0 )