Fixed bug 263823

6 files changed, 311 insertions, 10 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 0baac4bdc56..5b002ee53df 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*kdelibs-4.2.1-r4 (26 Mar 2009)
+
+  26 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  +files/kdelibs-fixx11h.h.diff, -kdelibs-4.2.1-r3.ebuild,
+  +kdelibs-4.2.1-r4.ebuild, kdelibs-4.2.67.ebuild, kdelibs-9999.ebuild:
+  Fixed bug 263823
+
   23 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   kdelibs-4.2.1-r3.ebuild:
   Restored plasma as obligatory in 4.2.1
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 4da9092bc13..0cb18935707 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -10,10 +10,11 @@ AUX kdelibs-4.2.0-knode_crash.patch 404 RMD160 ecb72bd6ef1a111b155780d85a2dde026
 AUX kdelibs-4.2.1-kcatalog.patch 1653 RMD160 068c80e3818051df6ebe14a333b840545e8e67ff SHA1 2c6015e1f1357029b751187e698457daee3c9b59 SHA256 11951b308bd63ad87ec9e8c77579e8f6afbe87cea6f6cbda23b08809d98bf881
 AUX kdelibs-4.2.1-kdialog.patch 514 RMD160 59db100560e50c9a42bf4857eea900dbcd8b863f SHA1 c36ec0e8df80e82ae2446b1547fcd917cee71253 SHA256 decc2410a66a785a39bc67aba6cab038d98b6659dcb72241f34e3055cd83e1d5
 AUX kdelibs-4.2.1-qt4.5.patch 19805 RMD160 4a266bdbe3d9dcc088f7abbffc2b46714d57208a SHA1 9490015fb83982d0aeac3a1b7918fa4262957782 SHA256 2a3ffd511d25d8a4fc4a8e246e97245a78af7766a33c6baac382568da04dc791
+AUX kdelibs-fixx11h.h.diff 321 RMD160 3bbefc48cb27a945d65efa2a0a05fa959cd722f3 SHA1 ad8c6a159ebd4d841cac18765dc56849bbef4821 SHA256 e6372a1683142da2b3ae87862645b8795a47378ac621e3b0588e6455f94a5856
 DIST kdelibs-4.2.1.tar.bz2 10049614 RMD160 8099366677a4d238d8cfa18862f74c4fafa49ef7 SHA1 d2214b9864b64e4a8382a9f593d082c801c58571 SHA256 25ee5be213c4f1ccaf6f19a1a2375c3b23f6e2b4602a45542758e58782a0864d
 DIST kdelibs-4.2.67.tar.lzma 8402560 RMD160 ade0e15ead2d8f8cd5cc05a319cdb43ceb58b740 SHA1 74e04c462aa646759a0bf908f87b7ebaaeb1ec68 SHA256 9b3ecec821e4742c9bfae111b360c5b05e2ce18193571e65175ea6b5deec2a93
