Fix USE=-https build failure. Reported by CasperVector.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 29 insertions, 8 deletions

diff --git a/app-text/pandoc/ChangeLog b/app-text/pandoc/ChangeLog
index b2fffcbac349..332e066d0475 100644
--- a/app-text/pandoc/ChangeLog
+++ b/app-text/pandoc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/pandoc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.44 2015/07/20 19:04:24 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/ChangeLog,v 1.45 2015/08/01 11:31:55 slyfox Exp $
+
+  01 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/pandoc-1.15.0.6-no-https.patch, pandoc-1.15.0.6.ebuild:
+  Fix USE=-https build failure. Reported by CasperVector.
 
 *pandoc-1.15.0.6 (20 Jul 2015)
 
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 44fb6c14c950..1a4680f18d0e 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -6,6 +6,7 @@ AUX pandoc-1.11.1-no-man-tests.patch 899 SHA256 633640721ea96c90c0df7e3b8ca7524f
 AUX pandoc-1.11.1-tagsoup-0.13.patch 2529 SHA256 45578ec8bdb219af9d8cdd45f992f9f376f6c77d4c7619ab19d9a218bc1147b7 SHA512 7dc5839924df61a948b65eaa79e755fabfe4589543f076dcfc2ad501a9e671bceed86d587d901e9146b5d7b6e3379187c75f59b5ae23a019288a9deb3cc4d951 WHIRLPOOL 71ae44c99d7db952438531d132e2f3dada25f8944f44b157082f313ceffaa0b0bef72d1f360b6321bdaa1bb937113085703c588555ebf56fdc0fbeec90f79c97
 AUX pandoc-1.11.1-test.patch 1583 SHA256 da6ddb7b668d7fe043f4032be975eaf8a85d2d0c0eeffec4036d9aa2ade74b0c SHA512 9d6d13989d86ddcbb3ede45bc356710c8ef2f459652bbb4b06589f7312c74b8a77f6941727684fc9f315460360ef102961da04a79f57c3d03cddee41bf909bdc WHIRLPOOL f5063c32fa23f1b9dd0c3d8d015c6338d9c8a573f8095c97437850023489ce22de4395d6443f9b5f1d6990f95237351a40e6cd5965da9566c2f9d48aafc49e8e
 AUX pandoc-1.13.2-ghc-7.10.patch 11614 SHA256 b9889ea1e9d4bddc1197a79a676900dc7c6f418ae9c147eca5d6172aebcac76a SHA512 7cebb333454720dd79eeb7f76f73fd32bee7b818a255fdd9dacabc334889cb7d4c850abcf1f006342f5f8998ab852d461c2fedf335b8d3329b4dc4ba0d42f034 WHIRLPOOL 528b393d81380e8e9e6017112b901ac93c02aaeb591187cd69975a88d990307ab2635af7e8bd20c6ff799111eb590169c1a584619fe6e0fb26a1a0572ad2ecd6
+AUX pandoc-1.15.0.6-no-https.patch 407 SHA256 256f6aeb9872b77ea11d104720c4a23c410b5af8c03b997c6d95d4dcfc6f7f34 SHA512 3c8901649fdedd56bd6ae65af5667c563a04aff8f282194cfb70ae343408d82a6842e9e2e46be73f1938db889773fe946ae8da46bca45acbc882f5eabbf747e1 WHIRLPOOL fddb00e5b7099c9ae6fb553924e4b68477c0323af331d9055e384aa041e7c0ed7a52f9349d93953b2bcb7521c6a3a5ad0543978d5a51053688defed9a25497e8
 DIST pandoc-1.12.1.tar.gz 991330 SHA256 ce9ac36ba558654dc30793887581ffa6b5c086557418fbec61556cdc1ccb5e33 SHA512 79507c7e447b35ce8b93371968da833153e74bc8a298db623d864f977abf2fa40aebf6bce8bbb5a8f825b8f734afe0a6013018041e29cb530abb12a2b8f02979 WHIRLPOOL b6245a6790fdc6952fd47545c0944806b9ab98ca89b37e6278cc654feb4a0747d0c5ee4eab1f516e55b489d249845e214ec08804c80ad43a96dc0b2d5478e7e0
 DIST pandoc-1.12.2.1.tar.gz 1004090 SHA256 8e9a37bb802efd44e6e6063060105ad4ef8328a093fccbd971c533f0b583dbf7 SHA512 2dc17f6ae9a4cbdeb62aaf1b21b4922f480de425120442bfea1c832a0cf53c25120ded1c91df1e985946c6a5664671075f24edeece163e9d691fea784bab62f8 WHIRLPOOL 8fd4901e6f59b6ea224fe72f427fa80ca61d686b12a9bab19b8add18bdd52952d1f18befc32425299502c0106412b75ddb6afa41c52ff8032a003a87b7d94855
 DIST pandoc-1.12.3.1.tar.gz 1081035 SHA256 ec06bb322950c900f1a69426756fcffa0f5b9fa0a2ffe41337615b261a087c4f SHA512 6fe52fdafe6c3951297d819a137c1c6ea1d86d3173637fb1bf99cade89dc03fe29fd321024c6137747fd81028a0475156c4d8724ad4366cc0a27821bbf75f7e5 WHIRLPOOL 2618c83fa07979fe6f571af690fb0a12177eeca1f65307980c6e809cfee40be889389bf74eb8846899a4ac88757474eb7c18775be769a3bd5d622e4a4240c790
