Merge updates from master

6 files changed, 105 insertions, 2 deletions

diff --git a/kde-frameworks/kpackage/files/kpackage-5.28.0-install-metadata.patch b/kde-frameworks/kpackage/files/kpackage-5.28.0-install-metadata.patch
new file mode 100644
index 000000000000..f79cc3540234
--- /dev/null
+++ b/kde-frameworks/kpackage/files/kpackage-5.28.0-install-metadata.patch
@@ -0,0 +1,30 @@
+From e7861d979c71815a614f2baf0b3d25f329fadef0 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Fri, 18 Nov 2016 15:51:49 +0100
+Subject: keep installing metadata.desktop
+
+there are too many existing users that rely on existence of metadata.desktop,
+so keep installing it, even if with new plasma-workspace releases only the
+metadata.json would be used. the framework should never change its behavior
+wrt old software, even if it was doing something in a sense wrong
+CCMAIL:	Aleix Pol Gonzalez <aleixpol@kde.org>
+BUG:372594
+---
+ KF5PackageMacros.cmake | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake
+index cc5aae2..a14ab0b 100644
+--- a/KF5PackageMacros.cmake
++++ b/KF5PackageMacros.cmake
+@@ -31,7 +31,6 @@ function(kpackage_install_package dir component)
+       set(install_dir ${KPACKAGE_RELATIVE_DATA_INSTALL_DIR})
+    endif()
+    install(DIRECTORY ${dir}/ DESTINATION ${KDE_INSTALL_DATADIR}/${install_dir}/${root}/${component}
+-           PATTERN metadata.desktop EXCLUDE
+            PATTERN .svn EXCLUDE
+            PATTERN CMakeLists.txt EXCLUDE
+            PATTERN Messages.sh EXCLUDE
+-- 
+cgit v0.11.2
+
diff --git a/kde-frameworks/kpackage/kpackage-5.28.0.ebuild b/kde-frameworks/kpackage/kpackage-5.28.0-r1.ebuild
index 773ed1298f4d..24d83c5aa949 100644
--- a/kde-frameworks/kpackage/kpackage-5.28.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.28.0-r1.ebuild
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
 	man? ( $(add_frameworks_dep kdoctools) )
 "
 
+PATCHES=( "${FILESDIR}/${P}-install-metadata.patch" ) # fix for <=Plasma-5.8
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package man KF5DocTools)
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index 8009030a3309..c9bf037ca4b5 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1,5 +1,6 @@
 DIST gnu-efi-3.0.2.tar.bz2 136134 SHA256 194b580ecdb1fad0e41914845ba064c279afb687855960b58693459e5537b4d7 SHA512 960dc0374dd63dea5eb25e2bf6670d3f7474ebeca2090514c2895b28ff6e058a852958d028eadbe156df4645bd04d1a93ffaae1153861fce6e7da72f8f9dbeec WHIRLPOOL 3e692058a74f3f42867f84fe6af41cc0911280b2a295c441b2c4e27d116f162e0d166fe713b8eb15a6c6a8184037bae34db6ee1f0fdf7c2f9e53ee8215b2cfdb
 DIST gnu-efi-3.0.3.tar.bz2 142229 SHA256 c530f21a15fd9c214dd92d29a6caa20fac989289267512020b6da1f5e6f5b4cb SHA512 0b0582e22344ea8a544aba540b56dc36364febfeb5bb655e87277e638fd4e549214a0cd2079a852d15ee376cd51c33794f65a7efb23be9a7a929e889cd616c8c WHIRLPOOL 79796e2f46086b3cae100cda1f1ace48af0e743d5b0129246b4ebf8fd7b46392550a834085c73798e59163cbcc8778251ed7e1d9c1a9036f888e1de265387f16
