Update khelpcenter:5 dependency. Remove old.

Package-Manager: portage-2.2.15/cvs/Linux x86_64

4 files changed, 9 insertions, 311 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 029a119208a4..c2be75c5597e 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.1039 2014/12/11 15:45:01 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.1040 2014/12/14 03:16:58 mrueg Exp $
+
+  14 Dec 2014; Manuel Rüger <mrueg@gentoo.org> -kdelibs-4.14.3.ebuild,
+  kdelibs-4.14.3-r1.ebuild:
+  Update khelpcenter:5 dependency. Remove old.
 
   11 Dec 2014; Manuel Rüger <mrueg@gentoo.org> -kdelibs-4.14.2.ebuild:
   Remove KDE SC 4.14.2
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 90d9db97f4b1..fb7ce076685b 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -16,8 +16,7 @@ AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf36
 DIST kdelibs-4.12.5.tar.xz 11551604 SHA256 9711c3a3d29387dc8b40425cc2957e9f1f2d747d83e9e0213bb8ff6638e68e09 SHA512 222a3a5ad7a728723862fbfcca6886316964ba1b100214132d27d0f8b1bb89b73824aa0c144cd4dbdf37a43d641d9c602befcd94e8095b7bc73bcba431c3b13f WHIRLPOOL f959b45cd7d8fb0ead29153eac830ba54448b53ff0c9959628513e92c90948b128b0413d3fbdf88698d998f3c2d8d819564013987e6d1034242dbd1de23b3518
 DIST kdelibs-4.14.3.tar.xz 11600500 SHA256 f8206da1106184ef0bd031b82701c4910b8dade331c4cdaf1cd9c6c5208cfd9e SHA512 7713cec4851fd4d7d5376afd905515902395ca469cefe1924c05ac0cd4499c28ab6a3c3e7bee10c4cfb3584f2fe93cfb6129d5b550d56d18217866f5fde748cf WHIRLPOOL 9b6d525136cee8e43b832dbbe7451494cc30e15cc58cc34eeab8c9040a9cbe893dc8ba794be50cdb3462e20279bfb41bee22385d3d106a353ef738da510f5c04
 EBUILD kdelibs-4.12.5-r2.ebuild 8687 SHA256 766c49e483380970b54134ef1a3cb49d8a84bdbe718a83f44adc23e0feff675f SHA512 e5d52fb6fb265b95f49808a08d6da06607f3905e5296344ddcad8e7ebee8c218bb7b271c583654369f31f4e4e817cddd4633cd3908ded0b2162df21fa08ea1fa WHIRLPOOL 37af099002f5bb8c66853114436d9f881677d30797897e098eb0a5416d47fc57283847741385d2c9d4e81946be424ae94bcb11300c7b710b46521a870edf3d15
