summaryrefslogtreecommitdiff
path: root/app-text
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/Manifest.gzbin48393 -> 48377 bytes
-rw-r--r--app-text/bibletime/Manifest6
-rw-r--r--app-text/bibletime/bibletime-3.0.1.ebuild2
-rw-r--r--app-text/bibletime/bibletime-3.0.2.ebuild (renamed from app-text/bibletime/bibletime-3.0.ebuild)6
-rw-r--r--app-text/calibre/Manifest4
-rw-r--r--app-text/calibre/calibre-5.16.1-r1.ebuild (renamed from app-text/calibre/calibre-5.16.1.ebuild)2
-rw-r--r--app-text/calibre/calibre-5.25.0-r2.ebuild (renamed from app-text/calibre/calibre-5.25.0-r1.ebuild)2
-rw-r--r--app-text/coolreader/Manifest2
-rw-r--r--app-text/coolreader/coolreader-3.2.59.ebuild67
-rw-r--r--app-text/editorconfig-core-c/Manifest2
-rw-r--r--app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild2
-rw-r--r--app-text/poppler/Manifest3
-rw-r--r--app-text/poppler/files/poppler-9999-respect-cflags.patch116
-rw-r--r--app-text/poppler/poppler-9999.ebuild4
-rw-r--r--app-text/sigil/Manifest4
-rw-r--r--app-text/sigil/sigil-1.5.1.ebuild82
-rw-r--r--app-text/sigil/sigil-1.7.0.ebuild2
17 files changed, 202 insertions, 104 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 51eb34e7eeea..5f6e5446d406 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
Binary files differ
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index ad2ca688def7..297742c66973 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,5 +1,5 @@
DIST bibletime-3.0.1.tar.xz 1630180 BLAKE2B fe03cc8396f44ba0d68e27d50f60435c9d9501b620278c5d7565bea50c18f711675ac1020c6738790eb8452380ed974cba1a41bfb6f87778224d814c63e10aa3 SHA512 217e45c034d8fd8de4b7ef936f340a613fd7046b4700f828edd6d6f32f4bad4ecda2ec2c4425461af39c6926170fe080406238780e3c63bdbe0273679e0aef94
-DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
-EBUILD bibletime-3.0.1.ebuild 1170 BLAKE2B 7db7ebfed65551923087980a6a1026120e6cda66eb1ddcd122a26a685fc903f0825d823591bda54309dd3649e19be3e6a37be0dbea6ac9be028004af31711abb SHA512 af58cd2e47d0bfe86266566b354cee6aff21232cc57ae8ed91901030880b4d1ae8b516db56182da834397135e854bf0de2badeccc4e630ed8667212535ccdd23
-EBUILD bibletime-3.0.ebuild 1305 BLAKE2B bd114fabd567e3ed57a8ab3ceaa993bed146bf5243056583ec74e2cbb1368fe546fc905e4686191e45b21017471409e48113794706680045bd191dd96650ee66 SHA512 adaccb36fd3709860ad17ef107dea9ac1255a36e2dcb83210cd3bcddfc1b209924b8c53a11630e44abf1cba930dd9fdc1334a9da7b09d6aa9abda1998efa55cb
+DIST bibletime-3.0.2.tar.xz 1631828 BLAKE2B 7ff319e6810717391d7b4a8b96a63ac315bf1663dd4caaa742f9ec92a3a6490d238cdf4e13ea6aef45b7c6772d4c41ea498c181daa7a8d0abacc58ca59c39b4e SHA512 d374bf88844e63dead0da5dc3f951a7e6eca133e18067acf28432d1e9d12ac9f481fb7421d9b5ae4c76b5aff7eb05c083fa6828a58332d02a3975f1921d8914c
+EBUILD bibletime-3.0.1.ebuild 1168 BLAKE2B 0c162eee43c492ef394ad8984b74958d3c52bbca1f63dba7ea6e588ca5388d5c813af9caaf5940b83622550a29b6cbce8f757aa646b968e6b4f3a2412ef19ae0 SHA512 b779e54a429ef93a4d6c9a89acfb9cf3103ac82f1053cd4c7c1457febb11c862078f62cc33239b84d4c509f0cbe280afff71d0e3bc5c5aa734f2e20dd3b5f7df
+EBUILD bibletime-3.0.2.ebuild 1170 BLAKE2B 7db7ebfed65551923087980a6a1026120e6cda66eb1ddcd122a26a685fc903f0825d823591bda54309dd3649e19be3e6a37be0dbea6ac9be028004af31711abb SHA512 af58cd2e47d0bfe86266566b354cee6aff21232cc57ae8ed91901030880b4d1ae8b516db56182da834397135e854bf0de2badeccc4e630ed8667212535ccdd23
MISC metadata.xml 656 BLAKE2B 2402db72930eebc4448e4f0e48ae2e0494a20b9f52ba82a4bf61ea446aa476c917ce0af0229bb3c935ee5648aa69ea82943dd3ef98649aa6ae58af85f475eb53 SHA512 4e72b972bdbbb02fd7297414ba11fcf1680f640a05a4d47e45a4765441923f5c3fea4c2e5c758355fec60b809d94897151a30a8c09675c9466201db62940bf83
diff --git a/app-text/bibletime/bibletime-3.0.1.ebuild b/app-text/bibletime/bibletime-3.0.1.ebuild
index 1e4d38ca16f3..9aa26c20e7e8 100644
--- a/app-text/bibletime/bibletime-3.0.1.ebuild
+++ b/app-text/bibletime/bibletime-3.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND=">=app-text/sword-1.8.1
dev-cpp/clucene
diff --git a/app-text/bibletime/bibletime-3.0.ebuild b/app-text/bibletime/bibletime-3.0.2.ebuild
index bc31ba995fcc..1e4d38ca16f3 100644
--- a/app-text/bibletime/bibletime-3.0.ebuild
+++ b/app-text/bibletime/bibletime-3.0.2.ebuild
@@ -11,11 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Known to fail and will all be gone come next release (see upstream commit
-# d05797db79074c526987329dff78d89eef8c501c)
-RESTRICT="test"
+KEYWORDS="~amd64 ~x86"
RDEPEND=">=app-text/sword-1.8.1
dev-cpp/clucene
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 452b69dead5c..c1db0a840805 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,6 +6,6 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
DIST calibre-5.25.0.tar.xz 36849112 BLAKE2B f9cb423317ea1f5b22e7f3540708fd4fa6e7dff2d6d2c667755c74c4f46b72f52aac7672933c51efaf56a5ef57e573c8927649fe30570481c2057e5f757cdfde SHA512 7913fec188d8a8c40cf2768671836f6431d233ac53d1d683222a12f8a753a11cc4023fcfc1dd5ca8b27fd049fb579563b1cdd89624b824ce4eec7b438e25006e
-EBUILD calibre-5.16.1.ebuild 8632 BLAKE2B b9c94603db82e4ee6d478bdd0259f7a3bd63610cba7d85962bfc33041ae77412ebd0077d9b8b60b17188b71b05adad69eed73b12bb76484cd5ec337fbc5a91c2 SHA512 193b9cfb42833dc0266a216a72a68b3ca88b488a2876c744db1715a9409045d3b3756bbdaa4d75f80e9036a763cad09c0cdd3e31e6e1a9ce2bda035edf6cd164
-EBUILD calibre-5.25.0-r1.ebuild 8503 BLAKE2B 26158d2392ae6a5465aced0c07dafda0205b7667d2cd9160a4ddba1fe636acd628df5c6c1ce2bb17c4545cd141bb9004b47c2d4403aedd14e6bb8d46ba93e347 SHA512 0d02e0bde9f63d339a35abe5e98ec5c28fd56c5d04e393dd86415e0ad276d0989b0e80a4d51033d70cd628da72558e2ba2b228320fa4675e9eaf766da9ab2dc2
+EBUILD calibre-5.16.1-r1.ebuild 8635 BLAKE2B a2b4d0148c21f404b43af87a91dda4145a71ccf36f8bd0ffa5b519fc1df991c2bc7fa2317bc48b86ff0614452e3ad75f09644dbbc5077492b3561eedde2fc389 SHA512 a9f8664dcd3132122f396aa8556ed42f0b0c8d071d053a00427a71d9a847ca04d12f3e3d65a6cf7251998ff720c6d6a51a4178d4444a683b905657f9fbcdd1c4
+EBUILD calibre-5.25.0-r2.ebuild 8506 BLAKE2B ed2aef65b483cad81b5efaf2fd855ce3a04d1e7ee4fa0dc68eb5c9c5ff0b2a84337975c54a76d4eb9128d58cd87fd92cd1b914a42365f1e80d6e48bbb8d269c3 SHA512 2686d8072c4f72fa59f34e8d8d2793056c88d09720ad9bf3b43411e2ba5a303302c12676a5f14f31465a1a07f63f9677e5e5d4e759a346d6397a714280c0ea78
MISC metadata.xml 303 BLAKE2B f50da5b3e8c1e9b4553180ccce38939e7c8e11e5a0527f94c3df7ac4d93a37d5e838c633e58b3fe960dc60ce52c6c6ec6901eedbcd99039c0cc1ccf6dc8a0a44 SHA512 38da4e43d91a3a1d1adf6daf32e4ec69696ab7df6179788fbda75a40219acf01cedbff28943c0b169b2de9f490f3a324285294a9b2783c90757c8cd23aa9e847
diff --git a/app-text/calibre/calibre-5.16.1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild
index 546774b0f935..97757b4f3eed 100644
--- a/app-text/calibre/calibre-5.16.1.ebuild
+++ b/app-text/calibre/calibre-5.16.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6,sqlite,ssl"
+PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
diff --git a/app-text/calibre/calibre-5.25.0-r1.ebuild b/app-text/calibre/calibre-5.25.0-r2.ebuild
index 419397284072..e0bb47f48186 100644
--- a/app-text/calibre/calibre-5.25.0-r1.ebuild
+++ b/app-text/calibre/calibre-5.25.0-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6,sqlite,ssl"
+PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index a8b47ba8f41e..eb4a26e878ee 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,5 +1,7 @@
DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161
DIST coolreader-3.2.58.tar.gz 13454079 BLAKE2B e3b85ffbb3e4023a8c0567879a4a67d21141c1025b58f7d2c5017cab773e989e797229529440167a8c83db810f599566a77aaaab06b34081472f0e4b20293ec9 SHA512 d1d3e60bf5b73c20617937850912d7c452863bd5c91f0154be320ad256f774f368039896ad5e8acfc3cafa7361e8c11ca526accf0a14dabb79f059255989bac6
+DIST coolreader-3.2.59.tar.gz 13596218 BLAKE2B a59d11aff93166de77add5d230539068172a81968414b9c38b6ca25f08bd7830b81c0b800055a4eefbd6bb1be94298bf74d240f981c928bd4514073d943bb33d SHA512 72fc05814ca4f6da5310f7b47fd7939bc1567e5dd7e7e75bc29e2b1436dc4901498622a770e89323581c3f0b3b9ec305050ca5917eceba4df4a07cff3e1748d6
EBUILD coolreader-3.2.57.ebuild 1838 BLAKE2B 4102bd201652798763151becd33544ead1797676999f2365fb73edd4164bc732dc1402ecfa7e682c51d4d51247485cbb0f929d00862bfdc59a8db8c47a65afbe SHA512 be37d6dcd3a81c8fddd4ed6cc23d210b1d718dff8a1a572c9046789eb50d961766755e1c064603bc59a9827c20bc876bcfe4cf34603058cc85c251e0f02769e7
EBUILD coolreader-3.2.58.ebuild 1840 BLAKE2B 81e9fa93ea854a110e2e69fa34a91a520f86ac55e0f8da883c0ec6e390a50a5932c2fc9f0fea5d474e73a9eb4cfd6a92e03afc9307bef78ec9171ebb3eefd545 SHA512 cf24327f8e9cc384b26c4352b13cabfedf38dcb870a6f2915a39a1e639514c8cdcba8150f5e1ce3daa885208fab2491292fd2e393523e9e5bdd795841df0534b
+EBUILD coolreader-3.2.59.ebuild 1840 BLAKE2B 81e9fa93ea854a110e2e69fa34a91a520f86ac55e0f8da883c0ec6e390a50a5932c2fc9f0fea5d474e73a9eb4cfd6a92e03afc9307bef78ec9171ebb3eefd545 SHA512 cf24327f8e9cc384b26c4352b13cabfedf38dcb870a6f2915a39a1e639514c8cdcba8150f5e1ce3daa885208fab2491292fd2e393523e9e5bdd795841df0534b
MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.59.ebuild b/app-text/coolreader/coolreader-3.2.59.ebuild
new file mode 100644
index 000000000000..32e43b6cdee3
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.59.ebuild
@@ -0,0 +1,67 @@
+# 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 plocale wxwidgets 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
+ plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+ sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_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/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
index a8f6ac9506fc..baad7e908011 100644
--- a/app-text/editorconfig-core-c/Manifest
+++ b/app-text/editorconfig-core-c/Manifest
@@ -2,5 +2,5 @@ AUX editorconfig-core-c-0.12.3-no-static-libs.patch 2732 BLAKE2B 0ce8fd79ba40701
DIST editorconfig-core-c-0.12.3.tar.gz 67701 BLAKE2B d5e6310f770099f542eb81f4ca7ec975e74c49f481c4e8e07832a7f9fc0882e2cb65da5b4b18ad926786d7ac92c3deb6ac0a547188bd68d350143258796ad1b8 SHA512 4a17cd6317bd45f8b0131070165d852569d020f1cf74e72b44057b97672184b4992aee54aae6e3222c669fdce8bb6b1f3482235e6518acffcef05e1d74087e6e
DIST editorconfig-core-c-0.12.4.tar.gz 72141 BLAKE2B bfbd7ab2eb3ac1c73d387447e16c0888b4dce1318f14f1a511cbf1e5c34aecb31921955fb51a6c07a8a991fb388995971ceed22b4e53c53b1c56fddbbcccfdfc SHA512 e275d4f77fddd31717a588be15a67a630e693efbddc5e1cf7e9b116b1c1a700fa9bafc1322733aa73a009c78519e00083b151bbc4a5ad55128df2c7360f9a163
EBUILD editorconfig-core-c-0.12.3-r2.ebuild 864 BLAKE2B ea50011f62f7c5f4f59f051865d924ac0a9f32d8253b2b7ed805e5a782d0d11fc552c8a49398dfc4c6d0525650c94bbec1e6286862ed2367537480ab9000e5cb SHA512 e35bedfc956d726984996ac1380e45b022c2f6e0fe5df64191428afeed84736c045a79d4dae2dc1b83818754834993a845f27ea8ac1092aa616b37d948e3cc3d
-EBUILD editorconfig-core-c-0.12.4.ebuild 1017 BLAKE2B 33d03dc3276a1e3670fada6c8af3b65b91948bb1beb847274223683b5cf265240e7b705173f4156d6bb251191305a99e4b1565fed53f7665eefd02552aa7baba SHA512 f0c76490fceb9bd062dbfeea942a6027bc0849a694db696de6d9d37300f5f3976d091cb844d55715dc1d7aab6e73b2b02e2ccb66db22b1ae8dfebcf078190cf0
+EBUILD editorconfig-core-c-0.12.4.ebuild 1014 BLAKE2B 25b8fc5e384755fc33210381feeec3d771b2c58439ba8433ab21dae4039dea438b9230dd3681c82df6a8970c1c4deb2dbfa32e66fad80cc1d41dac0ce3dc7f25 SHA512 c18706566ce2c7cac4d94fd8b7de2dd696000589c56a9aa159212af0b81bc9406365b3a5a9b8783a3166fb359bd3c101343d15bb0c3f5468681eeb77375a5663
MISC metadata.xml 388 BLAKE2B d2a5f28be0aea3f3aefd1b8e82e337b87e67192b96bea1e2e0e5073e44f8c54d3f0380a089118d405c417d42ee6d978919dc8e0212a36ee0d3808b706846ad70 SHA512 fbaff22b9f648c2e94d68904cbb23de8ee0340641c626d5a533992837ec6405b65a96872bfdedce3a75351ac73e344d5faed1a51f63a4330f65e4aa8190ffed4
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
index 9df4830557e6..2b2c11d556d4 100644
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="cli doc"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ae84213a48b9..573a90c8c7c4 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,9 +1,10 @@
AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
AUX poppler-21.04.0-respect-cflags.patch 5738 BLAKE2B d09ed8ca5211b89a06b56d8e7f3564ca6b388f36469d174444a5b974ef0403e55061900b79049ad9192a0a5e2baa0bee295904c3ea27a74dfba7eb8813501600 SHA512 f9f915f3343f42f504080320fb1e35164f489abfa55bd7bc0889dffe05db56f49c8a528bc253e315e5616e6baccb413710a562021538ad4fa7f081b673bc688b
+AUX poppler-9999-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
DIST poppler-21.08.0.tar.xz 1717372 BLAKE2B f617b41ebacee183730f20233273a2cc773c12b6c9d045850f8e738985b9079338c0e86b66d598a5dd4fd0227f70989604164a38fd45150b239e603c4da7e42f SHA512 266583279fb5c6b5300d23f8ba5b9da3e1f475fe21341a82ed7350dd9e321e243f3ef051944006c4f242c2d63a8c46bcda565a56017eb3a68caa5680ce719211
EBUILD poppler-21.07.0.ebuild 3339 BLAKE2B fa5a0f1aee4edc405149d5573b917320eb8748054687222ba9dab6c61105af7286022bfc7d7b685aff174966a7d0db1274dddf9464343fd4e35a4dd6d5c53921 SHA512 c0f8caf6a63c76024c668e8f98cdb67ddd5ff3a0798cd54d1276a1aecae54324dcbbd291e308a4e322eefa61ff13a34027fe86bbd9f464a8fc9873da6a41af48
EBUILD poppler-21.08.0.ebuild 3347 BLAKE2B 700214c4ab1e71cc530bb084915ffdae2dbb4b56a30eed2ae599c0bf8f71fc03f5357ab105c41123c075397743ee86b0cc920b0356c642ca7e4ad1ccc663e293 SHA512 2964d203250ad578b09895582fdf02e855b2355944bc318384db76d39701582233382c436f9d2f22e643a88db98dc891070edabe3a11c94614ace4fc224cfb95
-EBUILD poppler-9999.ebuild 3347 BLAKE2B 700214c4ab1e71cc530bb084915ffdae2dbb4b56a30eed2ae599c0bf8f71fc03f5357ab105c41123c075397743ee86b0cc920b0356c642ca7e4ad1ccc663e293 SHA512 2964d203250ad578b09895582fdf02e855b2355944bc318384db76d39701582233382c436f9d2f22e643a88db98dc891070edabe3a11c94614ace4fc224cfb95
+EBUILD poppler-9999.ebuild 3335 BLAKE2B 83ef2335947c97d172e5e26e46cbf6ffab1759d0a40960ecd2fb1ac2f1ad67328b5ed92179adea80ad49ab0b06f69dfe48620e6eab586d45b798ab2453201ca1 SHA512 60cefdca9a7825cc60d5fc6a4180f58e9c649d7a08441d60f994118956daee2d08b12a3c3c65f0fd0042a9946751121179fd7cb365ceba784ebb7cb15fcbc9d2
MISC metadata.xml 1077 BLAKE2B c49251ca6f1d793da24746e5161d43b01550c560fb942d64298c19a889c531f4c5fab967cde87f7063ecb4789a6586e40ca519b196633912ccb55ed568a650cf SHA512 c09156d438acc9cf85e77fd1f57262596c28f305559d9635d4a457189f88e56e0689e102ad60d2be998b9e286c36ed45227e95ae5e9ce6a247662331d44f2076
diff --git a/app-text/poppler/files/poppler-9999-respect-cflags.patch b/app-text/poppler/files/poppler-9999-respect-cflags.patch
new file mode 100644
index 000000000000..08eb5beed26b
--- /dev/null
+++ b/app-text/poppler/files/poppler-9999-respect-cflags.patch
@@ -0,0 +1,116 @@
+This can be renamed on the next version after 21.08.0. User wanted to test
+some patches committed upstream so ended up needing to rebase this patch.
+
+From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001
+From: Theo Anderson <telans@posteo.de>
+Date: Wed, 14 Apr 2021 10:16:11 +1200
+Subject: [PATCH] build: respect cflags
+
+[Rebased by: Stefan Radermacher <gentoo@zaister.de>]
+Signed-off-by: Theo Anderson <telans@posteo.de>
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -87,20 +87,15 @@ set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE)
+ # CMake toolchain file). To avoid surprising compilation errors, we emit an
+ # error in that case, so that the user can handle the passed CMAKE_BUILD_TYPE
+ # in the compiler flags logic below.
+-if (NOT "${_CMAKE_BUILD_TYPE_UPPER}" IN_LIST _known_build_types)
+- message(FATAL_ERROR "Unsupported CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-endif()
+ set(_save_cflags "${CMAKE_C_FLAGS}")
+ set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+
+ if(CMAKE_COMPILER_IS_GNUCXX)
+- # set the default compile warnings
+ set(_warn "-Wall -Wextra -Wpedantic")
+ set(_warn "${_warn} -Wno-unused-parameter")
+ set(_warn "${_warn} -Wcast-align")
+ set(_warn "${_warn} -Wformat-security")
+ set(_warn "${_warn} -Wframe-larger-than=65536")
+- set(_warn "${_warn} -Wlogical-op")
+ set(_warn "${_warn} -Wmissing-format-attribute")
+ set(_warn "${_warn} -Wnon-virtual-dtor")
+ set(_warn "${_warn} -Woverloaded-virtual")
+@@ -116,20 +111,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+
+ set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+ set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-
+ poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+ if(GCC_HAS_AS_NEEDED)
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+@@ -139,56 +120,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(_compiler_flags_changed 1)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# set the default compile warnings
+- set(_warn "-Wall -Wextra -Wpedantic")
+- set(_warn "${_warn} -Wno-unused-parameter")
+- set(_warn "${_warn} -Wcast-align")
+- set(_warn "${_warn} -Wformat-security")
+- set(_warn "${_warn} -Wframe-larger-than=65536")
+- set(_warn "${_warn} -Wmissing-format-attribute")
+- set(_warn "${_warn} -Wnon-virtual-dtor")
+- set(_warn "${_warn} -Woverloaded-virtual")
+- set(_warn "${_warn} -Wmissing-declarations")
+- set(_warn "${_warn} -Wundef")
+- set(_warn "${_warn} -Wzero-as-null-pointer-constant")
+- set(_warn "${_warn} -Wshadow")
+- set(_warn "${_warn} -Wweak-vtables")
+-
+- # set extra warnings
+- set(_warnx "${_warnx} -Wconversion")
+-
+- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+- set(CMAKE_CXX_FLAGS_DEBUG "-g")
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+- set(CMAKE_C_FLAGS_DEBUG "-g")
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+- set(_compiler_flags_changed 1)
+-endif()
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign")
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign")
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign")
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign")
+- set(_compiler_flags_changed 1)
+-endif(CMAKE_C_COMPILER MATCHES "icc")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+
+ if(_compiler_flags_changed)
+ # Ensure that the previous CMAKE_{C,CXX}_FLAGS are included in the current configuration flags.
+--
+2.33.0
+
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index be72663ad68d..2013baa8c3f7 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -61,7 +61,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
PATCHES=(
"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
- "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-9999-respect-cflags.patch"
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
)
@@ -70,7 +70,7 @@ src_prepare() {
# Clang doesn't grok this flag, the configure nicely tests that, but
# cmake just uses it, so remove it if we use clang
- if [[ ${CC} == clang ]] ; then
+ if tc-is-clang ; then
sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
fi
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 85d2f9adbfee..36de8a2672e8 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,5 +1,3 @@
-DIST sigil-1.5.1.tar.gz 20020962 BLAKE2B ac70c117d69c4062d66151372fc8cbede48be6f38ceae7d1dd1bd49fd8a0a4a352c885a120e00ba729e64ebfa928103d07f7bb85d69cbb3385f640f4fcf42985 SHA512 281c8327f7a05b9c9f805b02ef4c21f50d340a2f9e09dcae74be30aad107b0f2605801f0239e9a503db70afa2b37b7931dfec0efa5662dde906ce6c014da8849
DIST sigil-1.7.0.tar.gz 21315598 BLAKE2B 29f7c682925d1e1bbff082e96b747ce32df82d78406ccd984b4f8de1f01944c35aa86587ce47a18687d5fe281b8cb656085b52d3a1e72ed17862501121d9d134 SHA512 9918bb0bfbe3d068c95bb31cd84a37a0fac6dd6be9e94cb382e8c0140cdb375f47384f33c62fdff7f27aed379037a4a64e8d4a1065ae297bb389e2be78597c16
-EBUILD sigil-1.5.1.ebuild 2012 BLAKE2B cc0ff455a7cea95499872c82fe675f30ea360b5a6a2777bc448dd913dc0b896cf43c168d372dd4a61bce59e00aaf101643613217ea44bbe45aefa596b3608a1e SHA512 39ca3e0970b166450afe0c955725d99e89b2ba67f30e0d3d348fd87c6b1caef97201dc61286fec258dbc0e1de8c0f3542e2964b8f8217051855d0261256050be
-EBUILD sigil-1.7.0.ebuild 1856 BLAKE2B 33eae27a66f606c38abb130e73a81bf08a4ce8077f3a512f46158c637dcf1284058fcb151defd9c23cafafb06af53c6a9672b6a518ab77f6ef6cefaa83dec4d0 SHA512 5d75662a62912f2f8f03371a7c43eb75a6fd296d4b1120e1ed6450aedf466b856e2aa50e73e935654993059c46f97bb6e7cb04e82b14ded87b99546d7612c128
+EBUILD sigil-1.7.0.ebuild 1854 BLAKE2B ff67b41ebc8fb7939753b212070cd6cc2ebc15800e647b8988f01f8ec0c96c9b282b3694fc446918380921ef211d81c14ab1d677b7e1607c3b0c9548eaaae058 SHA512 2daad4895f948c7c946d3e20b0602f6486d816bc48f06b2d3f621a6b6144b19bb1e6fb02921212fe8aa192ff3b203bc989265ead5d4eda039c30293172521dd6
MISC metadata.xml 809 BLAKE2B 98f1480f608f28bc2f39f31ea91a87b276d6ca181da159bc490c8c36f196015081007cfcd5f9d3fd54ac0e211efec434f69014a9c898ad41e97de3048f07d878 SHA512 b593df7b245eb41665eeeceb3ae9dc9be9bdacd5b6cfca3a847d3bc61b4cddbd9c29547cc332eff10ed8149c46f15fdef058f50e7b8e7460f488dd056a74a4ba
diff --git a/app-text/sigil/sigil-1.5.1.ebuild b/app-text/sigil/sigil-1.5.1.ebuild
deleted file mode 100644
index c7f5b33a10e8..000000000000
--- a/app-text/sigil/sigil-1.5.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake python-single-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-text/hunspell:=
- dev-libs/libpcre:3=[pcre16]
- $(python_gen_cond_dep \
- 'dev-python/css-parser[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]')
- >=dev-qt/qtconcurrent-5.12:5
- >=dev-qt/qtcore-5.12:5
- >=dev-qt/qtgui-5.12:5
- >=dev-qt/qtprintsupport-5.12:5
- >=dev-qt/qtwebengine-5.12:5[widgets]
- >=dev-qt/qtwidgets-5.12:5
- sys-libs/zlib[minizip]
- plugins? ( $(python_gen_cond_dep \
- 'dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/cssselect[${PYTHON_USEDEP}]
- dev-python/dulwich[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]') )
- system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/Sigil-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_BUNDLED_DICTS=0
- -DUSE_SYSTEM_LIBS=1
- -DSYSTEM_LIBS_REQUIRED=1
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- )
- use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- python_fix_shebang "${ED}"/usr/share/sigil/
- python_optimize "${ED}"/usr/share/sigil/
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-1.7.0.ebuild b/app-text/sigil/sigil-1.7.0.ebuild
index 0b2453ffe0da..56f93e6b73f0 100644
--- a/app-text/sigil/sigil-1.7.0.ebuild
+++ b/app-text/sigil/sigil-1.7.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"
LICENSE="GPL-3+ Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+plugins system-mathjax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 03:16:25 +0000