Bumped to fix bug 303651 - handled in eclass now for >=4.4, apply manually for 4.3

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 4a8ea7ae60bbf7976a5fc382ca9d139630d17c7a..2fa3fa3666ebd12022e4a9a1cca094d21e05341f 100644 (file)
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.148 2010/03/11 18:37:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.149 2010/03/15 03:39:29 reavertm Exp $
+
+*kaddressbook-4.4.1-r1 (14 Mar 2010)
+*kaddressbook-4.4.0-r1 (14 Mar 2010)
+*kaddressbook-4.3.5-r1 (14 Mar 2010)
+
+  14 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -kaddressbook-4.3.5.ebuild, +kaddressbook-4.3.5-r1.ebuild,
+  -kaddressbook-4.4.0.ebuild, +kaddressbook-4.4.0-r1.ebuild,
+  -kaddressbook-4.4.1.ebuild, +kaddressbook-4.4.1-r1.ebuild:
+  Bumped to fix bug 303651 - handled in eclass now for >=4.4, apply
+  manually for 4.3.
 
   11 Mar 2010; Brent Baude <ranger@gentoo.org> ChangeLog:
   Marking kaddressbook-4.3.5 ppc stable for bug 300393

diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 59627566facc75a4f3ff2da6a05b3156a62912d2..135f24633dff4c7a0ffd2cca7403b559c61bdbd4 100644 (file)
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -5,8 +5,8 @@ DIST kdepim-4.4.0.tar.bz2 9356227 RMD160 0a242701d3a26669e097fc05ebbe01f5b0b6b1a
 DIST kdepim-4.4.1.tar.bz2 9357611 RMD160 afc104ed625957a789d05cc548054d8891122de9 SHA1 cd2e0fb48c1fe4a1b7840d098fd07ab8cc9751a4 SHA256 bfb1684dbc685c3c29691531e31772220c98d2f8981dc9fae37fa5d49a41b383
 EBUILD kaddressbook-4.3.3.ebuild 1261 RMD160 18dab3567fd7a7743d4eabcb550186c0534837df SHA1 3f1a079d62d4bf0ebc5e61705014249efece3490 SHA256 98990fc77fe26247afa533e51421982b5af5aa4d2a86c15cab959f0bf7796891
 EBUILD kaddressbook-4.3.4.ebuild 1279 RMD160 4f9b0df3d65c45a2f029015111802574bd1837f3 SHA1 af4cf457bab5cf6a1f496404e147016d62d53a13 SHA256 d1231c8e7484a9feb83cebf4d7dd63268cf8a530bffcc8a99ab862634b9be3a5
-EBUILD kaddressbook-4.3.5.ebuild 1278 RMD160 8eca92db09be38eae95542e79833289e8ad2e668 SHA1 c668dec16448e5ed67e1b2c2a98a646240ae6a22 SHA256 376acdee3b755292ad51eb8d7cbb4398ff07d28557e097716a270bf7c63a18c1
-EBUILD kaddressbook-4.4.0.ebuild 952 RMD160 be9c5b67b476a1029ae92fc04655f4f302713a21 SHA1 8ecff1a23723cedb4f48ef2d96c736e50818e405 SHA256 d9c00174049632429096b69b30d86ed1abee5f8185b3b2ef9c5f0fea9bbd5990
-EBUILD kaddressbook-4.4.1.ebuild 955 RMD160 a67a7d362e2bcc07a117b961ce6d2b8314d63b69 SHA1 ce317dfc223352da0c1dc8ded49bc9cb932d3610 SHA256 6dd0fa36f625650559023405f51bea71d633539208bd96170c4064e931304046
-MISC ChangeLog 18529 RMD160 d55e6cae5cf048aa6731f94c865257282584747e SHA1 9bd2c79935cc8fc297f68baca3cbb86e4480928d SHA256 99e93b2f0c86ca0d5fe986f2fba56f1c9dc2bc2606240526eaeac11aa3d0317d
+EBUILD kaddressbook-4.3.5-r1.ebuild 1562 RMD160 635cc1472740cf809d1255709837aa5f317f13ee SHA1 5e5ef6462659fb585dbaabadbfcbce8a40ca4063 SHA256 e28ebf9d9ac8c1c030411e2ea744ad17e52ec89769c7c4c398b340eb48e015bf
+EBUILD kaddressbook-4.4.0-r1.ebuild 957 RMD160 77e86161ee139d96fce5aa32f8edf090bfd19597 SHA1 0bc5bcdb46ca612f1b65311c3c8a3ae6da1a59a3 SHA256 3e73484e5fba5fe39f29457b499eb2c514e4cef2f4320842312ec640a6f6bc12
+EBUILD kaddressbook-4.4.1-r1.ebuild 957 RMD160 8f3f3a23050705427c750c492ee24d6b01638624 SHA1 c7585a173328fcd2d7a71d2be761a35e8ca23dec SHA256 d08fe950e30acda1e785f129fc990da06cfe344cfb924801cb10d16e9dbbc249
+MISC ChangeLog 18969 RMD160 989cf806897344df1474750437ebbc7efd1245ea SHA1 1e0558e8d28c201578c752a08e913e790ef4837f SHA256 6c04ee3e0c7d2562c095e22cbc1b2fcaffe09ae96e18fc1c59a05b154be1d9e9
 MISC metadata.xml 267 RMD160 d8062a20042efd5c1c8471fe72d395d5f233172a SHA1 7dc839167883c5f3dca58dd101f28d4e3d74f20c SHA256 767eee971926a02fe48e50c4d2373b94d993857d993026a537011b62d0ad4e49

