gentoo resync : 13.06.2020

4 files changed, 14 insertions, 195 deletions

diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 0b8ed6d010d3..3e55718a7bf8 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,8 +1,5 @@
-AUX podofo-0.9.6_pre20171027-libressl-bug-635890.patch 840 BLAKE2B f4bca9474abacf43ddaa42e80345f3b4646ab8a60cf8d05861601047b9e962b4b289735d6b8ca59308c4de205fd145e5d17b5052b4ecf94cd78e9483dfdda1ec SHA512 cbe44430c0a4511afaa43d41e1c0e5d02cb7f805a6ca4d8f8f9adada26e01bb2bb43c327c0b78ccdc26103dd4abfa7d9c8b5ed2c61401d4c587cb12c1ad5d3bb
 DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
-DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10
-DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be
+DIST podofo-0.9.6_p20200526.tar.xz 752264 BLAKE2B 52eb40a63e8462b6d1f975c76c2112b93ae98c19ad6cb65906bef018e99a3d92e26781cee9d4ef1c4de74779db7eca6589c320849be84b70c20d5c7d988c0a49 SHA512 7baa58c9a524ccc5aa954bd5fe891b9add8b8f4ec29e3ebbc1c8a467d2787e6c3f9e4652db08e50cb4c28a73691215947940634975e292ec01fb57e2e45efbe4
 EBUILD podofo-0.9.6_p20180715.ebuild 4661 BLAKE2B c5e6616218c01a583ef3bcd8e93a80edd060b9fe010cf9f91372a5ce3e9f34d592d69fe20cc8e9ba02dceefa6ac70679c5d66783580fd7d70b40cc2f74c5a85d SHA512 b6b6a274d5ee92d13d4b573844cd0d1629f13b552f5d8257e884a0c555ba1d14425abe3fab1be9e01d27c5c1da9eae07519ad0916862569a0495808d2719449f
-EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4605 BLAKE2B b1af6d6e60638220fa4ef3d4d6019fd56fdc186911d9fee02fb4cf1e3dad7d9d75d95e2a2860395d7257ce6f7ac6f4bcda391fdab113795c6351d03130bad326 SHA512 64a66ab34e3b7cb2d01bd8214429f3c880d589a7ca469686e37b1ca1f8c3fb2d780bd3da489a8386b8f6d84f994c596791e88f869a1b063cd2d7f01431f02d53
-EBUILD podofo-0.9.6_pre20171027.ebuild 4667 BLAKE2B fe2ee3f4bbfadc0b25f9c30dc94bc01ad041dc4006251748d9c1e9b5cb6307ab5705e71b716cd7b068452b7063d3c189cf9872f35a0b20ead7397633840d17ab SHA512 8fb15f004cc08cdb63d8ed455c53e425def5c67b388c8de6fd06110d0524b510b71bfa056575fd99541e126bd0cfbeffc0b66f288faad57e4c50f98f0b910483
+EBUILD podofo-0.9.6_p20200526.ebuild 4591 BLAKE2B 14522471c08143d9adbee39ec8301e705169a48fc2557b44707432ce25c26e0e2eab8b822bc188f11795f55092e8c85ebc22384ac747e1285098aa20ed722f62 SHA512 ad7feded62a43adfd9d807087109816ef637d8e2ce7046a9dc0eebce27b7aee6cda9c93059aedcc999828b6cc13455899bc9a80de30bfc1ce2cd90f366da3e7b
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/files/podofo-0.9.6_pre20171027-libressl-bug-635890.patch b/app-text/podofo/files/podofo-0.9.6_pre20171027-libressl-bug-635890.patch
deleted file mode 100644
index 2b25dc7b6856..000000000000
--- a/app-text/podofo/files/podofo-0.9.6_pre20171027-libressl-bug-635890.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 85e66b066de98f38e0430428906d5cf5396876a0 Mon Sep 17 00:00:00 2001
-From: Michelangelo Scopelliti <kernelpanic@gmx.it>
-Date: Thu, 23 Nov 2017 12:29:36 +0000
-Subject: [PATCH] Fix to compile with libressl (does not have OPENSSL_init_ssl)
-
-Bug: https://bugs.gentoo.org/635890
----
- tools/podofosign/podofosign.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/podofosign/podofosign.cpp b/tools/podofosign/podofosign.cpp
-index a7be1e5..5c9d146 100644
---- a/tools/podofosign/podofosign.cpp
-+++ b/tools/podofosign/podofosign.cpp
-@@ -875,7 +875,7 @@ int main( int argc, char* argv[] )
-         outputfile = NULL;
-     }
- 
--#ifdef PODOFO_HAVE_OPENSSL_1_1
-+#if defined (PODOFO_HAVE_OPENSSL_1_1) && !defined (LIBRESSL_VERSION_NUMBER)
-     OPENSSL_init_ssl(0, NULL);
- #else
-     OpenSSL_add_all_algorithms();
--- 
-2.13.6
-
diff --git a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild b/app-text/podofo/podofo-0.9.6_p20200526.ebuild
index bbed6ce6bb91..058f8499ab01 100644
--- a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20200526.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit cmake-utils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
 HOMEPAGE="https://sourceforge.net/projects/podofo/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20200526.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PVR}"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
+SLOT="0/${PV%_*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+boost idn libressl debug test +tools"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 REQUIRED_USE="test? ( tools )"
 
 RDEPEND="dev-lang/lua:=
