Split off libkactivities into new kde-base/kactivites

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

3 files changed, 350 insertions, 16 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index c4e661e39d17..6e2ce839b5b1 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.787 2011/09/26 21:15:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.788 2011/09/27 21:40:11 abcd Exp $
+
+*kdelibs-4.7.1-r2 (27 Sep 2011)
+
+  27 Sep 2011; Jonathan Callen <abcd@gentoo.org> +kdelibs-4.7.1-r2.ebuild:
+  Split off libkactivities into new kde-base/kactivites
 
   26 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdelibs-4.6.3-r3.ebuild, -kdelibs-4.7.1.ebuild, kdelibs-4.7.1-r1.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index a01ed5454b05..eeabf6f4d49d 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -30,22 +30,23 @@ EBUILD kdelibs-4.6.3-r2.ebuild 10274 RMD160 c748b1ac47cd5f75ae30e59659d6f8057a95
 EBUILD kdelibs-4.6.5-r1.ebuild 10225 RMD160 aef9c6922a3c5a82c1aa383335917d1245ba06e8 SHA1 1902170d6a79c851b48da35a7d2e8ef119c6228a SHA256 dd3b27125574655dbf525f0d90e8855d3fad786ea5af8bfc99ae81a04b29dd7f
 EBUILD kdelibs-4.7.0-r1.ebuild 9799 RMD160 d26d79209a7d849e40b5710e1071498901578e5c SHA1 895a9ef91374c0a44aa4ff6ac336d2aeaeb6fb5b SHA256 79ebaa6afccb6d1ca93a417f9f4136e0356512077a810f7d88881fa93dae8c4e
 EBUILD kdelibs-4.7.1-r1.ebuild 9843 RMD160 e9322ba24e9b48f37dcf90ac37e30d05176bb1c0 SHA1 f6f115a49dd069839f22865086a8e15652615cfa SHA256 3d83efe02635e1a628fc9edd12084271c148e8622aeaee79fd170b3243afb5b5
-MISC ChangeLog 131584 RMD160 bd946bf5192148a2a82ab59a746366a1bbd4cbd2 SHA1 4f1cb441e27c648ce5d004f84666a2b4af1cd67d SHA256 303d35d81f888edbb39cee0813d662c67339e00367f4fb39056163cc645b5012
+EBUILD kdelibs-4.7.1-r2.ebuild 9873 RMD160 4af7093d986546371951ddcf6162022566a97f2d SHA1 cad604a62acbae461e7437697089e563fa9e0044 SHA256 b22c6ddbe2e4232b3dea1a6a72882219f2a713682070f91c1e5ef857e539ef13
+MISC ChangeLog 131744 RMD160 73ff1b24b2269c0ec52a79f6d0782f66a33e52d7 SHA1 f13e0b50f82afefe31096c4d970200da42fd29d8 SHA256 9e2989959c95f9ae53630d59725afbeea4132c60aa37e9f0c82e8e4d1b2d75ab
 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOgOudAAoJENwGBM22xffeljUP/0yTEe41ZJESuOrwjXWOBT+0
