gentoo resync : 03.03.2021

3 files changed, 7 insertions, 102 deletions

diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index ea43762f7841..b3cdf1a391a5 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,9 +1,7 @@
-DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
 DIST coolreader-3.2.50.tar.gz 21252394 BLAKE2B 68550656c644d623e24a7da310baf77881c72621db03f481eeaaceddc0a3c77ecd4d2098c4afe0b56fc50a67f471a9a6a20c172590365bd888222894d27c1826 SHA512 01417c1daae5da6ebb4d92fd68693d3aff09013d1f5679a30138941e23f79db58bdf2b20721deb10ad3d0b9ab0530f8237aeaa2b6f1c1fabbff1c43f48d68ac3
-DIST coolreader-3.2.51.tar.gz 21575605 BLAKE2B dcd0b33706d675d0da46825b298b726c6c4ef041989b74619fb289ffefa3f62284d22d8ab0930f2866b1b01ae92f2acb8efe51fc8230d925454ed351b9c30242 SHA512 e7e4645c501c4999dd4a3069d3b11a634eca285da23c113bb9fe339ba9b519de994f972fcd65cf941ab6ec326a234af91ae7728689e3afe3f00ad2e93c08c279
 DIST coolreader-3.2.53.tar.gz 12550563 BLAKE2B 24543cac98349f4c0587149a3eb8f964cfb46891a0ed7c613a4a0bd644e8d24cb0ff057eab74aecf3c574e604d4208dbbee4c7023d8197282589184317312ee3 SHA512 4f500d877287b3c391cb0be7038586897e7c0eb9cfbe87d9b3ee3923db82c4ce04533249dee83a259a084bc142236cc5cc67f3e4428f05756da8c593a47a9558
-EBUILD coolreader-3.2.2.1-r2.ebuild 2475 BLAKE2B ef04a9149a2ca2b02b82de190fe071aeaa7f3880dfac03f39e4b20d1c408f55114048ec20479bcfc2ae92f396520a583a940f16afe09f3d53418b65ab25169dd SHA512 280a8eaddbb44e09ce50cc02c26f9a07f34ca986d30c79f3b2100c14a73fa63f0970cdf1436dc4f496191cbd423fa5bd8d7afd34e201f938caab0741ed9b54d2
+DIST coolreader-3.2.54.tar.gz 13231261 BLAKE2B aac948ab4535238caf0541f25b3fb1332d17aa46dc7b116543d37c4cd5d900f0e7861e1ab745ba455feec236c6dc05fde6faad2f4e378e33441cee7736b22b9f SHA512 11ca3588a3794dcc5c5970dc508ade43e29a9d6db7d8ef01c7f04d7cfad2c50a21f6f333574d057c45c8f6d7eb619b5f0f072b1163327f694dcbdcc4b7539220
 EBUILD coolreader-3.2.50.ebuild 2450 BLAKE2B 94b8e8cbfaee42fca275ba15fe910e0feb5962f3f1b5a5388e4e45281d7089300904dcda2e38085fb9510b1535320d4e260c63e9480eba5bf0f1e0b87747159c SHA512 2ce5d70774b33bf61efb62ce5546210b07521709e55da040d849fc4d84b225dae16148b6f30aa199c7d991675a33ce94627af77a128d37d4e2bf100821119d80
-EBUILD coolreader-3.2.51.ebuild 1756 BLAKE2B 249d73cd0c5754eed0083e3b33836620be1ec53aeda9cd83100ad119ef8093369190dfd6765cd0cd615c5fa27cc1d69d37cdf22effbc728232c4209135e33f00 SHA512 2ab5f9f9e6e4f9a440cb81d52208d4399879558d7bb41e4310ad35401dd850e99d8abf525370c960f4bc0b91258ab789f14c130488c7aa9eb136ee6517aa37f3
 EBUILD coolreader-3.2.53.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
+EBUILD coolreader-3.2.54.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild b/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
deleted file mode 100644
index 40a838c4e2c4..000000000000
--- a/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
-
-CR_PV=$(ver_rs 3 '-')
-
-if [ "${PV}" != 9999 ]
-then
-	# git tag cr3.2.2-1
-	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-cr${CR_PV}"
-else
-	inherit git-r3
-	# github mirror has some new commits to fix page margins settings
-	# sourceforge mirror saved as backup
-	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
-	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
-	SRC_URI=""
-fi
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://sourceforge.net/projects/crengine/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-DEPEND="${CDEPEND}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-for lang in ${PLOCALES}; do
-	IUSE="${IUSE} l10n_${lang}"
-done
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# locales
-	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	local lang langs
-	langs=""
-	for lang in ${PLOCALES}; do
-		if use l10n_${lang}; then
-			langs="${langs} ${lang}"
-		fi
-	done
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if ! use wxwidgets; then
-		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
-		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
-		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
-		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/coolreader/coolreader-3.2.51.ebuild b/app-text/coolreader/coolreader-3.2.54.ebuild
index 6abcf90a4895..7c75f5c7adcc 100644
--- a/app-text/coolreader/coolreader-3.2.51.ebuild
+++ b/app-text/coolreader/coolreader-3.2.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,10 @@ CDEPEND="sys-libs/zlib
 	media-libs/libpng:0
 	virtual/jpeg:0
 	media-libs/freetype
+	dev-libs/fribidi
+	media-libs/fontconfig
+	media-libs/harfbuzz
+	dev-libs/libunibreak
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
 	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
 BDEPEND="${CDEPEND}