Handle homepage url properly.

Package-Manager: portage-2.0.54

5 files changed, 86 insertions, 34 deletions

diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 4cf60def219e..ac5a09cb1d45 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.43 2006/04/06 00:54:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.44 2006/04/22 10:53:54 carlo Exp $
+
+*kaddressbook-3.5.2-r1 (22 Apr 2006)
+
+  22 Apr 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kaddressbook-3.5.2-addressee-hompage-fix.diff,
+  +kaddressbook-3.5.2-r1.ebuild:
+  Handle homepage url properly.
 
   05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -kaddressbook-3.5.0.ebuild, -kaddressbook-3.5.1.ebuild:
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 0aac0680baea..698644a46af9 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -1,43 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a2dfa216f550218c902bf9335e99d7a6 ChangeLog 5680
-RMD160 9c7825874b9f73ca244498d1a1a233db1a89e3d9 ChangeLog 5680
-SHA256 9191802d5cd1dd5c70966ec0994b2bbc8bddf806c5e02b418d8248fb847ed438 ChangeLog 5680
+MD5 3fca36d6112d9bb91436702d3bc8d519 ChangeLog 5885
 MD5 98742ffe69ec2a609069bb2804d85af8 files/configure-fix-kdepim-gnokii-3.4.patch 1965
-RMD160 1e0c88eeb8c74cf7d052ce9d8e27e3c250d9340d files/configure-fix-kdepim-gnokii-3.4.patch 1965
-SHA256 00e603dec06e30d22a22deedb3d7cf1b424e7af0c6b283919b5208c55e5d895e files/configure-fix-kdepim-gnokii-3.4.patch 1965
 MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kaddressbook-3.4.1 208
-RMD160 a6185d391139f96c8706b8459f811267aa8254f4 files/digest-kaddressbook-3.4.1 208
-SHA256 13d734567761359795df4277f8e107a116627d38aca0531bfb91f1a0f4bf6e2f files/digest-kaddressbook-3.4.1 208
 MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kaddressbook-3.4.2 282
-RMD160 6c21b8a8578c49208c6a35e538dce0577c45e1b9 files/digest-kaddressbook-3.4.2 282
-SHA256 68f1cbf0899c203a29e8a535da6e3df2f97811b7e967b76cabc15200470b270b files/digest-kaddressbook-3.4.2 282
 MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kaddressbook-3.4.3 67
-RMD160 2b704341b9b6cd49f646304700670dd2324e4ee3 files/digest-kaddressbook-3.4.3 67
-SHA256 53a597b89fa83f7e953fd6c3565b00cbbceb08c07211f1ba11d1e24883cd82fe files/digest-kaddressbook-3.4.3 67
 MD5 4b77483fe398773d23a75714c3dd6223 files/digest-kaddressbook-3.5.2 247
-RMD160 6593013cc2b82f2b51819d483733f409262d7d91 files/digest-kaddressbook-3.5.2 247
-SHA256 316a6c56abca376dcc823a955f36bb4a04daf20009db56ff7cd3f6f38f150c5e files/digest-kaddressbook-3.5.2 247
+MD5 342529061ff068b5002fa430c5c6b20c files/digest-kaddressbook-3.5.2-r1 67
+MD5 6cc2ca285f46bebab23dc9c21174b027 files/kaddressbook-3.5.2-addressee-hompage-fix.diff 730
 MD5 a8854f652d8134ae4f7015c69affd8ae kaddressbook-3.4.1.ebuild 1673
-RMD160 df9f55b13e30173e4c047368b2f0f14d0d0d4ba0 kaddressbook-3.4.1.ebuild 1673
-SHA256 a5d2c70982670e53a8978b5868d9955bc58bb7e44eea24fb8ed1d9b8f8c9f653 kaddressbook-3.4.1.ebuild 1673
 MD5 da836a591019f65ef3ef30a5676e7c10 kaddressbook-3.4.2.ebuild 1677
-RMD160 6b0e2db90830492cf5ba405f857303f1b1cdda28 kaddressbook-3.4.2.ebuild 1677
-SHA256 1bebf003b960db58d0937bf838634b81e0542471965ad835eaf736eacd734463 kaddressbook-3.4.2.ebuild 1677
 MD5 41f6eaae93daafd3e92a8abbe77dabf7 kaddressbook-3.4.3.ebuild 1678
-RMD160 5d5b9ed9dedee92091be21f73e1caaf92572134a kaddressbook-3.4.3.ebuild 1678
-SHA256 b792571fd5cb7923171f8ded1c3c06bfd8a6409f1d4f24f2cdf2a90a52356dbd kaddressbook-3.4.3.ebuild 1678
+MD5 138b766d45587a096ceeae393907f46d kaddressbook-3.5.2-r1.ebuild 1695
 MD5 e479975b14e0ff4207ccd9f51b3a98de kaddressbook-3.5.2.ebuild 1627
