9 files changed, 4 insertions, 464 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5aa7d5f9fca3..466707634525 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 2ea1e506161d..784670700a9f 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,4 +1,4 @@
 DIST pdftk-v3.3.3.tar.gz 2380289 BLAKE2B b370777f5b87706ed811e424214db23b5622ef4e2420fe00c7e5e7d03fb51314589e7a1588d911c0734c075612adab9af17a1ad4ddcaac7a5dfc407c1aa28392 SHA512 2fd8dce8787856955984d6396ccb9a57d4e7a255cd74f10b31a7d87c84fac80143c0067d76bf6d8c0ec1a55dfb7d1e90f4898706e8ae26ccdf657b38d88e6cd6
 EBUILD pdftk-3.3.3.ebuild 1926 BLAKE2B 6ba722118bc28b42436039d270844002fa75aad0bb927b22fefa683818a35b7dffc0c55d31fe23cb442cdf06085576d2ab743a0180f0d41e289c00a8dae41369 SHA512 4abc5b436f94a182b8a5d5c14377fe3fc314ec6c04845030b367596fa92328104543128c58134ca8baf6552e514f3e7676296f1786fc4cf96a2a924c0dd576c3
 EBUILD pdftk-9999.ebuild 906 BLAKE2B bbc5a168431ff4f4f8a51ee581c1dde06c3044212be071360168a7f192cf7f257fa3b0bf966cc66532763b3cbe5ac74fca56de276f8afbf17cfe49fa7a837a5a SHA512 312c2f2bfb40abc41c2b67f96ecb54b1cdaeeb083dffb2d395e5fb757e56b7b1d128850f64c6427a4066734a2cf33d29ebbf3841497cbc8a106edb1c305de55a
-MISC metadata.xml 349 BLAKE2B 3fd6e82540ef8da6c46195a90af4638d914e5f3f6a1e6f3e3dbf0bfb940f23ed7b26578185219ef1fd00f069bb38a308056a39edea7661e263ac523c3bd40a2e SHA512 364f75cc6a80de2e1d517b094c1073fab7fc10738182d1fb37f0723fdcfc5238704f905a0f6ec8e373e1a91f2a7ad0990891beb26f94010eab13e8f688d230ad
+MISC metadata.xml 427 BLAKE2B d839579ab02144cd303ff7094601b4db0473bfd39479cd24183e4012469fb2ccd4320c1c0d6bf36e1ed08a6ea51469eaabe19712a3d3a1e21c45a2b066cd3e79 SHA512 a015f4405e987d543783d3fcf36876b6d8d0bc986570f47baaf2ab12eb08be77024ad75450b98867d9e9a625168af51542ffe90214fd4f997dbb6c25b1f9324b
diff --git a/app-text/pdftk/metadata.xml b/app-text/pdftk/metadata.xml
index 0761a7190d4a..81ba34ef8d7e 100644
--- a/app-text/pdftk/metadata.xml
+++ b/app-text/pdftk/metadata.xml
@@ -9,4 +9,7 @@
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
+<upstream>
+	<remote-id type="gitlab">pdftk-java/pdftk</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 7bf4b70612c1..95b0bb5cc9b9 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,9 +1,5 @@
 AUX podofo-0.9.6_p20190928-cmake_lua_version.patch 522 BLAKE2B b911b2ab2b35f5eccb58b32e575a775fe43cac1576831bb4e47d10c666a1e7040d8c01c865ee63ef1c3ff3c1a1feb2059dc25c71924b61995302dad21c32c868 SHA512 953f41b44468918aa96af42ecf3de8e3dd0d7721ed7c6283d8a6d44941caf70d9ef63d7d59ee1d94081fdc91a915ba8770bc335f8af5d60b24cd1f6c04698f6f
-DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
-DIST podofo-0.9.7.tar.gz 1005247 BLAKE2B d8f123008d272c1c39f60438d7cd6112cdd851488775e7e0fcb3fd9c4669fd64867fa293ef18b3189eac01f84a8a6b3c536171528f2b6097a5fe181c98501a71 SHA512 0e699739c2fb7d4d02ffca371504bb19f3a8a97ddcbfc06f8d9636db9e73064b4f633f7f09bce92140bb2174610ad68c1e5f8460d474d176ab803ed28295251b
 DIST podofo-0.9.8-bug-888463.patch 1269 BLAKE2B 632e9326112eecb484a15a532fc218263eab081acaf2af2bc1cc3d1020347846ce9ce82147d9d2fa9b42d690270b01b68eaf621cfbbdcfce041b8d651754c08e SHA512 9b0764d8697fad57107647a620f6dbe5d8025628faf02b1d6839d3f975216b16a58ccc115f58809aa4e31fb6b4b487b1490eedf468ddc8b90e494f68d8e50dc6
 DIST podofo-0.9.8.tar.gz 1012918 BLAKE2B 5d343128bcf06dbb8ef1d70b32f580a800726c33e4c14c86a6c7df0278a34b2d96cba7975c00d32e792596ca3cb54fa66fee262b49a240cd52e31646947b943e SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1
-EBUILD podofo-0.9.6_p20190928-r101.ebuild 4655 BLAKE2B c379c5cef61673671c9dfbda5e6b4123f9d66ff93a3064bc40bac56ba6e99e5672049f18710e31a4dfb0d1d56160ed10191ff1699836f77cb1b1811fcdc831e3 SHA512 bea8324cf06beb7d0b920c3659639656e439f0a224102391b66aab2aaf5148948117c4f79a0657596993eed0c8c7131e44683aaaa49c88916453fc6c76ec873e
-EBUILD podofo-0.9.7-r1.ebuild 3159 BLAKE2B faeeae5cbd4e445961db6eb50180fc82e7a50e6f63dc29d7569b6fd134562e806e59ae441e5a74be1448c4f89ccb7898dd1fd211eba2f97682088456f28ce2d3 SHA512 7ecb65bf995b5f8ad796fe67a25fee8cd797abd0d7dfc27d10f1ef0e8e39ec1ba0c5a66c775511aa9dd5d36e694edec5466a474bd1dec6f475442ad130b555e3
 EBUILD podofo-0.9.8-r1.ebuild 3304 BLAKE2B 9914548743904ca027878a0c8584786e427700744bd6e56bc8f4c4b21de837a85d66cf74c56072b7ae39a918202a2f2955c521439f8aa4699327229d430026c1 SHA512 dd67345ef90972668c896cbb81f3a8bb31289da2a008f8b2b896d9f80cc5c0bb2df24348cbc9a92e753a072f7630ee474567194eb723990186d248667cbd8470
 MISC metadata.xml 510 BLAKE2B a8b777ebbbbadbb251c30aa0c662509559849d74c326e38d8ef965aa32f4cdd613a8d2251771d43fd217dbedd195dc11c8167e09bb2aa7ecf064a7dc2e13abe9 SHA512 d47dfa7ef44f0f0758662550afafd90e2566ad1ee418173aa27ead580ec0d328e0facd812e68b9701a2a6d7e6dcb9d62576c62c9a441c2c7f2fd664cd8f92bbc
