gentoo new year resync : 01.01.2021

6 files changed, 67 insertions, 296 deletions

diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index ba115d924131..0c76bcf9842d 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,11 +1,7 @@
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
-DIST coolreader-3.2.39.tar.gz 17679570 BLAKE2B e84fb7d8032ae62fec24a74a9cebab086664a2ed3827f0664e667a4ab3b8d76b722790958f71f5fcd79729238e897c6592059f9b45eb4069c9ad483883bc0600 SHA512 1b92b35750174a8ef4df4b7c4f33bb9fcc94b36008c08a7f9d1f8e85c6b642c5b037e0673a783cde1aa98296887bb286c4a2da186911b26f298f689605e1eb4b
-DIST coolreader-3.2.45.tar.gz 20290340 BLAKE2B a4e6218965618a1b0938606ca323534112a5d7b64a1d56e06f56ba8b2e5591d380d7fb2aeb9c37d007fb834963a42e684e2af939720272c3a7494e5afc65501e SHA512 d7dc9921b74d1da236aeb02edcb39d44dfcfb9da5d6d3b1bf428157f67415c19af218c2454a602828d12d0c6d8c80d1335e92101acda1af8abd6bd312900c33c
-DIST coolreader-3.2.49.tar.gz 21398327 BLAKE2B 9a63f34d661f7c12d55e08788edb0c348d33c67708890e89a857975ce3a6fc82d8788dc0a15ad18e025d68254293b1b34977b2ffe24ea19ab4865727d5afbdcb SHA512 06c8416c33ccf939c0292b573352c097c4b2a0b1390181428e5f1bf08e145f1fa1f8ebdcf658bb0f9e8846c1fd5a57a67fb075b8e7285e1e7602e26aba6790b0
 DIST coolreader-3.2.50.tar.gz 21252394 BLAKE2B 68550656c644d623e24a7da310baf77881c72621db03f481eeaaceddc0a3c77ecd4d2098c4afe0b56fc50a67f471a9a6a20c172590365bd888222894d27c1826 SHA512 01417c1daae5da6ebb4d92fd68693d3aff09013d1f5679a30138941e23f79db58bdf2b20721deb10ad3d0b9ab0530f8237aeaa2b6f1c1fabbff1c43f48d68ac3
+DIST coolreader-3.2.51.tar.gz 21575605 BLAKE2B dcd0b33706d675d0da46825b298b726c6c4ef041989b74619fb289ffefa3f62284d22d8ab0930f2866b1b01ae92f2acb8efe51fc8230d925454ed351b9c30242 SHA512 e7e4645c501c4999dd4a3069d3b11a634eca285da23c113bb9fe339ba9b519de994f972fcd65cf941ab6ec326a234af91ae7728689e3afe3f00ad2e93c08c279
 EBUILD coolreader-3.2.2.1-r2.ebuild 2475 BLAKE2B ef04a9149a2ca2b02b82de190fe071aeaa7f3880dfac03f39e4b20d1c408f55114048ec20479bcfc2ae92f396520a583a940f16afe09f3d53418b65ab25169dd SHA512 280a8eaddbb44e09ce50cc02c26f9a07f34ca986d30c79f3b2100c14a73fa63f0970cdf1436dc4f496191cbd423fa5bd8d7afd34e201f938caab0741ed9b54d2
-EBUILD coolreader-3.2.39.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
-EBUILD coolreader-3.2.45.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
-EBUILD coolreader-3.2.49.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
-EBUILD coolreader-3.2.50.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
+EBUILD coolreader-3.2.50.ebuild 2450 BLAKE2B 94b8e8cbfaee42fca275ba15fe910e0feb5962f3f1b5a5388e4e45281d7089300904dcda2e38085fb9510b1535320d4e260c63e9480eba5bf0f1e0b87747159c SHA512 2ce5d70774b33bf61efb62ce5546210b07521709e55da040d849fc4d84b225dae16148b6f30aa199c7d991675a33ce94627af77a128d37d4e2bf100821119d80
+EBUILD coolreader-3.2.51.ebuild 1756 BLAKE2B 249d73cd0c5754eed0083e3b33836620be1ec53aeda9cd83100ad119ef8093369190dfd6765cd0cd615c5fa27cc1d69d37cdf22effbc728232c4209135e33f00 SHA512 2ab5f9f9e6e4f9a440cb81d52208d4399879558d7bb41e4310ad35401dd850e99d8abf525370c960f4bc0b91258ab789f14c130488c7aa9eb136ee6517aa37f3
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.39.ebuild b/app-text/coolreader/coolreader-3.2.39.ebuild
deleted file mode 100644
index 0b26482993e9..000000000000
--- a/app-text/coolreader/coolreader-3.2.39.ebuild
+++ /dev/null
@@ -1,96 +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
-	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://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
-	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.45.ebuild b/app-text/coolreader/coolreader-3.2.45.ebuild
deleted file mode 100644
index 0b26482993e9..000000000000
--- a/app-text/coolreader/coolreader-3.2.45.ebuild
+++ /dev/null
@@ -1,96 +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
-	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://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
-	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.49.ebuild b/app-text/coolreader/coolreader-3.2.49.ebuild
deleted file mode 100644
index 0b26482993e9..000000000000
--- a/app-text/coolreader/coolreader-3.2.49.ebuild
+++ /dev/null
@@ -1,96 +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
-	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://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
-	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.50.ebuild b/app-text/coolreader/coolreader-3.2.50.ebuild
index 0b26482993e9..0f27ef3e2ac8 100644
--- a/app-text/coolreader/coolreader-3.2.50.ebuild
+++ b/app-text/coolreader/coolreader-3.2.50.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/buggins/coolreader/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="wxwidgets"
 
 CDEPEND="sys-libs/zlib
diff --git a/app-text/coolreader/coolreader-3.2.51.ebuild b/app-text/coolreader/coolreader-3.2.51.ebuild
new file mode 100644
index 000000000000..6abcf90a4895
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.51.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 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
+	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
+}