gentoo resync : 19.01.2018

5 files changed, 69 insertions, 47 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 3cfc4d0f402a..7f50c2523f33 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kdelibs-env/Manifest b/kde-frameworks/kdelibs-env/Manifest
index 923a99ba4d8c..c9fc1bb689f5 100644
--- a/kde-frameworks/kdelibs-env/Manifest
+++ b/kde-frameworks/kdelibs-env/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdelibs-env-4.14.3.ebuild 899 BLAKE2B cdf5931d83ce67314ef3fbdf8ed5e13c141175f570a804093d08b70e7616d23fddb1fdea68cd11d7e614d79e4c9c1d016cb4840d020c30af0ca951bac15ed734 SHA512 5680292a767167fafbaae862f31e8e7129c7b5ad65bf3fa9982898cb2c5f699273e27cf3b908e85740327f7446f4148012d9a58869af778a6e7e84630f0b535d
+EBUILD kdelibs-env-4.14.3.ebuild 783 BLAKE2B 55c30075fb2fa2f31042c6383a7ec2dd9586d77f95b560c89000db8ddc55f05f1c1faf9fb322bb8f202ca313cd01f6ffdcdcb192410638129887aca7dc099c31 SHA512 362e70efadfd5d550588070f4ba79a62443b53287eaeaddbc9c9a248838a16fd6db487bd3a48e2a48c4274b3437f956fb8e93d6f4f1ed178278c2f285cac9c99
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs-env/kdelibs-env-4.14.3.ebuild b/kde-frameworks/kdelibs-env/kdelibs-env-4.14.3.ebuild
index b04fb2204dc0..32bb29de8f80 100644
--- a/kde-frameworks/kdelibs-env/kdelibs-env-4.14.3.ebuild
+++ b/kde-frameworks/kdelibs-env/kdelibs-env-4.14.3.ebuild
@@ -1,29 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-CMAKE_REQUIRED="never"
-KDE_REQUIRED="never"
-inherit kde4-base
+EAPI=6
 
 DESCRIPTION="Environment setting required for all KDELibs4 apps to run"
+HOMEPAGE="https://www.kde.org/"
 SRC_URI=""
-ESVN_REPO_URI=""
 
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
+SLOT="4/4.14"
 IUSE=""
 
-S=${WORKDIR}
-
-src_unpack() {
-	:
-}
-
-src_prepare() {
-	:
-}
+S="${WORKDIR}"
 
 src_install() {
 	# number goes down with version
@@ -42,11 +31,3 @@ if [ -z "\${XDG_MENU_PREFIX}" ] && [ "\${DESKTOP_SESSION}" = "KDE-4" ]; then
 fi
 EOF
 }
-
-pkg_preinst() {
-	:
-}
-
-src_test() {
-	:
-}
diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest
index b920ac2994fc..452ec744533b 100644
--- a/kde-frameworks/kdelibs/Manifest
+++ b/kde-frameworks/kdelibs/Manifest
@@ -13,5 +13,5 @@ AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 BLAKE2B 19df42a9b0ba3f0ab1b6a5d990b4
 AUX kdelibs-4.8.1-norpath.patch 788 BLAKE2B cdf6f6cd3df45f53782d81be09ea85051e90e1a9925972b608cec1a9324c2a5d364821b2ef63076c50140f0558ffe46e1f13b7f1754c4c2e3da2c805c3c49e1a SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89
 AUX kdelibs-4.9.3-werror.patch 1525 BLAKE2B cf48f41c843ef00493c0cfe99dc97c63ff09446f8822ba17d73de40dd09561c07f6b0020d8318a3fb7df8393315b8f7bacb0f1fda158ed869701c526ccf37692 SHA512 d2df35a0330bc98745cedb0dba1733969198cb3024de8b1b70bc552b4abd0bcf42c8f17a40519189b29f4ab2d054ba7ee28436e274c8ed674c9b12620b07814f
 DIST kdelibs-4.14.37.tar.xz 11642272 BLAKE2B 6d4384b9de08c557ba2a9af856825985bc26e71ab6deb515f13ad023a5c6f74d820666f13a6b719d51aff6fa03243f8606c3bbf568d279532ab7eb79c6cd5b2f SHA512 b25a845b7c1edae0c66b0a0881801dd3c57febc4cb57186ddddfd32c3253e492b7ff866fb38a10e4fb489233ecee71e80f3a1806f293a29607ea5f68d60ab6e1
