backported halbattery fix in kdelibs - b.k.o bug 187600

4 files changed, 256 insertions, 1 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index a6ee126d1a5..3756048a140 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.3-r1 (07 May 2009)
+
+  07 May 2009; Alex Alexander (wired) <alex.alexander@gmail.com>
+  +kdelibs-4.2.3-r1.ebuild,
+  +files/kdelibs-4.2.3-halbattery_backport_fix.patch:
+  backported halbattery fix - b.k.o bug 187600
+
 *kdelibs-4.2.85 (07 May 2009)
 
   07 May 2009; Alexey Shvetsov <alexxy@gentoo.org> +kdelibs-4.2.85.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index bfcec4155cd..8c050d6e7df 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -13,12 +13,15 @@ AUX kdelibs-4.2.1-kcatalog.patch 1653 RMD160 068c80e3818051df6ebe14a333b840545e8
 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-4.2.2-kickoff-focus.patch 1475 RMD160 08d37ea62d5fedacb205cc61ad551d0d281009c4 SHA1 6dae007ef33f02699c36ab0418b73fb1f3644000 SHA256 4e29c20cebab3b52e495b57ab2296b52c74f86f4023631c214aadb4e6c4032e5
+AUX kdelibs-4.2.3-halbattery_backport_fix.patch 750 RMD160 12cafe49a443ba9a5ceac21e901140ad55f0af45 SHA1 974db6a4d431f4906038e8fdadd3f2d9b217322b SHA256 acfa2f6ea003c7c6e74d303b15549bc45a382418aa480e504952e28d670c2223
 AUX sanbox-error.patch 594 RMD160 fe8d9557e82bbf9d5df16d8f69f7addae1012bf8 SHA1 e99f1e647a8546d86fac79125ee80c549aa44ab9 SHA256 7997f74901718bea0dca35b0d0936004e47365db5aaf7efe87db80f69761e314
+DIST kdelibs-4.2.3.tar.bz2 10029005 RMD160 61e36718a7e86be182fd777aa7250208d92fbfd9 SHA1 c4cde3ea347d89d79ffdead203c85b1c2d1f8757 SHA256 a2f2b4b70589a8148c799fefd9f61f2c42ee14a174ae8dc1c396036bf9c23304
 DIST kdelibs-4.2.71.tar.lzma 8438620 RMD160 9c5b1d5f06cfe356b80b7a83e02789dba440b866 SHA1 09bf0f7242d95a93985829d2481711c23a3756a7 SHA256 06438df320a0120ad686c12e28b7d9f83b7cc2723a2f778d228286339be83e2e
 DIST kdelibs-4.2.85.tar.bz2 10050737 RMD160 036095f19067993305d51896940802ed98e40a94 SHA1 0a5caa850f0a9029bc4e5d6603d61cefe89826da SHA256 438c26f2cbbe0ef0bc2a84cbe769651ddac5262455bce2041a0a987d04c2627d
+EBUILD kdelibs-4.2.3-r1.ebuild 6064 RMD160 d9446e9afdda59a5cadc5c749bff2edeb6dae590 SHA1 ea2acbc62d8aa9edc24410af3324574c48779752 SHA256 6b227a1d08333f3e5a06aa4d897bfc13faf8ae11c576b120645632a670d7a38b
 EBUILD kdelibs-4.2.71.ebuild 5494 RMD160 f8be395243b55e0970049e251b3e83f63f1e682e SHA1 ff4f030499a30685cc1e15dd8941a89ede78ad30 SHA256 c4175e3740d9f523290f54540299e4f198b6a477ef613bf2dfe411d16eaa6fea
 EBUILD kdelibs-4.2.85.ebuild 5640 RMD160 1e5e2977b1f28b8e51a208f5bd91e5ca2024a348 SHA1 ede5ad22326191c228e178778a912757eafcbd9d SHA256 caead1f66c4b8abd3a71a352896a4fb8854e6f49429ede677d655c3f773eb52c
 EBUILD kdelibs-4.2.9999-r1.ebuild 5907 RMD160 3867659c1017af3ee4e9b4693901345cc2864462 SHA1 f70d78d220a87e07322b73ff662b4af288877318 SHA256 9ff841a3a8b6406f7b87b08e66220488486a4e1fe1c6b8782408d082ce33aa23
 EBUILD kdelibs-9999-r1.ebuild 5629 RMD160 556e099c19d38b455ea8d028f91270ff6e852883 SHA1 6561aed446829eea38071564c13aa8784120b769 SHA256 4d9ebe96c5fe771e4badcaaf41b7ed717639b6ea7429334f0e002dde467874d8
-MISC ChangeLog 18625 RMD160 8759dd69390d539e7ab0a5ac96ab4853eafbd0ad SHA1 f555f387b060bb279b56f57a3e788777e0009b99 SHA256 8dd8ff9c45bea9644a343fe02ac23638b64075db61f74b1f13bd91166a8a01fc
+MISC ChangeLog 18853 RMD160 100608d02bf7753e35ac1c9f524d9d5e4e3bc860 SHA1 ae2a816361a24dbbde02b65149bea673e27916bd SHA256 5fe832b09d5c966b3c3843e107e340df36a55f99e49cd9ed70d9ae2729fb9477
 MISC metadata.xml 241 RMD160 e23ea97bfdc981201294af826fc0f315ebc0c663 SHA1 65e562c9b76e5c338c984bdd9dd5f1026013c0d3 SHA256 3f6cec1e375ad99ac2929f89e8fbe74237333497106dfc52c36af0aa5629b139
diff --git a/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch b/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch
new file mode 100644
index 00000000000..d9d0e2519cf
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch
@@ -0,0 +1,19 @@
+--- trunk/KDE/kdelibs/solid/solid/backends/hal/halbattery.cpp	2009/03/31 03:29:32	947130
++++ trunk/KDE/kdelibs/solid/solid/backends/hal/halbattery.cpp	2009/03/31 03:58:04	947131
+@@ -112,12 +112,14 @@
+     {
+         emit chargePercentChanged(chargePercent(), m_device->udi());
+     }
+-    else if (changes.contains("battery.rechargeable.is_charging")
++
++    if (changes.contains("battery.rechargeable.is_charging")
+            || changes.contains("battery.rechargeable.is_discharging"))
+     {
+         emit chargeStateChanged(chargeState(), m_device->udi());
+     }
+-    else if ( changes.contains( "battery.present" ) )
++
++    if ( changes.contains( "battery.present" ) )
+     {
+         emit plugStateChanged(isPlugged(), m_device->udi());
+     }
diff --git a/kde-base/kdelibs/kdelibs-4.2.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.2.3-r1.ebuild
new file mode 100644
index 00000000000..b065ec7b60d
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.2.3-r1.ebuild
@@ -0,0 +1,226 @@
+# 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.3.ebuild,v 1.3 2009/05/07 11:43:44 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/libplasma
+		!<=kde-misc/kdnssd-avahi-0.1.2:0
+	)
+	kdeprefix? (
+		!<=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/kde-env-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kdebase-data-${PV}:${SLOT}[kdeprefix=]
+"
+
+# upstream patches / dist patches
+# systemsettings title issue
+# ${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch - see bug 263823
+# ${FILESDIR}/${P}-halbattery_backport_fix.patch - b.k.o bug 187600
+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}/${P}-halbattery_backport_fix.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
+}
+
+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
+}