Merge updates from master

16 files changed, 40 insertions, 39 deletions

diff --git a/app-office/kexi/kexi-3.1.0.ebuild b/app-office/kexi/kexi-3.1.0.ebuild
index 8074480ced66..16241347eb89 100644
--- a/app-office/kexi/kexi-3.1.0.ebuild
+++ b/app-office/kexi/kexi-3.1.0.ebuild
@@ -76,7 +76,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
-		-DKEXI_SCRIPTING_DEBUG=$(usex debug)
 		-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
 		-DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
 		$(cmake-utils_use_find_package marble KexiMarble)
@@ -84,5 +83,7 @@ src_configure() {
 		$(cmake-utils_use_find_package mysql MySQL)
 		$(cmake-utils_use_find_package postgres PostgreSQL)
 	)
+	use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) )
+
 	kde5_src_configure
 }
diff --git a/app-text/poppler/poppler-0.66.0.ebuild b/app-text/poppler/poppler-0.66.0.ebuild
index 5d2ce10f9354..893cc9f7e682 100644
--- a/app-text/poppler/poppler-0.66.0.ebuild
+++ b/app-text/poppler/poppler-0.66.0.ebuild
@@ -99,7 +99,6 @@ src_configure() {
 		-DWITH_Cairo=$(usex cairo)
 		-DENABLE_LIBCURL=$(usex curl)
 		-DENABLE_CPP=$(usex cxx)
-		-DWITH_GObjectIntrospection=$(usex introspection)
 		-DWITH_JPEG=$(usex jpeg)
 		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
 		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
@@ -110,6 +109,7 @@ src_configure() {
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
 	cmake-utils_src_configure
 }
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 5d2ce10f9354..893cc9f7e682 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -99,7 +99,6 @@ src_configure() {
 		-DWITH_Cairo=$(usex cairo)
 		-DENABLE_LIBCURL=$(usex curl)
 		-DENABLE_CPP=$(usex cxx)
-		-DWITH_GObjectIntrospection=$(usex introspection)
 		-DWITH_JPEG=$(usex jpeg)
 		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
 		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
@@ -110,6 +109,7 @@ src_configure() {
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
 	cmake-utils_src_configure
 }
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 932d5c36f1bf..98b6228b3335 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild b/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
index 39687661fcdc..5fb91d5638ff 100644
--- a/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
+++ b/dev-perl/CGI-Fast/CGI-Fast-2.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="CGI Interface for Fast CGI"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Class-Load/Class-Load-0.240.0.ebuild b/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
index e04d24cc6a9b..4f9cec84a748 100644
--- a/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
+++ b/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A working (require q{Class::Name}) and more"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 # uses Scalar-Util
diff --git a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
index e79bf7b62dee..11b6bca59b1c 100644
--- a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
+++ b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="String manipulation for Unicode strings"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND=">=virtual/perl-MIME-Base64-2.11"
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index c2608c7c4455..130b3d368d81 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 REQUIRED_USE="
diff --git a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
index 81d5579d3d99..57312a69e418 100644
--- a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
+++ b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,6 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetadata)
 	)
 
 	kde5_src_configure
diff --git a/net-misc/openssh/openssh-7.7_p1-r5.ebuild b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
index 3fd5fceb7372..bed23d9a6036 100644
--- a/net-misc/openssh/openssh-7.7_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
@@ -31,7 +31,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index e1c557e03885..0c404bec2b23 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 2000d7a9f85d..e7c68002729d 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,3 +1,3 @@
 DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