-EBUILD kdelibs-4.14.37.ebuild 6627 BLAKE2B 17450c636b00b392a44bf4485fdf34db46885d5ffca881ad2ca19d1b3feed9a52964b1a43d24f86e81aefb4d555ca18daa47ff4fc32705e3d837cd153d5c1d69 SHA512 8273fdbc5fda2a731c90dd271e850b4de27b85bba6d2f1f9db764d3e371820b7f66fc0a4fdbc7323919b657985f2f0c6de4917c624170623385a257d3676ea09
+EBUILD kdelibs-4.14.37.ebuild 8078 BLAKE2B 9442afc9b31b7fdce97c8bc77fce8427d5572e208d832700b41ed6178a56bb6cd17466aef4fd8e9fe910476b86acee5b7be679be9d8f1f658fa4b47422667306 SHA512 56e48c2fdb81b25605bdbb784a3a3d5d423220e6c54aae1392992ba0642c5eee0e31441c8595b64c3f099a45139a35d0758d7a85c2bb00d3c44d266f600ffa8a
 MISC metadata.xml 353 BLAKE2B 3048f8a7581ac3c5f1178e2d17aba931887ea4542e529ec098af1b1f61b369d407613bfb2b4cb8ff931cf486475246c52cdaa4362ee16e8d7449695849faeb46 SHA512 6dae9e92d4f396fec1c208d028b9590cbc3b874a8c5e5968488b236e93d99fa763a87ce3ff22383721f7cbc76949c79e1e1bfe85c4ebdd7266ed986fda782587
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
index c7a824f98618..63019bdb243c 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-inherit kde4-base toolchain-funcs flag-o-matic xdg-utils
-
-APPS_VERSION="17.08.2" # Don't forget to bump this
+QT_MINIMAL="4.8.7"
+inherit cmake-utils toolchain-funcs flag-o-matic gnome2-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Libraries needed for programs by KDE"
-[[ ${KDE_BUILD_TYPE} != live ]] && \
-SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
+HOMEPAGE="https://www.kde.org/"
+SRC_URI="mirror://kde/stable/applications/17.08.2/src/${P}.tar.xz"
 
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam jpeg2k kerberos
+SLOT="4/4.14"
+IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam +handbook jpeg2k kerberos
 libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support
-spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
+spell test cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
 
 REQUIRED_USE="
 	udisks? ( udev )
@@ -31,12 +28,19 @@ RESTRICT="test"
 COMMONDEPEND="
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xsl-stylesheets
+	dev-lang/perl
 	>=dev-libs/libattica-0.4.2
 	dev-libs/libdbusmenu-qt[qt4]
 	dev-libs/libpcre[unicode]
 	dev-libs/libxml2
 	dev-libs/libxslt
-	>=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support?]
+	>=dev-qt/designer-${QT_MINIMAL}:4
+	>=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support?,ssl]
+	>=dev-qt/qtdbus-${QT_MINIMAL}:4
+	>=dev-qt/qtdeclarative-${QT_MINIMAL}:4
+	>=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)]
+	>=dev-qt/qtscript-${QT_MINIMAL}:4
+	>=dev-qt/qtsvg-${QT_MINIMAL}:4
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/giflib:=
@@ -86,13 +90,16 @@ COMMONDEPEND="
 "
 DEPEND="${COMMONDEPEND}
 	doc? ( app-doc/doxygen )
+	handbook? ( >=dev-qt/qttest-${QT_MINIMAL}:4 )
 	nls? ( virtual/libintl )
+	test? ( dev-util/cppunit )
 "
 RDEPEND="${COMMONDEPEND}
 	!dev-qt/qtphonon
 	>=app-crypt/gnupg-2.0.11
 	app-misc/ca-certificates
 	kde-frameworks/kdelibs-env:4
