gentoo resync : 25.08.2020

3 files changed, 2 insertions, 150 deletions

diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 0d3c1c12eee5..8b8720560109 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,5 +1,3 @@
-DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
 DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
-EBUILD podofo-0.9.6_p20180715.ebuild 4661 BLAKE2B c5e6616218c01a583ef3bcd8e93a80edd060b9fe010cf9f91372a5ce3e9f34d592d69fe20cc8e9ba02dceefa6ac70679c5d66783580fd7d70b40cc2f74c5a85d SHA512 b6b6a274d5ee92d13d4b573844cd0d1629f13b552f5d8257e884a0c555ba1d14425abe3fab1be9e01d27c5c1da9eae07519ad0916862569a0495808d2719449f
-EBUILD podofo-0.9.6_p20190928.ebuild 4670 BLAKE2B df7e653e7251ee6a8c82f45cff91ab7703aa73045d1dd16b7bdaf0ba10d9475e5736566411600d473f1b4ba79df8742e96f616e8d1b45b524382d569b568b2b8 SHA512 f0d481bbf173348d0da77ac046aa4fafa5301e91fb888107f6bad455ee366edd1a7fbfa56a1b8533e9f72c1a9cf27ff45668769b86c6820e99c84d266746f19a
+EBUILD podofo-0.9.6_p20190928.ebuild 4665 BLAKE2B 82b5f6179a54e471a1b8aeab45d87d5499f59fb47a82b9a39302b3053d4f0642a8677e723013a6b307e112a057ae61609940b6298cc43c9b203cefe08153aeee SHA512 ae262d3bef4ff0ef909779620b7c80768158a53ddabcdbf500f034f2f5a988b64a2de7d4f19998618780d888252783add8b2a3f3030124b52685077e268f1ea9
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
deleted file mode 100644
index e53db8b61f42..000000000000
--- a/app-text/podofo/podofo-0.9.6_p20180715.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 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 ~arm64 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 )"
-
-DOCS="AUTHORS ChangeLog TODO"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	local x sed_args
-
-	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.
-	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
-	mkdir -p "${S}/test/TokenizerTest/objects" || die
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}"/test/unit
-	./podofo-test --selftest || die "self test failed"
-}
diff --git a/app-text/podofo/podofo-0.9.6_p20190928.ebuild b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
index 0c3c7b2bd809..a07aaa17adbf 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"