3 files changed, 21 insertions, 18 deletions
diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index ad045670b326..f3e70d5e68ab 100644
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/nettle
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.85 2013/03/14 12:44:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.86 2013/03/14 16:19:49 ago Exp $
+
+  14 Mar 2013; Agostino Sarubbo <ago@gentoo.org> nettle-2.6.ebuild:
+  Stable for s390, wrt bug #461104
 
   14 Mar 2013; Agostino Sarubbo <ago@gentoo.org> nettle-2.6.ebuild:
   Stable for sparc, wrt bug #461104
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index ee5c05676d3a..1ccf941f40d6 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -17,23 +17,23 @@ EBUILD nettle-1.15.ebuild 1091 SHA256 72b8395e01466561ba5c0054bbb2cf6297cbcea98d
 EBUILD nettle-2.4.ebuild 1097 SHA256 b7f725a7d24f5441126f63c77996c35fb2b6ab6363a46e57b12bcd5fbf510601 SHA512 438174edf6ac6ec6b0a4b3a00b7edffdb6a21816d1111fee5e23dddc6cb2cfb8cda7c1db41f3f5e01cc87a267889a679a5ce36ff7f446b17f130a8070ebe69bf WHIRLPOOL 1bf775f2f6c7cbc09512dda20cae8c43573e4436032a33cc508330fb329f9ba04a5159ce896dbd55bf0aebabe40488ed79586d8201870cb1821dd27193893fc3
 EBUILD nettle-2.5-r1.ebuild 1168 SHA256 72ce9ac362d0492a3971a509d09bd40b27e1309ccac300d2220a90b23ad2a875 SHA512 7a6b1689535446def39f367588ca89e70b8599cceacbd2e0908436245887d3753816cbf20594dc48d085c71b432bc956437df9a9ae92f9eb5d079055ba92b23a WHIRLPOOL 20189b6c71f492009d4c08f10779951d8d4cae60ae75b2c0e53680851466ccb7f0b905c9b4c51067ce1b3727e12f9c533f13ae4d4d9bf80bf06fdcc71fb2074c
 EBUILD nettle-2.5.ebuild 1039 SHA256 af811b23075e5f1f6f327ca6a15f0bef3ea45bceee4b642d5b37bef0711b39b5 SHA512 a3b555f337257164893f0e160502f34b3c5b134742d095d341ada4839cd73160c35b721efc6fb83aa31410dc818295c3cc31abe557cc9a2a2be33059ce49dd43 WHIRLPOOL 8b867409ba38014beda5937e6fda825c91f9e29d441c1c3774658fa95f5729301f7826a830c1418633a07a46a3b1afb4673889bedc1f0ed121acfa4a4eda7b94
