gentoo auto-resync : 25:12:2022 - 14:05:06

9 files changed, 32 insertions, 108 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 91c13505d7da..6887b5ff503f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest
index b275e342430c..62f4d502d96e 100644
--- a/app-text/crengine-ng/Manifest
+++ b/app-text/crengine-ng/Manifest
@@ -1,5 +1,3 @@
-DIST crengine-ng-0.9.2.tar.bz2 3123671 BLAKE2B 7ecafc398e81fa9771f5728d0fa60fbc6c3fb883a56d09fc4857d92c3d2f997cbbc0d4ac9818bff82d38ffb110463b88663f3298380a15e83df7292dff461cc2 SHA512 09b6f8f9bb747d71258802741d0d8962808279122ed6f2791b2c3813b684bb515206bc8656128e129fc7bcc76bcbb2c485360adb3b60f51377b87f26a1874e05
 DIST crengine-ng-0.9.3.tar.bz2 3125528 BLAKE2B 49f3c99dda63987fefff55184522f635af4c792e96efdc337e5c42c97d5975658a52308d33e314337d20ba9b8c70d0c590c567db567a01cc46d060d059ee20df SHA512 4a393c3ebb5ccc2a94fc06fae34b037c0e5d725d1b58a30d7f19476f94dbeb86e7138a444a84b80f536afb2fbed06a8899c87e322303322066a1d35a5bcd70a9
-EBUILD crengine-ng-0.9.2.ebuild 1634 BLAKE2B 66e9342e3fa43ffc227a022fb82539a755b23fd078989c0851211f0ef798094fd9cc818f67011c9f8010d4efe6457a59eb6e1a4db64c3099e4afef09459ac05f SHA512 c283ac39b48919622238c443af5192440c10ad456d06f049b1f641984e1f1f2597a45c66d52fb8c11a63cf28797e082c6e7a33f9a28462f4b977142883097f5f
 EBUILD crengine-ng-0.9.3.ebuild 1604 BLAKE2B 5a58df581a2e0c326601de20e766240b194f73a8f38c42b1de0783c36a2f36f2431fdacdfccea694bcf5a5c3c5c4abbb690ecdf4cef1aef63bc1b0ff7b86e3c4 SHA512 34ba53829325903c482e23b6c9b8c99f407bf30c1a2b618da60645508cc8f79dbc1172f08de041734b632a64443a8fb24c9e72aa6fbbddd321369244580f5b5c
 MISC metadata.xml 1232 BLAKE2B ecb2f3ff8720e43b48f6e211da27f0f34d3123644a429cb7853ae4044761793f5137dfbeaa0962093f2b722fdcfb6e3bf9ad432835fa6fa3f5bbf5f7f7abd78c SHA512 6aa7904c0d002926d4223c46b31de30f5ab06dee8291909498ecaa6deed3a6b547cfaa40df1ad7dca7e74faa55e95ab4fe4fa4ac0698202b5dd0221a50288036
diff --git a/app-text/crengine-ng/crengine-ng-0.9.2.ebuild b/app-text/crengine-ng/crengine-ng-0.9.2.ebuild
deleted file mode 100644
index 35edaf121645..000000000000
--- a/app-text/crengine-ng/crengine-ng-0.9.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-DESCRIPTION="Cross-platform library designed to implement e-book readers. Supports many e-book formats"
-HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng"
-SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs"
-
-CDEPEND="sys-libs/zlib
-	png? ( media-libs/libpng:0 )
-	jpeg? ( media-libs/libjpeg-turbo )
-	>=media-libs/freetype-2.10.0
-	harfbuzz? ( media-libs/harfbuzz:= )
-	libunibreak? ( dev-libs/libunibreak:= )
-	fribidi? ( dev-libs/fribidi )
-	zstd? ( app-arch/zstd:= )
-	libutf8proc? ( dev-libs/libutf8proc:= )
-	fontconfig? ( media-libs/fontconfig )"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	${CDEPEND}"
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	local mycmakeargs=(
-		-DCRE_BUILD_SHARED=ON
-		-DCRE_BUILD_STATIC=$(usex static-libs)
-		-DUSE_COLOR_BACKBUFFER=ON
-		-DWITH_LIBPNG=$(usex png)
-		-DWITH_LIBJPEG=$(usex jpeg)
-		-DWITH_FREETYPE=ON
-		-DWITH_HARFBUZZ=$(usex harfbuzz)
-		-DWITH_LIBUNIBREAK=$(usex libunibreak)
-		-DWITH_FRIBIDI=$(usex fribidi)
-		-DWITH_ZSTD=$(usex zstd)
-		-DWITH_UTF8PROC=$(usex libutf8proc)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_NANOSVG=$(usex svg)
-		-DUSE_CHM=$(usex chm)
-		-DUSE_ANTIWORD=ON
-		-DUSE_FONTCONFIG=$(usex fontconfig)
-		-DUSE_SHASUM=OFF
-		-DBUILD_TOOLS=OFF
-		-DENABLE_UNITTESTING=OFF
-		-DENABLE_LTO=$(usex lto)
-	)
-	cmake_src_configure
-}
diff --git a/app-text/crqt-ng/Manifest b/app-text/crqt-ng/Manifest
index 95e5881d9c21..5a0cc047c223 100644
--- a/app-text/crqt-ng/Manifest
+++ b/app-text/crqt-ng/Manifest
@@ -1,5 +1,4 @@
-DIST crqt-ng-1.0.2.tar.bz2 419058 BLAKE2B 5d8b6704e6ec226852a0c82cc6c00b386c5b348675f00c4acc9dddbee999f381616083101f183523671ef81bb5036eddb7643b3f31857535d6773a549405ab1c SHA512 f8ebf9d5dec13b69fe7440209cd4da807d25413075b4ad2de885fa73134729be5c23df7d0a73bff061171449e394474ac3779b940120f144d93a7a98eca6cf55
+AUX crqt-ng-1.0.3-typo.patch 946 BLAKE2B d2311ff47a07650cb4c49560dcad7aa29c4c050bb22fc1e8bae1e65eb2d0eaba09d9ad7e556f6d7761151bd0543b10c4aca73531ee844577af03272a7b5b51b5 SHA512 1de876db69a37902563f33fe9b3138027cc3b9e3755e9d08e6395127b3da0db2ed7ba87b64b392b0d706c73a02fb6e1d3d7fc700179f19ecf424292c43a47223
 DIST crqt-ng-1.0.3.tar.bz2 423741 BLAKE2B 70b43b601b9b51673b12467a108683d83d087b20867bd21f919913f98d67f367c5dc40d4bd514e4fa5534a5c0766b486e41566c44d50ab8dd85c1717a4b20742 SHA512 aab30e3f42ffcc6a1d54e777d4968df8ae864e5d25df045634fc8041b8418d1440250fe7edc865648b3031bcd39f051295e1518b9e2078ee6046aa66add42dd2
