Fix system-cacerts patch.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

diff --git a/dev-python/requests/ChangeLog b/dev-python/requests/ChangeLog
index 963d63cbbd0f48f4a1286f4d82580a074ea72fb3..9aafad806011560852d6af20bea4ab99e6707a0b 100644 (file)
--- a/dev-python/requests/ChangeLog
+++ b/dev-python/requests/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/requests
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.80 2014/12/04 03:20:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.81 2014/12/04 03:32:03 radhermit Exp $
+
+*requests-2.5.0-r1 (04 Dec 2014)
+
+  04 Dec 2014; Tim Harder <radhermit@gentoo.org> -requests-2.5.0.ebuild,
+  +requests-2.5.0-r1.ebuild, +files/requests-2.5.0-system-cacerts.patch:
+  Fix system-cacerts patch.
 
 *requests-2.5.0 (04 Dec 2014)
 

diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 6847eb307ee12ac17ef46da1892c37bb35fb7146..98b46afacd906865574b3c295a6cf0313125576c 100644 (file)
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -6,6 +6,7 @@ AUX requests-1.2.0-system-libs.patch 501 SHA256 5bd4be07b4072a713857ede3542f78ef
 AUX requests-1.2.1-urllib3-py3.patch 569 SHA256 a156046ccd0462b446a6a99b7b1e6121ff038cbdc9eba8eda44085e9242a12fb SHA512 dbd12eaf466b3b0a2e8b78876cf10d43bf988914cc829746516a6f60d46634018ced86110dbb977430533b9fc5cf4f2d6492145195f6d769263b970e7f23eacd WHIRLPOOL 8901f22a1f491bfa119672a04d2c978d8894fbeb13d90b1b405298e9a2b07890e2c41c0a04d3dd20b5fbff408fcc4e563419916217597e50cd81a46281c60246
 AUX requests-2.2.0-system-chardet.patch 460 SHA256 da64f0578e0046ab95cef8d2fdcad7a31e0e47bcaece56c08fbda5f4efdedfc1 SHA512 ebd366b2824662e4f3e23032b7269482226bbc3bfc95536cbf56e7b50f499310f357c01f08e772b07180bd3165874a85cfba14ed827a6b1be588f0a7b427eb72 WHIRLPOOL f7b91d40102b63e61435068a8ce211b6f68f9cd93da936ad4b8e6ac6ed40baec174e53f00e7bec303214b33d19aecec6be3c32909a77c12c6fcfa2b34b8fafb5
 AUX requests-2.4.0-system-cacerts.patch 548 SHA256 7baf03a70cd99e7b2fb90dfd95095b48a694490ac439c87d0bf56730d86f5d85 SHA512 8e7b304c7a0b235078ac02d53cabfbbbcbe8bfe267aa0c501fc91707560e7b88d1f49df9f66478638fdc880a96b8f411613c4ede28e6a919ae3901fd81ed7030 WHIRLPOOL b14c8c1f828bfa0dbcb7aa15b90d5839d3d99fa4e8bae87914655655368707260d5f3e7fa97ce5d841f30bf11e386daab204bb6631db8089a5403045d697994a
+AUX requests-2.5.0-system-cacerts.patch 694 SHA256 e2cbb0eb75b61c8afd84d35c12fc847340ba0dcad9d2bdb24cce9c08eabc71de SHA512 804a2e2d46b6377c3f2a675ab367a1410e1f333dc6d087535f7eff73a78da06cef5ef66c3ad947bc1830aa373b963bfd30b4598eb6ca203a0f7e532cf971d145 WHIRLPOOL 3aba2db15012523bf1e10a87db3617e181943a4dd3b6cc7f643a5ba103e73e57b2df9bc5999d66c40c2bf0f018d10686a8301eaeb23b167607d6632bcc274f6c
 DIST requests-2.3.0.tar.gz 429521 SHA256 1c1473875d846fe563d70868acf05b1953a4472f4695b7b3566d1d978957b8fc SHA512 4723bcdee7cd8c5b71177a065cdbd29bcd3bd92d69c1887f9cfdcde23b8b105006a7cf4a06f906b9f14a35154c43b4cc436f612c2505c6a463dda131ae3e92e9 WHIRLPOOL 55549153437c69e249de010f71b7a679c700d27dc2a260dbe8e43578ee6c077463820f873ca7a6ba02ce1fe1a0e5b7917ea5812addc61404ec60360e9d8f0295
 DIST requests-2.4.1.tar.gz 436872 SHA256 35d890b0aaa6e09ec40d49361d823b998ced86cc7673a9ce70bbc4f986e13ad8 SHA512 19abd4413978539fef1c239695b2e7477b2082793df45063d5f0eab988542f71afb32d3d3853d3aada2af19279ca62638a418bdc400bc0165c07371213e691c0 WHIRLPOOL 30a2874ea2771eb33e8eeba410663ba951956eeedc43149139b68108af746506f0b0cc141ad08ab650bdf3f45888c3e47b257d5ec904cb48875a5bce70fc7205
 DIST requests-2.4.3.tar.gz 438132 SHA256 53c68313c5c6149b1a899234c000296e60a8900682accf73d6f0c6d608afc6b1 SHA512 9d98a8a97327f8dc74b9f8245605a1b7ee4f603884f180c48fd97e33b940be487015581dc3b38ead7c9e4332e175b83244b02f6b08fe76cefd9a376cea55b4d8 WHIRLPOOL 7dd1d30c6c37b6d555a554ae4e4d3a39cc64ba18ed21a6b9bbfb67d121481e09d05d30281f5dac8c4970239d56ead11a43a8756027f7560d813737768b6db4ef
