gentoo resync : 25.05.2018

3 files changed, 88 insertions, 59 deletions

diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index f655328d0979..801284577731 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,6 +1,7 @@
 AUX cr3.1.2.71-r1_qt5_wx.diff 10066 BLAKE2B 8b1ecc7765735608e9651f23d1d9882186766e34c0ac5f9cac1312da68345d7a9028abaf9792f4ee85a4ddb5490fa1521d220b751eeeda84aa5ac79d92d33e88 SHA512 9f7a82964d1f5c308ad5124433dd0ed7debd715f1c0c2431bc84c9bf71d1d5dbbfb82a669b1c6ee114196c5e8ba1b745b07cc2195d4198c664ea15cf82182384
 AUX cr3ini.diff 1535 BLAKE2B 1eb5908bedf2a706d461ed84a60ed3232a4c98bee5d4b29c55e63d780d54785a1e3f77e9eb85d0675ac0efeb1652d505e9cef93b9c7dce39086c3b0a3f765c6b SHA512 efd7bfda3617168bda2bfad9e561b7bf3de89f141cf4155618bc6864fa5497d5b0e08ea583b302f4e9e3f60442472c7e5358313dd49549dce3fe078d58ee4ee5
 DIST coolreader-3.1.2.71.tar.bz2 10141514 BLAKE2B 143a69082a2dcabbb7a246df575e7ed2fddb4b11c542910faa2f6d44155f0de8ba6d7e0fd321b53fc0eda47c8d2867bfec02af3b95edbcb623f6a15fa6c4bc72 SHA512 2859eabfc8ba603d1cb09b07358887135b6968268a5f2fa7f874a1e8613d1b5ebe69d9b133f16e84321d1a460eae5088a7947433c6fb340a47bde9ceee415735
-EBUILD coolreader-3.1.2.71-r3.ebuild 1661 BLAKE2B 00ff6e9c7a6e73f09e1c7a7197c2476545fe3424d7325e4a1d5cec3bdebdc505c146890303738d406c4c82bc16173ab510713ef5e7400c5a43b5b84d92433791 SHA512 72c1a9b718ce1b165e410b40907c45c826d04b2cb5fe87c6c215de46dc6dc5dd8f32740297abccd226477621b31a8d4270616e938d994f8e67248f39566b4365
+DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
 EBUILD coolreader-3.1.2.71-r4.ebuild 2366 BLAKE2B 94049adc28a85bbba7648a992ae1975307816f477d15fbd48343314a99504889ed22e1d4ebd7379620b295a1e378675c0a331f41a144045ee6cd060caeb08628 SHA512 21be4a384808ca943d2278fe592c3acbbce7ea6951000efe107cb744b937c8b68c32fe2f8824abcf32c41343e835265bed865e7c5a01bef7d0d77a83093d7f43
+EBUILD coolreader-3.2.2.1.ebuild 2020 BLAKE2B 17bc4cfc083d7bb30ea67b98a0dc700695823b8a39e0fc20ff4b4ae80178c5207c60838874a80a23cbbf99430d7b1b26e39b430b94d4e870b981eefed46ec961 SHA512 f8b5daa8dc76471bce823563f53e9e3810c9530a58dde042400996b73ba636b8a726115b72b2666b561a9f419865e5e56c227d94034292c5aa7edd557451fc27
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild
deleted file mode 100644
index 9c7e43e5f3f1..000000000000
--- a/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit cmake-utils wxwidgets
-
-if [ "${PV}" == 9999 ]
-then
-	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/coolreader.git"
-	SRC_URI=""
-else
-	# git tag cr3.1.2-71
-	SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-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"
-
-DEPEND="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 )"
-RDEPEND="${DEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-# 1st patch: To save cr3.ini to ~homedir.
-# 2nd patch: To build QT5 and WX GUI version of coolreader3;
-# setting correct vesrion number and years of cr3qt/cr3wx;
-# internal switching between wxGTK 2.8 or 3.0 version;
-# show wxWidgets version in "About" dialog window;
-# disabling "iCCP: known incorrect sRGB profile" warning popup window for wxwidgets GUI
-
-PATCHES=( "${FILESDIR}/cr3ini.diff" "${FILESDIR}/cr3.1.2.71-r1_qt5_wx.diff" )
-
-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
-}
diff --git a/app-text/coolreader/coolreader-3.2.2.1.ebuild b/app-text/coolreader/coolreader-3.2.2.1.ebuild
new file mode 100644
index 000000000000..3d97d3b6b4e7
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+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"
+
+DEPEND="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 )"
+RDEPEND="${DEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+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
+}
+
+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
+}