Revbump due to impatient users broke their stuff with unfinished ebuilds.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 271 insertions, 2 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index c6e5617d5547..e7859f28fa3d 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.581 2009/04/12 23:26:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.582 2009/04/14 15:25:12 scarabeus Exp $
+
+*kdelibs-4.2.2-r1 (14 Apr 2009)
+
+  14 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +kdelibs-4.2.2-r1.ebuild:
+  Revbump due to impatient users broke their stuff with unfinished ebuilds.
 
   12 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> kdelibs-4.2.2.ebuild:
   Remove the suposed fix for latex issue. Per bug #265915.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 615a08c541b7..39b5ae8c7ea7 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -45,6 +45,7 @@ EBUILD kdelibs-4.2.1-r1.ebuild 6725 RMD160 8e6fd0382b60cdd150c89c94d3bf762112d1c
 EBUILD kdelibs-4.2.1-r2.ebuild 7151 RMD160 b488ad66e5a12b3e3438a91d460cf01cf551f743 SHA1 27f9e38e6bad6ab52a7af6a0c850dd9fb21b0525 SHA256 e7096eeab646e0c16770c512b78136f6925f6c11aee70e486a7a3fbb1589e95b
 EBUILD kdelibs-4.2.1-r3.ebuild 7337 RMD160 9cb0a30c5c7ab172246d61cc34b7547dde9bf676 SHA1 344c9b14bcbb57472b0161bcf6eadb510c4090ca SHA256 944599e1e277df4e5d252e5b1c5bc0f66dfaddd8817687ed9ad4f28883a5a47f
 EBUILD kdelibs-4.2.1.ebuild 6570 RMD160 63363a2c262f23189f7a63ddf8f20a2915cc76ea SHA1 df38ba5ff222935f4d4f45a034ef6dd0b6f158f6 SHA256 1376a9c68399c7de53c7e0f02448b9e66882f11fe9b69d24f22d22ac4665bbf0
+EBUILD kdelibs-4.2.2-r1.ebuild 7139 RMD160 0d527fa084afa40671631e1f33b10d7951b5697a SHA1 4107b28613c3c1f0837a5f9599ed9a367c6e6fe2 SHA256 804b45e952bf1aebd79a0ffac89cc96fd558da731d7d74fcfcd6161154950a3b
 EBUILD kdelibs-4.2.2.ebuild 7136 RMD160 0422951dd81f8a0c2ace4d942915688f5b17182f SHA1 cc3eaaa9163e3ed4d17f99bea721ebd6f6ff17b9 SHA256 981bf12799595b264c2c703436d13c18c8e9226686252253e7127b4df32e2372
-MISC ChangeLog 96066 RMD160 355521368df9e928c138659811777f234f4d81d4 SHA1 17f55e9e50ee3dbf578be6e708550217679358be SHA256 77ff4c3f6afe2d5e946aaefa27c5fd93668cbc6d41610519ce2c1322ec9837c0
+MISC ChangeLog 96256 RMD160 0c78b7049f2a95a166001ab195d13da32806d670 SHA1 461ff178c5d5f83cc9d9f764e02f312e40f00618 SHA256 00718667c8d9980ba8e08bb6e83ee04e127b4c922758b44075682f95f85c307f
 MISC metadata.xml 441 RMD160 e57f70d613371f6611dd4b9836dcc2d782b37dff SHA1 a9ccd73256be801916ce41b1e40269bc094587eb SHA256 e9b96a886144e7453b3cf5f6361e14b2f35a448f24a10c00074ce00c5a179caf