diff --git a/kde-base/kaddressbook/kaddressbook-4.3.5.ebuild b/kde-base/kaddressbook/kaddressbook-4.3.5-r1.ebuild
similarity index 78%
rename from kde-base/kaddressbook/kaddressbook-4.3.5.ebuild
rename to kde-base/kaddressbook/kaddressbook-4.3.5-r1.ebuild
index f075b67f9428ba18686e1e3a9b32fbe786d355c8..b78b4e8f9a6052bf46ca8794cfda7e477cbcf076 100644 (file)
--- a/kde-base/kaddressbook/kaddressbook-4.3.5.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.3.5.ebuild,v 1.3 2010/03/11 18:37:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.3.5-r1.ebuild,v 1.1 2010/03/15 03:39:29 reavertm Exp $
 
 EAPI="2"
 
@@ -28,6 +28,15 @@ KMEXTRACTONLY="
 "
 KMLOADLIBS="libkdepim libkleo"
 
+src_prepare() {
+       kde4-meta_src_prepare
+
+       sed -n -e '/qt4_generate_dbus_interface(.*org\.kde\.kmail\.\(kmail\|mailcomposer\)\.xml/p' \
+               -e '/add_custom_target(kmail_xml /,/)/p' \
+               -i kmail/CMakeLists.txt || die "uncommenting xml failed"
+       _change_cmakelists_parent_dirs kmail
+}
+
 src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_with gnokii)

diff --git a/kde-base/kaddressbook/kaddressbook-4.4.0.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.0-r1.ebuild
similarity index 93%
rename from kde-base/kaddressbook/kaddressbook-4.4.0.ebuild
rename to kde-base/kaddressbook/kaddressbook-4.4.0-r1.ebuild
index 8415a07dd4eeb14ab1300049ae8224e9798d8d5b..f1ac64a602aa9786467e1012f7c5e0b0dd748b52 100644 (file)
--- a/kde-base/kaddressbook/kaddressbook-4.4.0.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.0.ebuild,v 1.1 2010/02/09 00:18:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.0-r1.ebuild,v 1.1 2010/03/15 03:39:29 reavertm Exp $
 
 EAPI="2"
 

diff --git a/kde-base/kaddressbook/kaddressbook-4.4.1.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.1-r1.ebuild
similarity index 93%
rename from kde-base/kaddressbook/kaddressbook-4.4.1.ebuild
rename to kde-base/kaddressbook/kaddressbook-4.4.1-r1.ebuild
index 8219bee5ac2f27a6f9f86872f49496859d2e5291..ec76c9547b79864c78f8b52865f3b46a86701b8c 100644 (file)
--- a/kde-base/kaddressbook/kaddressbook-4.4.1.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.1.ebuild,v 1.1 2010/03/02 15:38:21 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.1-r1.ebuild,v 1.1 2010/03/15 03:39:29 reavertm Exp $
 
 EAPI="3"