Beautifying-the-clearbutton revbump
authorAndreas Hüttel <dilfridge@gentoo.org>
Fri, 23 Sep 2011 21:32:05 +0000 (21:32 +0000)
committerAndreas Hüttel <dilfridge@gentoo.org>
Fri, 23 Sep 2011 21:32:05 +0000 (21:32 +0000)
Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

kde-base/kdelibs/ChangeLog
kde-base/kdelibs/Manifest
kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch [new file with mode: 0644]
kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild [new file with mode: 0644]

index e51fb7bee5d9ff849a5d05fbf407b600009bef11..87f51ee3fc107b33f65ddb15f092fa6734ced33b 100644 (file)
@@ -1,6 +1,12 @@
 # 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.784 2011/09/07 20:13:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.785 2011/09/23 21:32:05 dilfridge Exp $
+
+*kdelibs-4.7.1-r1 (23 Sep 2011)
+
+  23 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdelibs-4.7.1-r1.ebuild, +files/kdelibs-4.7.1-clearbutton.patch:
+  Beautifying-the-clearbutton revbump
 
 *kdelibs-4.7.1 (07 Sep 2011)
 
index 6f0db649f58d8155a9b251e9d390d65825b0df4c..136cc2216c7d435fe989be8007f18c3b8bd5714d 100644 (file)
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 RMD160 80ac0ae419f0f721a044053cdaeaf2f1f982f74e SHA1 80e9a70b108cab0b05efc50d6fa66665b711f149 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
@@ -20,6 +20,7 @@ AUX kdelibs-4.6.3-doublepost.patch 1212 RMD160 eca05c22984e2e39ed3ecd59bb313a070
 AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 RMD160 d1570291799f3b87963da05ddaa949ad19b67814 SHA1 8536664b5d46f2dfd32828a4a0523f280ebe6bdf SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb
 AUX kdelibs-4.6.3-use_QWeakPointer.patch 3884 RMD160 c23d4f6a2eea9a16e89720a5b3a4562097ee0366 SHA1 10fbbac1cb70e6032d918302824e6ceff98e9ff5 SHA256 dabf4e8e8b451783f0f3b474141ffae7557d28dbfe9276a5e148ff0e0117c6b6
 AUX kdelibs-4.6.5-cardinality.patch 11947 RMD160 2712fadedc0504d622a54a72cf3e35cd655ca3c9 SHA1 3159edd0252436ab755a3e4970116af6fa69a2e4 SHA256 aae50b729cfc116654d01313062bc5a6a02a1f8c475eceef723ff99d3f395282
+AUX kdelibs-4.7.1-clearbutton.patch 3523 RMD160 8bdfde44ab59c4f6adc1678599bdec6913938ce8 SHA1 877c70e1bc7eee5a6fb63fb0e2118c1003f2c16f SHA256 e79a51de565a3b4d4dd9ced50caa867205f843cde468a44f32fa0f1b00fd557a
 DIST kdelibs-4.6.3.tar.bz2 12916816 RMD160 f7f78ef93fa75d488efcd7c66dcbce6d153f9c28 SHA1 c7fb089c9d52a6b1d9188b9e788753373a3288e4 SHA256 b6ea04dc9014ff3fca0242fd927faeb67dc53288779aeb873d46104aa6109e38
 DIST kdelibs-4.6.5.tar.bz2 12917554 RMD160 cd167d17c4c090b21f7271c84d52bfa6401b8f6c SHA1 9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120 SHA256 d7b0de699f6db29a6309053719a523f2516a08e77b951d15610aeb11ea9d5ba0
 DIST kdelibs-4.7.0.tar.bz2 12032091 RMD160 8bcc65072818285031f5611f4b183a74ad0f4d1a SHA1 2a7a59ac78a161c7c2393db89179449b495dd2db SHA256 db6bed2159c192a614e793ae583c9f0ce446af93dd0b1a1b566e52c035ab1cb8
@@ -28,23 +29,24 @@ EBUILD kdelibs-4.6.3-r2.ebuild 10274 RMD160 c748b1ac47cd5f75ae30e59659d6f8057a95
 EBUILD kdelibs-4.6.3-r3.ebuild 10317 RMD160 66ab258e9c360dc84b17e4ae2932ba2b2cdac7aa SHA1 ce71cfa98a6642744cddc5a8f616b7032cef091e SHA256 cdb146d2cd4d45203d91ec3b890a407cb195a7edbaa40d33456ab4553a40a4aa
 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 9801 RMD160 de1ebac5d8382f71aa5cc81759d892db1431da21 SHA1 558e186aa31105e642d30f78af1fa0e52ccdcec7 SHA256 097a009200a671ce32877c512ff8ae9fc0e75733bd61dacfb7b4159ed7273fc7
 EBUILD kdelibs-4.7.1.ebuild 9750 RMD160 0905fe3efba7ce5197b97366882b7cab2f5ebd14 SHA1 e75b107847f50657fd6ad87ab9843e81818a448b SHA256 6f7aa754c2e3fcd53efa5af1c629b76e4831cef8a11cf121c05a0575aa6d4b4a