@@ -13,17 +14,17 @@ DIST requests-2.5.0.tar.gz 443222 SHA256 d2daef4919fc87262b8b3cb5a9d214cac8ce1e5
 EBUILD requests-2.3.0.ebuild 1225 SHA256 d420c7d6d3381833079d0b284c67600e2b08ecaedc910202162fe0be1510e50f SHA512 6c621387219944c5485846804fcd9ef525af1794150029b5ed34fd3c10008686355b15d4562d60276ab28ad6fda1d55b56575c7a5e914313f02a686252f0b7a4 WHIRLPOOL 7a8f24f2174bc440a001a37fe1e362d6099efebf19b45da9d7c261603426aab09c069ab2e76f10bf7eee00e5fa0ec8608502f300e09622696d4c157235bc86f7
 EBUILD requests-2.4.1.ebuild 1196 SHA256 16e0fd7b25009e95fdc2e18f25d3d7e9c9d57fb6e12cd15a0968d2d79597f678 SHA512 0340e7242340f4ea05164d5dfc602b25a635771debcba8128a4520c9b88a0f891cc415de23cc2f5b9c6dcecea6da52638e56695d77a4d9aa7909536e6d25dccf WHIRLPOOL e12e7bde431f806c058e743eccb6c7428dff8094b25b7594968fd4e1e2579e3e3cfe8173c799bca61597752dc3fe88dbd619db3c1ddc2a62d64ac6b199c5141e
 EBUILD requests-2.4.3.ebuild 1198 SHA256 6ea6d49b62da5d1d9f4ce584d19511f0d02a02061814c75b20461ce6530f0100 SHA512 0c375b00bcc99a2abd3b8965f1e3eaca4e3b52646882fd2a767d4401e9733c74168b22af869c2550190d664a694ae94d8c0915b59b42d1ddc1eea254dbef9533 WHIRLPOOL cc4ab6ce5c33cd10652a51630a71a93ca182a2cbd1c2d13c1a3297e4efa462c9d91956e1d7c9d83f86f2ea66929b2d32d006b577537224adebab44d44abb4738
-EBUILD requests-2.5.0.ebuild 1200 SHA256 2fdfee208f5d12506c3ade298f18f4e97ea78281bc87d3ff3d7fc140fa405fa3 SHA512 6c8faa22b431a694575059c48486c9a69d2a6ecf5427a214e74346f4a7c5cb96167e28d4201fd0ce5ba624f1f0720d9d95e51f1a3762c0c99b05842703fd1574 WHIRLPOOL b2717130a1a96b442d3088fcde65c309fd5740024bbfd85673320f46bb553e430c060ed9b82eff1a45201c6723ef0463a48a6ed5efe96affd118c7ba5523d975
-MISC ChangeLog 12515 SHA256 d46c47d116dc9f0dbe7efedbe361fbc06451fde86e898998037ad78c5bb9687b SHA512 f960292494d2536001270c3968c04abca8edffd958dde5f35b0bc8faabfe9cf648b4e9f2415cc062d33caf3b0effb93cd3b40bbffdb4ddf82207635c4a05bfba WHIRLPOOL dfc3f2772ffe4f2879bff33aecf2a2f9f7febaa168d49986597b39d1f737f803db15f615737ea851f4c7cde652ee89054f093377202482fc4818dd75cfb919df
+EBUILD requests-2.5.0-r1.ebuild 1194 SHA256 fd4cd4c98d70405a1634e7b68d59dd5bb331d663613616c61863d7a0664dd2d9 SHA512 20aeae376a227584ad801dcfd41843a6774892edc71c9f4bbde23b5f28d5eb69e43a6dc0ab0cd08049991cd27ca7a1dec6bbd13fd8a694aa0f850a8a54931d38 WHIRLPOOL a65c364ca98ed01111a0ba77d8a2522915b29801c4ed86ab222abfb0de1d6701e24e5f2596432154c2878d11f740e7f5d12f79f9a7741e6ddda376a545b11cf1
+MISC ChangeLog 12724 SHA256 aae38fc328d0ea4c575c0a3811b03dc84ac10beca864f3003f8ed368538d8f8d SHA512 54652d476f059aa5db11ea18ace567c81814e176f3a722ff4c36db972c5b55869c5a0746ff28945a3a35d25d1f7aeb36b5479d6b9a7df44165944f7a6a97355d WHIRLPOOL d8e651428c5f7e14b6f4815c2262106653e2f9d96b4c892303805fb07a25f3ebcd88356d82c337a67b18c88b6d3cc14bf33ef9fe758334b9af05186c19ac6ba3
 MISC metadata.xml 231 SHA256 7bbca8901dd0afb4da18f659567071156f1efea52100213d20d43e53721a0ff9 SHA512 dce3df6bc1c4fc9517e39c41e0c904f39fd092cd63024f03ee5c15aef5b4840dfb265ebe565a5e5a8da9a8805d58b3ec3f772429bf00b125c3172f2f79e089bb WHIRLPOOL 2f6573a3f74f88a549a3344deeea5cdd4f27a310b59d466684902f009c7b404c0557f26f416b450f1f7bdce133c3d52897c5169fce01707233630ddfa783d9c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUf9LvAAoJEEqz6FtPBkyjXbAIALNxY1fxF8eyJCPfkxhT44+e
