Add support for >=beagle-0.3 (bug #210447)

Package-Manager: portage-2.2_rc2/cvs/Linux 2.6.26 i686

4 files changed, 37 insertions, 14 deletions

diff --git a/kde-misc/kerry/ChangeLog b/kde-misc/kerry/ChangeLog
index 1413f9e0996c..43884cdcabbf 100644
--- a/kde-misc/kerry/ChangeLog
+++ b/kde-misc/kerry/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kerry
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/ChangeLog,v 1.13 2008/02/18 22:39:50 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/ChangeLog,v 1.14 2008/07/26 05:16:13 ford_prefect Exp $
+
+  26 Jul 2008; Arun Raghavan <ford_prefect@gentoo.org>
+  +files/kerry-0.2.1-libbeagle-0.3.patch, kerry-0.2.1.ebuild:
+  Add support for >=beagle-0.3 (bug #210447)
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -files/kerry-0.1-ebuilds-2.patch, -files/kerry-0.09-del-shortcut.patch,
diff --git a/kde-misc/kerry/Manifest b/kde-misc/kerry/Manifest
index fce40371bd5d..3c382856704d 100644
--- a/kde-misc/kerry/Manifest
+++ b/kde-misc/kerry/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX kerry-0.2.1-libbeagle-0.3.patch 797 RMD160 7b2aafbb1c54f764a0a1a1fefc1aef5e6fe34295 SHA1 eabbe0952637caf1412bdf6345210d2e50838b92 SHA256 72ede37e1e3da2e126d6904fe4176148d2f660f3844b3189478acc74fd77bb8e
 DIST kerry-0.2.1.tar.bz2 636591 RMD160 8fc122262fb27ee83f833d90beaa0fd64b8fb1a2 SHA1 d94d7646725aaaaed9b9d2dd0ce95f6473e6b935 SHA256 6e5c9ce11c1f9c0668dc3bbac083cf9f8fc7c3ae6729055c50418b08673576f8
-EBUILD kerry-0.2.1.ebuild 613 RMD160 b70a6675d1b1ccdd932d54ae533ce8ac1b74dc4a SHA1 2c06cd830e2334c782866ba63f4abab7d3629709 SHA256 fa577c6f1a1170bcd308eca6d2dbff8aab3d010e33312322548aea2bec42c48a
-MISC ChangeLog 2391 RMD160 541af900f79e2b614b7ce06f063cc6aceafa7c5d SHA1 c8768ed468309b77ba65567d1e1c1af525c78d25 SHA256 f66b80da9dbfe20ed88803ec8368e12d5697fc9bbf9ae2eeca71a74fe52210c8
+EBUILD kerry-0.2.1.ebuild 793 RMD160 21aef44864f6003e893f21a884c3f12e19702507 SHA1 5700393e58344470bf71ed89ae2dfc4c8de14348 SHA256 2c9349c29def938f7f945b945202f54f2e156b73c40e28304b18b039e236575f
+MISC ChangeLog 2560 RMD160 f30a7f3e3c9c935ef6601586a02a954d9ab82d44 SHA1 7da4b49dc6925c52ffd2455a8ca50142bc69911e SHA256 323b86afdd0c32be3af954f07bd5e57ce0ba2a6d1a42ed8a35f8d63dc59e4530
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHugkBB18eXLOpYdkRAjaJAKCIWAxqllHtzrbI2EKnEHloD1j/lQCgh+uW
-0GlB4BY2R+D1wmhOzdrycEE=
-=MyRS
------END PGP SIGNATURE-----
diff --git a/kde-misc/kerry/files/kerry-0.2.1-libbeagle-0.3.patch b/kde-misc/kerry/files/kerry-0.2.1-libbeagle-0.3.patch
new file mode 100644
index 000000000000..b4ae009672c0
--- /dev/null
+++ b/kde-misc/kerry/files/kerry-0.2.1-libbeagle-0.3.patch
@@ -0,0 +1,19 @@
+diff -urNp kerry-0.2.1.orig/kerry/configure.in.in kerry-0.2.1/kerry/configure.in.in
+--- kerry-0.2.1.orig/kerry/configure.in.in	2006-12-04 19:05:38.000000000 +0530
++++ kerry-0.2.1/kerry/configure.in.in	2008-07-17 17:19:00.000000000 +0530
+@@ -57,8 +57,13 @@ dnl Check for libbeagle 0.2.0
+ # LIBBEAGLE_LIBADD:  libbeagle libraries (-l options)
+ # LIBBEAGLE_LDFLAGS: flags containing path to libbeagle libraries (-L options)
+ 
+-LIBBEAGLE_PACKAGES="libbeagle-0.0"
+-LIBBEAGLE_VERSION="0.2.5"
++if $PKG_CONFIG --exists libbeagle-1.0; then
++	LIBBEAGLE_PACKAGES="libbeagle-1.0"
++	LIBBEAGLE_VERSION="0.3.0"
++else
++	LIBBEAGLE_PACKAGES="libbeagle-0.0"
++	LIBBEAGLE_VERSION="0.2.5"
++fi
+ AC_MSG_CHECKING(for libbeagle-0.2.5 (at least $LIBBEAGLE_VERSION))
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.15 ; then
diff --git a/kde-misc/kerry/kerry-0.2.1.ebuild b/kde-misc/kerry/kerry-0.2.1.ebuild
index 90fc0264b8cc..c96fe8d7b9da 100644
--- a/kde-misc/kerry/kerry-0.2.1.ebuild
+++ b/kde-misc/kerry/kerry-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/kerry-0.2.1.ebuild,v 1.3 2008/02/18 22:37:51 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/kerry-0.2.1.ebuild,v 1.4 2008/07/26 05:16:13 ford_prefect Exp $
 
 inherit kde
 
@@ -19,3 +19,12 @@ DEPEND="${RDEPEND}
 	|| ( =kde-base/kdebase-3.5* =kde-base/libkonq-3.5* )"
 
 need-kde 3.4
+
+PATCHES="${FILESDIR}/${P}-libbeagle-0.3.patch"
+
+src_unpack() {
+	kde_src_unpack
+
+	# force regeneration of configure script for the libbeagle patch to work
+	rm -f configure
+}