-EBUILD kdelibs-4.14.3-r1.ebuild 8695 SHA256 633268f3514d1421766b8d5ea762bb7af1b59bf436372dfa9d2fa98bf81cd4c3 SHA512 f5e363986ed6783b8a0f06855d4742a77ed6c64a8e7ce585b187cbf7aba40b4171e1b73c1de19e02c1a4592c2517ae7f6f30eb5b50628d7722cd21c4989be8fb WHIRLPOOL bc11f83119396624ff78ddf7d3ed002465d931bb87c1c85e5f6e994b3a0f326b0f4d68ec178b024ad94f66c111c97469bd6dd6fffc5f1784a3084b83a49f2749
-EBUILD kdelibs-4.14.3.ebuild 8647 SHA256 e9a644d5e049e33d6012f5bc040f49015124f8cd93aa52d4475631c0974b46de SHA512 5e46c4be5ccd1f7ef7f67ab021b185b7983c3bb430abef79f16090228a7ba3f5494433bad1f288bc34e654f8ee6b45fdeeec8a00ce488d0a623179860b9c8567 WHIRLPOOL 8d64d76bfabc75991665fd19070e04d4da576213fd1e505f3d81d0c967f28882260577252b26b3767baa01f45f06c363408dab5f963e1169967fb526e0674dc3
-MISC ChangeLog 60635 SHA256 f5082e0d3dad49a508e6e47749a58deaedc7cb7f76289b3659027f9f4f77d86e SHA512 bdff3691da3d1ebbbaa581b956e08fe1826fe6ab5f919bd8791f4cfc85f6850052f65965c79232e14162da1a7fdaf0d4124258f47b3b3b0a0288bbb14910f78d WHIRLPOOL 3e4dc8950e9abd2c5eb58198ef5475f16dfe9bbf4d11e2b5446462994b845fc678d607589aab72e6538f87cfadf85eaea6a7c6fcf707f83f3f72d73ac3d8fc90
+EBUILD kdelibs-4.14.3-r1.ebuild 8695 SHA256 57de89e3c516f5b162fdbb627d8438c20073f4e0d7ad7e831cd240e82d59094b SHA512 c788b66540cd628b79b27365660b992a48f420097c3980e27e1d1e0df9676bfb15b91f6ed552ffc2953b9142967672e70a756cb4bbbafa760bce68d9276d1ab3 WHIRLPOOL cdc3551036887d5627b7c785f7776bfc09335b939a1fddee967fcfcd3b9e6fdc536445f3450d41bb4cf37e1947c9943204c661475b372c3797aecf19bae98aef
+MISC ChangeLog 60783 SHA256 b413c26a0e9a4fd89deee8c9ce558d88a317d4999edc4b49f98c39791b816b08 SHA512 379a736354c8d8ff158743db13d621ef95688bd330e7e5aa41d3c2d04dd4d6bac6e0007dfc7431e987a1965e2f77caf70392088d0eefebb438ee7eb74f271ecd WHIRLPOOL b03ee87e6b6a7bae181be0235e09276cb59ffca1c7f0833cf3bc9254567a337dda866e469287bb2c0f87f9179920274a06e44fb38f9d674a2059b7b03d0b1036
 MISC ChangeLog-2009 110608 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f SHA512 c643c3bd742f1c2c4322217b4d9f2992310e9bf86f585ef687cf68f54ed2a86d2950f7f3c3fc5021a2dd472b6db39e17415ca6cde478e4ef4f91317a116889b5 WHIRLPOOL 8dd58bffc294a811176bc3f9882a0fa8a12c02fcdd692bacfccfc9745646d5062d3980553388fcdc835bbbecefd0783f029d07a5999e7208ceece5a93fa36893
 MISC metadata.xml 335 SHA256 ce5c36bcfe52e7bc12d4c7fb83f64b01fd52f5b329365cadd44bd9d59b1e3a3a SHA512 efc588b15e3096574a9ecf0d0edf99f979197cc0e33b2710fd7babb16f2dcaf3cff22197e9fb429ef97590a1288410f77cd987e5c03b3dac8c85236b9af751e6 WHIRLPOOL 6f8cba5c16126a196fb424944b9c12322579ccbe8165821e5cb11611f941a664dee1a31f52927a346da165c25cd829c1f0187e40d209e5ef7c0af7e1afac3347
diff --git a/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild
index 62404e4085ff..5f861a5b95c7 100644
--- a/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild,v 1.2 2014/12/11 12:19:57 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild,v 1.3 2014/12/14 03:16:58 mrueg Exp $
 
 EAPI=5
 
