Added an upstream patch to fix bug 212749 (incorrect cursor position after pasting).

Package-Manager: portage-2.1.4.4

4 files changed, 227 insertions, 12 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index cad323ffb55e..033fab9eb7d3 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.519 2008/03/20 16:45:58 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.520 2008/03/28 23:34:31 philantrop Exp $
+
+*kdelibs-3.5.9-r1 (28 Mar 2008)
+
+  28 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kdelibs-3.5.9-cursor.patch, +kdelibs-3.5.9-r1.ebuild:
+  Added an upstream patch to fix bug 212749 (incorrect cursor position after
+  pasting).
 
   20 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -files/kdelibs-4.0.1-X11-optional.patch,
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index c8840ba4f019..fd4a9d5a3ae8 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX FindXine.cmake 2627 RMD160 e680a4c0998dd0354e429c9e755a00e0ab83c6c0 SHA1 e638a8cf1ab6889c5734cd54879dad808a549d92 SHA256 73c7030144d889d1065fc4bdaf9c640cb04ce40a9a15b8fafeeefbdf1c35e798
 AUX e-tempdir.patch 1413 RMD160 f0a369f929c18770d66a54b605dad8c99d03367c SHA1 779714956d94366a3b05514df19e21b4b3434f5c SHA256 1a7e888cd5173b68039717030119e3ab479675fed8f9df4b5e1d98869d89235a
+AUX kdelibs-3.5.9-cursor.patch 427 RMD160 e0d7d41196cdbbb7cfd15c6b4ce94d88142e8ad8 SHA1 6f58f95e642522062ba6f2aaf564b0a8c363e3f0 SHA256 4daac960ff06601fc3d67948983266e27ce5204e37bd1c71f5389c1db8c2088c
 AUX kdelibs-4.0.2-X11-optional.patch 6103 RMD160 ff7c315d65204253cc3ed2fa90e45b5dbef709d8 SHA1 2093a73b17246d39b0518a8ccb1162caed263aee SHA256 398bde6b24e7fb3bf7325ef1f4409f02839baee52ac20bb041f623acd1900b5e
 AUX kdelibs-4.0.2-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec29acd3878f SHA1 53a3d7658ca700a7e8b642e7f66b69b8d25774c8 SHA256 b9107dd43916c015a9392ada81bdfebeff91d2c136eeaa01fb1c89ddd89fd914
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
@@ -11,14 +9,8 @@ DIST kdelibs-3.5.8.tar.bz2 15557343 RMD160 e3524ca8613fca338a0530213e921fbfae56e
 DIST kdelibs-3.5.9.tar.bz2 15568675 RMD160 9ac02bf2314de387b2aa9664703c72b0613fcbb3 SHA1 b8197d94075a54f90f08a9ef7bed95ccf53e12ad SHA256 4f92553f3ff50de87a83435fce3bae440c43f0d37a8e80a1736d007f80d8f755
 DIST kdelibs-4.0.2.tar.bz2 9066281 RMD160 ed4cdfc9bead4241e43aefe5cffb9568cb44857e SHA1 ec213d6a7d41083acc322a0f781ffb030a29155a SHA256 ec183ba5e3e9827951f4dc1dacd393f998543db0a39486771cc4ebdd962089ac
 EBUILD kdelibs-3.5.8-r3.ebuild 6010 RMD160 df84ce126867707d20b83ceeeb09c7fb4f93f343 SHA1 b1eba517036ed63b3b7fb79a3be75f9614948559 SHA256 a97299fa3ce88eaa230a01f3c7b5bf19dd2547a0d56dcd73218b923675f654dc
+EBUILD kdelibs-3.5.9-r1.ebuild 6129 RMD160 5c3374dc64c90656d6cf8f30c7bcf8a95f5f3eeb SHA1 1d307fac7d9a6644d275cd0ccb8be566f01ddc1b SHA256 2f2d844853ed90df74a4c90ebf5f9cdc3e7c4aaf8f906437b09bfa84cf7f6e41
 EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7 SHA1 721388ab5fa4ee455bdadb189afa021bd336fc16 SHA256 f7acb5abb483ebeeaee7a8636073b85d4ea0b7e9badcd8f8073d5ac8dcd2167b
 EBUILD kdelibs-4.0.2.ebuild 6415 RMD160 4087b7d5424bd5539ee69d0617b468a89ede652a SHA1 d73664b265158430a1c5cc2a0411ec37d4239ea9 SHA256 39906b1d60e336f13d29e5fb345080aa9f4c100d5b42bbcd6264203eef8c9725
