diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-31 22:30:36 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-31 22:30:36 +0000 |
| commit | 618c3037024b4e5328531cdc07c6ceb7486f5329 (patch) | |
| tree | 7c9f8d50c6f5fbd53f3df583c471f5d2e5c34202 /app-text/coolreader | |
| parent | 76dfef0cec9170000357d2f354e412daf48941fc (diff) | |
gentoo resync : 31.12.2017 (final resync this year)
Diffstat (limited to 'app-text/coolreader')
| -rw-r--r-- | app-text/coolreader/Manifest | 4 | ||||
| -rw-r--r-- | app-text/coolreader/coolreader-3.1.2.71-r3.ebuild (renamed from app-text/coolreader/coolreader-3.1.2.71-r2.ebuild) | 10 | ||||
| -rw-r--r-- | app-text/coolreader/metadata.xml | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest index 06b6199f7db5..90a8a46eca4b 100644 --- a/app-text/coolreader/Manifest +++ b/app-text/coolreader/Manifest @@ -1,5 +1,5 @@ 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-r2.ebuild 1769 BLAKE2B da957458ea637448ecafb9966b41b123923eca91a11dca91e8119172198e40ecca163471bd645d57499dc90aa4fb44542b92afab2e787d4a615efa11ec9fd66a SHA512 ba1db10c44e2cd8ad697596264d041c3eafad8ea82fda1878ac6077696e928b3e2b3ac335f63878d7849ffbecd66ff5a220f64e3425315c5f1520176c842d0bb -MISC metadata.xml 528 BLAKE2B ab49d8fb15bc3d716c5f027a3d1615963f68745dfd9d30a072b4211693d1a7bd78ba74a649435c03824ade40ce9db8018a3995e691543cbbe21fb172ac8db33b SHA512 7cca7abbe95fc510c91f0c3b4db45257b00dd5497c1f978e398d4e5a7dcd8238e9056b4980eaa9e4cbd97cda9b5781186f87301df17383b051a876d0974cbf8f +EBUILD coolreader-3.1.2.71-r3.ebuild 1661 BLAKE2B 00ff6e9c7a6e73f09e1c7a7197c2476545fe3424d7325e4a1d5cec3bdebdc505c146890303738d406c4c82bc16173ab510713ef5e7400c5a43b5b84d92433791 SHA512 72c1a9b718ce1b165e410b40907c45c826d04b2cb5fe87c6c215de46dc6dc5dd8f32740297abccd226477621b31a8d4270616e938d994f8e67248f39566b4365 +MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8 diff --git a/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild index afcc1ac458be..9c7e43e5f3f1 100644 --- a/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild +++ b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 +WX_GTK_VER="3.0" -inherit cmake-utils +inherit cmake-utils wxwidgets if [ "${PV}" == 9999 ] then @@ -30,7 +31,7 @@ DEPEND="sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype - wxwidgets? ( || ( x11-libs/wxGTK:3.0 x11-libs/wxGTK:2.8 ) ) + 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 ) )" @@ -48,10 +49,7 @@ src_configure() { CMAKE_USE_DIR="${S}" CMAKE_BUILD_TYPE="Release" if use wxwidgets; then - . "${ROOT}/var/lib/wxwidgets/current" - if [[ "${WXCONFIG}" -eq "none" ]]; then - die "The wxGTK profile should be selected!" - fi + setup-wxwidgets local mycmakeargs=(-D GUI=WX) else local mycmakeargs=(-D GUI=QT5) diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml index afd1b4bc9da9..0bc14087cc2d 100644 --- a/app-text/coolreader/metadata.xml +++ b/app-text/coolreader/metadata.xml @@ -8,6 +8,9 @@ A fast and small cross-platform XML/CSS based eBook reader for desktops and handheld devices. Supported formats: FB2, TXT, RTF, DOC, TCR, HTML, EPUB, CHM, PDB, MOBI. </longdescription> + <use> + <flag name="wxwidgets">Use <pkg>x11-libs/wxGTK</pkg> instead of Qt5</flag> + </use> <upstream> <remote-id type="sourceforge">crengine</remote-id> </upstream> |