Resolves bug #138277. This application will build against >=openobex-1.1. Architectures that have lower versions have to stabilize them asap.

(Portage version: 2.1.1_pre1-r5)

2 files changed, 102 insertions, 1 deletions

diff --git a/net-wireless/kdebluetooth/ChangeLog b/net-wireless/kdebluetooth/ChangeLog
index 0498d7506c7d..0fc006a1481b 100644
--- a/net-wireless/kdebluetooth/ChangeLog
+++ b/net-wireless/kdebluetooth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/kdebluetooth
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.47 2006/06/27 14:39:40 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.48 2006/06/30 16:40:14 deathwing00 Exp $
+
+  30 Jun 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  kdebluetooth-1.0_beta1-r2.ebuild:
+  Resolves bug #138277. This application will build against
+  >=openobex-1.1. Architectures that have lower versions have
+  to stabilize them asap.
 
   27 Jun 2006; Marcus D. Hanwell <cryos@gentoo.org>
   -kdebluetooth-1.0_beta1.ebuild, -kdebluetooth-1.0_beta1-r1.ebuild:
diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-openobex-1.1.patch b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-openobex-1.1.patch
index 422228c325d8..d1ef1ce20f95 100644
--- a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-openobex-1.1.patch
+++ b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-openobex-1.1.patch
@@ -117,3 +117,98 @@ diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h kdeblu
  }
  
  class ObexObject;
+diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.in kdebluetooth-1.0_beta1/kdebluetooth/configure.in.in
+--- kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.in	2006-06-30 14:03:45.000000000 +0200
++++ kdebluetooth-1.0_beta1/kdebluetooth/configure.in.in	2006-06-30 14:04:58.000000000 +0200
+@@ -127,74 +127,7 @@
+ 
+ 
+ 
+-
+-dnl Check for openobex library
+-# Modified by Simone Gotti for kde-bluetooth on 2003-10-04
+-
+-AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
+-
+-if test "$OPENOBEX_CONFIG" = "no" ; then
+-	AC_MSG_WARN(openobex-config not found. Pehaps openobex is not installed.)
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
+-	OPENOBEX_CONFIG="false"
+-fi
+-
+-OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
+-openobex_inc_dir=`echo $OPENOBEX_CFLAGS | cut -dI -f2`
+-if test -f "$openobex_inc_dir/obex.h" ; then
+-    :
+-else
+-    if test -f "$openobex_inc_dir/openobex/obex.h" ; then
+-        OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS/openobex"
+-    else
+-        DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
+-    fi
+-fi
+-OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
+-
+-min_obex_version=1.0.0
+-AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
+-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 -n "$obex_req_major_version" && test -n "$obex_config_minor_version" ; then
+-	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
+-fi
+-
+-if test "$obex_config_version_ok" != "yes" ; then
+-	AC_MSG_WARN(Installed openobex library too old ($obex_config_version))
+-	DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
+-fi
+-
+-
+-AC_SUBST(OPENOBEX_CFLAGS)
+-AC_SUBST(OPENOBEX_LIBS)
+-AC_MSG_RESULT(yes)
++AM_PATH_OPENOBEX(1.0.0)
+ 
+ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+ 
+--- kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.bot	2006-06-30 14:12:01.000000000 +0200
++++ kdebluetooth-1.0_beta1/kdebluetooth/configure.in.bot	2006-06-30 14:12:11.000000000 +0200
+@@ -26,13 +26,6 @@
+ 	echo ""
+ fi
+ 
+-if test "$obex_config_version_ok" != "yes" ; then
+-	echo ""
+-	echo "The installed openobex library version is too old: ($obex_config_version)"
+-	echo "Kdebluetooth won't be compiled without a newer version, so you should"
+-	echo "consider updating it."
+-	echo ""
+-fi
+ 
+ 
+