Apply gnokii patch, bug 234905

Package-Manager: portage-2.2_rc32/cvs/Linux x86_64

5 files changed, 29 insertions, 8 deletions

diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 0f0b1641069d..30e58df2b179 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.112 2009/05/06 22:51:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.113 2009/05/07 20:57:57 tampakrap Exp $
+
+  07 May 2009; Theo Chatzimichos <tampakrap@gentoo.org> kaddressbook-3.5.9.ebuild,
+  kaddressbook-3.5.10.ebuild, +files/kaddressbook-3.5-gnokii.patch:
+  Apply gnokii patch, bug 234905
 
 *kaddressbook-4.2.3 (06 May 2009)
 
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index c728c98c69fd..1b93f1181592 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -1,11 +1,12 @@
+AUX kaddressbook-3.5-gnokii.patch 383 RMD160 d45a943add96e145575908bd2c5f044c8bc4494a SHA1 6eaccd3764a427ea360f260ff979614026ab9f3b SHA256 5e50b7f26eff8086887db90dbe0d682a796de47af91a9a41c7e3bb4967d3f0a1
 DIST kdepim-3.5-patchset-05.tar.bz2 24339 RMD160 1059e70a9c71197356a9e592a95a53155305cfb0 SHA1 df0426d995b9db6a83679924a97b641ac8e7d997 SHA256 d94b0b3013669501e0cc9816815a4c1809e96861ff14c3067c719b5f6a7a646d
 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 kdepim-4.2.2.tar.bz2 12082557 RMD160 dcd9abadf62f4a80dfb94d39573330e1dbeca557 SHA1 abd6d9e7777cf192aa7919dce56644e942d8e2e9 SHA256 a9d1d4acaea5a60163f51379e713609bede9b69534edfb9eaaafafe86becb2f1
 DIST kdepim-4.2.3.tar.bz2 12131940 RMD160 442734671927cb672f6fbec328b5db8083fff857 SHA1 9d46fe2ce1bf183cce82d0d60a9a29ec3c53832f SHA256 a4a938c004271e20bc4573a55620a93a0e076634f2210967f0d6b3b83e48bc79
-EBUILD kaddressbook-3.5.10.ebuild 1680 RMD160 3f5e328a92df11b3c284aff63b6ceaf8186ced5f SHA1 ef50984944dde4566055409d9492116579f17249 SHA256 0f828b17b8ce0595d580c924777e0191fb12a17cd9220797ad02795a8da5e9e7
-EBUILD kaddressbook-3.5.9.ebuild 1587 RMD160 b7e6a80c92497b4c853b368061c834e80ae9e388 SHA1 d297805cb4d19a5d2f8a13bb35be869b8f76c826 SHA256 5bed0fdd05c9cf6ab15471bb3f3d4206696f099dfda3e18b60c69764d0c99514
+EBUILD kaddressbook-3.5.10.ebuild 1741 RMD160 604f5c24518686cd504daba5c6c820044d5d9ece SHA1 54f9d046ec0dfdb132e77465bb758a62b16f658d SHA256 b61ecba445c28468193767a6f103793067f18df86659522fd6655f3cf752d158
+EBUILD kaddressbook-3.5.9.ebuild 1647 RMD160 6d047f38ecd5846f073a94b4cf132d0ae3f5b15f SHA1 a39f4fbc97246a5aa481023da4c297c977306419 SHA256 db66e2ddb398a3943e0afa84a3e662c1dd7288f16822ecb47ba6048315663756
 EBUILD kaddressbook-4.2.2.ebuild 1058 RMD160 9e14daf6d7df418f152055399d7738a217a99756 SHA1 333c16e0271234c9fbcdc1a10c3f656e00df452e SHA256 7623d741a2d70ae95bdc5d6649105cbea799ce9d6ce1228e81949e590fe6a1d4
 EBUILD kaddressbook-4.2.3.ebuild 1058 RMD160 1593a3dea985b226f831c9664c1a7b3222463022 SHA1 7acf37c66eea5f5889478dc596602a25516e5699 SHA256 d57f266ba2b9e7242a1bc26d488f8ca85b964037bd441f083386b3ce638411f5
