summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Raghavan <ford_prefect@gentoo.org>2008-07-26 05:16:13 +0000
committerArun Raghavan <ford_prefect@gentoo.org>2008-07-26 05:16:13 +0000
commit638dab0ee7f0ae4a50f3677b0d7fd7e5c542261c (patch)
treef159413efcd3cc8ab667f8e277f99b7afd281b2f /kde-misc/kerry
parentfix up metadata.xml (diff)
downloadgentoo-2-638dab0ee7f0ae4a50f3677b0d7fd7e5c542261c.tar.gz
gentoo-2-638dab0ee7f0ae4a50f3677b0d7fd7e5c542261c.tar.bz2
gentoo-2-638dab0ee7f0ae4a50f3677b0d7fd7e5c542261c.zip
Add support for >=beagle-0.3 (bug #210447)
(Portage version: 2.2_rc2/cvs/Linux 2.6.26 i686)
Diffstat (limited to 'kde-misc/kerry')
-rw-r--r--kde-misc/kerry/ChangeLog6
-rw-r--r--kde-misc/kerry/files/kerry-0.2.1-libbeagle-0.3.patch19
-rw-r--r--kde-misc/kerry/kerry-0.2.1.ebuild11
3 files changed, 34 insertions, 2 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/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
+}