-MISC ChangeLog 131021 RMD160 cc52b4556c252cdfdcfa0676a37acffb81ded05d SHA1 abb486e1d3e038840e25c11b563bb6c59a388764 SHA256 70b202342fe032798ceeca45ae633852a335d90e059bf155c02b1ea3e5695fd9
+MISC ChangeLog 131221 RMD160 1e53b5e368e1006935211c4cec19c1dddf64b526 SHA1 124116064218241d5e3306cb99964d10fc88fc8f SHA256 47871c0060744626f7904543b87caf8724eb6e3db254bd04dcefa79785b3013c
 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOZ9I7AAoJEOf+E+/4L5Lmf1IQAJBPjMfnMG14NOxH9FEI1o3X
-uFPnd4UkVo3Y8qwJmm0XWahh8rzkbqFhFtDyqYTlC6dkQMCNJL6J0qveJ+znePUv
-CLxq83+T2Ea14S3FdHRvBh65JzXkQbBlmjqdUGtSZtnA9XvcMujuvzi8je36p8B9
-Yjt9bV7Z2xUPYBfyO+ve+rdfz1NuayNKIcAue/ATHEguYWOZRexyIvlq4OkAIaPZ
-3HCfLEqRkyh1cqnBslVm3pUD3OVfz9N3J0C60mijha5XR0mWGOAn6xQfvn0Sni1W
-HFyGxd41IimBPc8cxsppPl2CrbV7Do2GnCeLJOoMOj8eFd3EonfK7eT8/DcK11K2
-y/bGC1oQ5V0KQqVkOB7doVKYe6uf9Be0tG0DnLoEkNxbS3QP2tJIIyhjrKMW8gFk
-xKpjtsriSVmzXLV6r1AIw5l4np5tpZhjhBVbPSbMJteJJU73MBVyjZ00kO6OTDr1
-g5OrGv+HrQJMOhsidpax350oeIZVW8nHLYrYt0sehcjsL3WIilSQoJaGXiHfumz9
-BbVhwItSaelMPYqFK7GrFCc6xx+HV0mr6lsU1jX8jmzrjjRk1V+MkUH+YC+GAhQ5
-uiUD15vuVY8AYCbOyi/k47SMsZdgj7zZBsrLttxsZf4MAPABS47xhTyezRbw7/vg
-HdOiQzw5bXsstZx6PQT5
-=2Gam
+iQIcBAEBCgAGBQJOfPr6AAoJENwGBM22xffepDEP/07XQZPooty1HGM8rE8ssK/c
+IkbMwfZH1hPhC6q4kTw5qqPjYeHmCdBGEl+R2IPtB3AggpO72yXkKHZ6Qdjv71Th
+suIsY0hHc/XqQ/Lo0Ee8PO+Xt9pDcMLlu/ZA37A3L0Eemw45RjnA4moMW5FZrimy
+ZKAeIxOHNmaTo2DGq66h41p/r3vIkZXjF5KKdq80cErQi539yhESoR+flyRJ8lxh
+Loao8npEaqRG5cZqngZ/XCSSDqPH+NGd2vud0RsEsLsfuDKWuCcg7485glr4erIl
+D6hCnUkWexES73ZIcuu8hCxQjNKlg1aR/kBqaANV34ofH2odLplOzsa0MLdxJd7j
+IvCdALz2DQZ6mik0vuAPReMENMCziAKwuY0PMy/rYYrHyh6ybIDrMo6pZEsP46pe
+u8z/YobroC55WAZJ4hNKSNsHrrH1fd5Z5tf0m68TX2/b3IozSb26GKTvb53mA05T
++u+RcDAXz3njzgIlkZHsU5d7tWcvPBQLnIajl5yJpCGemPL5jcIsWkkiESD92wEU
+BQemvTERbX8gDEyvDJ4KGUGKPyCUVzUyLsDJRcy94tcniNxEyP0+fMXOoajtfrZI
+VIkoOizMya6mgbpOpRqb95iapBgea6IhdRoEwMsnnmeuKwuC5cdAyb9IeSfEBgHn
+nJk7XtSamtVnoJDMvWMu
+=wqIr
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch b/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch
new file mode 100644 (file)
index 0000000..c177b28
--- /dev/null
@@ -0,0 +1,82 @@
+commit 07d20a558da67fb9f849e2b20c52cf275ea01794
+Author: Andrea Iacovitti <aiacovitti@libero.it>
+Date:   Sat Sep 17 10:12:04 2011 +0200
+
+    -Do not set WA_OpaquePaintEvent attribute for line edit clearButton
+     (should fix the not transparent background bug)
+    -Optimize a bit the code to enable/disable it
+    
+    BUG: 230024
+    CCBUG: 280226
+    FIXED-IN: 4.7.2
+
+diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
+index 715e182..c919b99 100644
+--- a/kdeui/widgets/klineedit.cpp
++++ b/kdeui/widgets/klineedit.cpp
+@@ -291,6 +291,7 @@ void KLineEdit::setClearButtonShown(bool show)
+         }
+         d->clearButton = new KLineEditButton(this);
++        d->clearButton->setObjectName("KLineEditButton");
+         d->clearButton->setCursor( Qt::ArrowCursor );
+         d->clearButton->setToolTip( i18nc( "@action:button Clear current text in the line edit", "Clear text" ) );
+diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
+index 1db9b1a..28dbac3 100644
+--- a/khtml/khtmlview.cpp
++++ b/khtml/khtmlview.cpp
+@@ -1363,7 +1363,7 @@ void KHTMLView::mouseMoveEvent( QMouseEvent * _mouse )
+         if (kw && kw->m_kwp->isRedirected())
+             setCursor = false;
+         else if (QLineEdit* le = qobject_cast<QLineEdit*>(rw->widget())) {
+-            QList<QWidget*> wl = qFindChildren<QWidget *>( le, "KHTMLLineEditButton" );
++            QList<QWidget*> wl = qFindChildren<QWidget *>( le, "KLineEditButton" );
+             // force arrow cursor above lineedit clear button
+             foreach (QWidget*w, wl) {
+                 if (w->underMouse()) {
+@@ -1942,7 +1942,10 @@ static void handleWidget(QWidget* w, KHTMLView* view, bool recurse=true)
+       w->setAttribute( Qt::WA_NoSystemBackground );
+     w->setAttribute(Qt::WA_WState_InPaintEvent);
+-    w->setAttribute(Qt::WA_OpaquePaintEvent);
++
++    if (!(w->objectName() == "KLineEditButton"))
++        w->setAttribute(Qt::WA_OpaquePaintEvent);
++
+     w->installEventFilter(view);
+     if (!recurse)
+diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
+index 845db1a..3302920 100644
+--- a/khtml/rendering/render_form.cpp
++++ b/khtml/rendering/render_form.cpp
+@@ -1044,20 +1044,21 @@ void RenderLineEdit::setStyle(RenderStyle* _style)
+     RenderFormElement::setStyle( _style );
+     widget()->setAlignment(textAlignment());
++
+     bool showClearButton = (!shouldDisableNativeBorders() && !_style->hasBackgroundImage());
+-    widget()->setClearButtonShown( showClearButton );
+-    if (showClearButton) {
++
++    if (!showClearButton && widget()->isClearButtonShown()) {
++        widget()->setClearButtonShown(false);
++    }
++    else if (showClearButton && !widget()->isClearButtonShown()) {
++        widget()->setClearButtonShown(true);
+         QObjectList children = widget()->children();
+         foreach (QObject* object, children) {
+             QWidget *w = qobject_cast<QWidget*>(object);
+-            if (w && !w->isWindow()) {
++            if (w && !w->isWindow() && (w->objectName() == "KLineEditButton")) {
+                 // this duplicates KHTMLView's handleWidget but this widget
+                 // is created on demand, so it might not be here at ChildPolished time
+-                w->setObjectName("KHTMLLineEditButton");
+                 w->installEventFilter(view());
+-                w->setAttribute(Qt::WA_NoSystemBackground);
+-                w->setAttribute(Qt::WA_WState_InPaintEvent);
+-                w->setAttribute(Qt::WA_OpaquePaintEvent);
+             }
+         }
+     }
diff --git a/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.1-r1.ebuild
new file mode 100644 (file)
index 0000000..a0fa621
--- /dev/null
@@ -0,0 +1,326 @@
+# 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-r1.ebuild,v 1.1 2011/09/23 21:32:05 dilfridge 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.6.3
+       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'
+# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75
+add_blocker plasma-workspace '<4.3.75'
+
+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"
+)
+
+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
+               $(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
+}