gentoo resync : 17.10.2017

4 files changed, 123 insertions, 4 deletions

diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 8a7892e57e64..1458f48afb5f 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,7 +1,8 @@
+AUX podofo-0.9.6_pre20170629-openssl-1.1.patch 3527 SHA256 ddbf668ae31baf29993ad107ddb53bb65ffd3d78d3896f150aa84afd4eced472 SHA512 c30e0a8b40e2e93a66d0d100549c567ae0868766aeffe4c9ec97b9755b062f8c9b96725c9692a605eaa8abfed06dec18432289798161ad949de20d45337509ad WHIRLPOOL faa43500fa988f24caa1279951341be0c3f763c6cb5aacf52c52429603a873cd6f246be697c60339b1eb793209506348808b1c5208b2cf68a23d796dc61d1bd8
 DIST podofo-0.9.6_pre20170508.tar.xz 919876 SHA256 6a35e08aa22105eeb6b00078b74791da2d4dc0d86189f795315808428efacd17 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10 WHIRLPOOL c0ad8baca1f912929d1b2dd2e783340aeeb50965136dcf2699407cb70ca058e20748ee8024739b913a1e2ddb317c72f5aed6074862c4360d339365764ac9c67a
 DIST podofo-0.9.6_pre20170629.tar.xz 919076 SHA256 439c0bffed19275315075d5b0a2728453e7a8bee4480e1f23bca2ee4b02462d0 SHA512 29b0e28131ca9cadf19e5ec43df1c39e146ad8d35ad9f0bfa2dff1138e3448c3be95c6130ef8a19b7ad927b8e0c5a7890485f120d7f7da85e2b434e4a417d9bc WHIRLPOOL b8ecab404679f48ff611e543d375829a636f4026232a83ff2fe3f3ca42f1a5c2a589641d4c09b92b7b078026a6b4d95b172a764089729086f7001d3a4850b272
-EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4568 SHA256 6448aa71687a02888a1899668eda1c7ad25241002c541a1249b0d3fda6adeddb SHA512 0eadda6a9b55c3ae59c97c05913a16e72ffa8a92a9fd493af559fb2ad6ec47f4a63a38b6234262914ad592c3f0c1638baa500f26d0417efa5f7220238e150cf9 WHIRLPOOL 22b58c5d7ec43342fe196c1a83cc29df91fde63192c6ab1ba66f881bf0eeab99742b56eb29b555074219ad9e8df67a5aaaf1c471889628e38a538cfaeecd639e
-EBUILD podofo-0.9.6_pre20170629.ebuild 4572 SHA256 e7017feda1ec4a493cade2a16c47896c6c315fe44bdf0096baf938df3e8fb6fa SHA512 9674acb8f7c2083d016be5d1a2b13b37260fb1f3af01df35b7348f39b75a521e7e268719ba18045265cc7972152576d3dd964631122c7120bc707ed181c34aea WHIRLPOOL 1d3e37b1fdd14c15f4e0a2dc79ba0d2c65e0bac581afd549584c6db0f7e720a3d2b62e5e1b845ca410b1fc889870194d4fc34dc4686c21fb863f8fd906404b0a
+EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4581 SHA256 02d2c5fb96cdf74592c670203c096dcb61b42dbd68df30690a867e55cc52a0c6 SHA512 abc3b61b00606184996b904475ad9d41d61bbf6e9c301216df47a8c93b8c42f1f03fcd8c200c06e2c9c630105c39546097dc02df153f825aeecc4638a0ae65f3 WHIRLPOOL 8fd37902ee697f806838228815cab9ae3123792da738d71d4d110b0c46e34652ec47c4ebcbc5081644d07e067b1562c2ec59c9ad442f1d3c2bf90cfbca1c483a
+EBUILD podofo-0.9.6_pre20170629.ebuild 4634 SHA256 79f15d586b2de60d65d6082871fd4241528addad6d8f52dd475699dc81bf829d SHA512 6d54f49efac182f9fae94ad4d22b8f10b1b4ac447af4bbf7d7f3a04eb2f951aa4e14623b9b64dd27bf38e65fa0cfd3869b0c6bc6dee896a615a2479c626da657 WHIRLPOOL 7f90b686fc82d70ae9f0f122fd4f982e4976d9e4e435d2d6217709b13803fdcb35b36c14aa5d044700e8091762b784d58e8893cf24bf2950b9fce7d928b4080b
 MISC ChangeLog 2797 SHA256 2bbdfd21d3a55ef07a70dc8cd12541154ae04fbf8730517da21521f516a2cd84 SHA512 65aafc3ae675642aa2fbdeace471764dd39a0f9652fd7d11b7323014442663747c335f0fd69e465b53a10d828df80b9e00cdd96c16d0c3bdd6d907a467e36f19 WHIRLPOOL 58fe360d9c9a798c757b8daaa8e159b2959a94730a0a50b16912585b352290dcc83361848fafc6bffe6bf568a9be42a9cf6a06d86e207f3a557873effb46758b
 MISC ChangeLog-2015 6318 SHA256 5889ccb41f137263065fb570314a65cd47716f1e19ca4b33fa0991376e257b16 SHA512 0e2b938cc3a3890f5e6703db04e0de4e9472ef198dd92c48bff69761f7f9455f91b528c1d5aac0384ed6eb69e0a5c5932b3ec30f3a8c926160a4f26fd2045a89 WHIRLPOOL ced1b9d5d0d16cfafde24523293cc56bbeb8646b1cca1555a2d5d410b80ce41b5c692128d04a212ae9c90e0d102984deaac3006bb453a7b4870e72527bf5c08a
 MISC metadata.xml 509 SHA256 5f3cae4a9d1bc05fdb61e1cdf376a8b21575a5745d04b5ea15d49156dfd0cfdc SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236 WHIRLPOOL 035d533eece1c3c373dbb817c202b8a7e069d7e96046f0d4d945ca79faaf1d3d61b21cb30f40ce7b6d33acfe3f40cb1233cd32e6144f2b36f6202a5d3a995318