@@ -117,7 +117,7 @@ PDEPEND="
 	handbook? (
 		|| (
 			$(add_kdebase_dep khelpcenter)
-			kde-base/khelpcenter:5[compat(+)]
+			kde-plasma/khelpcenter:5[compat(+)]
 		)
 	)
 	nepomuk? (
diff --git a/kde-base/kdelibs/kdelibs-4.14.3.ebuild b/kde-base/kdelibs/kdelibs-4.14.3.ebuild
deleted file mode 100644
index 834bc245cc47..000000000000
--- a/kde-base/kdelibs/kdelibs-4.14.3.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.14.3.ebuild,v 1.5 2014/12/11 13:05:46 zlogene Exp $
-
-EAPI=5
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-EGIT_BRANCH="KDE/4.14"
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k kerberos lzma mmx
-nepomuk nls openexr +policykit spell sse sse2 ssl +udev +udisks +upower
-zeroconf"
-
-REQUIRED_USE="
-	udisks? ( udev )
-	upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	>=app-misc/strigi-0.7.7
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.4.2
-	>=dev-libs/libdbusmenu-qt-0.3.2
-	dev-libs/libpcre[unicode]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib
-	media-libs/libpng:0=
-	media-libs/phonon[qt4]
-	sys-libs/zlib
-	virtual/jpeg:0
-	>=x11-misc/shared-mime-info-0.60
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	!aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXcursor
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/libXtst
-		!kernel_SunOS? (
-			|| (
-				sys-libs/libutempter
-				>=sys-freebsd/freebsd-lib-9.0
-			)
-		)
-	)
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( app-crypt/qca:2 )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper )
-	kerberos? ( virtual/krb5 )
-	nepomuk? (
-		>=dev-libs/shared-desktop-ontologies-0.11.0
-		>=dev-libs/soprano-2.9.0[dbus,raptor,redland]
-	)
-	openexr? (
-		media-libs/openexr:=
-		media-libs/ilmbase:=
-	)
-	policykit? ( >=sys-auth/polkit-qt-0.103.0 )
-	spell? ( app-text/enchant )
-	ssl? ( dev-libs/openssl )
-	udev? ( virtual/udev )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
-	!dev-qt/qtphonon
-	!<=kde-base/plasma-workspace-4.7.1:4
-	!<=kde-base/kcontrol-4.4.50:4
-	>=app-crypt/gnupg-2.0.11
-	app-misc/ca-certificates
-	$(add_kdebase_dep kde-env)
-	sys-apps/dbus[X]
-	!aqua? (
-		udisks? ( sys-fs/udisks:2 )
-		x11-apps/iceauth
-		x11-apps/rgb
-		>=x11-misc/xdg-utils-1.0.2-r3
-		upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-	)
-	udev? ( app-misc/media-player-info )
-"
-PDEPEND="
-	$(add_kdebase_dep katepart)
-	|| (
-		$(add_kdebase_dep kfmclient)
-		x11-misc/xdg-utils
-	)
-	handbook? (
-		|| (
-			$(add_kdebase_dep khelpcenter)
-			kde-base/khelpcenter:5[compat(+)]
-		)
-	)
-	nepomuk? (
-		$(add_kdebase_dep nepomuk-core)
-		$(add_kdebase_dep nepomuk-widgets)
-	)
-	policykit? (
-		>=sys-auth/polkit-kde-agent-0.99
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-	"${FILESDIR}/${PN}-4.14.0-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
-	"${FILESDIR}/${PN}-4.6.2-armlinking.patch"
-	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
-	"${FILESDIR}/${PN}-4.9.3-werror.patch"
-	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
-	fi
-}
-
-src_prepare() {
-	kde4-base_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' \
-		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
-	if use aqua; then
-		sed -i -e \
-			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
-			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
-		#if [[ ${CHOST} == *-darwin8 ]]; then
-		sed -i -e \
-			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
-			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
-		#fi
-
-		# solid/solid/backends/iokit doesn't properly link, so disable it.
-		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
-			|| die "disabling solid/solid/backends/iokit failed"
-		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
-			|| die "disabling solid/solid/backends/iokit failed"
-
-		# There's no fdatasync on OSX and the check fails to detect that.
-		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
-			|| die "disabling fdatasync failed"
-
-		# Fix nameser include to nameser8_compat
-		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
-			|| die "fixing nameser include failed"
-		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
-		# Try to fix kkeyserver_mac
-		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DWITH_DNSSD=OFF
-		-DKDE_DEFAULT_HOME=.kde4
-		-DKAUTH_BACKEND=POLKITQT-1
-		-DBUILD_libkactivities=OFF
-		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_has 3dnow X86_3DNOW)
-		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has mmx X86_MMX)
-		$(cmake-utils_use_has sse X86_SSE)
-		$(cmake-utils_use_has sse2 X86_SSE2)
-		$(cmake-utils_use_with acl)
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with fam)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with kerberos GSSAPI)
-		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with nepomuk Soprano)
-		$(cmake-utils_use_with nepomuk SharedDesktopOntologies)
-		$(cmake-utils_use_with nls Libintl)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with policykit PolkitQt-1)
-		$(cmake-utils_use_with spell ENCHANT)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with udev UDev)
-		$(cmake-utils_use_with udisks SOLID_UDISKS2)
-		$(cmake-utils_use_with zeroconf Avahi)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# use system certificates
-	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
-	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/*
-	fi
-
-	if use aqua; then
-		einfo "fixing ${PN} plugins"
-
-		local _PV=${PV:0:3}.0
-		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
-		install_name_tool -id \
-			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
-		einfo "fixing ${PN} cmake detection files"
-		#sed -i -e \
-		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
-		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
-			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
-			|| die "failed fixing FindXKB.cmake"
-	fi
-
-	einfo Installing environment file.
-	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
-	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
-	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
-	doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the avahi daemon"
-		elog "is running."
-		echo
-		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
-		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
-		einfo "to include 'mdns', e.g.:"
-		einfo "	hosts: files mdns dns"
-		echo
-	fi
-
-	kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
-	# Remove ksycoca4 global database
-	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-
-	kde4-base_pkg_postrm
-}