-RMD160 76213914e799e439da65b559728f764f03fd32d9 kaddressbook-3.5.2.ebuild 1627
-SHA256 0bcce9271f3e2b4985a63d0f63020c4b9841d201f9f3f844d3319b86fa86128d kaddressbook-3.5.2.ebuild 1627
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENGZMAiZjviIA2XgRApe6AKDT5/m4PaWwTb7/kA+Y6PmQcXX6rQCg5RTA
-SX5vsn/DUypVq/xShxbgM8A=
-=BpFc
------END PGP SIGNATURE-----
diff --git a/kde-base/kaddressbook/files/digest-kaddressbook-3.5.2-r1 b/kde-base/kaddressbook/files/digest-kaddressbook-3.5.2-r1
new file mode 100644
index 000000000000..9ee81dd048d6
--- /dev/null
+++ b/kde-base/kaddressbook/files/digest-kaddressbook-3.5.2-r1
@@ -0,0 +1 @@
+MD5 ac6b3b503e27a65a7b883c1e0a57262e kdepim-3.5.2.tar.bz2 12887336
diff --git a/kde-base/kaddressbook/files/kaddressbook-3.5.2-addressee-hompage-fix.diff b/kde-base/kaddressbook/files/kaddressbook-3.5.2-addressee-hompage-fix.diff
new file mode 100644
index 000000000000..47ce51e754e9
--- /dev/null
+++ b/kde-base/kaddressbook/files/kaddressbook-3.5.2-addressee-hompage-fix.diff
@@ -0,0 +1,18 @@
+--- kdepim/kaddressbook/addresseeeditorwidget.cpp	2005/08/22 20:40:57	452218
++++ kdepim/kaddressbook/addresseeeditorwidget.cpp	2006/04/17 19:42:19	530843
+@@ -572,7 +572,14 @@
+ 
+   mAddressee.setRole( mRoleEdit->text() );
+   mAddressee.setOrganization( mOrgEdit->text() );
+-  mAddressee.setUrl( KURL( mURLEdit->text().stripWhiteSpace() ) );
++  QString homepage = mURLEdit->text().stripWhiteSpace();
++  if ( homepage.isEmpty() )
++     mAddressee.setUrl( KURL() );
++  else {
++     if( !homepage.startsWith("http") )
++       homepage = "http://" + homepage;
++     mAddressee.setUrl( KURL( homepage ) );
++  }
+   if ( !mBlogEdit->text().isEmpty() )
+     mAddressee.insertCustom( "KADDRESSBOOK", "BlogFeed", mBlogEdit->text() );
+   else
diff --git a/kde-base/kaddressbook/kaddressbook-3.5.2-r1.ebuild b/kde-base/kaddressbook/kaddressbook-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..91abcd8af236
--- /dev/null
+++ b/kde-base/kaddressbook/kaddressbook-3.5.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.2-r1.ebuild,v 1.1 2006/04/22 10:53:54 carlo Exp $
+
+KMNAME=kdepim
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="The KDE Address Book"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnokii"
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
+$(deprange $PV $MAXKDEVER kde-base/libkcal)
+$(deprange $PV $MAXKDEVER kde-base/certmanager)
+$(deprange 3.5.0 $MAXKDEVER kde-base/libkdenetwork)
+$(deprange $PV $MAXKDEVER kde-base/kontact)
+gnokii? ( app-mobilephone/gnokii )"
+
+myconf="$myconf $(use_with gnokii)"
+
+KMCOPYLIB="
+	libkdepim libkdepim
+	libkcal libkcal
+	libkleopatra certmanager/lib/
+	libqgpgme libkdenetwork/qgpgme/
+	libkpinterfaces kontact/interfaces/"
+KMEXTRACTONLY="
+	libkdepim/
+	libkdenetwork/
+	libkcal/
+	certmanager/
+	kontact/interfaces/
+	akregator
+	kmail/kmailIface.h"
+KMCOMPILEONLY="
+	libkcal/libical/src/libical/
+	libkcal/libical/src/libicalss/
+	akregator/src/librss"
+	# We add them here because they are standard plugins and programs related to kaddressbook but not a dep of any other kdepim program, so they will be lost if noone install them
+KMEXTRA="
+	kabc/
+	kfile-plugins/vcf
+	kontact/plugins/kaddressbook"
+
+PATCHES="${FILESDIR}/kaddressbook-3.5.2-addressee-hompage-fix.diff"
+src_compile() {
+	export DO_NOT_COMPILE="libical" && kde-meta_src_compile myconf configure
+	# generate "ical.h"
+	cd ${S}/libkcal/libical/src/libical && make ical.h
+	# generate "icalss.h"
+	cd ${S}/libkcal/libical/src/libicalss && make icalss.h
+
+	kde-meta_src_compile "make"
+}