diff --git a/kde-base/kdelibs/kdelibs-4.2.2-r1.ebuild b/kde-base/kdelibs/kdelibs-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..6c2975dcb616
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.2.2-r1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.2-r1.ebuild,v 1.1 2009/04/14 15:25:12 scarabeus Exp $
+
+EAPI="2"
+
+CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="always"
+inherit kde4-base fdo-mime
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+LICENSE="LGPL-2.1"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam jpeg2k kerberos
+mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
+
+RESTRICT="test"
+
+COMMONDEPEND="
+	>=app-misc/strigi-0.6.3[dbus,qt4]
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=kde-base/automoc-0.9.87
+	media-fonts/dejavu
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib
+	media-libs/jpeg
+	media-libs/libpng
+	>=media-sound/phonon-4.3.1[xcb]
+	sys-apps/dbus[X]
+	sys-libs/libutempter
+	sys-libs/zlib
+	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/libXtst
+	x11-misc/shared-mime-info
+	acl? (
+		kernel_linux? ( sys-apps/acl )
+	)
+	alsa? ( media-libs/alsa-lib[midi] )
+	bzip2? ( app-arch/bzip2 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	openexr? (
+		media-libs/openexr
+		media-libs/ilmbase
+	)
+	semantic-desktop? ( >=dev-libs/soprano-2.2.2[dbus] )
+	spell? (
+		app-dicts/aspell-en
+		app-text/aspell
+		app-text/enchant
+	)
+	ssl? ( dev-libs/openssl )
+	zeroconf? (
+		|| (
+			net-dns/avahi[mdnsresponder-compat]
+			!bindist? ( net-misc/mDNSResponder )
+		)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+# Blockers added for !kdeprefix? due to packages from old versions,
+# removed in the meanwhile
+# kde-base/libplasma
+# kde-base/knewsticker
+# kde-base/kpercentage
+# kde-base/ktnef
+RDEPEND="${COMMONDEPEND}
+	!<=kde-base/kdebase-3.5.9-r4
+	!<=kde-base/kdebase-startkde-3.5.10
+	!<kde-base/kdelibs-3.5.10
+	!x11-libs/qt-phonon
+	!kdeprefix? (
+		!kde-base/kitchensync:4.1
+		!kde-base/knewsticker:4.1
+		!kde-base/kpercentage:4.1
+		!kde-base/ktnef:4.1
+		!<kde-base/libkworkspace-${PV}[-kdeprefix]
+		!kde-base/libplasma
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
+	kdeprefix? (
+		!<kde-base/libkworkspace-${PV}:${SLOT}
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
+	x11-apps/iceauth
+	x11-apps/rgb
+	>=x11-misc/xdg-utils-1.0.2-r3
+"
+PDEPEND="
+	>=kde-base/kdebase-data-${PV}:${SLOT}[kdeprefix=]
+"
+
+# upstream patches / dist patches
+# systemsettings title issue
+# ${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch - see bug 263823
+PATCHES=(
+	"${FILESDIR}/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch"
+	"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
+	"${FILESDIR}/dist/23_solid_no_double_build.patch"
+	"${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch"
+	"${FILESDIR}/${PN}-${SLOT}-fix_kio_http_401.patch"
+	"${FILESDIR}/${P}-kickoff-focus.patch"
+)
+
+src_prepare() {
+	sed -e 's/find_package(ACL)/macro_optional_find_package(ACL)/' \
+		-i CMakeLists.txt || die "Failed to make ACL disabled even when present in system."
+
+	# Rename applications.menu
+	sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-${SLOT}-applications.menu|g" \
+		-i kded/CMakeLists.txt || die "Sed for applications.menu failed."
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
+		elif has_version net-misc/mDNSResponder; then
+			mycmakeargs="${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="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=OFF"
+	fi
+	if use kdeprefix; then
+		HME=".kde${SLOT}"
+	else
+		HME=".kde4"
+	fi
+	mycmakeargs="${mycmakeargs}
+		-DWITH_HSPELL=OFF
+		-DKDE_DEFAULT_HOME=${HME}
+		$(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 ACL)
+		$(cmake-utils_use_with alsa Alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with fam FAM)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with spell ASPELL)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+	"
+	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
+
+	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/* || die "Install phase of KDE4 API Documentation failed"
+	fi
+
+	dodir /etc/env.d
+	dodir /etc/revdep-rebuild
+
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	if use kdeprefix; then
+		cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version
+PATH="${PREFIX}/bin"
+ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
+LDPATH="${_libdirs}"
+MANPATH="${PREFIX}/share/man"
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+#KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="${PREFIX}/share"
+KDEDIRS="/usr"
+EOF
+		doenvd "${T}"/43kdepaths-${SLOT}
+		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
+SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+EOF
+	else # Much simpler for the FHS compliant -kdeprefix install
+		cat <<-EOF > "${T}"/43kdepaths # number goes down with version
+CONFIG_PROTECT="/usr/share/config"
+#KDE_IS_PRELINKED=1
+		EOF
+		doenvd "${T}"/43kdepaths
+	fi
+	# Ensure that the correct permissions are set on ${PREFIX}/share/config
+	fperms 755 "${PREFIX}"/share/config
+}
+
+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. Make sure also that multicast dns lookups are enabled by editing"
+		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
+		elog "	hosts: files mdns dns"
+		echo
+	fi
+	elog "Your homedir is set to "'${HOME}'"/${HME}"
+	elog
+	elog "If you experience weird application behavior (missing texts, etc.) run as root:"
+	elog "# chmod 755 -R /usr/share/config $PREFIX/share/config"
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}