Added ${FILESDIR}/${P}-kcatalog.patch and bumped to kdelibs-4.2.1-r2 to fix remaining issues on upstream bug 186038 and Gentoo bug 261367 related to gwenview.

Package-Manager: portage-2.2_rc24/cvs/Linux x86_64

4 files changed, 317 insertions, 2 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index aa0a0f41e438..c6d1831cde87 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.570 2009/03/10 13:34:09 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.571 2009/03/11 14:47:59 jmbsvicetto Exp $
+
+*kdelibs-4.2.1-r2 (11 Mar 2009)
+
+  11 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/kdelibs-4.2.1-kcatalog.patch, +kdelibs-4.2.1-r2.ebuild:
+  Added ${FILESDIR}/${P}-kcatalog.patch and bumped to kdelibs-4.2.1-r2 to
+  fix remaining issues on upstream bug 186038 and Gentoo bug 261367 related
+  to gwenview.
 
 *kdelibs-4.2.1-r1 (10 Mar 2009)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 0edd02740b5d..c5342c7176e9 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -20,6 +20,7 @@ AUX kdelibs-4.0.2-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec
 AUX kdelibs-4.0.3-CVS-2008-1670.patch 739 RMD160 348782a28e75435c4b36548879d2d8d243fc0436 SHA1 c08f374abc2f44cd1ece01881b510ef83241f186 SHA256 41e219e50b652800a2ca892e70baeb40ee6e7cf0f981d098dbdf2ca0926ddf5f
 AUX kdelibs-4.1.1-cmake-modules.patch 2905 RMD160 d7043d4153927ab655c4d7630389024983c6b95a SHA1 9d232044bf51f98656a48092082a5aafcb9d4699 SHA256 8836e0c8267054b2dedcf1c879e57bde67ff83c1b824337dec81d96a3d69754e
 AUX kdelibs-4.1.3-gcc4.1.patch 10046 RMD160 923b2d8d1b88651601d0fababac9251d37e84709 SHA1 86718c9abd5b68494136a83dc2d7bc696cc6612e SHA256 b6779f1bf29272ac160e559ab8315e8f7bad42e4f13a1092284e66849b5cc627
+AUX kdelibs-4.2.1-kcatalog.patch 1611 RMD160 6a2acc649e7f2cb08ca22ed8eecb6313cb32eb0f SHA1 7a0ad824246106d7ed3fbd310725fd4df0f31189 SHA256 3a1dbff55da070638233bcf6f91e16b70c4562a3b4a31f8e5529a5f3f960e248
 AUX kdelibs-4.2.1-qt4.5.patch 19805 RMD160 4a266bdbe3d9dcc088f7abbffc2b46714d57208a SHA1 9490015fb83982d0aeac3a1b7918fa4262957782 SHA256 2a3ffd511d25d8a4fc4a8e246e97245a78af7766a33c6baac382568da04dc791
 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
@@ -36,6 +37,7 @@ EBUILD kdelibs-3.5.9-r3.ebuild 6285 RMD160 0946a13cebba7c34600acaee2cb1b9be6341c
 EBUILD kdelibs-3.5.9-r4.ebuild 6370 RMD160 75c38e396b898acf3f90dc1533b500b7698c8628 SHA1 30ab876b29bb33d4aa0320949ea4cb2e4e6f575c SHA256 67ec9c7241faf95bd0614dd2309ce8f063078d047662ff5cd1300524cd0ad102
 EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7 SHA1 721388ab5fa4ee455bdadb189afa021bd336fc16 SHA256 f7acb5abb483ebeeaee7a8636073b85d4ea0b7e9badcd8f8073d5ac8dcd2167b
 EBUILD kdelibs-4.2.1-r1.ebuild 6725 RMD160 8e6fd0382b60cdd150c89c94d3bf762112d1ce08 SHA1 dc471bf0cc1515f319cf53fd26a14970f57f106f SHA256 31b7846c08aca784f083f8d97e409f983a4259f73a4f52334fca0357b9d921ce
+EBUILD kdelibs-4.2.1-r2.ebuild 6830 RMD160 970f72fc9206a57420d96d076817575b831f0f2e SHA1 efe5ca496bb7c27f1f46bba64946c6c82ad79884 SHA256 07dee0b36f7eb3f26f78fb8b53fc7406add5f3c59d0beb5741b477f3f5030afb
 EBUILD kdelibs-4.2.1.ebuild 6570 RMD160 63363a2c262f23189f7a63ddf8f20a2915cc76ea SHA1 df38ba5ff222935f4d4f45a034ef6dd0b6f158f6 SHA256 1376a9c68399c7de53c7e0f02448b9e66882f11fe9b69d24f22d22ac4665bbf0
-MISC ChangeLog 93945 RMD160 0460ad576e05c7a2a18b09f3b42d7f03054d28f0 SHA1 26e7617178171bc5cd2c67bcd7cbd0e05fecb31b SHA256 adb651be5fbc725b934a81902acd15d63f16d71845604149a617f3c0645ecbc6
+MISC ChangeLog 94276 RMD160 e5c2bb0b83fab89036fb3e468993d574995db7ef SHA1 65ed12257876e22277dce50daa6f1b07fdec5c28 SHA256 6e8ee4b2073b0b14459cd4d8f56eed146596e4b85a37e4c32e464ce2305f347f
 MISC metadata.xml 375 RMD160 0a16bbd99eb0c4f3d89dbede17c5d6feea41c6ba SHA1 531b56c08557857a57c7833d2bab42cdf879b9a8 SHA256 3b5a8f2ca27aa45532679f3ab64756b02a953c5c11e86d9539cec95bab292b9b