@@ -33,11 +33,13 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog TODO"
 
 src_prepare() {
+	cmake-utils_src_prepare
 	local x sed_args
 
-	# The 0.9.6 ABI is not necessarily stable, so make PODOFO_SOVERSION
-	# equal to ${PV}.
-	sed -e 's|${PODOFO_VERSION_PATCH}|\0_'${PV##*_}'|' -i CMakeLists.txt || die
+	if use libressl; then
+		sed -e 's:^#ifdef PODOFO_HAVE_OPENSSL_1_1$:#ifndef PODOFO_HAVE_OPENSSL_1_1:' \
+			 -i tools/podofosign/podofosign.cpp || die #663602
+	fi
 
 	# bug 620934 - Disable linking with cppunit when possible, since it
 	# triggers errors with some older compilers.
@@ -114,8 +116,6 @@ src_prepare() {
 			tools/podofocolor/luaconverter.cpp \
 			tools/podofoimpose/planreader_lua.cpp || die
 	fi
-
-	cmake-utils_src_prepare
 }
 
 src_configure() {
@@ -137,9 +137,5 @@ src_configure() {
 		)
 
 	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}"/test/unit
-	./podofo-test --selftest || die "self test failed"
+	mkdir -p "${S}/test/TokenizerTest/objects" || die
 }
diff --git a/app-text/podofo/podofo-0.9.6_pre20171027.ebuild b/app-text/podofo/podofo-0.9.6_pre20171027.ebuild
deleted file mode 100644
index 4c9b80bd810b..000000000000
--- a/app-text/podofo/podofo-0.9.6_pre20171027.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
-HOMEPAGE="https://sourceforge.net/projects/podofo/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+boost idn libressl debug test +tools"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tools )"
-
-RDEPEND="dev-lang/lua:=
-	idn? ( net-dns/libidn:= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	media-libs/fontconfig:=
-	media-libs/freetype:2=
-	virtual/jpeg:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	boost? ( dev-util/boost-build )
-	test? ( dev-util/cppunit )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libressl-bug-635890.patch"
-)
-
-DOCS="AUTHORS ChangeLog TODO"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	local x sed_args
-
-	# The 0.9.6 ABI is not necessarily stable, so make PODOFO_SOVERSION
-	# equal to ${PV}.
-	sed -e 's|${PODOFO_VERSION_PATCH}|\0_'${PV##*_}'|' -i CMakeLists.txt || die
-
-	# bug 620934 - Disable linking with cppunit when possible, since it
-	# triggers errors with some older compilers.
-	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
-
-	# bug 556962
-	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
-		test/unit/EncryptTest.cpp || die
-
-	sed -i \
-		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
-		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
-		CMakeLists.txt || die
-
-	# Use pkg-config to find headers for bug #459404.
-	sed_args=
-	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
-		[[ ${x} == -I* ]] || continue
-		x=${x#-I}
-		if [[ -f ${x}/ft2build.h ]] ; then
-			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
-		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
-			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
-		fi
-	done
-	[[ -n ${sed_args} ]] && \
-		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
-
-	# Bug #439784: Add missing unistd include for close() and unlink().
-	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
-		test/unit/TestUtils.cpp || die
-
-	# TODO: fix these test cases
-	# ColorTest.cpp:62:Assertion
-	# Test name: ColorTest::testDefaultConstructor
-	# expected exception not thrown
-	# - Expected: PdfError
-	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
-		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
-		-i test/unit/ColorTest.h || die
-
-	# ColorTest.cpp:42:Assertion
-	# Test name: ColorTest::testHexNames
-	# assertion failed
-	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
-	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
-		-i test/unit/ColorTest.h || die
-
-	# Bug #352125: test failure, depending on installed fonts
-	# ##Failure Location unknown## : Error
-	# Test name: FontTest::testFonts
-	# uncaught exception of type PoDoFo::PdfError
-	# - ePdfError_UnsupportedFontFormat
-	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
-		-i test/unit/FontTest.h || die
-
-	# Test name: EncodingTest::testDifferencesEncoding
-	# equality assertion failed
-	# - Expected: 1
-	# - Actual  : 0
-	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
-		-i test/unit/EncodingTest.h || die
-
-	# Bug #407015: fix to compile with Lua 5.2
-	if has_version '>=dev-lang/lua-5.2' ; then
-		sed -e 's: lua_open(: luaL_newstate(:' \
-			-e 's: luaL_getn(: lua_rawlen(:' -i \
-			tools/podofocolor/luaconverter.cpp \
-			tools/podofoimpose/planreader_lua.cpp || die
-	fi
-}
-
-src_configure() {
-
-	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
-	filter-flags -fvisibility-inlines-hidden
-
-	mycmakeargs+=(
-		"-DPODOFO_BUILD_SHARED=1"
-		"-DPODOFO_HAVE_JPEG_LIB=1"
-		"-DPODOFO_HAVE_PNG_LIB=1"
-		"-DPODOFO_HAVE_TIFF_LIB=1"
-		"-DWANT_FONTCONFIG=1"
-		"-DUSE_STLPORT=0"
-		-DWANT_BOOST=$(usex boost ON OFF)
-		-DHAVE_LIBIDN=$(usex idn ON OFF)
-		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
-		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}"/test/unit
-	./podofo-test --selftest || die "self test failed"
-}