-1ZeaPRKYjPNMhqo6beA9yJ5SfggWziku952zw0T0jo2hD8PRvB/clNaC0ogV0aUP
-h2lT8alHHiJaB4HdYc6edAgVfelHkVo/lMiAIf+z6dqItcn5nWHj6XXZxJUqDvLx
-cIRlpKBwKbcvC4f/EYI4eHbkzRVV8R2iOy1MiOocMao2jRxmsJWT6esI8RgdUCuB
-+fCEoLyz8AFJJdowHYXic0ippG0re3hdrisyRxj6ITBezUhBZbBLwdriPCZk173+
-EWyP1SEgjaqi/pZQVN/PAJvVgiE4bTNIArdD1P8znSFkxPOENT0JAEZvo2zdHbM=
-=3tC2
+iQEcBAEBCAAGBQJUf9W+AAoJEEqz6FtPBkyjVBwH/A54FiwoFucFAunzqcCoXr81
+YIq8y83r3N3zauBMC4oUenwz3HQwPQv+0b0RhrdFpgVY8991EwggBanonPinqWV3
+s0aJFBxn2dfylFHaX13SMuNzYQSJj9a+H/I1oN4tRzgyIMcTC54SfZnQjQoAlro8
+xoRp+buPauXUz+jehwxiJFnVmD93NDu0Jz+piOzmy/g1u2qyFayKwwptsooMTfVQ
+MV+KbBgVo79GnSJb9jirg0FZzQ0JFCQvukQEPe6kpftzzc3vNyAAJlI3V2rd+8sq
+wrvNxEIHLsOhTskwaSXEqkmhA7DmWO5TwX8I0Yu4n5rA9KuNzaeLAy5Q8dsvYR0=
+=I9/M
 -----END PGP SIGNATURE-----

diff --git a/dev-python/requests/files/requests-2.5.0-system-cacerts.patch b/dev-python/requests/files/requests-2.5.0-system-cacerts.patch
new file mode 100644 (file)
index 0000000..f0d9e94
--- /dev/null
+++ b/dev-python/requests/files/requests-2.5.0-system-cacerts.patch
@@ -0,0 +1,24 @@
+--- requests-2.5.0/requests/certs.py
++++ requests-2.5.0/requests/certs.py
+@@ -13,13 +13,14 @@
+ """
+ import os.path
+ 
+-try:
+-    from certifi import where
+-except ImportError:
+-    def where():
+-        """Return the preferred certificate bundle."""
+-        # vendored bundle inside Requests
+-        return os.path.join(os.path.dirname(__file__), 'cacert.pem')
++def where():
++    """Return the preferred certificate bundle."""
++    cacerts = '/etc/ssl/certs/ca-certificates.crt'
++    if os.path.exists(cacerts):
++        return cacerts
++
++    # vendored bundle inside Requests
++    return os.path.join(os.path.dirname(__file__), 'cacert.pem')
+ 
+ if __name__ == '__main__':
+     print(where())

diff --git a/dev-python/requests/requests-2.5.0.ebuild b/dev-python/requests/requests-2.5.0-r1.ebuild
similarity index 86%
rename from dev-python/requests/requests-2.5.0.ebuild
rename to dev-python/requests/requests-2.5.0-r1.ebuild
index f7bbe627ed8679cde5a20f53ace7754d746965de..5f98048c38a00b020a13da11f4c5a3baaf9bf0f8 100644 (file)
--- a/dev-python/requests/requests-2.5.0.ebuild
+++ b/dev-python/requests/requests-2.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-2.5.0.ebuild,v 1.1 2014/12/04 03:20:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-2.5.0-r1.ebuild,v 1.1 2014/12/04 03:32:03 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -25,8 +25,10 @@ DEPEND="${RDEPEND}
 # tests connect to various remote sites
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.2.0-system-chardet.patch \
-               "${FILESDIR}"/${PN}-2.4.0-system-cacerts.patch )
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
+       "${FILESDIR}"/${P}-system-cacerts.patch
+)
 
 python_prepare_all() {
        # use system chardet