-EBUILD crqt-ng-1.0.2.ebuild 1087 BLAKE2B edaf6f8101555e0227c516b3ae616849c6b19bdb8418641dfbee2b0a2438d9e379f7b85ce67303a388e205bee9c4c78985593e3f3d1386bf34e53c0eee59ebc0 SHA512 e0c99bf02db0e39d2a6d6adbdc8de192766b54fc8a0a126f1bbcd36836f355363cac3e2c43f634eed45e4c042d966a7152a025321472276678418f9a2159a981
-EBUILD crqt-ng-1.0.3.ebuild 1087 BLAKE2B ef692fac9b3cdeb12dd6fc3794b94ca8055072f180cbb9ebb9457596bb2f93bbf5970d6326dd5f463ef773e8904993499102aff3dd475f073a5bd771977d707e SHA512 ff8923b57dfef117a4dfdcdfd5955f2c469a7ab65dc99d7962e9b7b0def829a3ae66135d5091204964e5f189a9b75d4b8edc302df87d7415f34306a9274e86c8
+EBUILD crqt-ng-1.0.3-r1.ebuild 1130 BLAKE2B 3a1afad0e8bec9aca4459f0983f6b3dd5647f62d133f18767a50da6447cc9758f8342344ee40bb013d5a56965348a63699acd5f3894d1debda6c7c92fcd7e198 SHA512 e0c1417cb31d500fb6a7068c766c5554dce1a1dbde4337b5cbb3f3a90daa03581588279ae3bb3dfa6acbba3ecb78a51caa9a18039ba594624607ce11d7831f5b
 MISC metadata.xml 1177 BLAKE2B 0c28a5a4feb5c6dd5cb1115c063770bb276f2accff5c7a5e695b1492ae5cf3a188ceef2d5fb3519da87f6b68eff452f4f61b87f6ebd196b08cba55a26836047f SHA512 7cd49c422506be812eb080160286b21e0ecd48d6ae877e3bbea2ea8fd2ca0998e36c670db0e75c708a54c0b311b55fcadbfc1bf791e4c0c912c29b42ed6fcee4
diff --git a/app-text/crqt-ng/crqt-ng-1.0.2.ebuild b/app-text/crqt-ng/crqt-ng-1.0.2.ebuild
deleted file mode 100644
index ecb531fad955..000000000000
--- a/app-text/crqt-ng/crqt-ng-1.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PLOCALES="bg cs hu ru uk"
-inherit cmake plocale xdg
-
-DESCRIPTION="Cross-platform e-book reader"
-HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng"
-SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
-
-CDEPEND="app-text/crengine-ng[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_environment_reset
-
-	# locales
-	plocale_find_changes "${S}"/src/i18n 'crqt_' '.ts'
-	sed -e "s|set(LANGUAGES .*)|set(LANGUAGES $(plocale_get_locales))|i" \
-		-i "${S}"/src/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	local mycmakeargs=(-DUSE_QT=QT5)
-	cmake_src_configure
-}
diff --git a/app-text/crqt-ng/crqt-ng-1.0.3.ebuild b/app-text/crqt-ng/crqt-ng-1.0.3-r1.ebuild
index 8ab0c97e1f85..0855e2640420 100644
--- a/app-text/crqt-ng/crqt-ng-1.0.3.ebuild
+++ b/app-text/crqt-ng/crqt-ng-1.0.3-r1.ebuild
@@ -22,6 +22,8 @@ RDEPEND="${CDEPEND}"
 BDEPEND="${CDEPEND}
 	dev-qt/linguist-tools:5"
 
