Drop sqlite patch that is in the 3.14.3 release already.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 24 insertions, 19 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index d95d63097d1d..d2f34814ab09 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.297 2013/03/29 22:45:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.298 2013/03/29 22:54:52 vapier Exp $
+
+  29 Mar 2013; Mike Frysinger <vapier@gentoo.org> files/nss-3.14.2-sqlite.patch,
+  nss-3.14.3.ebuild:
+  Drop sqlite patch that is in the 3.14.3 release already.
 
   29 Mar 2013; Mike Frysinger <vapier@gentoo.org> nss-3.12.11-r1.ebuild,
   nss-3.13.2.ebuild, nss-3.13.3.ebuild, nss-3.13.4.ebuild, nss-3.13.5-r1.ebuild,
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index afd56989ddbc..4059463590ea 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -11,7 +11,7 @@ AUX nss-3.13.5-x32.patch 2304 SHA256 ae402bef2c97cdeac3a00430729d3668167af5f957b
 AUX nss-3.14.1-gentoo-fixups-r1.patch 6370 SHA256 68a7e9f3f05d247825abe364e12289b7924e5e6f079d309b18aa7ef0be90d002 SHA512 8ac25987f330a34dd364ba4ea1eb9378813268d0a47dc6f287ece66184d88d2eb32fb80f8c6ea46815161ef54f6dac2960c8024ef443545d8ffdba43c10405e1 WHIRLPOOL fa45342b098c62daa6b8b798f8bcfec894743b264d50bd0c025f0395b91bd3c354547f4282fa8d9afcb5dd844f9f2590014657d881ab606cc71c2d84ba9ed7ce
 AUX nss-3.14.1-gentoo-fixups.patch 6405 SHA256 f0e6348d757fa1a0840b2fdae7ca53dbf8fd02846cd47026c4c815b929141df5 SHA512 8be37bd621fc8101928b8782910f41df4ba9e47d26937aa3c95f9da646c14daad1d6ac9acd2e856a159efcb7fe661c96fcaf23511dc917ce8a9db40e09b75e29 WHIRLPOOL 8b32fbb736c5ca43d8bf9b99eb51c1fabeb8f6a011cb920708f65271c3a056aa7ca37d18a6f6d39a04257af57458b9c029b6cda5d090ff478fb10b38385dc47f
 AUX nss-3.14.2-solaris-gcc.patch 659 SHA256 d6ac2638602fcf5d73020efb616c2c16d5775d3a75122cc1681c944ddcd0a07f SHA512 5703fa0d6cd793f9622c331983499ce35f696b71589cac347e2a72d4d377ab53d97f79d9b1396bf1f255a933067ebe2f0e4fb6fca9cc5f3c179275d42a6be9f8 WHIRLPOOL b5f49f0a860598cf508ce7ea97165840ab5c068a00f213591d41101c12ec1e5afbffdbad7c3a1d69ef52c34f4d00da0d1aef4a80829f21209c60908e21a2663a