-EBUILD nettle-2.6.ebuild 1355 SHA256 8f856e372511ffc120e4c20e66cdd6758fa3d01d6fb565e31a8476d790b44ce3 SHA512 edbf138838e2fd261c999c9b6db2fa20cd4ef63bb530d244a827e5c17994486998fed110c6d4c317e632000bd6a2ecb713251744b0681b33c6c1b61f4cfa68c6 WHIRLPOOL 8dc756ee722c4b987c9716c8c206c2fb032e0c609ae915db349351631b8edda244f0940ffbd582aa29a9b8f7200ec7637c47c067a60eac147882863110976d6b
-MISC ChangeLog 10887 SHA256 b8fa8264da7a00b8320b8380a7061a21417653148a2fe20a5eaf833fb22fda90 SHA512 23c3fb2360220e56a0f7d91398fd85740560386d42484236aa0142a7ae20566102f1a12e047d7305ef321987e23549b17663a8efa3c15441695bca420346365f WHIRLPOOL 888844f0803f9b19a324cc708fb61f2867208a9b6a1d92f2cbe43390305d98e541e7d6618c57245798d10f7a35180ff5ee56442cb628c010410966e8bbe4f1d4
+EBUILD nettle-2.6.ebuild 1354 SHA256 cd4133fb67ac1eff3b134242a2bab7130f016c60398bb43b4a5a28bc19c21e98 SHA512 42fa8b56efed882c74dc0f429895a8f4bed7bd09e73d2e4b0bdd51be121f58320d4430fed735bb65cea443ec93d906257fde227263f449bc7165a868405aa6c1 WHIRLPOOL e99b6b959d150b6f625b70829a36fb0d096bbe73fa848b34bb19ca93ba780e59994fefd38d8f69742add3a02ebf542ffd21e2099c8b37be8facf54cbd8330c6c
+MISC ChangeLog 10991 SHA256 d8436b8ccfd72fd7f7bf8c5a04585183d64f0c996f38037355e8ddf6a352d5e8 SHA512 9e29f351dd69026eaa9760f41d2b067328521dd48b2a4df33536e2a5860b768913252b80a34fb81adc49d412b14d975db9fd1fad65728080ae1bc80d540f3768 WHIRLPOOL f526ed4d36aa471f04c8d61de230bba037404ed24dae4172f079532df3a7bb346e0a4c39cc5419da3346143b73bd70ebe767f9fc0f47e49212a37176de7944d5
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRQcWtAAoJELp701BxlEWfe84P/16AR8odBFKiy7vmZg69s21H
-ZN2MUPuOnBINsdAnSW7mSrnjM2Ku5uJx/yhr1pMLJB3/PX4YjUhxBsmHB+aYBxxp
-fyXpn5Czsac52rVO6mBZVuIlkqaGZl4u8cyVXdLVXKw/ze0yVifOJuBzrQQ/enBJ
-Zz3RxXc2FlK2lsvfQg9V5KtGBP63WA2EfXrai3b90okWEJxCWqqoImkKn6k5ZOrU
-uroPbFpsACCXFnTtgvyQ/0khH9cmWbB4rSfM/uewOQIRP5ag6PU45uI1M0Y95ZeI
-zex6Co+u3RwEwAKXIIzco24feTTDs9NNl9crtIoq9vu4AdxCIglmmkMl8neh6XfX
-be4dZgGaNkpwQqF7HonRWgKx6g8Wz/GkLWwfzDpguyyrI7lC9hCHD808e4i2OUoc
-aP0M4RYZx0QorjO6YxIFVnYoYJyQoF68n2Qo+iznG2fu7ciy3ArEz5Qz6DPQOZxt
-i8/lWgD6U4LxtiUl/FpPO7qHWC8rN9Bwyp3SCCMK2jAUjx/7oEo0yIkqqpmoVXVa
-N76QOu7iaejNGr4cXOosaMI6LxqagCU8dghrbXnBa9HWAKkbz9SbCP6fKQkT7Dou
-KkWtYhaCImvxDamgtrMgnKsVtTCqgTkXoaGoSXMJMZ8FZTDxTF5/5G3HhBZrN0ER
-GK2uRQEvC4UtZRpAfWvV
-=uURi
+iQIcBAEBCgAGBQJRQfgYAAoJELp701BxlEWfBT8QAK1D/XSp//98nXIiA+fZ4C3v
+TqTwzHTPqxr1QOcgDWzy0C9fLuSxgMaG7+QtsPvmB58okvVrXaudsBjrWNlizRzp
+uJy4oVQp28rrhpxtj/anvhyVZH2xoccPe8I737fS1+G9u5af/fS83MeoIcNMbVwE
+DxwHAU0IFmWt/IBApLRrxq9+cvg1JkX1YmeX6+sFLv1rbWI8v/O9Kcf//Zj5XCvH
+MPQOjSgV0wPDUz6S2tS4jTpqZ3Al0yVdOpxws7QmofJm4MjxBIS32wFBq+NWXKwF
+CRyEl7gVB38OQDXnQeatX506nZ7MELnhZue3Q0MZ1AafiXiZP7a49c9JwlX03LnQ
+UZiI91oWlvxicDH4oRsr7BwYbZez8s52kZ07/UEXsmyKXeKJyH8eVq8vw1OhiXyq
+EEmToiXECg/1dRc8rv+p0i0Qq4AXMIWHEa+H7He0DLwJMMLqNFyCVBIxGags6TEI
+yW41AErnx6heKqlMOJ7t1RVO4F+xnjNZw//0z0nTecAMt339U8G7KStVsz3qNrQW
+U8V7DntbHL3lC9fV2/MgY8Jq175WaBiazRuAMzxaPra5yNZAX4ZEKhLSHhsSbIaU
+DjqaW19eHKQpNRv8Jroxjg2H4UZRCr8YByM8s/9eoJuGwUzsZ7Vd4GXb9uFWwTG4
+6gbcZC5jsVYE6rz9rEjS
+=wkuJ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nettle/nettle-2.6.ebuild b/dev-libs/nettle/nettle-2.6.ebuild
index 14480f95a7a1..79672e9caebd 100644
--- a/dev-libs/nettle/nettle-2.6.ebuild
+++ b/dev-libs/nettle/nettle-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.6.ebuild,v 1.12 2013/03/14 12:44:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.6.ebuild,v 1.13 2013/03/14 16:19:49 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/4" # subslot = libnettle soname version
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp static-libs test"
 
 DEPEND="gmp? ( dev-libs/gmp )"