diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-05-06 21:10:15 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-05-06 22:02:01 +0200 |
commit | 169244b9dc13a148c768aeccea04f8f84c1219cc (patch) | |
tree | bfa3f506cd9ef401c49bf594089bc31625b283de /kde-apps/konqueror | |
parent | kde-apps/svgpart: Drop slot 4 (diff) | |
download | gentoo-169244b9dc13a148c768aeccea04f8f84c1219cc.tar.gz gentoo-169244b9dc13a148c768aeccea04f8f84c1219cc.tar.bz2 gentoo-169244b9dc13a148c768aeccea04f8f84c1219cc.zip |
kde-apps/konqueror: Drop slot 4
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Diffstat (limited to 'kde-apps/konqueror')
-rw-r--r-- | kde-apps/konqueror/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch | 15 | ||||
-rw-r--r-- | kde-apps/konqueror/konqueror-16.08.3-r1.ebuild | 102 | ||||
-rw-r--r-- | kde-apps/konqueror/metadata.xml | 2 |
4 files changed, 0 insertions, 120 deletions
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest index 180c5605554f..79194971d69d 100644 --- a/kde-apps/konqueror/Manifest +++ b/kde-apps/konqueror/Manifest @@ -1,3 +1,2 @@ -DIST kde-baseapps-16.08.3.tar.xz 2051000 SHA256 47e9bb15c64495392625d69af9ac7e00644caa52c98c7187489a7c569ec842a1 SHA512 6606430c2ec5ab934d253a009bbc2c1df4e9d1f8b54dcf16dd9f1894449d7c734641f17360b906a3a7667ac7083ab712b8498b44a20c137d836dd1dab8963649 WHIRLPOOL b65a32a9c03424ed6718db4b5fea85c28690074f450f49df1c581d77e03cc172004dda5aadd39de087e6ff0d101ac1f7587a960e20f7d4faa56f2b45a6ee7643 DIST konqueror-16.12.3.tar.xz 1172012 SHA256 e52654a1bb2c0be317f8ed80dba3147bc4d2126abce209ab57c6e69e64159bdf SHA512 cef6fe2fbade73a89d8f8b7932ae0dba42d98fbf1160dcc888339a071d72084aeb847fc74a22ae4a39b21fd0cef24a60832e343885c0e673b418482faebad93a WHIRLPOOL 1afb257eb10cff77e71d1479972d25029727dd1a6202173422203f9e309767a80150b713a104dd7848c66ad86c342e1c6a1d7bf28c705051a52e9a120ed1d4c3 DIST konqueror-17.04.0.tar.xz 7783204 SHA256 95a6358da4cfd9589b66b78116adce29c0f69a5964e81fcde3862e32b1653833 SHA512 8d6c00a4df41a7feec82b63647a64fabf810dad8ed40647178d98529bfcfbfc228a05649f5b1e267644cd21db1efbc8fe43362a2dfef25bdec5b4cfee336336a WHIRLPOOL ae83fb5f379d2c68e0ec0fad1a96d22da0747268500963532fd2caadb04142cd731ff30939c1538fd4165ca31cb8a34c6bbfe7097831dcafe6f85f99bd870efb diff --git a/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch b/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch deleted file mode 100644 index 9207fd6b9739..000000000000 --- a/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch +++ /dev/null @@ -1,15 +0,0 @@ -Make sure KActivities headers aren't used either if disabled. - ---- a/dolphin/src/CMakeLists.txt 2016-08-24 22:25:42.603345565 +0200 -+++ b/dolphin/src/CMakeLists.txt 2016-08-24 22:27:39.921317927 +0200 -@@ -27,7 +27,9 @@ - macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) - configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h ) - --include_directories( ${KACTIVITIES_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ) -+if (KActivities_FOUND) -+ include_directories( ${KACTIVITIES_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ) -+endif (KActivities_FOUND) - - if(HAVE_BALOO) - include_directories(${BALOO_INCLUDE_DIR} ${BALOO_WIDGETS_INCLUDE_DIR} ${KFILEMETADATA_INCLUDE_DIR}) diff --git a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild deleted file mode 100644 index b2a1a5b75955..000000000000 --- a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KMNAME="kde-baseapps" -inherit flag-o-matic kde4-meta - -DESCRIPTION="Web browser and file manager" -HOMEPAGE=" - https://www.kde.org/applications/internet/konqueror/ - https://konqueror.org/ -" -KEYWORDS="amd64 ~arm x86" -IUSE="+bookmarks debug +filemanager svg" -# 4 of 4 tests fail. Last checked for 4.0.3 -RESTRICT="test" - -DEPEND=" - $(add_kdeapps_dep libkonq) - filemanager? ( - media-libs/phonon[qt4] - x11-libs/libXrender - ) -" - -# bug #544630: evince[nsplugin] crashes konqueror -RDEPEND="${DEPEND} - kde-apps/kfind:* - $(add_kdeapps_dep kfmclient) - $(add_kdeapps_dep kurifilter-plugins) - bookmarks? ( kde-apps/keditbookmarks:* ) - filemanager? ( - $(add_kdeapps_dep kdebase-kioslaves) - $(add_kdeapps_dep konsolepart) - !kde-apps/dolphin:4 - ) - svg? ( $(add_kdeapps_dep svgpart) ) - !app-text/evince[nsplugin] -" - -KMEXTRA=" - dolphin/ -" - -KMEXTRACTONLY=" - konqueror/client/ - lib/konq/ -" - -PATCHES=( "${FILESDIR}/${PN}-16.08.0-kactivities.patch" ) - -src_prepare() { - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc - - # required for dolphin - sed -e "/konq_copytomenu.h/ s/# //" \ - -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \ - -i lib/konq/CMakeLists.txt \ - || die "Failed to fix libkonq CMakeLists.txt" - - kde4-meta_src_prepare - - # Avoid doc file collisions with kde-apps/keditbookmarks:5 - if use handbook; then - sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt || die - fi - - use filemanager || cmake_comment_add_subdirectory dolphin - - # Do not install *.desktop files for kfmclient - sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \ - || die "Failed to omit .desktop files" -} - -src_configure() { - local mycmakeargs - - if use filemanager ; then - mycmakeargs=( - -DWITH_Baloo=OFF - -DWITH_BalooWidgets=OFF - -DWITH_KFileMetaData=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_KActivities=ON - ) - fi - - kde4-meta_src_configure -} - -pkg_postinst() { - kde4-meta_pkg_postinst - - if use filemanager && ! has_version media-gfx/icoutils ; then - elog "For .exe file preview support, install media-gfx/icoutils." - fi - - if ! has_version virtual/jre ; then - elog "To use Java on webpages install virtual/jre." - fi -} diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml index 88fd03fe7211..a198affb5420 100644 --- a/kde-apps/konqueror/metadata.xml +++ b/kde-apps/konqueror/metadata.xml @@ -7,8 +7,6 @@ </maintainer> <use> <flag name="activities">Enable kactivities support</flag> - <flag name="bookmarks">Add dependency on bookmark package.</flag> - <flag name="filemanager">Install the dolphin kpart for use as a file manager.</flag> <flag name="speech">Build text-to-speech plugin</flag> </use> </pkgmetadata> |