gentoo resync : 31.05.2021

3 files changed, 2 insertions, 71 deletions

diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 67a8343f5426..8c8816a460f7 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,5 +1,3 @@
-DIST coolreader-3.2.55.tar.gz 13230319 BLAKE2B 1cb414f38b76072f66705370162a28505ba2273282755704bb8ad28a7b0eb2928aba0a929291ae33fdf9ce42b442c4b941740d59f4f329a401470e2fceceef18 SHA512 4eef99c86259642d6a5c3d9eb388a11c27b7438c0f05a055ef61a1df93af567d30fa39790cc5d5b3d10dcaa4b2931a51773f967904ff75f7fff2040f313c09d6
 DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161
-EBUILD coolreader-3.2.55.ebuild 1838 BLAKE2B f5c912d33d88c0a9040ca6b495aa7a202b4d1f0eb043a57275fe1e9ff61081ed069acd9ae2c86381d7299a13ebfcc46f4eeb5f5bafe92da6c04c86750b8ea8c7 SHA512 50159e31e21ded5890111091f26ee10d91aab33714130be060d8ba7f4510ea90de2eb5f722be9007f67a2bbb71096ec39df3367f235643dfb97d02b3ecd37f4f
-EBUILD coolreader-3.2.57.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
+EBUILD coolreader-3.2.57.ebuild 1838 BLAKE2B f5c912d33d88c0a9040ca6b495aa7a202b4d1f0eb043a57275fe1e9ff61081ed069acd9ae2c86381d7299a13ebfcc46f4eeb5f5bafe92da6c04c86750b8ea8c7 SHA512 50159e31e21ded5890111091f26ee10d91aab33714130be060d8ba7f4510ea90de2eb5f722be9007f67a2bbb71096ec39df3367f235643dfb97d02b3ecd37f4f
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.55.ebuild b/app-text/coolreader/coolreader-3.2.55.ebuild
deleted file mode 100644
index 115cf9e91673..000000000000
--- a/app-text/coolreader/coolreader-3.2.55.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake wxwidgets l10n xdg
-
-CR_PV=$(ver_rs 3 '-')
-SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-cr${CR_PV}"
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://github.com/buggins/coolreader/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="wxwidgets"
-
-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}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_src_prepare
-
-	# locales
-	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(l10n_get_locales))|" \
-		-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_src_configure
-}
-
-src_install() {
-	cmake_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
-}
diff --git a/app-text/coolreader/coolreader-3.2.57.ebuild b/app-text/coolreader/coolreader-3.2.57.ebuild
index 7c75f5c7adcc..115cf9e91673 100644
--- a/app-text/coolreader/coolreader-3.2.57.ebuild
+++ b/app-text/coolreader/coolreader-3.2.57.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/buggins/coolreader/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="wxwidgets"
 
 CDEPEND="sys-libs/zlib