-AUX nss-3.14.2-sqlite.patch 585 SHA256 9672be84ac06e7c041a6704aa03522d75318d801adfedb23f827f62282a712d3 SHA512 e40d674795309e709ee97af8f56af2fc4e4e738d4d5428b4f3d7b2c46b36c07043c1db9f1bf77021c3401736df8ead2b607414eb5dc11120820aa38cda2c81d3 WHIRLPOOL 40fcc0df77d0ba68b2abd4d01356e662e3b277da7e738e4f283b30765044942f0f3ed0cccca69fc916cf1e35394726e66a08792936496732a5945233a82904d1
+AUX nss-3.14.2-sqlite.patch 638 SHA256 3549a58a40bf6b023d205e918ee006a320cb90811582994d4d16c7bdb80e9c3b SHA512 2a8c11208f861722b44129471758b9e2518a877ce093fdc333f009abe5385384cbdbe77aa5a9457e74874c00090d2c2480cb6df7bb9989830b0165659dc66321 WHIRLPOOL 832d31fba571bcb6b8c003f64041e5ee268aa4c0396cc43f4cddcd1b7ff7afee0f27bb06105bacfba087cf7e19110881771f7203eeebcd2dbbd843d4207cc3f6
 AUX nss-3.14.2-x32.patch 1941 SHA256 396e2609aafc24d2a51382f74e2124f3eac615d9ae33a848b1a1cffa2789e1e9 SHA512 2b056701ee0d3af16d93ed965d60a55e46cce2a60c946b922f75461c91284242d32746358637292b0e7cf0013ce906b69c04545e23ca26500ef4028f00b49fe8 WHIRLPOOL 03f49c9547e47068e1ff894fec74163b7fadf6ff7e8c2a3ca0ed5b2a18c40cdb9e7f9dfb9666fd748d595925568606e138a27f2674f9f197d59b932a8777d86c
 AUX nss-3.14.3_sync_with_upstream_softokn_changes.patch 12364 SHA256 34519ce93a62de743caca2904c47df16d94993a0c5f84626a88ababc3ae65156 SHA512 f41e167bcdab7850280b93b433b2cfd10d38657b52de26b6bfd63019b2b542c8a8a9fa0e99b12917239cea2eb686649da595520cf54bd34b64b53add8d7fa03d WHIRLPOOL e8fa84826d5374cae03a59d0ebc02aa405fa4034cf3c7b5f339d6bf2b4716639e212d010dd73629c9dbb9add6da38b27aa2f12b55994f9ed88dcbbd8f65dadc3
 DIST nss-3.12.11.tar.gz 5944840 SHA256 d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16 SHA512 3ed1134c972cee9ac23a77adc4c38eeb0597d0734b13b561ec74480560eb77b259ebc9708e4ecd8cc1565bfb6ae9e471c7131dd26ca48e6b427284c3c005ec6a WHIRLPOOL e4cc92496e62c49dd89e2263848154aeadcaea22b51d227e4f8dc41c1e8f9e7922f8e0ff7b99dffde845780a6277696b83339c49eff903885e0cf0ba5f283443
@@ -39,24 +39,24 @@ EBUILD nss-3.13.5.ebuild 6844 SHA256 61f0ff12a4d3e37d7819989c38490ba3cfd574e441d
 EBUILD nss-3.13.6.ebuild 6930 SHA256 1788393922d2ec554cb36d6ed298d26d24eb4aa42991d8abe7713c4213569e79 SHA512 2dacca2727ac196d72c7fda715e558ccfdeb84855207ac0264fe6a48032d1c802abab8fa1c806a50e895bafd85db3a6c883478370083677cc15459caee716577 WHIRLPOOL ec0608f66bbc2feae3fba9deb38cadc12d3de059aa4f5f2c7fa02a29ddec5204413b28435014a25acda12071527377abca4d9a81eec29dabb5bd464164a2d429
 EBUILD nss-3.14.1.ebuild 8042 SHA256 8d10101c1de0ba134145ed6a5a67160df6b16fb3cca6504b6b163bcac90a41ff SHA512 c7dfd62f0a7d8e92568d6c58a9d485086cd83aef6948d4706b5802cbc43566b36814472c9da82f9501897f6ca9820b5f88e77cdef05ad5e16e7ff62360374c7f WHIRLPOOL 4ed0fdd31e2be5ae5191ca6db292a242a6a65cfe30e6135da7ef682890014e31c0137c4fd0cb6b19ad2c4fd5fcc64ac807c73dc559ddd4d5dc3c980ed377bd3f
 EBUILD nss-3.14.2.ebuild 8098 SHA256 eded08efe981e2b895687ca7f7239113a6142397476143cb9f4f15cd726bdac5 SHA512 6dc10de79e357e9560eb412776badd9082cf0159898c399703c8d053aa96362605e6028720900fda47047ca35b95cd6df1f9f3005d40d0e8aef926fba0596420 WHIRLPOOL 9b2843b20a6e31199f76d56f2627ba9dc93021a39ab089b3af45856a96245b14435ecee5a75b96e1ac40987431999c4e02eca60e0e1aab18dcaa3ba8876078a3