@@ -29,13 +30,13 @@ EBUILD pandoc-1.13.2-r1.ebuild 4866 SHA256 80238dc3c45339e5ed0101ea32d8191e5a8f9
 EBUILD pandoc-1.13.2.1.ebuild 5154 SHA256 a6a37ab981ddd39227ef0e6464b971dc30ad6c29fe1f4ec71e8b18e1aecdf613 SHA512 e88be95bb82fc073b0ec48efafbe5d57d8dbe09ab5f9a3f29adb1b6f4aa9c294c83320ac596011c9001edadd3acc88b63fa3078f0ae337410f40c156197423df WHIRLPOOL 14e0f9932ce89da6bac62a4560d1714bfc7010837b9427bb09b0bc2ed87244207aba93cf3908c8a0a07a306d3d5bf43f9a2844ab694a24057b69d04dc10d6a61
 EBUILD pandoc-1.13.2.ebuild 4678 SHA256 77081023c3f06e35ca613d77c2363f542ecce4fe4b528f3dbc9dd8b782eb424a SHA512 213a9662295720b81f9d25df184094e362d09003059fd96ef848c3ecdb76f23c96663db7b5e9c4c1a5eca9dbb8d8e983ea671ba62d29406a2ac661ac2ef66e45 WHIRLPOOL 1c30aaf464b8459e5fd900489fd0b6a3b847b2e78928fea5c866d5a74c03082e52181ae8eb817631de3d48aab9fcd6bb93d85509eaa7f153ab5630190dfb84c5
 EBUILD pandoc-1.14.0.4.ebuild 5453 SHA256 6b5478498b3d8f8d2a2a4948983462e71be2a266f358557aeadcd29b743e97de SHA512 119887db41542d1a09061cd938e20e9d11e9915d03185dcc114a759f669c0c306aadfee0afd2745b3d0f2dc4a2804e4a0420321d9a5e3016be990fe6f25cd06a WHIRLPOOL ba15e164aa64953c8faf6fdd1e7085811a1eabba06582439f92b10e9c8dcbdfc182fa81f24d5826c39705e222a0c0c5ecef423da55dd7cb59d08b328b0f273f2
