Use AM_PATH_OPENOBEX definition installed by dev-libs/openobex (#122262)

(Portage version: 2.0.54)

5 files changed, 106 insertions, 4 deletions

diff --git a/kde-misc/kbeam/ChangeLog b/kde-misc/kbeam/ChangeLog
index a9f095e97665..ad32a83831a5 100644
--- a/kde-misc/kbeam/ChangeLog
+++ b/kde-misc/kbeam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/kbeam
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/ChangeLog,v 1.3 2004/12/02 16:20:31 carlo Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/ChangeLog,v 1.4 2006/04/21 08:44:39 mrness Exp $
+
+*kbeam-0.61-r1 (21 Apr 2006)
+
+  21 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  +files/kbeam-0.61-aclocal_openobex.patch, +kbeam-0.61-r1.ebuild:
+  Use AM_PATH_OPENOBEX definition installed by dev-libs/openobex - fix kbeams
+  compilation error when >=openobex-1.1 is used (#122262).
 
   02 Dec 2004; Carsten Lohrke <carlo@gentoo.org> kbeam-0.61.ebuild:
   QA: need-kde() after R/DEPEND
diff --git a/kde-misc/kbeam/Manifest b/kde-misc/kbeam/Manifest
index 91e9fbc10b29..7f7aff5e2407 100644
--- a/kde-misc/kbeam/Manifest
+++ b/kde-misc/kbeam/Manifest
@@ -1,4 +1,7 @@
-MD5 2834f1cb97eea873f19ab95ccad6bc6d metadata.xml 216
-MD5 5878b62f167a899122af6e0c9116d52c kbeam-0.61.ebuild 564
 MD5 cd1d41903d1659f36cb466dac1ecc4cc ChangeLog 1063
 MD5 ba873639f681c915eb79da03aecaa9b3 files/digest-kbeam-0.61 62
+MD5 ba873639f681c915eb79da03aecaa9b3 files/digest-kbeam-0.61-r1 62
+MD5 2fdf369b38b2ceb17e7d66a967e7f734 files/kbeam-0.61-aclocal_openobex.patch 2289
+MD5 d9980b4ca173e2872a97107d3789c354 kbeam-0.61-r1.ebuild 798
+MD5 5878b62f167a899122af6e0c9116d52c kbeam-0.61.ebuild 564
+MD5 2834f1cb97eea873f19ab95ccad6bc6d metadata.xml 216
diff --git a/kde-misc/kbeam/files/digest-kbeam-0.61-r1 b/kde-misc/kbeam/files/digest-kbeam-0.61-r1
new file mode 100644
index 000000000000..fbf4b5a0dfa7
--- /dev/null
+++ b/kde-misc/kbeam/files/digest-kbeam-0.61-r1
@@ -0,0 +1 @@
+MD5 a763ede339b10110b9e97f0ec973c2b0 kbeam-0.61.tar.gz 650233
diff --git a/kde-misc/kbeam/files/kbeam-0.61-aclocal_openobex.patch b/kde-misc/kbeam/files/kbeam-0.61-aclocal_openobex.patch
new file mode 100644
index 000000000000..f0f04fc69921
--- /dev/null
+++ b/kde-misc/kbeam/files/kbeam-0.61-aclocal_openobex.patch
@@ -0,0 +1,63 @@
+diff -Nru kbeam-0.61.orig/acinclude.m4 kbeam-0.61/acinclude.m4
+--- kbeam-0.61.orig/acinclude.m4	2004-09-02 00:33:09.000000000 +0300
++++ kbeam-0.61/acinclude.m4	2006-04-21 11:18:21.791165500 +0300
+@@ -11260,59 +11260,3 @@
+ SED=$lt_cv_path_SED
+ AC_MSG_RESULT([$SED])
+ ])
+-dnl Check for openobex library
+-dnl Written by Pontus Fuchs 2000-08-18
+-dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17
+-
+-AC_DEFUN([AM_PATH_OPENOBEX], [
+-	AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
+-
+-	if test "$OPENOBEX_CONFIG" = "no" ; then
+-		AC_MSG_ERROR(openobex-config not found. Perhaps openobex is not installed.)
+-	fi
+-
+-	min_obex_version=ifelse([$1], ,0.9.6,$1)
+-	AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
+-
+-	OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
+-	OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
+-
+-	obex_config_version=`$OPENOBEX_CONFIG --version`
+-
+-	obex_config_major_version=`$OPENOBEX_CONFIG --version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-	obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-	obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-
+-	obex_req_major_version=`echo $min_obex_version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-	obex_req_minor_version=`echo $min_obex_version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-	obex_req_micro_version=`echo $min_obex_version | \
+-		sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-
+-
+-	if test $obex_req_major_version -lt $obex_config_major_version ; then
+-       		obex_config_version_ok="yes"
+-       	fi
+-	if test $obex_req_major_version -eq $obex_config_major_version ; then
+-		if test $obex_req_minor_version -lt $obex_config_minor_version ; then
+-       			obex_config_version_ok="yes"
+-	       	fi
+-		if test $obex_req_minor_version -eq $obex_config_minor_version ; then
+-			if test $obex_req_micro_version -le $obex_config_micro_version ; then
+-				obex_config_version_ok="yes"
+-			fi
+-		fi
+-	fi
+-	
+-	if test "$obex_config_version_ok" != "yes" ; then
+-		AC_MSG_ERROR(Installed openobex library too old ($obex_config_version))
+-	fi
+-
+-	AC_SUBST(OPENOBEX_CFLAGS)
+-	AC_SUBST(OPENOBEX_LIBS)
+-	AC_MSG_RESULT(yes)
+-])
diff --git a/kde-misc/kbeam/kbeam-0.61-r1.ebuild b/kde-misc/kbeam/kbeam-0.61-r1.ebuild
new file mode 100644
index 000000000000..d5fe16545e59
--- /dev/null
+++ b/kde-misc/kbeam/kbeam-0.61-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/kbeam-0.61-r1.ebuild,v 1.1 2006/04/21 08:44:39 mrness Exp $
+
+inherit kde autotools
+
+KLV="14683"
+DESCRIPTION="A KDE application that lets you send and receive files to devices, using your Infrared port."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=${KLV}"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+SLOT="0"
+
+DEPEND=">=dev-libs/openobex-1.1"
+
+PATCHES="${FILESDIR}/${P}-aclocal_openobex.patch"
+
+need-kde 3.2
+
+src_unpack() {
+	kde_src_unpack
+
+	#need it for using the AM_PATH_OPENOBEX definition installed in system
+	eaclocal && eautoconf || die "eaclocal or eautoconf has failed"
+}