gentoo resync : 09.06.2018

3 files changed, 2 insertions, 69 deletions

diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index d63f6e0e9b9f..7d89e5e3b6f0 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,5 +1,3 @@
-DIST falkon-3.0.0.tar.xz 1985800 BLAKE2B 8505e2c91600d265c28f70c37bf9e8f669ecd907dd9263371a4a4c10b854d32415ec1a3fd6ac163b297d0a9f42c542d4691a6cd417ed81864585f0c66b769e34 SHA512 1d99ecd47022986570dd6bb9b57484abe30838bf52daf669c977e1d2a9381efdd60912fd72b97e0b43b6102159f4343c4d1589d4f6442d0ed62c24f1482a8d97
 DIST falkon-3.0.1.tar.xz 2219444 BLAKE2B 013d29925f9a1c7e77d5f194eb4a1371dadda05de01a0c103902acfbb16941c6fa9c7256a98ef1965c622222ccfcee8b44c48076cb00bd892378157502f73916 SHA512 e2384cb49d4e1ec52ff7804cf798688be2d80fa5957c72accb09376aa0c41ee491c45234fd53c79871bc474a8d0677e40ddb48241a70d77102c67406b0719191
-EBUILD falkon-3.0.0.ebuild 1605 BLAKE2B 5af00f3e964cc1d7703ed335ad2502c2d9dc4556e242cd98a8721f1dfbd43b485e011cd8a9baafb180d39fbcf09ece10cbc69a1fb90c11eb8fecb797b37cec3f SHA512 9e95e10ef76a536e966736f0b57f3770d3f58a4170d6fa9a4f4bf68aa94cbcd93cba94013b7b80c80725d39a6e7cba301a9ecadd00cace3df82dbdbf9a35bd01
-EBUILD falkon-3.0.1.ebuild 1703 BLAKE2B f90856c653da3d9cdf812cfb6a347da6bbfc5b6675b1cb539e068cd3e1fdb44f69f1724aea14dd1d14a341792c9bdd39c4078010dc74f24d0e01fcb764da1930 SHA512 c7a7b56a79d1fd8a60642501ba3ef6eb2a504fa7b229debd8de32c52d3a17ecdbd36b421c1314888d16c5611e538272902f33e2e716b6e06dc251688cc7d2255
+EBUILD falkon-3.0.1.ebuild 1702 BLAKE2B 073a5b29b63bcfc04b00a26328f14f9d634af8fc6987dcbf154fdd408ef580b1cb6e561ef1272071263420fe623281f45b5046ab3e72a7085c9b130f1398449f SHA512 e417cc0d67821e64d0e160ca10cf041cb34027d21c550738882a361500b275b6db17a0f116f04fdebe154dffb1b72e78109d72cd2a8af0ec5c166e2cf3db6a5e
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/www-client/falkon/falkon-3.0.0.ebuild b/www-client/falkon/falkon-3.0.0.ebuild
deleted file mode 100644
index efdb7d0926ec..000000000000
--- a/www-client/falkon/falkon-3.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-QT_MINIMAL="5.9.2"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.falkon.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="dbus gnome-keyring kwallet libressl +X"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwebchannel)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	dbus? ( $(add_qt_dep qtdbus) )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	kwallet? ( $(add_frameworks_dep kwallet) )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-	$(add_qt_dep qtconcurrent)
-	gnome-keyring? ( virtual/pkgconfig )
-"
-RDEPEND="${COMMON_DEPEND}
-	!www-client/qupzilla
-	$(add_qt_dep qtsvg)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_DBUS=$(usex !dbus)
-		-DBUILD_KEYRING=$(usex gnome-keyring)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-		-DNO_X11=$(usex !X)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "If you were previously using QupZilla, you can manually migrate your profiles"
-	elog "by moving the config directory from ~/.config/qupzilla to ~/.config/falkon"
-}
diff --git a/www-client/falkon/falkon-3.0.1.ebuild b/www-client/falkon/falkon-3.0.1.ebuild
index 8db691656aae..89bfcfe00996 100644
--- a/www-client/falkon/falkon-3.0.1.ebuild
+++ b/www-client/falkon/falkon-3.0.1.ebuild
@@ -16,7 +16,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="dbus gnome-keyring kwallet libressl +X"
 
 COMMON_DEPEND="