-MISC ChangeLog 85369 RMD160 0be2c8c41d502e00542b8af39fafe5e2d4ec8169 SHA1 318465eccfcce74c1187ba04d03792809798274a SHA256 29ba48d912d444c0afe0e7d2ba53ef8a3d7e6c91907eb3ac792354824ab1d8df
+MISC ChangeLog 85614 RMD160 88a3dc03b360dd225076d1cdca1f62e0b50cba17 SHA1 05bc5eda285ded53cfbb63a7f2e5ed6a78a91a89 SHA256 aaa5d87d99fcf40d4c3bc025c2b0e18b1eb1dafc473f0472b416148ebfc299bb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH4pSwB18eXLOpYdkRAg5wAKCm1/g4W0Nf9rQP5kOBZtv6XXdR3QCghNRK
-mPRWUwueusdHWPWE+TOPT+Q=
-=xMjt
------END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.9-cursor.patch b/kde-base/kdelibs/files/kdelibs-3.5.9-cursor.patch
new file mode 100644
index 000000000000..1a9cb993cb79
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.9-cursor.patch
@@ -0,0 +1,11 @@
+--- branches/KDE/3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:01:38	777285
++++ branches/KDE/3.5/kdelibs/kate/part/katesupercursor.cpp	2008/02/20 11:02:18	777286
+@@ -186,7 +186,7 @@
+ {
+   if (newLine)
+   {
+-    if (m_line > int(line) || (m_line == int(line) && m_col > int(col)))
++    if (m_line > int(line) || (m_line == int(line) && m_col >= int(col)))
+     {
+       if(m_line == int(line))
+          m_col -= col;
diff --git a/kde-base/kdelibs/kdelibs-3.5.9-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.9-r1.ebuild
new file mode 100644
index 000000000000..52af710aa032
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.9-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.9-r1.ebuild,v 1.1 2008/03/28 23:34:31 philantrop Exp $
+
+EAPI="1"
+inherit kde flag-o-matic eutils multilib
+set-kdedir 3.5
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
+	mirror://gentoo/kdelibs-3.5-patchset-14.tar.bz2
+	mirror://gentoo/${PN}-3.5.8-seli-xinerama.patch.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
+	avahi kernel_linux fam lua kdehiddenvisibility"
+
+# Added aspell-en as dependency to work around bug 131512.
+# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
+RDEPEND="
+	arts? ( >=kde-base/arts-3.5.5 )
+	app-arch/bzip2
+	>=dev-libs/openssl-0.9.7d
+	>=dev-libs/libxslt-1.1.16
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-6.6
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/libart_lgpl
+	net-dns/libidn
+	>=x11-libs/qt-3.3.3:3
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( >=net-print/cups-1.1.19 )
+	tiff? ( media-libs/tiff )
+	kerberos? ( virtual/krb5 )
+	jpeg2k? ( media-libs/jasper )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
+	fam? ( virtual/fam )
+	virtual/ghostscript
+	utempter? ( sys-libs/libutempter )
+	!kde-base/kde-env
+	lua? ( dev-lang/lua )
+	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
+	>=sys-apps/portage-2.1.2.11
+	!kde-base/ksync"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+	x11-apps/rgb
+	x11-apps/iceauth"
+
+PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
+	bindist? ( kde-misc/kdnssd-avahi )"
+
+# Testing code is rather broken and merely for developer purposes, so disable it.
+RESTRICT="test"
+
+pkg_setup() {
+	if use legacyssl ; then
+		echo ""
+		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
+		elog "sites, but breaks others instead. It is strongly discouraged to use it."
+		elog "For more information, see bug #128922."
+		echo ""
+	fi
+
+	if ! use utempter ; then
+		echo ""
+		elog "On some setups, which rely on the correct update of utmp records, not using"
+		elog "utempter might not update them correctly. If you experience unexpected"
+		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
+		echo ""
+	fi
+
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror "The alsa USE flag in this package enables ALSA support"
+		eerror "for libkmid, KDE midi library."
+		eerror "For this reason, you have to merge media-libs/alsa-lib"
+		eerror "with the midi USE flag enabled, or disable alsa USE flag"
+		eerror "for this package."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if use legacyssl ; then
+		# This patch won't be included upstream, see bug #128922.
+		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
+	fi
+
+	if use utempter ; then
+		# Bug #135818 is the eternal reference.
+		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
+	fi
+
+	if use branding ; then
+		# Add "(Gentoo)" to khtml user agent.
+		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
+	fi
+
+	# Xinerama patch from Lubos Lunak.
+	# http://ktown.kde.org/~seli/xinerama/
+	epatch "${WORKDIR}/${PN}-3.5.8-seli-xinerama.patch"
+
+	# Fixes bug 212749 (upstream bug 158069)
+	epatch "${FILESDIR}/${P}-cursor.patch"
+}
+
+src_compile() {
+	rm -f "${S}/configure"
+
+	myconf="--with-distribution=Gentoo --disable-fast-malloc
+			--with-libart --with-libidn --with-ssl
+			--without-hspell
+			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
+			$(use_with acl) $(use_with alsa)
+			$(use_with arts) $(use_enable cups)
+			$(use_with kerberos gssapi) $(use_with tiff)
+			$(use_with jpeg2k jasper) $(use_with openexr)
+			$(use_with utempter) $(use_with lua)
+			$(use_enable kernel_linux sendfile) --enable-mitshm
+			$(use_with spell aspell)"
+
+	if use avahi || use bindist ; then
+		myconf="${myconf} --disable-dnssd"
+	else
+		myconf="${myconf} --enable-dnssd"
+	fi
+
+	if has_version x11-apps/rgb; then
+		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
+	fi
+
+	# fix bug 58179, bug 85593
+	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
+	# closer look... - corsair
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# work around bug #120858, gcc 3.4.x -Os miscompilation
+	use x86 && replace-flags "-Os" "-O2" # see bug #120858
+
+	replace-flags "-O3" "-O2" # see bug #148180
+
+	kde_src_compile
+
+	if use doc; then
+		emake apidox || die
+	fi
+}
+
+src_install() {
+	kde_src_install
+
+	if use doc; then
+		emake DESTDIR="${D}" install-apidox || die
+	fi
+
+	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
+	fi
+
+	# Get rid of the disabled version of the kdnsd libraries
+	if use avahi || use bindist ; then
+		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
+	fi
+
+	dodir /etc/env.d
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${PREFIX}/${libdir}"
+	done
+
+	# Please note that the KDE install path has to be the last value in KDEDIRS.
+	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
+PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+MANPATH=${PREFIX}/share/man
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+KDEDIRS="/usr:/usr/local:${PREFIX}"
+#KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+EOF
+
+	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
+	dodir /etc/revdep-rebuild
+
+cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
+SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+EOF
+}