+DIST gnu-efi-3.0.4.tar.bz2 143148 SHA256 51a00428c3ccb96db24089ed8394843c4f83cf8f42c6a4dfddb4b7c23f2bf8af SHA512 f4cf340223835883448c95e893501e9921f6bd869a475a0ba3ba0b8eaada184ebcf617a93c27875684fb0f94bfc6ea2a3b8388100cf67c751122fe86f6820cd0 WHIRLPOOL 729422058532096df53a855f0b2f58371fe79e18005cdfff29d6ee50bf54890414e37122a1aacef1649bb1abce53ffdc3c24527aa8d3c4b57614b20240e7c70c
 DIST gnu-efi-3.0a.tar.gz 119079 SHA256 661b94996c184216dfd678b8a1ab82bd6afb82c55320841ba9c74db7aebb828a SHA512 190ca318369373c030b214ddc1b9b560d27fe067cb6119ce7b72e48117d284642a741b44fc79da22b6f91e24a5f9d735a6b1eb37994c8f04ffe33868e6d29cc7 WHIRLPOOL 979f2fc1f0c678460912afc98719749d32d98d43bddacd400e5a7d44ef7e3b6395e58fec6a41c0c5294f5062f2e2553763f1e84bf4bfefd0e02ae5c01783e008
 DIST gnu-efi_3.0g.orig.tar.gz 272150 SHA256 531971707640faeb994c0b102b9ccf2e1920b97d080e4cb2b6e55ea2318d6af0 SHA512 67a24366c8fed36600f4963f053a25e2b409ae140c5f20d2f4c517cb9b65c302552e67ad7bb98002746e41cb153d5ad27ddf242dfc3aca894fdd4c01181731d8 WHIRLPOOL b4518de145d2a71c646f9c6c69e2410367d472029978778d687f804a2588ceef890d59e4b5f47ad1e8516b68b0a73cc9d8660328cd431db63f90a61993395a88
 DIST gnu-efi_3.0i-2.diff.gz 4838 SHA256 4488db1978215e06a6e859fb75491d7f5bd5a6821e70be0ba604f0de628a442f SHA512 c4c141f976bc3178b0df44c23b0210eb629007862e7d0333c98ea58d5bc13d9ae523012399097175d916c4159870f50bcd6c282647996bde6619d35b9e9658e0 WHIRLPOOL 2a5f1737dd245332facf7386ff406498ccb417d3ec1ab74dd793e9074b537bee6249620fb92ee76ff54855531fa21ac70ff3d4b06187d89e195bcf03197a24cf
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.4.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.4.ebuild
new file mode 100644
index 000000000000..65873c623768
--- /dev/null
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Library for build EFI Applications"
+HOMEPAGE="http://gnu-efi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# IA64 build is broken in setjmp code:
+# https://sourceforge.net/p/gnu-efi/bugs/9/
+KEYWORDS="-* ~amd64 ~arm ~arm64 -ia64 ~x86"
+IUSE="abi_x86_32 abi_x86_64"
+
+DEPEND="sys-apps/pciutils"
+RDEPEND=""
+
+# These objects get run early boot (i.e. not inside of Linux),
+# so doing these QA checks on them doesn't make sense.
+QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
+RESTRICT="strip"
+
+efimake() {
+	local arch=
+	case ${CHOST} in
+		arm*) arch=arm ;;
+		aarch64*) arch=aarch64 ;;
+		ia64*) arch=ia64 ;;
+		i?86*) arch=ia32 ;;
+		x86_64*) arch=x86_64 ;;
+		*) die "Unknown CHOST" ;;
+	esac
+
+	local args=(
+		ARCH="${arch}"
+		HOSTCC="${BUILD_CC}"
+		CC="${CC}"
+		AS="${AS}"
+		LD="${LD}"
+		AR="${AR}"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR='$(PREFIX)'/$(get_libdir)
+	)
+	emake -j1 "${args[@]}" "$@"
+}
+
+src_compile() {
+	tc-export BUILD_CC AR AS CC LD
+	if [[ ${CHOST} == x86_64* ]]; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
+		use abi_x86_64 && efimake
+	else
+		efimake
+	fi
+}
+
+src_install() {
+	if [[ ${CHOST} == x86_64* ]]; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
+		use abi_x86_64 && efimake INSTALLROOT="${D}" install
+	else
+		efimake INSTALLROOT="${D}" install
+	fi
+	einstalldocs
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 23d21f93a4df..53683269beec 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,6 +1,6 @@
 DIST vivaldi-1.4.589.29_p1-amd64.deb 46300958 SHA256 e6852d92462c961b04eef7beac3e0ae0a2522c75dc72a6febc0c5b9c312a4b93 SHA512 a0ca45ebe1b7d4c4255d49f5c296765dd4003916d4ff760e97494f9d166ece00244a67236e7f664f4326a05d855a4930d7636e5412cf1cd77dfea1498acd0dec WHIRLPOOL 62e87e460e8e1583c2a378cdc0c64e7d244fbd3e390f49b203f737ccbdf70dd74f388dd2da74fd5b348142f7d2dfc52e11dab73f9615381a130ea2482b4e85d9
 DIST vivaldi-1.4.589.29_p1-i386.deb 47999782 SHA256 4cf93c5da656cde9e83d101ae9ce39de1c394a9fb2efac25fbbcd35ea24c9430 SHA512 1592dbfc5b95b95a77ae5523e09b390f71e296775b6dcc84395b8b8d2dee673e8f957df4e006133513c2d86a2dc5133ae3cea3d870b370ddee29151bfea0951a WHIRLPOOL 9a2fa8aeed6e839aea1a0ad46d0eb147caa86e0ce02c8e778fe755188f66e45b4412928d4e1919dc9af1d944439ad504131508e8bb09406fe13ab0b48d03999a
-DIST vivaldi-1.5.658.21_p1-amd64.deb 48020860 SHA256 398568f8c86722bd7937e62cd080608ce8f889ffb25ca39655134d756914d204 SHA512 6c20701c2bdfce7a2116f03db489b67c595b7d860bef39d4726e5895f67f814a1e0735076a83b49f148887bfe9081c3de4bad89960f78cbac243ff3f2bd58640 WHIRLPOOL 516e83a09b13bca0e21b7a9204c1446ced7b791fa9bd0956d3ba79d6ee2a43c46849061c25f37a76e4de026730409fef039ecf248286513321d922952584432d
-DIST vivaldi-1.5.658.21_p1-i386.deb 48334722 SHA256 ca7282b7ce4cd9c630adb6b2db921631fc918de26a101dc5554e02d1f8b97c42 SHA512 b53d9c55aae5bb08ca1584eb17b6ebe7d9f9ba013270f201409b272a4a1124c5de3d15d5d670f9e8dc2e697ba4ad39e5dce9f8b5e215e0a41c26014066c570a2 WHIRLPOOL ab378d3a08b3676c1bd76fef1a08fd5c5bc7faeb882c87c7e2b058ebe6d11d16f323435ff146b1d440a5c67f3db046f9051ef8f198ecf8312253326e60c32695
 DIST vivaldi-1.5.658.27_p1-amd64.deb 48048014 SHA256 c4259fc3ab45a2809cda9a14edaf3e744b77200df0c21c4e7a2186e1043c5aec SHA512 ce46e0ba3cb9e91202c82c3f4dea8fd2a182428b4949776a02c3113446a3fdde8153a31facc83865bac5abc401c040d4a8d0676fef022b10b8bd396171e05d97 WHIRLPOOL 69a2842dc719983e6299551f5ebbcfb395c3ea5494bd0609fb698f3a76194d045a8d1059ef78c4cb3c59e8bec584e22af6cfbea51245f0267648c8cff8bb1267
 DIST vivaldi-1.5.658.27_p1-i386.deb 48325988 SHA256 78867c5e9122b21c8b54477c26acf4f58b24a7b4c183838e955043c511314017 SHA512 c2e28df627d067052986f2c56885511b692f80e24aa8dbd506ad15f82da9538eb319caabd1a355e41e1d6c7feaa2ab5941e99e56afa8010bc7de0f54eeb6963f WHIRLPOOL ff307b79db8090388a5a7e47720a1e8df22eab760ca594bb9f96d818092bb2f414369da96648122baf03159cd1dc419b0989b869162688ab20a63216783cda6a
+DIST vivaldi-1.5.658.31_p1-amd64.deb 48061342 SHA256 319ec7d0fc9adc12e365ff87e77210eda54e1678e42491811c1e3376d995d188 SHA512 e6a9518e3028fad7e4bc9d23e085e5e61721baf015cd1190f71abf62cf6c92b4b345206b5af996329121b262ac27001b8c1dc7bd7440881b22632227746bb084 WHIRLPOOL e0482b69c97028f51ceca104eafefe97315f90564692de8850ce8bcb9efaede47aa59432ae711a7e95003a56d351ec3165bea662ba2a2065f33c356bbb510e4d
+DIST vivaldi-1.5.658.31_p1-i386.deb 48332812 SHA256 d7fa21b624310fad30503865d355f76d6a8f4bd1d2eb06d288d2f74be04655e6 SHA512 074c5f817d663aeaa1f9ca69fece2eee18f57f6bbe2f2b0f8a975dddc7e25d6affa282a6f1a6e36d107d67dbfac7ee44d5006364d0128bbf40bc2872e25fb7ce WHIRLPOOL 9e4d81ea7dfd6df0c39b14e8c097def292006a78f2ae5106bb1595d707614fa5e109f6754a7854cb2123c9640280f5d4fb3f95dfb89ebbc649ad104df7c5bca8
diff --git a/www-client/vivaldi/vivaldi-1.5.658.21_p1.ebuild b/www-client/vivaldi/vivaldi-1.5.658.31_p1.ebuild
index 19616d9ec421..19616d9ec421 100644
--- a/www-client/vivaldi/vivaldi-1.5.658.21_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.5.658.31_p1.ebuild