-EBUILD pandoc-1.15.0.6.ebuild 4972 SHA256 4ab57e0eb8f2be25e0b2713fc9483499f57780e68fb8c81eb72ef888ebd5b332 SHA512 594e1b22c1bbfb688a9560288f5e136efa00d33aed0d099768ebe3bfa213c2efc0df544f3f12db6ac0373b07b7f6a7b6c5dca9ea91c1ea3817f935b6a621db35 WHIRLPOOL 53bfd7a1775281d4feb553811e5a6ff75d8cf536801eb5aef31cd943023c1ba780ae7e29ec57fe68193748a64eb78b2733c07efa4d9c22812d1961f99d4720d4
-MISC ChangeLog 7931 SHA256 dbc9a0e8fbff398708b71036cead2a5154d7f427423f6b5ac80b9841d125d5a2 SHA512 62e8444ff82351faf587e63e16ff1f81be2a6cef91e6c45d14e4c26328c0cb76f9537ec7195ac92a7ac23fc6070620c91513474fe3961670c42653f809a12ebd WHIRLPOOL 9a18d46a3a36f55d6a7839bf3a28deb11df068dfc80dc5686bfc979754b4e7c186f8ba4ca69895e61ed602798dba9a837679790af0f5af54acf63b9b056591e9
+EBUILD pandoc-1.15.0.6.ebuild 5040 SHA256 615c4e966f71374c2f6ba05dcd1b84826f8ee3cf272b1ac08536b7c9861476cf SHA512 57f47385a58c08470c0855bd4220ec33f56558c828840922ec3d487f1080ee94757b0ff66a04471e1367af5747a2af3cec685e0d4639983467f76111d5584dc8 WHIRLPOOL 94510d9e5a1e1c8c5ae65bdf685b084704343b835ec7c55e64458967442443937b4a5f88f225616ce9b331b18d1e04e654a4b23720081c31e9304ed96495386e
+MISC ChangeLog 8109 SHA256 51ff1436ef8b9a1a522d24e71cb2926aa0d352fd24d92dd722e22dca82e710d6 SHA512 455dcbb987e09979244965413ec94be35e1b5824190218e2201203e61b7a8c49f4773e7de8b054a3a2cc45750db49c048e69f9ada42414b3415efa23ef4555eb WHIRLPOOL ad3ed4f4c562c60c8fec7e75c02013b87462da3bf58c4f7389c8807420538d0254b65bc636a610e18572234302a7086c57a6a4aefa8abc6ef075f7149b18b7d7
 MISC metadata.xml 1232 SHA256 d4908e6f47857ddaf0848285a62b50a75ff7706a14b1e403cd976b4525e0f2c5 SHA512 5c884f5ce92a521507c956381bbdf0a8cdaa109ea5384fbc8ca975010dbe0f38812efd1d27801f1897bb81b59491e0b23658567fa4ef7a4e6cbb40e1af9abd46 WHIRLPOOL 32922f56b54c5f7b54f59a2d35d723e0ec3b939be553914a4aba46550c955855a34f8283bacf941c297990eb20cc7c364a6ec2ca187f039bddbf885ac5a98e0f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWtRjkACgkQcaHudmEf86r8JwCfZ2ldXEeUEpLko5YvfHrIuVGD
-hfcAn0uarVUKtZrcZycl+PKkA/y+l/RH
-=Fk/y
+iEYEAREIAAYFAlW8riwACgkQcaHudmEf86pfdgCeL8CHR+QQrFj4/eY6LY0jkveu
+nOQAn0dbCsYQmuc/+u8jkbW25XIxaX+U
+=FcCb
 -----END PGP SIGNATURE-----
diff --git a/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch b/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch
new file mode 100644
index 000000000000..7e0f4d375a71
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
+index ef9f66a..50b0ec4 100644
+--- a/src/Text/Pandoc/Shared.hs
++++ b/src/Text/Pandoc/Shared.hs
+@@ -143,2 +143,3 @@ import Paths_pandoc (getDataFileName)
+ #endif
++import Codec.Archive.Zip
+ #ifdef HTTP_CLIENT
+@@ -152,3 +153,2 @@ import Network.HTTP.Types.Header ( hContentType)
+ import Network (withSocketsDo)
+-import Codec.Archive.Zip
+ #else
diff --git a/app-text/pandoc/pandoc-1.15.0.6.ebuild b/app-text/pandoc/pandoc-1.15.0.6.ebuild
index 34db2b4f0ead..c385918cd313 100644
--- a/app-text/pandoc/pandoc-1.15.0.6.ebuild
+++ b/app-text/pandoc/pandoc-1.15.0.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.15.0.6.ebuild,v 1.1 2015/07/20 19:04:24 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.15.0.6.ebuild,v 1.2 2015/08/01 11:31:55 slyfox Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.4.5.9999
 
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
+inherit eutils haskell-cabal
 
 DESCRIPTION="Conversion between markup formats"
 HOMEPAGE="http://pandoc.org"
@@ -78,6 +78,10 @@ DEPEND="${RDEPEND}
 	embed_data_files? ( dev-haskell/hsb2hs )
 "
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-https.patch
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag embed_data_files embed_data_files) \