diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-11 16:02:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-11 16:02:49 +0100 |
| commit | 88ebe56470c37b02a044e1091cad6b2df0f3be8f (patch) | |
| tree | d80b2d9337c01c4a0fe11a2ef9691fc3153ed6d3 /kde-apps/konqueror | |
| parent | 4645b6f17f0da81e9fe84081fb126a37102ba153 (diff) | |
gentoo resync : 11.05.2018
Diffstat (limited to 'kde-apps/konqueror')
| -rw-r--r-- | kde-apps/konqueror/Manifest | 6 | ||||
| -rw-r--r-- | kde-apps/konqueror/konqueror-18.04.1.ebuild (renamed from kde-apps/konqueror/konqueror-18.04.0.ebuild) | 14 | ||||
| -rw-r--r-- | kde-apps/konqueror/metadata.xml | 1 |
3 files changed, 14 insertions, 7 deletions
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest index ecb74e114bd5..5d523b9bb72f 100644 --- a/kde-apps/konqueror/Manifest +++ b/kde-apps/konqueror/Manifest @@ -1,5 +1,5 @@ DIST konqueror-17.12.3.tar.xz 7720068 BLAKE2B 803f1ea753764be169339e48f490f4e379eaeeec1ab048fca8fc75c82a0b952b9f1e1a3b0cd1f40f35f7412d51f1b8c909526c03676b8e946acebcfeb060296e SHA512 12d3b33b8d437e8f20bd329281c3b03600bc15d2ebbb85016b79d9f5da002f88f2906cc982bc3e5c94d8a9511880ee0155e6ac800e7186ad8368620b3ab5ff92 -DIST konqueror-18.04.0.tar.xz 7726188 BLAKE2B 84af194200333fd734b1aec7b7b2585b51dc0d8e6d311af69fd705e499da994ab16ec648a5b67d75e369034d0525827986cd3645db5b31bc559bdccace02be97 SHA512 c424836befecb8d5911534f91f4f344b03758562af047f150177e23f1c6b161c3e0c99a728130420cb59ad937619a9074654c6f0243bb4658b564d71448108bf +DIST konqueror-18.04.1.tar.xz 7729888 BLAKE2B 22f03c2d8cc1a6c7ee4cc470a8aac9bc63188957f59929f1f27dc148fd47378b91cca7d2fafe9021a6e0c7cbdd066e02c47c1496134a76320c4e8cb0d7732a27 SHA512 7385c753fee216a728c08d3d7dd4645a63f95804a158ab4b0d38da69d1c8391ebba3e1cd6d8f5b349ab4e12c659c6a38d01dba43119828668c8f6080e3976be1 EBUILD konqueror-17.12.3.ebuild 2782 BLAKE2B 356f538e8b789972345c451b56226ba2c8f14bf998f6e4e314a54047a9b1af2aea560b9abc39e43bb7471fbe5e4e53cce56c520a3dc521cb2b9c25022dd8854b SHA512 7c918eb59c79a1aa283ad7b9fa0d237c0fe68af5a4397002934db635cbcf2e4abbcb99a2c0f2c7ca6d7efcd52840605213be9730f2b96a779ca9d46ee0d591df -EBUILD konqueror-18.04.0.ebuild 2815 BLAKE2B d6413c2b3e99bd5d8449f23b6c464afa56c7ba81128cd09a47de7433f5225cee75e9c6e502d8378f9922a037c9d2a3c73c6fb2d3d5e262ad18d4928a3a344049 SHA512 0088f4f318a8c2851cd1eb68b76922b4ff478393e2ab7259121c82a1584d143e3184597b571b1f4bfc97fec575cb474db5d897201634379da88f1ecb2dfbc64d -MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955 +EBUILD konqueror-18.04.1.ebuild 3001 BLAKE2B 0589ca1207c070b35188e6cff8d90c24abcb2c0567bb2291ac525869f22ffd7824ec596c4798e396d7f8b55b60fcf72967f2ceb467037101d2360cf772afca74 SHA512 631bb163fd808a8950a094ea8d958098cab38e208a85afbb2146730cbe6379e89f116937a32645e86530beea1e4994c95371a7298f4b7dee0f948f9cf3d3245e +MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2 diff --git a/kde-apps/konqueror/konqueror-18.04.0.ebuild b/kde-apps/konqueror/konqueror-18.04.1.ebuild index 9f52a596a115..2ca638dfbc27 100644 --- a/kde-apps/konqueror/konqueror-18.04.0.ebuild +++ b/kde-apps/konqueror/konqueror-18.04.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE=" https://konqueror.org/ " KEYWORDS="~amd64 ~x86" -IUSE="activities speech tidy X" +IUSE="activities speech tidy +webengine X" # 4 of 4 tests fail. Last checked for 4.0.3 RESTRICT+=" test" @@ -46,28 +46,34 @@ COMMON_DEPEND=" $(add_frameworks_dep kxmlgui) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) - $(add_qt_dep qtwebengine 'widgets') $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) sys-libs/zlib speech? ( $(add_qt_dep qtspeech) ) tidy? ( app-text/htmltidy ) + webengine? ( $(add_qt_dep qtwebengine 'widgets') ) X? ( $(add_qt_dep qtx11extras) ) " DEPEND="${COMMON_DEPEND} activities? ( $(add_frameworks_dep kactivities) ) " RDEPEND="${COMMON_DEPEND} - $(add_kdeapps_dep kfind) - $(add_plasma_dep kde-cli-tools) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 + $(add_kdeapps_dep kfind) + $(add_plasma_dep kde-cli-tools) + !webengine? ( kde-misc/kwebkitpart:5 ) " src_prepare() { [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc + if ! use webengine; then + punt_bogus_dep Qt5 WebEngineWidgets + cmake_comment_add_subdirectory webenginepartexit + fi + kde5_src_prepare } diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml index a198affb5420..462e8ca3746b 100644 --- a/kde-apps/konqueror/metadata.xml +++ b/kde-apps/konqueror/metadata.xml @@ -8,5 +8,6 @@ <use> <flag name="activities">Enable kactivities support</flag> <flag name="speech">Build text-to-speech plugin</flag> + <flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> as web browser engine (fallback is <pkg>kde-misc/kwebkitpart</pkg>)</flag> </use> </pkgmetadata> |