diff --git a/app-text/podofo/podofo-0.9.6_p20190928-r101.ebuild b/app-text/podofo/podofo-0.9.6_p20190928-r101.ebuild
deleted file mode 100644
index b38d2983b91f..000000000000
--- a/app-text/podofo/podofo-0.9.6_p20190928-r101.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs
-
-DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
-HOMEPAGE="https://sourceforge.net/projects/podofo/"
-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"
-IUSE="+boost idn debug test +tools"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	test? ( tools )"
-
-RDEPEND="${LUA_DEPS}
-	idn? ( net-dns/libidn:= )
-	dev-libs/openssl:=
-	dev-libs/libunistring:=
-	media-libs/fontconfig:=
-	media-libs/freetype:2=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-BDEPEND="virtual/pkgconfig
-	boost? ( dev-libs/boost )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS ChangeLog TODO"
-
-src_prepare() {
-	cmake_src_prepare
-	local x sed_args
-
-	# 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+
-	case "${ELUA}" in
-		lua5-1|luajit)
-			;;
-		*)
-			sed -e 's: lua_open(: luaL_newstate(:' \
-				-e 's: luaL_getn(: lua_rawlen(:' -i \
-				tools/podofocolor/luaconverter.cpp \
-				tools/podofoimpose/planreader_lua.cpp || die
-			;;
-	esac
-}
-
-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"
-		-DLUA_VERSION="$(lua_get_version)"
-		-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_src_configure
-	mkdir -p "${S}/test/TokenizerTest/objects" || die
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/test/unit || die
-	./podofo-test --selftest || die "self test failed"
-}
diff --git a/app-text/podofo/podofo-0.9.7-r1.ebuild b/app-text/podofo/podofo-0.9.7-r1.ebuild
deleted file mode 100644
index e15f6767e6c5..000000000000
--- a/app-text/podofo/podofo-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs
-
-DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
-HOMEPAGE="https://sourceforge.net/projects/podofo/"
-SRC_URI="https://cfhcable.dl.sourceforge.net/project/podofo/podofo/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+boost idn debug test +tools"
-RESTRICT="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	test? ( tools )"
-
-RDEPEND="${LUA_DEPS}
-	idn? ( net-dns/libidn:= )
-	dev-libs/openssl:=
-	media-libs/fontconfig:=
-	media-libs/freetype:2=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )
-"
-
-BDEPEND="virtual/pkgconfig
-	boost? ( dev-libs/boost )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS ChangeLog TODO"
-
-src_prepare() {
-	cmake_src_prepare
-	local x sed_args
-
-	# 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 #407015: fix to compile with Lua 5.2+
-	case "${ELUA}" in
-		lua5-1|luajit)
-			;;
-		*)
-			sed -e 's: lua_open(: luaL_newstate(:' \
-				-e 's: luaL_getn(: lua_rawlen(:' -i \
-				tools/podofocolor/luaconverter.cpp \
-				tools/podofoimpose/planreader_lua.cpp || die
-			;;
-	esac
-}
-
-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"
-		-DLUA_VERSION="$(lua_get_version)"
-		-DWANT_BOOST=$(usex boost ON OFF)
-		-DHAVE_LIBIDN=$(usex idn ON OFF)
-		# We use libidn for unicode support instead
-		-DCMAKE_DISABLE_FIND_PACKAGE_UNISTRING=ON
-		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
-		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
-	)
-
-	cmake_src_configure
-	mkdir -p "${S}/test/TokenizerTest/objects" || die
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/test/unit || die
-	./podofo-test --selftest || die "self test failed"
-}
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index 51da117cd609..bd54b69350aa 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,8 +1,5 @@
 AUX sdcv-0.5.3-t_list.patch 592 BLAKE2B 7f1618750a8d9c452f8db257a2b4791b803f45f10334789dd6f6d13f46335d9daf4a1a070ad03a38d40e6937d5e70371502ba26361c4d62486031888645843c3 SHA512 1aad632517f04423fd0a985256d760a06e5e38c3c9335f814f6997559ed3e3fb33fe1dba25e49b8298eda6570526323c2fdef18be83ab3363caa074cd59db107
-AUX sdcv-synonyms-bin-search.patch 3409 BLAKE2B e40f32a2e0e401ae5b996992fa227ef70a439f928d762285094237871b7dded242928bab8206a146acf1abf716cdbcaa8a8d0ed5a430ec4dff5cae3a3a014b34 SHA512 bf4cf297abed05f4052cbff8decac2069a52657b3cfc21435e72731536ab9605ddde9053fa8b39d9a2f1dc67416126b1b10a1c31cabca37a6fb31d2272ba5e13
 AUX sdcv-t_interactive.patch 324 BLAKE2B ecdb0d89c4a26050927272f244e43b28e945e3ef5cb93167eaea7c09912e504af2061ec34c2b5f5a32665c784093e2d35ed92e10a00824b619da71e53049e5dc SHA512 9067330c6fa95910b5dd67716c9bc378d29a9ccc5d60c1eb0c1aca12e58478ea381b91c5122c1951bd2f4c9e8b629243ea885bdbbc87a2f88174340919f5cf8d
-DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f SHA512 73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442
 DIST sdcv-0.5.4.tar.gz 66706 BLAKE2B 9cb481f497483b502bec18765b9cbc31e8dd278e30ebd29005158a724669e171181a82c837b63016b9e88a84973831587d2b137bbbdb2290a89a73d3f0917f81 SHA512 6bae3a2c0f37ed9380f54715626efeea0df75d2525baa583c0915bba4d082d9ece40ee799a1e1bb5d36b7ccebace853653b6fab57d472a432b910f690235ee21
-EBUILD sdcv-0.5.3.ebuild 1599 BLAKE2B d1b997b6d9b39686690b1cecf6f51a79144e90d3a6f398a84c720071b99e5f707f286b58c029dd6d452632f9408aa156aefb5dbae5a9671532d5beb53222b5d8 SHA512 2ee3c48aff47225c46f9767d22c671db627a939168d20d1ab462266da12712b0c04933fda126479541811c78923d461cc48ec81d8a237ffa37a7da02e392a6a5
 EBUILD sdcv-0.5.4.ebuild 1552 BLAKE2B f235d0c2a63c6cc3d0cbed5c85138c584686aa6be3580be7af48b056ad93a7c495b4e9562ab62639e809c67f45aab436c338f8e14a9693bc65672f8a6cdaa3d0 SHA512 c50c4bc40f3211d83399f088c1c7c5ec1f9a671ed1f0003f8900ac4141d67615a24e7b47765ae7d411259e50094033b07df4c6a9344323574012bee52cd817cc
 MISC metadata.xml 449 BLAKE2B 3a4834d7d93e7b98e85a6ef09ae438ad9623eadcfbe3a0d50465b7cb1e9417bd0e4c8d4c005f45c9fb759926a35b566d3763b19311d3bb0fbcfdea9b147598c4 SHA512 b00e28f9c0c46e3068f53f98453dd351b3b7a305acd0aa68b286bd4e73ddc94bf4e7f16ec93a5945e05fc6dead340755d5949daa49fb878a80b1f18aa95f9b21
