gentoo resync : 25.11.2020

3 files changed, 101 insertions, 3 deletions

diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index b7d8ec6a2408..ba115d924131 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -2,8 +2,10 @@ DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb5061
 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
-EBUILD coolreader-3.2.2.1-r2.ebuild 2479 BLAKE2B 63c86c1dee137edc9f8937c72cb80c77c0f890347aa1d385b2be771a3fdfc11a1d895ee87b4bd295a52392dc72f9abcd34f019c5f350943d4a9ce45e3971f5b0 SHA512 8df9d4a6337416a8d394cbab4be7f9d166d7ca9febe6e4dc5054d842de4f006adb535342c24a1b80370988edad4c71f9a0e7f50a0aeb832ebcd251fa38f0d8b0
+DIST coolreader-3.2.50.tar.gz 21252394 BLAKE2B 68550656c644d623e24a7da310baf77881c72621db03f481eeaaceddc0a3c77ecd4d2098c4afe0b56fc50a67f471a9a6a20c172590365bd888222894d27c1826 SHA512 01417c1daae5da6ebb4d92fd68693d3aff09013d1f5679a30138941e23f79db58bdf2b20721deb10ad3d0b9ab0530f8237aeaa2b6f1c1fabbff1c43f48d68ac3
+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
 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
index db5d2760de9a..40a838c4e2c4 100644
--- a/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
+++ b/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ HOMEPAGE="https://sourceforge.net/projects/crengine/"
 
 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.50.ebuild b/app-text/coolreader/coolreader-3.2.50.ebuild
new file mode 100644
index 000000000000..0b26482993e9
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.50.ebuild
@@ -0,0 +1,96 @@
+# 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
+}