Revision bump, add patch for missing xml parse libs, taken from opensuse kdepim patchset, put changed due to conflicts with the libopensync patch. Bug

194668
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 54 insertions, 6 deletions

diff --git a/kde-base/kitchensync/ChangeLog b/kde-base/kitchensync/ChangeLog
index be7843177aad..c6897e97f265 100644
--- a/kde-base/kitchensync/ChangeLog
+++ b/kde-base/kitchensync/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kitchensync
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/ChangeLog,v 1.104 2009/02/17 13:45:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/ChangeLog,v 1.105 2009/05/28 14:26:47 tampakrap Exp $
+
+*kitchensync-3.5.10-r2 (28 May 2009)
+
+  28 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kitchensync-3.5.10-r2.ebuild:
+  Revision bump, add patch for missing xml parse libs, taken from opensuse
+  kdepim patchset, put changed due to conflicts with the libopensync patch.
+  Bug 
+  194668
 
   17 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kitchensync-4.1.4.ebuild:
diff --git a/kde-base/kitchensync/Manifest b/kde-base/kitchensync/Manifest
index a799d4105a69..9a6f413a77b1 100644
--- a/kde-base/kitchensync/Manifest
+++ b/kde-base/kitchensync/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA1
 
 DIST kdepim-3.5-patchset-05.tar.bz2 24339 RMD160 1059e70a9c71197356a9e592a95a53155305cfb0 SHA1 df0426d995b9db6a83679924a97b641ac8e7d997 SHA256 d94b0b3013669501e0cc9816815a4c1809e96861ff14c3067c719b5f6a7a646d
+DIST kdepim-3.5-patchset-07.tar.bz2 25332 RMD160 b963fb3893a9ada3f8b30ae3aae7fa5df7802b68 SHA1 3c4176b6c8619a738929c4656cfdb7d506a12cc2 SHA256 e99be7b42b07d5c1f40ab3d1e995434ea558ff19e7b9cd7b1976818094315856
 DIST kdepim-3.5.10.tar.bz2 14559901 RMD160 52a834dc8eb377d397404a16a09c8a59b568b305 SHA1 537da60fe3564ecc0ed2802e744fbf96386909a9 SHA256 95ec92023a25e4868e55389fa4648b337fed870d744d3b63022ed9838ff9b429
 DIST kdepim-3.5.9.tar.bz2 14497974 RMD160 7c2cbd5b5f9075bc8dcc7998fc04bf9b297bfd54 SHA1 53ab658c5cdf2e6f836d2e12e3bc4e2fe3b96f15 SHA256 ee3f02ac828f1915c09b8c0a1289efcfbae36321cd07bc071df8be041de10d3a
 DIST kitchensync-3.5.9-OpenSync0.30API.patch.tar.bz2 19489 RMD160 505c08d2a3e03d99d978c36d50033ea6f9552c29 SHA1 6b9570dcd777be3fdd9f64c000c2af05e391aafb SHA256 acef32703024d713b7639d664be51f95bcd875ab2e064a74021db76ebd7c714e
 EBUILD kitchensync-3.5.10-r1.ebuild 980 RMD160 a792daf8fa0f89829e4487e085698209c6b14fdc SHA1 e67340a9e95cb73b216d9629e237807c5951752a SHA256 715d9093b1cc84e2fdaf538f214abfcf0be3c550ea28a0d72cb6042ae7415e66
+EBUILD kitchensync-3.5.10-r2.ebuild 1092 RMD160 f208f1be9cf2d35df6341fc78970b2a5f75ad616 SHA1 547ec9771bb3569886d428167b50a1491879887b SHA256 93769119f11a6737240dfa8506fd67ef69130a605ea51f7f64278055821f3ffc
 EBUILD kitchensync-3.5.10.ebuild 906 RMD160 ff42d70684f4b7b6d8936be8628a81d060a4e679 SHA1 e2542fb4013bb87c5c2973a51a219149c894919a SHA256 5ee3b8a8ed07d29091648dd88e5ec64f8faf350b43ebfd5ff4539b0a904ffb19
 EBUILD kitchensync-3.5.9-r1.ebuild 1306 RMD160 e7857bb0fbb5e855e1aadda35fe94310eef86bc2 SHA1 caa717a2381f23fb85087a7e94e8afcfe7b401e9 SHA256 44d9b930ef7597757a10bd51721913a11c618631119aa09da43f0b9b05259f6c
 EBUILD kitchensync-3.5.9.ebuild 1162 RMD160 5ef7ccb0b0fca9cd00dd9dec4b8cc75d46804a81 SHA1 93f9ce200218c0aefa3b5b0202bf60ecb490a82b SHA256 8e89684116216abede5341d1a3566923d987b6e5c919cb3a4029dadb95d90290
-MISC ChangeLog 13502 RMD160 7eac89ca5d9a0924c0039ff86452244df16a16ca SHA1 142293ced6f7d87b4b2d7ab5817446490c0e54df SHA256 b87b1c37489e50632badbf3da6ee0c161afd262249a780f5cdb50db8df013161
+MISC ChangeLog 13800 RMD160 806cd1adb0afd609cbb59b45f2d1d418b3ca18e2 SHA1 21f084b46bf53665c6f1778d1baa920c81eb696a SHA256 ce37499563c2200be16141e879e539b0e4e67545f73ecd1c31c2e8936cc96c17
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmav3UACgkQ5BmOA85PVLi7ugCeKPxjxTBWbPyN7KJZ+AZfV+m3
-z+UAn0bICRjKNUYZphmy4crIuw+vT7ht
-=Y4h2
+iEYEARECAAYFAkoenzEACgkQjDdoMVfcAHjzdwCfUJQa9ukWSayZqGJ1QrJjaLpQ
+oaIAoN896VSpwn4auyV0PuVzktocEZ4+
+=Jp9E
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kitchensync/kitchensync-3.5.10-r2.ebuild b/kde-base/kitchensync/kitchensync-3.5.10-r2.ebuild
new file mode 100644
index 000000000000..da31d1227c7c
--- /dev/null
+++ b/kde-base/kitchensync/kitchensync-3.5.10-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/kitchensync-3.5.10-r2.ebuild,v 1.1 2009/05/28 14:26:47 tampakrap Exp $
+
+KMNAME=kdepim
+EAPI="1"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdepim-3.5-patchset-07.tar.bz2"
+
+DESCRIPTION="Synchronize Data with KDE"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+DEPEND=">=app-pda/libopensync-0.36
+	>=kde-base/kontact-${PV}:${SLOT}
+	>=kde-base/libkcal-${PV}:${SLOT}"
+
+RDEPEND="${DEPEND}"
+
+KMCOPYLIB="
+	libkcal libkcal
+	libkdepim libkdepim
+	libkpinterfaces kontact/interfaces"
+KMEXTRACTONLY="
+	libkcal/
+	libkdepim/
+	libkdenetwork/
+	kontact/interfaces"
+
+# Disabled by default in kontact/plugins/Makefile.am, so check before enabling - 3.4.0_beta1 -- danarmak
+# Let's give it a try, as requested in bug #233491.
+KMEXTRA="kontact/plugins/kitchensync"
+# KMEXTRA="kontact/plugins/multisynk"
+
+PATCHES=( "${WORKDIR}/patches/01_${P}-OpenSync0.30API.patch"
+	"${WORKDIR}/patches/02_${P}-xmlparse.diff" )