diff --git a/app-text/sdcv/files/sdcv-synonyms-bin-search.patch b/app-text/sdcv/files/sdcv-synonyms-bin-search.patch
deleted file mode 100644
index e3583b1a5fb6..000000000000
--- a/app-text/sdcv/files/sdcv-synonyms-bin-search.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-ommit 4ae420734990ab9f5ccc038262368256b9323f4a
-Merge: b66799f 994c1c7
-Author: Evgeniy Dushistov <dushistov@mail.ru>
-Date:   Wed Dec 23 04:30:13 2020 +0300
-
-    Merge pull request #67 from doozan/master
-
-    Use binary search for synonyms, fixes #31
-
-diff --git a/src/stardict_lib.cpp b/src/stardict_lib.cpp
-index 0af4304..6b1f92b 100644
---- a/src/stardict_lib.cpp
-+++ b/src/stardict_lib.cpp
-@@ -833,21 +833,23 @@ bool SynFile::load(const std::string &url, gulong wc)
- {
-     struct stat stat_buf;
-     if (!stat(url.c_str(), &stat_buf)) {
--        MapFile syn;
--        if (!syn.open(url.c_str(), stat_buf.st_size))
-+
-+        if (!synfile.open(url.c_str(), stat_buf.st_size))
-             return false;
--        const gchar *current = syn.begin();
-+
-+        synlist.resize(wc + 1);
-+        gchar *p1 = synfile.begin();
-+
-         for (unsigned long i = 0; i < wc; i++) {
-             // each entry in a syn-file is:
-             // - 0-terminated string
-             // 4-byte index into .dict file in network byte order
--            glib::CharStr lower_string{ g_utf8_casefold(current, -1) };
--            std::string synonym{ get_impl(lower_string) };
--            current += synonym.length() + 1;
--            const guint32 idx = g_ntohl(get_uint32(current));
--            current += sizeof(idx);
--            synonyms[synonym] = idx;
-+
-+            synlist[i] = p1;
-+            p1 += strlen(p1) + 1 + 4;
-         }
-+        synlist[wc] = p1;
-+
-         return true;
-     } else {
-         return false;
-@@ -856,13 +858,38 @@ bool SynFile::load(const std::string &url, gulong wc)
- 
- bool SynFile::lookup(const char *str, glong &idx)
- {
--    glib::CharStr lower_string{ g_utf8_casefold(str, -1) };
--    auto it = synonyms.find(get_impl(lower_string));
--    if (it != synonyms.end()) {
--        idx = it->second;
--        return true;
-+    bool bFound = false;
-+    glong iTo = synlist.size() - 2;
-+    if (iTo <0) return false;
-+
-+    if (stardict_strcmp(str, get_key(0)) < 0) {
-+        idx = 0;
-+    } else if (stardict_strcmp(str, get_key(iTo)) > 0) {
-+        idx = INVALID_INDEX;
-+    } else {
-+        glong iThisIndex = 0;
-+        glong iFrom = 0;
-+        gint cmpint;
-+        while (iFrom <= iTo) {
-+            iThisIndex = (iFrom + iTo) / 2;
-+            cmpint = stardict_strcmp(str, get_key(iThisIndex));
-+            if (cmpint > 0)
-+                iFrom = iThisIndex + 1;
-+            else if (cmpint < 0)
-+                iTo = iThisIndex - 1;
-+            else {
-+                bFound = true;
-+                break;
-+            }
-+        }
-+        if (!bFound)
-+            idx = iFrom; //next
-+        else {
-+            const gchar *key = get_key(iThisIndex);
-+            idx = g_ntohl(get_uint32(key+strlen(key)+1));
-+        }
-     }
--    return false;
-+    return bFound;
- }
- 
- bool Dict::Lookup(const char *str, glong &idx)
-diff --git a/src/stardict_lib.hpp b/src/stardict_lib.hpp
-index a629cbe..38f76f4 100644
---- a/src/stardict_lib.hpp
-+++ b/src/stardict_lib.hpp
-@@ -102,11 +102,15 @@ public:
- class SynFile
- {
- public:
-+    SynFile() {}
-+    ~SynFile() {}
-     bool load(const std::string &url, gulong wc);
-     bool lookup(const char *str, glong &idx);
-+    const gchar *get_key(glong idx) { return synlist[idx]; }
- 
- private:
--    std::map<std::string, gulong> synonyms;
-+    MapFile synfile;
-+    std::vector<gchar *> synlist;
- };
- 
- class Dict : public DictBase
diff --git a/app-text/sdcv/sdcv-0.5.3.ebuild b/app-text/sdcv/sdcv-0.5.3.ebuild
deleted file mode 100644
index 8f7ae8fc46d8..000000000000
--- a/app-text/sdcv/sdcv-0.5.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs fr ru sk uk zh_CN zh_TW"
-inherit cmake plocale
-
-DESCRIPTION="Console version of Stardict program"
-HOMEPAGE="https://dushistov.github.io/sdcv/"
-SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="darkterm nls readline test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.36
-	sys-libs/zlib
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( >=sys-devel/gettext-0.14.1 )
-	test? ( app-misc/jq )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.5.3-t_list.patch"
-	"${FILESDIR}/${PN}-t_interactive.patch"
-	"${FILESDIR}/${PN}-synonyms-bin-search.patch"
-)
-
-src_prepare() {
-	if use darkterm; then
-		sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
-	fi
-
-	rm_loc() {
-		rm "po/${1}.po" || die
-	}
-	plocale_for_each_disabled_locale rm_loc
-
-	# do not install locale-specific man pages unless asked to
-	if ! has uk ${LINGUAS-uk}; then
-		sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_NLS="$(usex nls)"
-		-DWITH_READLINE="$(usex readline)"
-		-DBUILD_TESTS="$(usex test ON OFF)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use nls && cmake_src_compile lang
-}
-
-src_install() {
-	# with USE=nls, but empty intersection of LINGUAS and list of
-	# supported translations, this directory is required, see bug 583386
-	mkdir -p "${BUILD_DIR}/locale"
-	cmake_src_install
-	dodoc doc/DICTFILE_FORMAT
-}