-EBUILD nss-3.14.3.ebuild 8230 SHA256 b4878bab114b6affba16e3cc6ba53a055c306a0f38c9d30ef6c5229a2b012046 SHA512 3685b2bf8311030041526b80383f1161aeba5e37fe682fea207fc1ed5cb7ddfe2fe3d99b3a3f1e1d6cf2a887fb647b7be6566a6c4037e66ee7bba4844c9de5d4 WHIRLPOOL 9c935490184586a712d1131453ae485ff11a9e37a70c7b29aa888424b04f83909aaa7ba6ad9900fe5766635e18f1ed7793f87804e05532269ca90f199766099b
+EBUILD nss-3.14.3.ebuild 8182 SHA256 29e1e6b150072cde0aa534c6e42957d7c466d144636a388190588bbbc2c9e826 SHA512 c5184d77bf0130ae34ef118d309b953ce137eeeb5764a09430c2c68610b81409ddbf5c6c5d2d04f527f975e44e4b06b20a63c8a9fee6025ccf3cdda5622ed606 WHIRLPOOL 5f203eaf4481fb9e794345bff8b48b0d93ed803a143aefd4d2faa27fb76c42ad4487bff530741d7344d65312012aaedcac18839e72bac9c8557ce9582cfdb17f
 EBUILD nss-3.14.ebuild 6919 SHA256 29b7f44f7652850a8b808111b9a6457bb4bddec0147424a7ddfe04880564a7a8 SHA512 fbc275e8aa0a1a3f992a055b2de93daf015f0de4283ff8bbb0ae345078b3de206817544e073fefe7e7e43664f013921613da23a207acc62842757db4c3d7b33b WHIRLPOOL 7baf9e73a12b64dbb6bbee1a8585c0a0e7fd29bdce348b5b6626cd4357112242da6ed961836e3c3d193327b3c9c0dbf3e5c1ae3c7f76f5119c3dcc2fceb802c7