-EBUILD kdelibs-4.2.1-r3.ebuild 7199 RMD160 a2a81954be86aa1ba0c89ab08afb403d862d2234 SHA1 9879c9f29d9d5f335408dffd4fc6561fb32e097b SHA256 e5e4d623e8062c5f2b252637e26052a8b5f06ef2fbafd988c654ae12d4ad708e
-EBUILD kdelibs-4.2.67.ebuild 6533 RMD160 6dccd06babb52a7fd5077ceee8da7d022e248e1e SHA1 a33baf941b7c8efc1d33d6bc811931cf49df3a2e SHA256 b888de5eb708cde6b5f286c212a5f955f8d8a8da63c3e3b1d1ea3462caead1d9
-EBUILD kdelibs-9999.ebuild 6522 RMD160 aa9830b18e09ad79e6de3d1763f730699fe34fce SHA1 3b3ad9e7d416db959607b502cd3c9129b67ae352 SHA256 cabd75249a7bbf07311f62d43e6920749b8b8ff572ed5b246127212810e666cf
-MISC ChangeLog 12678 RMD160 40f3d188674c58c249ebf5099b5e120dfbaa210a SHA1 78c95b463014ef6b3e0339a814c1dfd47b9d2d40 SHA256 fbd89bdd43bcf1b0ae1e549071ac6609d64eb928659b384dcc478c6fc32decd6
+EBUILD kdelibs-4.2.1-r4.ebuild 7288 RMD160 66535eb91956efa96f005612729273d662d26ac8 SHA1 0538898be4921f3de12b1f464490a63708dc7ff7 SHA256 e01573adf5e5f4d30faf46742cd08efd6feae47039dfc55e8a899f97d9010707
+EBUILD kdelibs-4.2.67.ebuild 6669 RMD160 099ce630df7d2951fa9f86a780e4dd554a2cfafa SHA1 b9694cf8fc15fe04728d1152d8cb26354201fa73 SHA256 0b493a0cf657c39278e8f0103320e9da530e7203274bb83cf2d08f0be9b54898
+EBUILD kdelibs-9999.ebuild 6658 RMD160 ce46aec924020f133195c9bd9e5f7c1d07d744a4 SHA1 1b1fbcadbbd8775e73e91f6c5d22ddb4568a4d01 SHA256 1eb7790d07b62340bff060e34e14d65113c58effd6a8ab249ba2c1b071d9fc66
+MISC ChangeLog 12926 RMD160 18ec0b50ecf54976efe067998abbd2223612ea24 SHA1 f1837d194de00e60b686cdb388d1aea40ccc4825 SHA256 81cf546c310261a7b62d08055f64fe50ff373f8df5abd76e448c61e12da84184
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdelibs/files/kdelibs-fixx11h.h.diff b/kde-base/kdelibs/files/kdelibs-fixx11h.h.diff
new file mode 100644
index 00000000000..234fb2b5119
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-fixx11h.h.diff
@@ -0,0 +1,14 @@
+Index: kdeui/util/fixx11h.h
+===================================================================
+--- kdeui/util/fixx11h.h	(revision 945040)
++++ kdeui/util/fixx11h.h	(working copy)
+@@ -92,8 +92,8 @@
+ typedef Bool XBool;
+ #undef Bool
+ typedef XBool Bool;
++#define Bool XBool
+ #endif
+-#undef Bool
+ #endif
+ // template <---
+ 
diff --git a/kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild b/kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild
new file mode 100644
index 00000000000..4369a1c2e2c
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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 ~hppa ~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/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
+	)
+	opengl? ( virtual/opengl )
+	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
+"
+
+# 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 gwenview and other issues on both bugs
+# ${FILESDIR}/${P}-kdialog.patch is upstream revision 938657 and fixes the
+# systemsettings title issue
+# ${FILESDIR}/${PN}-fixx11h.h.diff fixes 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}/${P}-qt4.5.patch"
+	"${FILESDIR}/${P}-kcatalog.patch"
+	"${FILESDIR}/${P}-kdialog.patch"
+	"${FILESDIR}/${PN}-fixx11h.h.diff"
+)
+
+src_prepare() {
+	sed -i -e 's/find_package(ACL)/macro_optional_find_package(ACL)/' \
+		CMakeLists.txt \
+		|| die "Failed to make ACL disabled even when present in system."
+
+	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
+	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="/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
+}
diff --git a/kde-base/kdelibs/kdelibs-4.2.67.ebuild b/kde-base/kdelibs/kdelibs-4.2.67.ebuild
index dd78298e52f..44a9d093f27 100644
--- a/kde-base/kdelibs/kdelibs-4.2.67.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.67.ebuild
@@ -13,13 +13,14 @@ DESCRIPTION="KDE libraries needed by all KDE programs."
 HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS="~amd64 ~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"
+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[qt4,dbus]
+	>=app-misc/strigi-0.6.3[dbus,qt4]
 	dev-libs/libpcre
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -104,6 +105,12 @@ RDEPEND="${COMMONDEPEND}
 	x11-apps/rgb
 "
 
+# upstream patches / dist patches
+# ${FILESDIR}/${PN}-fixx11h.h.diff fixes bug 263823
+PATCHES=(
+	"${FILESDIR}/${PN}-fixx11h.h.diff"
+)
+
 src_prepare() {
 	sed -i -e 's/find_package(ACL)/macro_optional_find_package(ACL)/' \
 		CMakeLists.txt \
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index 82bb37d848f..f77feec0ca3 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -13,13 +13,14 @@ DESCRIPTION="KDE libraries needed by all KDE programs."
 HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS=""
-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"
+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[qt4,dbus]
+	>=app-misc/strigi-0.6.3[dbus,qt4]
 	dev-libs/libpcre
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -104,6 +105,12 @@ RDEPEND="${COMMONDEPEND}
 	x11-apps/rgb
 "
 
+# upstream patches / dist patches
+# ${FILESDIR}/${PN}-fixx11h.h.diff fixes bug 263823
+PATCHES=(
+	"${FILESDIR}/${PN}-fixx11h.h.diff"
+)
+
 src_prepare() {
 	sed -i -e 's/find_package(ACL)/macro_optional_find_package(ACL)/' \
 		CMakeLists.txt \