+PATCHES=( "${FILESDIR}"/${P}-typo.patch )
+
 src_prepare() {
 	cmake_src_prepare
 	xdg_environment_reset
diff --git a/app-text/crqt-ng/files/crqt-ng-1.0.3-typo.patch b/app-text/crqt-ng/files/crqt-ng-1.0.3-typo.patch
new file mode 100644
index 000000000000..e14b9145b05f
--- /dev/null
+++ b/app-text/crqt-ng/files/crqt-ng-1.0.3-typo.patch
@@ -0,0 +1,25 @@
+From 90523e75b7e4dbb6e1dbe0ffe41035b9c174c977 Mon Sep 17 00:00:00 2001
+From: Aleksey Chernov <valexlin@gmail.com>
+Date: Sun, 25 Dec 2022 09:36:55 +0400
+Subject: [PATCH] Update src/i18n/crqt_ru.ts: typo fixed
+
+---
+ src/i18n/crqt_ru.ts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/i18n/crqt_ru.ts b/src/i18n/crqt_ru.ts
+index 124dc9c..2d9415f 100644
+--- a/src/i18n/crqt_ru.ts
++++ b/src/i18n/crqt_ru.ts
+@@ -939,7 +939,7 @@
+     <message>
+         <location filename="../mainwindow.ui" line="307"/>
+         <source>Go to the next position in navigation history</source>
+-        <translation>Перейти к следующей позиции і истории навигации</translation>
++        <translation>Перейти к следующей позиции в истории навигации</translation>
+     </message>
+     <message>
+         <location filename="../mainwindow.ui" line="310"/>
+-- 
+2.37.4
+
diff --git a/app-text/crwx-ng/Manifest b/app-text/crwx-ng/Manifest
index 71b0b2775aa2..9b93b0857d69 100644
--- a/app-text/crwx-ng/Manifest
+++ b/app-text/crwx-ng/Manifest
@@ -1,3 +1,3 @@
 DIST crwx-ng-0.2.0.tar.bz2 364917 BLAKE2B f8d541fa479fe3102d495ba43ce51d256f55b9724844d26b89db8396f2cbf90680dd312ecc0c816ee50fb498c8b69ba69d0db73f9ee5dcefc9991e8077754171 SHA512 0890a6066fca7178b483749e946659a6e4304f13694601024fe500e9b79351f7170403b136407a831abe7a040f775dd34c02d9411814c136da68ee6b69e00a99
-EBUILD crwx-ng-0.2.0.ebuild 699 BLAKE2B 4465401ed6b3d25fe49ca2a54ef016b975d144269009fe0314315cbafdaf4b1d95f6cfaaed4b155b73672c983b60e602b9ce4115ac964d01eeeb0804ffcf0a63 SHA512 641649c64ce54a67e83ca3ced03bf4af82f74574cea481791fc4104621d50fb40024045704afd2f81ccd3d56f91d6263bc0675298e7d69b7d23ea512e77199f7
+EBUILD crwx-ng-0.2.0-r1.ebuild 659 BLAKE2B 4f72aaf3febe1eb286053c39009f1f6c4beeaf2ff55a6e7d09e48ec02d90db383e318241156f2ec00b994f00e88d83afecb25126c9f99f73cd07ef7e62b7bb0c SHA512 5156ebf18e2a6671cb2d637c60c6a148aac3df52c8112969b7710c329e349f4b20735ee94036d558ea4de9bad43a6c857b616bca6344118a2a3ba32646793991
 MISC metadata.xml 1177 BLAKE2B d2d0af2338da64845775c14b66725abb760d84d267ca93a44f2ea679e0125f0cb1815ecd312da919ab1d9050f957c9e763ceeb817df7b48bac024b15ed292e96 SHA512 3bdc42749dff929ae4fdb6b9bd2c84eadbae352de4baacdd4f08572cd20d1f336dcd2d003b41bd79d56b3476026ba4d57d89331fe038592b8adaef60d03f34d7
diff --git a/app-text/crwx-ng/crwx-ng-0.2.0.ebuild b/app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild
index 7317e7272011..c3c0174eacf2 100644
--- a/app-text/crwx-ng/crwx-ng-0.2.0.ebuild
+++ b/app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild
@@ -6,7 +6,7 @@ WX_GTK_VER="3.0-gtk3"
 inherit cmake wxwidgets
 
 DESCRIPTION="Cross-platform e-book reader"
-HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crwx-ng"
 SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -18,4 +18,4 @@ CDEPEND=">=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuz
 	x11-libs/wxGTK:${WX_GTK_VER}"
 BDEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )"
+	virtual/ttf-fonts"