diff --git a/app-text/podofo/files/podofo-0.9.6_pre20170629-openssl-1.1.patch b/app-text/podofo/files/podofo-0.9.6_pre20170629-openssl-1.1.patch
new file mode 100644
index 000000000000..22b1e419312c
--- /dev/null
+++ b/app-text/podofo/files/podofo-0.9.6_pre20170629-openssl-1.1.patch
@@ -0,0 +1,114 @@
+From f5da3b4d9e35a2df272f2f4056c3647454eaea95 Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gmail.com>
+Date: Sun, 15 Oct 2017 23:04:57 -0700
+Subject: [PATCH] podofosign: fix compile errors with openssl-1.1.0f
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://sourceforge.net/p/podofo/mailman/message/36077904/
+
+This fixes the following compile errors with openssl-1.1.0f:
+
+tools/podofosign/podofosign.cpp:877:32: error: ‘OpenSSL_add_all_algorithms’ was not declared in this scope
+     OpenSSL_add_all_algorithms();
+                                ^
+tools/podofosign/podofosign.cpp:878:29: error: ‘ERR_load_crypto_strings’ was not declared in this scope
+     ERR_load_crypto_strings();
+                             ^
+tools/podofosign/podofosign.cpp:1085:22: error: ‘ERR_free_strings’ was not declared in this scope
+     ERR_free_strings();
+                      ^
+
+This patch has been tested on Linux with openssl-1.0.2l and
+openssl-1.1.0f.
+
+Bug: https://bugs.gentoo.org/614756
+---
+ CMakeLists.txt                  | 12 ++++++++++--
+ tools/podofosign/podofosign.cpp |  7 +++++++
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0c9a2ce..b4f7b3c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -325,6 +325,14 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ FIND_PACKAGE(ZLIB REQUIRED)
+ MESSAGE("Found zlib headers in ${ZLIB_INCLUDE_DIR}, library at ${ZLIB_LIBRARIES}")
+ 
++FIND_PACKAGE(OpenSSL)
++if(OpenSSL_FOUND)
++  SET(PODOFO_HAVE_OPENSSL TRUE)
++  INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIRS})
++  LINK_DIRECTORIES(${OPENSSL_LIBRARIES})
++  MESSAGE(STATUS "Using OpenSSL ${OPENSSL_VERSION}")
++  MESSAGE("Found OpenSSL ${OPENSSL_VERSION} headers in ${OPENSSL_INCLUDE_DIRS}, library at ${OPENSSL_LIBRARIES}")
++ELSE(OpenSSL_FOUND)
+ FIND_PACKAGE(LIBCRYPTO)
+ 
+ IF(LIBCRYPTO_FOUND)
+@@ -334,6 +342,7 @@ IF(LIBCRYPTO_FOUND)
+ ELSE(LIBCRYPTO_FOUND)
+ 	MESSAGE("OpenSSL's libCrypto not found. Encryption support will be disabled")
+ ENDIF(LIBCRYPTO_FOUND)
++ENDIF(OpenSSL_FOUND)
+ 
+ FIND_PACKAGE(LIBIDN)
+ 
+@@ -393,8 +402,6 @@ ENDIF(CppUnit_FOUND)
+ 
+ ENDIF(NOT PODOFO_BUILD_LIB_ONLY)
+ 
+-FIND_PACKAGE(OpenSSL)
+-
+ FIND_PACKAGE(FREETYPE REQUIRED)
+ MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}")
+ 
+@@ -499,6 +506,7 @@ SET(PODOFO_LIB_DEPENDS
+   ${LIBCRYPTO_LDFLAGS}
+   ${LIBCRYPTO_LIBRARIES}
+   ${LIBJPEG_LIBRARIES}
++  ${OPENSSL_LIBRARIES}
+   ${PLATFORM_SYSTEM_LIBRARIES}
+   ${stlport_libraries_if_use_stlport}
+   ${FREETYPE_LIBRARIES}
+diff --git a/tools/podofosign/podofosign.cpp b/tools/podofosign/podofosign.cpp
+index b8f5f61..a7be1e5 100644
+--- a/tools/podofosign/podofosign.cpp
++++ b/tools/podofosign/podofosign.cpp
+@@ -27,6 +27,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/err.h>
+ #include <openssl/pem.h>
++#include <openssl/ssl.h>
+ #include <openssl/x509.h>
+ 
+ #if defined(_WIN64)
+@@ -874,11 +875,15 @@ int main( int argc, char* argv[] )
+         outputfile = NULL;
+     }
+ 
++#ifdef PODOFO_HAVE_OPENSSL_1_1
++    OPENSSL_init_ssl(0, NULL);
++#else
+     OpenSSL_add_all_algorithms();
+     ERR_load_crypto_strings();
+     ERR_load_PEM_strings();
+     ERR_load_ASN1_strings();
+     ERR_load_EVP_strings();
++#endif
+ 
+     X509* cert = NULL;
+     EVP_PKEY* pkey = NULL;
+@@ -1082,7 +1087,9 @@ int main( int argc, char* argv[] )
+         result = e.GetError();
+     }
+ 
++#ifndef PODOFO_HAVE_OPENSSL_1_1
+     ERR_free_strings();
++#endif
+ 
+     if( pSignField )
+         delete pSignField;
+-- 
diff --git a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild b/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
index 5c1264949294..a75c43638425 100644
--- a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
+++ b/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
@@ -113,7 +113,8 @@ src_prepare() {
 			tools/podofocolor/luaconverter.cpp \
 			tools/podofoimpose/planreader_lua.cpp || die
 	fi
-	eapply_user
+
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/app-text/podofo/podofo-0.9.6_pre20170629.ebuild b/app-text/podofo/podofo-0.9.6_pre20170629.ebuild
index fad0b2864e29..186555f81920 100644
--- a/app-text/podofo/podofo-0.9.6_pre20170629.ebuild
+++ b/app-text/podofo/podofo-0.9.6_pre20170629.ebuild
@@ -30,8 +30,12 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )"
 
 DOCS="AUTHORS ChangeLog TODO"
+PATCHES=(
+	"${FILESDIR}/${P}-openssl-1.1.patch"
+)
 
 src_prepare() {
+	cmake-utils_src_prepare
 	local x sed_args
 
 	# The 0.9.6 ABI is not necessarily stable, so make PODOFO_SOVERSION
@@ -113,7 +117,6 @@ src_prepare() {
 			tools/podofocolor/luaconverter.cpp \
 			tools/podofoimpose/planreader_lua.cpp || die
 	fi
-	eapply_user
 }
 
 src_configure() {