+	kde-frameworks/oxygen-icons
 	sys-apps/dbus[X]
 	x11-apps/iceauth
 	x11-apps/rgb
@@ -103,11 +110,17 @@ RDEPEND="${COMMONDEPEND}
 	upower? ( >=sys-power/upower-0.9.23 )
 "
 PDEPEND="
+	dev-util/automoc
+	virtual/pkgconfig
+	>=x11-libs/libXtst-1.1.0
 	x11-misc/xdg-utils
+	x11-proto/xf86vidmodeproto
 	handbook? ( kde-apps/khelpcenter:* )
 	policykit? ( kde-plasma/polkit-kde-agent )
 "
 
+DOCS=( AUTHORS README{,-WIN32.TXT} TODO )
+
 PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
@@ -126,7 +139,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	kde4-base_src_prepare
+	cmake-utils_src_prepare
 
 	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
 	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
@@ -142,7 +155,10 @@ src_configure() {
 		-DWITH_HSPELL=OFF
 		-DWITH_ASPELL=OFF
 		-DKDE_DEFAULT_HOME=.kde4
+		-DKDE_DISTRIBUTION_TEXT=Gentoo
+		-DKDE4_BUILD_TESTS=OFF
 		-DKAUTH_BACKEND=POLKITQT-1
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
 		-DWITH_Soprano=OFF
 		-DWITH_SharedDesktopOntologies=OFF
 		-DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON
@@ -174,11 +190,25 @@ src_configure() {
 
 	use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF )
 
-	kde4-base_src_configure
+	if use debug; then
+		# Set "real" debug mode
+		CMAKE_KDE_BUILD_TYPE="Debugfull"
+	else
+		# Handle common release builds
+		append-cppflags -DQT_NO_DEBUG
+	fi
+
+	tc-is-cross-compiler || cmakeargs+=( -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" )
+	#qmake -query QT_INSTALL_LIBS unavailable when cross-compiling
+	tc-is-cross-compiler && cmakeargs+=( -DQT_LIBRARY_DIR="${ROOT}"/usr/$(get_libdir)/qt4 )
+	#kde-config -path data unavailable when cross-compiling
+	tc-is-cross-compiler && cmakeargs+=( -DKDE4_DATA_DIR="${ROOT}"/usr/share/apps/ )
+
+	cmake-utils_src_configure
 }
 
 src_compile() {
-	kde4-base_src_compile
+	cmake-utils_src_compile
 
 	# The building of apidox is not managed anymore by the build system
 	if use doc; then
@@ -189,7 +219,16 @@ src_compile() {
 }
 
 src_install() {
-	kde4-base_src_install
+	for doc in "${S}"/*/{AUTHORS,ChangeLog*,README*,TODO}; do
+		[[ -f ${doc} && -s ${doc} ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${doc})"
+	done
+
+	cmake-utils_src_install
+
+	# We don't want /usr/share/doc/HTML to be compressed,
+	# because then khelpcenter can't find the docs
+	[[ -d ${ED}/usr/share/doc/HTML ]] &&
+		docompress -x /usr/share/doc/HTML
 
 	# use system certificates
 	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
@@ -199,7 +238,7 @@ src_install() {
 		einfo "Installing API documentation. This could take a bit of time."
 		cd "${S}"/doc/api/
 		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/*
+		dodoc -r ${P}-apidocs/*
 	fi
 
 	# We don't package it, so don't install headers
@@ -212,7 +251,12 @@ src_install() {
 	doenvd "${T}/77kde"
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 
 	if use zeroconf; then
@@ -226,8 +270,6 @@ pkg_postinst() {
 		elog "	hosts: files mdns dns"
 		elog
 	fi
-
-	kde4-base_pkg_postinst
 }
 
 pkg_prerm() {
@@ -236,7 +278,6 @@ pkg_prerm() {
 }
 
 pkg_postrm() {
+	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-
-	kde4-base_pkg_postrm
 }