-MISC ChangeLog 14331 RMD160 43744981a7e884fec74e41bc18815b161c4f34c4 SHA1 7f2be5bc073330f3d3f60a9089dbcb3402357d94 SHA256 e6b0aa087557387cbc6c5078bfb5bd96a1ecc34fb1951bb62374d6c8afa2b5a0
+MISC ChangeLog 14516 RMD160 09945639da577aafb229d8a64c789241fc477bfd SHA1 917e4dbb6c6313d4a95d5d3f637ba3ada4a1afee SHA256 5e7548a8b21748dd051a1be583ee394d7e42d1bda5ee9ac33c9a652e137f2dcb
 MISC metadata.xml 267 RMD160 d8062a20042efd5c1c8471fe72d395d5f233172a SHA1 7dc839167883c5f3dca58dd101f28d4e3d74f20c SHA256 767eee971926a02fe48e50c4d2373b94d993857d993026a537011b62d0ad4e49
diff --git a/kde-base/kaddressbook/files/kaddressbook-3.5-gnokii.patch b/kde-base/kaddressbook/files/kaddressbook-3.5-gnokii.patch
new file mode 100644
index 000000000000..e83fc4dccf0f
--- /dev/null
+++ b/kde-base/kaddressbook/files/kaddressbook-3.5-gnokii.patch
@@ -0,0 +1,12 @@
+--- old/configure.in.in	2008-12-13 11:37:24.000000000 +0000
++++ new/configure.in.in	2008-12-13 11:44:08.000000000 +0000
+@@ -41,7 +41,7 @@
+ [
+   KDE_CHECK_HEADERS(gnokii.h)
+   AC_REQUIRE([AC_HAVE_XPM])
+-  AC_CHECK_LIB(gnokii, gn_cfg_read,
++  AC_CHECK_LIB(gnokii, gn_cfg_read_default,
+        [ LIB_GNOKII="-lgnokii $LIB_BLUETOOTH" ],
+        [
+     	AC_CHECK_LIB(gnokii, gn_cfg_get,
+
diff --git a/kde-base/kaddressbook/kaddressbook-3.5.10.ebuild b/kde-base/kaddressbook/kaddressbook-3.5.10.ebuild
index 82e71c77340c..ff12addc706d 100644
--- a/kde-base/kaddressbook/kaddressbook-3.5.10.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.5.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.10.ebuild,v 1.1 2008/09/13 23:57:19 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.10.ebuild,v 1.2 2009/05/07 20:57:57 tampakrap Exp $
 
 KMNAME=kdepim
 EAPI="1"
@@ -46,6 +46,8 @@ KMEXTRA="
 	kfile-plugins/vcf
 	kontact/plugins/kaddressbook"
 
+PATCHES=( "${FILESDIR}/kaddressbook-3.5-gnokii.patch" )
+
 src_compile() {
 	myconf="$(use_with gnokii) --enable-newdistrlists"
 	export DO_NOT_COMPILE="libical" && kde-meta_src_compile myconf configure
diff --git a/kde-base/kaddressbook/kaddressbook-3.5.9.ebuild b/kde-base/kaddressbook/kaddressbook-3.5.9.ebuild
index 06c1e1871bba..a06943d205d7 100644
--- a/kde-base/kaddressbook/kaddressbook-3.5.9.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.5.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.9.ebuild,v 1.7 2008/05/18 21:58:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.9.ebuild,v 1.8 2009/05/07 20:57:57 tampakrap Exp $
 
 KMNAME=kdepim
 EAPI="1"
@@ -43,6 +43,8 @@ KMEXTRA="
 	kfile-plugins/vcf
 	kontact/plugins/kaddressbook"
 
+PATCHES=( "${FILESDIR}/kaddressbook-3.5-gnokii.patch" )
+
 src_compile() {
 	myconf="$myconf $(use_with gnokii)"
 	export DO_NOT_COMPILE="libical" && kde-meta_src_compile myconf configure