-MISC ChangeLog 37356 SHA256 18fd657e885203735a5a8bff8576a68e4e3dc30aad85f1f978ab72f1c2b14883 SHA512 b1fa8c16374f78625291c425a3df03b4571d74e4b2cbbf5b430dcd8d5eb277b4ed975347303fe7922b787ef4427650ccd08618334cdd45908a1b844a88b59dbc WHIRLPOOL acc7174dd803aabf124df86960efe666c50aea168a43bcd085dedbfe2153b654af13a015c4d1f6d6986b02c95b40fbfb2615b44dd428e58bc3634c2f840a05b8
+MISC ChangeLog 37518 SHA256 f4e5a6e548ce20ffef85d6041226a079680b0257f2c1b2f5429a9fabb23a8c75 SHA512 b39991cdef91470f6aa4e4c7a1d3041d00c2a82675da136ab98d46d9b34b6249edfd7c107414e715d8d6d3072ee36e738e2000271a332891df9d9d4ab735653e WHIRLPOOL 481a6a75edca454750edb4fd71fc9f4528d3b07b0752f36ab282d10a907ca0de5d9b717a7b01174d56fedd122d3a8655e2d853bf22557f3997ca4d52e1fe6ef5
 MISC metadata.xml 245 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4 SHA512 3564c5476cd817e6ee8276a450cf646c8df81bfb90455345b8cd6f2cdd6c62b07cbf19f3c1abbcf1a02f9f91a034807303b5e6765df24404375b79fe13a646bd WHIRLPOOL 64c44be7cbb44e7707ef243d989222f3e498b4d23f6e1a875ac481d6577f54444c9dd575e92330d6d018c8f1084858a417eed59e650b7119842c7624a01d7462
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRVhqnAAoJELEHsLL7fEFWIiYP/1WF67Yr6Rr9xmHmVL0LRH7G
-2S8hdYxqUWHiWjSLR6wzPVrDFZMZhlT0G3ZlaCJoaPa4K8C8RnQdCrFcM7zR4Eag
-3kNSmqPIyCYR7HWgFblvklDDpQQbiQ40ejaVC1ggY4O46nh9Drfx0pGgkLNuHCaW
-p9bynjlK6mie9dhx+ZpYQF6eWHcQ355qPADAQj08zQqSOQfv+d/+xAqS0VOKyjgK
-2qZ5+QAx6cao0Kt7LoV6hcIJKngy7BudorXZrBVAOY9y2LJQVI/l1PaJTSaHnNVu
-BHAb2vRHMorb5LOIrHwf/ukR3lN1UQ+oWd/2noLg0c2pMIV42Yx5Dd0QYfus355H
-mlfqhlrD+YQff8ADmbZqQc1u3Y2QcYIn1tCePv2I5KkqXG1fCCyblCM0d0T2EDLr
-JjfcF+cogRblSBjmq34q/zfmrBvpLU3tmgndrhtw6L/aRjOytW7qXfoK+cc8Fmdp
-uSaewqAefjDCkepGxpIdIfPWHbnw9i+GiMASjg7pYoNa2UDVskxZDk674p6TwOJ1
-Xhsd4nMVKiFzfzk2MfJzJXTIKbwpZdGWkJ5MUWpKh2llQKpAqSfpEEzzXjNAum2c
-9b8QjBuv2xsfxy6kiX0xNzj4hjoiHCQWBz+Uc5wbvizuaQLkQFIUStQv+H9ZOiZr
-IW1cFfit72ZKKxq2DjfX
-=AVsK
+iQIcBAEBCAAGBQJRVhzkAAoJELEHsLL7fEFWExkQAJZqaeZcjqOhBexuIsp8hJfr
+OBl6+KeDLR4UNICNxqv3OYbU7MPBRkL8FU6xstxEyrCbEvK5MnyhfiBzE2Iy76e1
+rumUgl2WW18KGD+TfnYX9IMvZHBjcdA9vDQxBjpljX4KJSCnMrfYhbNPlEkzfTRd
+F61+Uf6GaOG2czU6I4wnYoXShmMORRyp2cSFJSN85FnT6hUUizEk2tMvzbs2rNT4
+TGHtErPiG9Dq19MF512CWmxf8T10jwiOmXHhg8RPwEvTZ7JqVHEv5vN/iv6g38VG
+iT+qKSFxCMdcdoqnNwQzfo+kqWLSigKiXkIdPGIDh/9kWev6uwuK4Aom4CvK1luu
+P9HLo17CH7cU1McdoJEsQ7DJ7HhqzRHFuF7NQURWQQD3mD1HTOpOqKQGmuKuBOZp
+fkR24uxY1tBAUM01zAZLf2iYhqJrCfhvCAOmEP8bHteXTnNqnkLxz98fHerpqlIB
+5LBwsTmMpn9h3VR/lY7L9UKoXT+1FOFlywv6Qo4c+d8bejcJUT+TEj1ewdBKuYlm
+80lWekUZHai/Yp8xJ3e01QjeEfZUUrDhQKBIWG99oJCi7R5F07ZGk3bmk3BQoOUB
+nUfBiyB3BWET7SBh/x8AoRzQ/FH2PZsAYzvaJpfUP8TuGQ9cS9v7xJGyjY+OnpRR
+NIgt/TxEerD6L7jQzYWR
+=rbo9
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/files/nss-3.14.2-sqlite.patch b/dev-libs/nss/files/nss-3.14.2-sqlite.patch
index 48d1ddbe0c13..461572fb1aa6 100644
--- a/dev-libs/nss/files/nss-3.14.2-sqlite.patch
+++ b/dev-libs/nss/files/nss-3.14.2-sqlite.patch
@@ -1,3 +1,5 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=837799
+
 Index: mozilla/security/nss/lib/softoken/sdb.c
 ===================================================================
 RCS file: /cvsroot/mozilla/security/nss/lib/softoken/sdb.c,v
diff --git a/dev-libs/nss/nss-3.14.3.ebuild b/dev-libs/nss/nss-3.14.3.ebuild
index 0875bf8f4dae..cf2ebf5614f0 100644
--- a/dev-libs/nss/nss-3.14.3.ebuild
+++ b/dev-libs/nss/nss-3.14.3.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/nss/nss-3.14.3.ebuild,v 1.12 2013/03/29 22:45:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.3.ebuild,v 1.13 2013/03/29 22:54:52 vapier Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -37,7 +37,6 @@ src_prepare() {
 	epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
 	epatch "${DISTDIR}/${PN}-3.13.3_pem.support"
 	epatch "${FILESDIR}/${PN}-3.14.2-x32.patch"
-	epatch "${FILESDIR}/${PN}-3.14.2-sqlite.patch"
 	epatch "${FILESDIR}/${PN}-3.14.3_sync_with_upstream_softokn_changes.patch"
 
 	cd "${S}"/mozilla/security/coreconf || die