-DIST elogind-235.4.tar.gz 1019339 BLAKE2B 728e6707f57f43acf9a40e127fe2e53389cbcba1c96b79f96b23dc7d2ffdc3c84efdd55905a22cbeae0442d9278fd1e9371904c2da8aa29c00f79b879522b2c6 SHA512 43a4a25219c234214b1541f17c4aec65847e62ebbeeb223c7890f6648a2ffadc8388e4c526ab49df9ff1f216160810c601c7609098b9b2955bc63142f684b16e
-DIST elogind-236.1.tar.gz 1050387 BLAKE2B d0d295210eb07374cae738f55b472d9410f68c9e7f318dd736b5fcb5c0409c3da144988d8042b1e3b103d34d7a02471b4e316a924c9b1640c605fc73972de3da SHA512 ab4989f4467ef001bb8b837035bee870beaf5ec5fa2389649bdcad2fe7bbf82691bfd3176cf9a3bf3b5c232c77210f431f2d38ebdbfd09f5a7868cd50e476c59
+DIST elogind-235.5.tar.gz 990321 BLAKE2B 03730f449e01ef74a92aa3313f59b93de3941425f95610e2d50dd6a0651682df5f2e245f9eeaeef5c5fd38300102fbccc980a55466ea12100e8904f126a5c44f SHA512 8f12c576f291fb9768e343e8257c74c62686f1a67b10170715b678e0431692cec7b6382102467dd2598a331c20d823d935128d5ff36f5b074dc02802ffec863c
+DIST elogind-238.1.tar.gz 1074179 BLAKE2B 3041e9cfa0d454f653db164db8e59af4db5f3821bbb65cb5482d83f63e410612e121791f7ef3e08c9ac3940c7b6c7931df2b072ba452d2073c3e424e4dfe10c3 SHA512 ba0a74e9b9168b08a54b13ed500e9c713c48bb1648aa6064dbe666a96fa3fbd5b69447c35f686db3a1813476a5585be34b1ae13e3c9017eac8171b73f6311c4c
diff --git a/sys-auth/elogind/elogind-235.4.ebuild b/sys-auth/elogind/elogind-235.5.ebuild
index c2dbf0ad0277..c2dbf0ad0277 100644
--- a/sys-auth/elogind/elogind-235.4.ebuild
+++ b/sys-auth/elogind/elogind-235.5.ebuild
diff --git a/sys-auth/elogind/elogind-236.1.ebuild b/sys-auth/elogind/elogind-238.1.ebuild
index 4a29aef92814..c532686d9faa 100644
--- a/sys-auth/elogind/elogind-236.1.ebuild
+++ b/sys-auth/elogind/elogind-238.1.ebuild
@@ -39,6 +39,8 @@ PDEPEND="
 	policykit? ( sys-auth/polkit )
 "
 
+DOCS=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
+
 PATCHES=( "${FILESDIR}/${P}-docs.patch" )
 
 pkg_setup() {
diff --git a/sys-auth/elogind/files/elogind-236.1-docs.patch b/sys-auth/elogind/files/elogind-236.1-docs.patch
deleted file mode 100644
index 46c6fa9b9ce6..000000000000
--- a/sys-auth/elogind/files/elogind-236.1-docs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/meson.build	2018-04-20 17:19:23.912940283 +0200
-+++ b/meson.build	2018-04-20 17:20:02.265941434 +0200
-@@ -2800,20 +2800,7 @@
- # install_data('modprobe.d/systemd.conf',
- #              install_dir : modprobedir)
- #endif // 0
--install_data('README',
--             'NEWS',
--             'CODING_STYLE',
--#if 0 /// UNNEEDED by elogind
--#              'DISTRO_PORTING',
--#              'ENVIRONMENT.md',
--#endif // 0
--             'LICENSE.GPL2',
--             'LICENSE.LGPL2.1',
--             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
--#if 0 /// UNNEEDED by elogind
--#              'TRANSIENT-SETTINGS.md',
--#              'UIDS-GIDS.md',
--#endif // 0
-+install_data('src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
-              install_dir : docdir)
- 
- #if 0 /// UNNEEDED by elogind
diff --git a/sys-auth/elogind/files/elogind-238.1-docs.patch b/sys-auth/elogind/files/elogind-238.1-docs.patch
new file mode 100644
index 000000000000..2288ddfecb32
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-238.1-docs.patch
@@ -0,0 +1,23 @@
+--- a/meson.build	2018-06-25 16:41:00.000000000 +0200
++++ b/meson.build	2018-06-30 21:45:52.139755680 +0200
+@@ -2928,11 +2928,6 @@
+ # install_data('modprobe.d/systemd.conf',
+ #              install_dir : modprobedir)
+ #endif // 0
+-install_data('LICENSE.GPL2',
+-             'LICENSE.LGPL2.1',
+-             'NEWS',
+-             'README',
+-             'doc/CODING_STYLE',
+ #if 0 /// irrelevant for elogind
+ #              'doc/DISTRO_PORTING',
+ #              'doc/ENVIRONMENT.md',
+@@ -2941,8 +2936,6 @@
+ #              'doc/TRANSLATORS',
+ #              'doc/UIDS-GIDS.md',
+ #endif // 0
+-             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
+-             install_dir : docdir)
+ 
+ #if 0 /// UNNEEDED by elogind
+ # meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))