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

Package-Manager: portage-2.1.1_pre1-r5

3 files changed, 110 insertions, 19 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/Manifest b/net-wireless/kdebluetooth/Manifest
index 4001c6a8f224..785e72fc0b0c 100644
--- a/net-wireless/kdebluetooth/Manifest
+++ b/net-wireless/kdebluetooth/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kdebluetooth-1.0_beta1-gcc41.patch 666 RMD160 e14ece6e5bd0ee91a4990431cfce0119bc815a5b SHA1 3770a41ecf35ad01a98f2e14298522b35f8486d7 SHA256 a3df51b15e79b0993928fc44eac6eedef6c5dadcaa6b832140452cb559fdee29
 MD5 36c3dda5a9a5d63617f729d76e999035 files/kdebluetooth-1.0_beta1-gcc41.patch 666
 RMD160 e14ece6e5bd0ee91a4990431cfce0119bc815a5b files/kdebluetooth-1.0_beta1-gcc41.patch 666
@@ -9,19 +6,19 @@ AUX kdebluetooth-1.0_beta1-kde3.5.2.patch 5380 RMD160 78521240c94c5046097b04b685
 MD5 3e91edd365c0b05c5f0ad91eec16c34b files/kdebluetooth-1.0_beta1-kde3.5.2.patch 5380
 RMD160 78521240c94c5046097b04b685355edfbae8a1c6 files/kdebluetooth-1.0_beta1-kde3.5.2.patch 5380
 SHA256 b36842c8aacd0cee5fadc0d0c0e0833fc84dcd056e00108251df1f895628f953 files/kdebluetooth-1.0_beta1-kde3.5.2.patch 5380
-AUX kdebluetooth-1.0_beta1-openobex-1.1.patch 4030 RMD160 0d9288a1def9a55bf51b10ac6f1cc3c9af37274d SHA1 3e96b2ce82ee4636979dbf771abcb057bfbd5f01 SHA256 3114a072eaeb1d56ea51f7f5de04e4727c6c32fb4402cb4c0578981065599bab
-MD5 fb53e3cd32d8a10945c6108015f8d4c3 files/kdebluetooth-1.0_beta1-openobex-1.1.patch 4030
-RMD160 0d9288a1def9a55bf51b10ac6f1cc3c9af37274d files/kdebluetooth-1.0_beta1-openobex-1.1.patch 4030
-SHA256 3114a072eaeb1d56ea51f7f5de04e4727c6c32fb4402cb4c0578981065599bab files/kdebluetooth-1.0_beta1-openobex-1.1.patch 4030
+AUX kdebluetooth-1.0_beta1-openobex-1.1.patch 7315 RMD160 c73ca92bcc511e91442ac27d9b362fa069c03db7 SHA1 ba4a45e8a138e9f53931389ccb989bb44992d3b8 SHA256 8b5dc80f455f9967dd1e0b94f3d32e9c270444063fa70eac5c387de1a8b5e848
+MD5 6fe386a584d7b93a65fa8d3553977dca files/kdebluetooth-1.0_beta1-openobex-1.1.patch 7315
+RMD160 c73ca92bcc511e91442ac27d9b362fa069c03db7 files/kdebluetooth-1.0_beta1-openobex-1.1.patch 7315
+SHA256 8b5dc80f455f9967dd1e0b94f3d32e9c270444063fa70eac5c387de1a8b5e848 files/kdebluetooth-1.0_beta1-openobex-1.1.patch 7315
 DIST kdebluetooth-1.0_beta1.tar.bz2 819384 RMD160 a6de390d5cecb840fb8b0fd87bc875fb743369a5 SHA1 58787b1d11ec98b1de52ebbe1f236218a78f5c13 SHA256 eac5da0f809b39f3df890543851cfa9a46193e21d0a13089658ad4c0e91ca784
 EBUILD kdebluetooth-1.0_beta1-r2.ebuild 1876 RMD160 5b719dd43558388e6c4c078ef8b4599dbcb9fd5b SHA1 49ded8bdac5a37bdb44ebb24da72ac64aee1865f SHA256 9acfd7c0b965070a00e4329b0ab6964c393d2c2622fd0bb982bed9213ebb1e6b
 MD5 5818ceadf796f7c0cf99097ea8fa6573 kdebluetooth-1.0_beta1-r2.ebuild 1876
 RMD160 5b719dd43558388e6c4c078ef8b4599dbcb9fd5b kdebluetooth-1.0_beta1-r2.ebuild 1876
 SHA256 9acfd7c0b965070a00e4329b0ab6964c393d2c2622fd0bb982bed9213ebb1e6b kdebluetooth-1.0_beta1-r2.ebuild 1876
-MISC ChangeLog 7766 RMD160 8969a6db70a73f63ed2399e3103bc74682c39747 SHA1 17bd21921084d159d6f4f8a4496880eb88503d4d SHA256 90a54fe8594d6db6bab72e294491de7e30f0408e4dcd4c95daad50f0391dbc5d
-MD5 df0d7b3402faf6d0c3b5ca3f7075a27e ChangeLog 7766
-RMD160 8969a6db70a73f63ed2399e3103bc74682c39747 ChangeLog 7766
-SHA256 90a54fe8594d6db6bab72e294491de7e30f0408e4dcd4c95daad50f0391dbc5d ChangeLog 7766
+MISC ChangeLog 8015 RMD160 cb43bfd2769bf1a986624279c44ac541491b1b8c SHA1 3f75380bf2cb06d357e7edff6586d2c50e210d59 SHA256 62d1ba09ada0b503e2b1ccf75e4131f64a46a30fa99eedd1485ad07144a2b30d
+MD5 10de3547a434cf536bc601d0a8292df8 ChangeLog 8015
+RMD160 cb43bfd2769bf1a986624279c44ac541491b1b8c ChangeLog 8015
+SHA256 62d1ba09ada0b503e2b1ccf75e4131f64a46a30fa99eedd1485ad07144a2b30d ChangeLog 8015
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -29,10 +26,3 @@ SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata
 MD5 447924f1bcc44581ffbfa3b19b0b38ca files/digest-kdebluetooth-1.0_beta1-r2 271
 RMD160 6ba44bc6d7ad239f478beca5901104e8e682e99d files/digest-kdebluetooth-1.0_beta1-r2 271
 SHA256 38c0025f697be25974e048b8175392502083f1bc4168ed2dc9e013a984abd795 files/digest-kdebluetooth-1.0_beta1-r2 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEoUMyntT9W3vfTuoRAqIJAJ9+6gwa4GzekjU72GTbc5BFtrC2dwCeL7hI
-8baPJLUAwZNLbjE5hHPVthk=
-=6LLp
------END PGP SIGNATURE-----
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
+ 
+ 
+