-OgEiE4ePDWXOmTb2cvNQGl8yORnvwFIuVrxc+nLsZXM3DsphiPjVmNOH6Zo61NFp
-+/dOj437V/xy4LpREzeFgw9ObTFKtpmvy7NtDh5yqaMCcW4BKhuOQiREaIsB9f8x
-WLGz63yIdVQPh+kSffBgAVdOxHc3eJXUsGgi+3YYLcJKrFFkrj0u2RrSK8Tqb1rM
-SbB6/G+bXi2wHz4NtCKxslGKjcmVKUydnFFuMhVU9L8TK1nnPyVpiE7CjcbcEwD5
-IS7KqOlftYgoeqWUAWMRTUa0SZ+EY0N5BAaaH/4Rnk7fVmtOEoQWyzrOml+cOWxc
-HobEE/eL0Kpw2Su7t1Zu2bbP7GKYX/4UEH9W85a0112GEorX9ujxa9ZIRtxPFdma
-RlMT0y1bFBf2u3LRCifgI9FZQ7uKRarYxvBfTMQnn4KOOncUvdMWRtg0prOLwfbV
-YBzPEoLr+4Xf3g1kOO2FegxmWocG5HrTXvxtugN2Fy3im1POuwe0/LbhsS/QOeH+
-kf2ARis68EghObdgr/8LYjK2ivg4i1aoMPjjrLpmZ9PyU82GfjwJZOfxWKjErCTL
-fgkwlxyFGJQwfMdHhc080adRD2prU65Kkf4OG591a3gA7mt1DmCgb7Cm3fT8Mgzw
-S942uGQBwidw34+M+AiW
-=+kun
+iQIcBAEBCgAGBQJOgkLLAAoJELHSF2kinlg4JT8P/RxtLz6ROE1h4Kpfw7BTWcnF
+Gvg2YxZQJgfKAh8clDlYtQSdqw+gHYz4x96bFyVunxGYX8wNiEDIo+LQMI33JzzE
+brnjs83MX4KQ0CzM3lqX1Z+i4QYrJfsZ7QIf3LFZIYbJwPOTieoXnAj7WCV+d0AD
+WIM2HeVvwUtgTZtoDF2HTbDFut4WWN9E7TPIPIqoOGWYLKnsNTbRg47hoVYoUows
+4RNkI9cnyXBflb1sH+ibvsypYAzNBjzmGqK96u86u523Mj6NtkkMXARPv1dNXd+D
+ziIrNvXFUuNZOOhUANYVtZ0/Whm7QfdsbrAUwx8Dwuay3y6H/Wouc9YcVACvZmwt
+USYZ+Zizds6+sWMyk1Wt0sw+Q/XLT8MdCQa31FHq1M+bEtTZP9nzU3PuBmkdveiF
+qLoZL9nNMk4axGBpPux5UR1VudfcuQCVGfeQnx+ghtwAdNRAW6vhEbuxMm96VYgP
+GTxijT0HNkRHVjQ51xp48qouJE3kaI2tMKcWRV3mgVagAGbuth+As+pz5pKq0gjX
+yaT4SYHDhItZr6B7XlY3EqLaOkpBF8SYnhFhfidHwJirn6nd2AgN71jigzroxge7
+7cQRlvZtpDukM9cRfNsPxO6N1dkngW9eA9hC4O6AtJDNs7eI+R1+d8qfUP9A/Jgt
+wgN7aDsxrzxfcxiQ3ccr
+=1vZg
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild b/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild
new file mode 100644
index 000000000000..a12de0b0d096
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.1-r2.ebuild,v 1.1 2011/09/27 21:40:11 abcd Exp $
+
+EAPI=4
+
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+OPENGL_REQUIRED="optional"
+KDE_SCM="git"
+inherit kde4-base fdo-mime toolchain-funcs
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
+lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev
++udisks +upower upnp zeroconf"
+
+REQUIRED_USE="
+	udisks? ( udev )
+	upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.7.6
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libattica-0.1.90
+	>=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-1.4
+	>=media-libs/phonon-4.4.3
+	sys-libs/zlib
+	virtual/jpeg
+	>=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 )
+	)
+	bzip2? ( app-arch/bzip2 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	lzma? ( app-arch/xz-utils )
+	openexr? (
+		media-libs/openexr
+		media-libs/ilmbase
+	)
+	policykit? ( >=sys-auth/polkit-qt-0.99 )
+	semantic-desktop? (
+		>=dev-libs/shared-desktop-ontologies-0.6.50
+		>=dev-libs/soprano-2.6.51[dbus,raptor,redland]
+	)
+	spell? ( app-text/enchant )
+	ssl? ( dev-libs/openssl )
+	udev? ( sys-fs/udev )
+	upnp? ( media-libs/herqq )
+	zeroconf? (
+		|| (
+			net-dns/avahi[mdnsresponder-compat]
+			!bindist? ( net-misc/mDNSResponder )
+		)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!dev-libs/conversion
+	!dev-libs/kunitconversion
+	!x11-libs/qt-phonon
+	!<=kde-misc/kdnssd-avahi-0.1.2:0
+	!<=kde-misc/knetworkmanager-4.4.0_p20100820
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env)
+	!aqua? (
+		x11-apps/iceauth
+		x11-apps/rgb
+		>=x11-misc/xdg-utils-1.0.2-r3
+		udisks? ( sys-fs/udisks )
+		upower? ( sys-power/upower )
+	)
+"
+PDEPEND="
+	|| ( ( $(add_kdebase_dep kfmclient) ) x11-misc/xdg-utils )
+	handbook? ( $(add_kdebase_dep khelpcenter) )
+	policykit? (
+		>=kde-misc/polkit-kde-kcmodules-0.98_pre20101127
+		>=sys-auth/polkit-kde-agent-0.99
+	)
+	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
+"
+
+# Blockers added due to packages from old versions, removed in the meanwhile
+# as well as for file collisions
+add_blocker libknotificationitem
+add_blocker libkworkspace '<4.3.66'
+add_blocker kcontrol '<4.5.80'
+# @since 4.4 - kpilot is gone (blocker added to help upgrades)
+add_blocker kpilot
+# Block some old versions of KDE-3.5 packages that don't work well with KDE-4
+add_blocker kdebase 0 3.5.9-r4:3.5
+add_blocker kdebase-startkde 0 3.5.10:3.5
+add_blocker kdelibs 0 '<3.5.10:3.5'
+# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities
+add_blocker plasma-workspace 4.7.1
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
+	"${FILESDIR}/${PN}-4.5.90-mimetypes.patch"
+	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+	"${FILESDIR}/${PN}-4.6.3-bytecode.patch"
+	"${FILESDIR}/${PN}-4.7.1-clearbutton.patch"
+	"${FILESDIR}/${PN}-4.7.1-libpng15.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
+	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
+
+	# 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
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch"
+		# getgrouplist not in solaris libc
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch"
+		# solaris has no d_type element in dir_ent
+		epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch"
+	fi
+}
+
+src_configure() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
+		elif has_version net-misc/mDNSResponder; then
+			mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
+		else
+			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+		fi
+	else
+		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
+	fi
+	mycmakeargs+=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=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 fam)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(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 semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with udev UDev)
+		$(cmake-utils_use_with upnp HUpnp)
+	)
+	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 'mdnsd' 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
+
+	elog "Your homedir is set to \${HOME}/.kde4"
+	echo
+
+	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
+}