diff --git a/kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch b/kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch
new file mode 100644
index 000000000000..40d4884645ae
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch
@@ -0,0 +1,59 @@
+Index: kcatalog.cpp
+===================================================================
+--- kcatalog.cpp	(revision 938013)
++++ kcatalog.cpp	(working copy)
+@@ -30,6 +30,24 @@
+ #include <locale.h>
+ #include "gettext.h"
+ 
++
++static bool s_localeSet = false;
++
++// Initialize the locale very early during application startup
++// This is necessary for e.g. toLocal8Bit() to work, even before
++// a Q[Core]Application exists (David)
++int kInitializeLocale()
++{
++    setlocale(LC_ALL, "");
++#if QT_VERSION >= 0x040500
++    extern Q_CORE_EXPORT bool qt_locale_initialized; // in Qt since 4.5.0
++    qt_locale_initialized = true; // as recommended by Thiago
++#endif
++    s_localeSet = true;
++    return 1;
++}
++Q_CONSTRUCTOR_FUNCTION(kInitializeLocale)
++
+ // not defined on win32 :(
+ #ifdef _WIN32
+ # ifndef LC_MESSAGES
+@@ -50,7 +68,6 @@
+ 
+   QByteArray systemLanguage;
+ 
+-  static int localeSet;
+   static QByteArray currentLanguage;
+ 
+   void setupGettextEnv ();
+@@ -62,17 +79,15 @@
+   return debug << c.d->language << " " << c.d->name << " " << c.d->localeDir;
+ }
+ 
+-int KCatalogPrivate::localeSet = 0;
+ QByteArray KCatalogPrivate::currentLanguage;
+ 
+ KCatalog::KCatalog(const QString & name, const QString & language )
+   : d( new KCatalogPrivate )
+ {
+-  // Set locales only once.
+-  if (! KCatalogPrivate::localeSet) {
+-    setlocale(LC_ALL, "");
+-    KCatalogPrivate::localeSet = 1;
+-  }
++    // Set locales if the static initializer didn't work
++    if (!s_localeSet) {
++        kInitializeLocale();
++    }
+ 
+   // Find locale directory for this catalog.
+   QString localeDir = catalogLocaleDir( name, language );
diff --git a/kde-base/kdelibs/kdelibs-4.2.1-r2.ebuild b/kde-base/kdelibs/kdelibs-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..3bf70d82a236
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.2.1-r2.ebuild
@@ -0,0 +1,246 @@
+# 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.1-r2.ebuild,v 1.1 2009/03/11 14:47:59 jmbsvicetto 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="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam jpeg2k
+kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
+LICENSE="LGPL-2.1"
+RESTRICT="test"
+
+# 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
+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[-kdeprefix]
+		!kde-base/knewsticker:4.1[-kdeprefix]
+		!kde-base/kpercentage:4.1[-kdeprefix]
+		!kde-base/ktnef:4.1[-kdeprefix]
+		!kde-base/libplasma[-kdeprefix]
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
+	>=app-misc/strigi-0.6.3[qt4,dbus]
+	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]
+	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] )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	nls? ( virtual/libintl )
+	openexr? (
+		media-libs/openexr
+		media-libs/ilmbase
+	)
+	opengl? ( virtual/opengl )
+	semantic-desktop? ( >=dev-libs/soprano-2.1.64 )
+	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}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+
+RDEPEND="${COMMONDEPEND}
+	x11-apps/iceauth
+	x11-apps/rgb
+"
+
+# upstream patches / dist patches
+# {FILESDIR}/${P}-qt4.5.patch is upstream revision 934640 and fixes upstream bug 186038 and
+# Gentoo bug 261367 - ${FILESDIR}/${P}-kcatalog.patch fixes remaining issues on both bugs
+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}/${P}-qt4.5.patch"
+	"${FILESDIR}/${P}-kcatalog.patch"
+)
+
+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
+	fi
+	if use kdeprefix; then
+		HME=".kde${SLOT}"
+	else
+		HME=".kde4"
+	fi
+	mycmakeargs="${mycmakeargs}
+		-DWITH_HSPELL=OFF
+		-DKDE_DEFAULT_HOME=${HME}
+		$(cmake-utils_has 3dnow X86_3DNOW)
+		$(cmake-utils_has altivec PPC_ALTIVEC)
+		$(cmake-utils_has mmx X86_MMX)
+		$(cmake-utils_has sse X86_SSE)
+		$(cmake-utils_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="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+EOF
+		doenvd "${T}"/43kdepaths-${SLOT}
+
+		# make sure 'source /etc/profile' doesn't hose the PATH
+		dodir /etc/profile.d
+		cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh
+if [ -n "${KDEDIR}" ]; then
+	export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
+	export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
+fi
+EOF
+
+		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
+XDG_DATA_DIRS="/usr/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+		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_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}