gentoo resync : 10.02.2019

3 files changed, 6 insertions, 73 deletions

diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index b4da8d2bd144..a03891323862 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -4,6 +4,5 @@ AUX falkon-3.0.1-qiodevice-main-thread.patch 3340 BLAKE2B b2778d6c25f0d27d683156
 AUX falkon-3.0.1-qtwebengine-version.patch 2404 BLAKE2B 95e31533b7a377fc51fdd711f9ee2564a7a3dbcc4a9e65c8055c6ec5f7d2aa1fcff4d2120c74eac5e529423269eb95a15b528bf42b703efc3565f61d8607c123 SHA512 be5b8810c6453df4068a161e06492b1274c9f296856070506d494a547b32afb521ca920a86b68f4b5a5c1819851cc68b8923a264d4a20bc88c6a7cecd2a10ff6
 AUX falkon-3.0.1-webinspector.patch 3178 BLAKE2B 1c24ff92127cfa529c13b88f6e969a816d000d92d896601b5ff50548bfdce2966d7d9709312e6f9b518ad1d4314fb79bf3f7a01bca4f6110ce24b9f19a364982 SHA512 5ff6dcc9e494226a5a23657378ef170abfc4e315c2cf68a373ca57f91aa5ea38712a0c34e4239acdeff9b7af2b73300cdc150451e50b158318709544e7ced40f
 DIST falkon-3.0.1.tar.xz 2219444 BLAKE2B 013d29925f9a1c7e77d5f194eb4a1371dadda05de01a0c103902acfbb16941c6fa9c7256a98ef1965c622222ccfcee8b44c48076cb00bd892378157502f73916 SHA512 e2384cb49d4e1ec52ff7804cf798688be2d80fa5957c72accb09376aa0c41ee491c45234fd53c79871bc474a8d0677e40ddb48241a70d77102c67406b0719191
-EBUILD falkon-3.0.1-r1.ebuild 2039 BLAKE2B 0123d497a462bef89f3a0cca4f6c1f00cec12304e46c9a79d976ac5d2711abc6964da5a70d456e05f1fee573095784ea531a697602bdf2a0aa882442e625189c SHA512 d67dd51eccbe4ad0e00a57f7e4b5a464e62419e7416125d61568e75bd34a8788da9fd2bd003243833cbe50db3a5af94885790464544e5681a6de7c09d4e520a8
-EBUILD falkon-3.0.1.ebuild 1701 BLAKE2B 735a5c49e6f1487347fe65d3da7f8ce9d346092a80bd1195ceaa44e8c20fb660a1529acea9b4df255c04248ec6ea434c31de414f6a73d7b76252f9eecb4b4c1f SHA512 5dde8e9e92d3415a630b60a139d7f348d44019caca4761f7189ab834389a28070359508c11e71bbe669c4ef7c985dd17870f2464e7440efe4b04a17fcdd67521
+EBUILD falkon-3.0.1-r1.ebuild 2069 BLAKE2B 34d0679e614d775e1cfcc6c053264aae7f19e9e740ec19ce0906ecb8e60eceeb0b44fff722a98480dacd637d30c47d049448989255bb7c2761f7abd91a055931 SHA512 209f57bc27cad945d6d40754fc4dedfed334ccfb6f5909ee6cdf0ca3234d7cc2d35af44acd4905ce9ec0017a4340453953c30d3a23f8c496ef1404649f3ae0d4
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/www-client/falkon/falkon-3.0.1-r1.ebuild b/www-client/falkon/falkon-3.0.1-r1.ebuild
index 71fb406ee4a5..3c30194cf4e8 100644
--- a/www-client/falkon/falkon-3.0.1-r1.ebuild
+++ b/www-client/falkon/falkon-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus gnome-keyring kwallet libressl +X"
 
 COMMON_DEPEND="
@@ -59,6 +59,9 @@ PATCHES=(
 	"${FILESDIR}/${P}-webinspector.patch"
 )
 
+# bug 653046
+RESTRICT+=" test"
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PySide2=ON
diff --git a/www-client/falkon/falkon-3.0.1.ebuild b/www-client/falkon/falkon-3.0.1.ebuild
deleted file mode 100644
index e9e625d2b3c3..000000000000
--- a/www-client/falkon/falkon-3.0.1.ebuild
+++ /dev/null
@@ -1,69 +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}/${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:=
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-	$(add_qt_dep qtconcurrent)
-	gnome-keyring? ( virtual/pkgconfig )
-"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	DEPEND+=" $(add_frameworks_dep ki18n)"
-fi
-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"
-}