Fix configure error when build against >=dev-libs/openobex-1.1 (#122262).

(Portage version: 2.0.54)

5 files changed, 191 insertions, 31 deletions

diff --git a/net-wireless/kdebluetooth/ChangeLog b/net-wireless/kdebluetooth/ChangeLog
index 99ed7b717edf..240705999799 100644
--- a/net-wireless/kdebluetooth/ChangeLog
+++ b/net-wireless/kdebluetooth/ChangeLog
@@ -1,6 +1,13 @@
 # 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.40 2006/04/08 14:58:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.41 2006/04/23 18:35:25 mrness Exp $
+
+*kdebluetooth-1.0_beta1-r2 (23 Apr 2006)
+
+  23 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  +files/kdebluetooth-1.0_beta1-openobex-1.1.patch,
+  +kdebluetooth-1.0_beta1-r2.ebuild:
+  Fix configure error when build against >=dev-libs/openobex-1.1 (#122262).
 
 *kdebluetooth-1.0_beta1-r1 (08 Apr 2006)
 
diff --git a/net-wireless/kdebluetooth/Manifest b/net-wireless/kdebluetooth/Manifest
index b250736804d9..cb157b78b1d9 100644
--- a/net-wireless/kdebluetooth/Manifest
+++ b/net-wireless/kdebluetooth/Manifest
@@ -1,40 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 01703f5feecd5c2f4528f0acebf2ce46 ChangeLog 6774
-RMD160 1f2b132904f16ec3acd61eae9a00c1da37a4d28c ChangeLog 6774
-SHA256 ac3a3a105ac60b34cb8ad70d8cb25f1a4cc7cb0a8c44c26bcafff836c5deae78 ChangeLog 6774
 MD5 8cc409d86fe7e8cdbe634fd6a075797d files/digest-kdebluetooth-0.99_beta1-r1 76
-RMD160 08167176a9d236f874d77c5b4f07e80f56e42486 files/digest-kdebluetooth-0.99_beta1-r1 76
-SHA256 16845708f41aac814da6626366882863354762a75060b76845f8a36fddb09208 files/digest-kdebluetooth-0.99_beta1-r1 76
 MD5 65837e8b7c7f001267c9139f49051cd2 files/digest-kdebluetooth-1.0_beta1 75
-RMD160 6a38091c17c3d3472e848720cb1c3749eec4dadb files/digest-kdebluetooth-1.0_beta1 75
-SHA256 90c5fa415bcfb19d5cff4c9eef60e9509fe163190e6ab425d80bf1b75b3adb9c files/digest-kdebluetooth-1.0_beta1 75
 MD5 447924f1bcc44581ffbfa3b19b0b38ca files/digest-kdebluetooth-1.0_beta1-r1 271
-RMD160 6ba44bc6d7ad239f478beca5901104e8e682e99d files/digest-kdebluetooth-1.0_beta1-r1 271
-SHA256 38c0025f697be25974e048b8175392502083f1bc4168ed2dc9e013a984abd795 files/digest-kdebluetooth-1.0_beta1-r1 271
+MD5 65837e8b7c7f001267c9139f49051cd2 files/digest-kdebluetooth-1.0_beta1-r2 75
 MD5 36c3dda5a9a5d63617f729d76e999035 files/kdebluetooth-1.0_beta1-gcc41.patch 666
-RMD160 e14ece6e5bd0ee91a4990431cfce0119bc815a5b files/kdebluetooth-1.0_beta1-gcc41.patch 666
-SHA256 a3df51b15e79b0993928fc44eac6eedef6c5dadcaa6b832140452cb559fdee29 files/kdebluetooth-1.0_beta1-gcc41.patch 666
 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
+MD5 fb53e3cd32d8a10945c6108015f8d4c3 files/kdebluetooth-1.0_beta1-openobex-1.1.patch 4030
 MD5 8882322a8d44d082629230230be6ccfd kdebluetooth-0.99_beta1-r1.ebuild 1619
-RMD160 db052d922761708cfa6a11242ba6a5905acf2a12 kdebluetooth-0.99_beta1-r1.ebuild 1619
-SHA256 86f7dc8b3675071b224693d22708f19fbcd1619f95ad9dcd43e7c186acba5f7c kdebluetooth-0.99_beta1-r1.ebuild 1619
 MD5 bc045eece2d19c6d8155e6ebeeb03dfb kdebluetooth-1.0_beta1-r1.ebuild 1742
-RMD160 782fedbc58453c3c752a53b5f9bd88d815a7cdb5 kdebluetooth-1.0_beta1-r1.ebuild 1742
-SHA256 54379df0252de9977a1ddc593b96bbb102e68ba6791466d85794f62944fd21d3 kdebluetooth-1.0_beta1-r1.ebuild 1742
+MD5 0e46386f4e83abb31fbcae4c846f43b1 kdebluetooth-1.0_beta1-r2.ebuild 1873
 MD5 1f2e8942e98a24d72fd694e8dd8befe0 kdebluetooth-1.0_beta1.ebuild 1704
-RMD160 aae3e4200c2ee863cb8d99d4ea1288bcd8a1782d kdebluetooth-1.0_beta1.ebuild 1704
-SHA256 121a5cc29f4dcda03bb6f23619754c1d745b0a31c6c07a390be38dfa437f050e kdebluetooth-1.0_beta1.ebuild 1704
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
-SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEN8+eAiZjviIA2XgRAuwQAJ9AxVNyhtAqj+FFDUPpPXkjWi2FCACfY7PT
-S5/9pB+t6g76z6iPI+absco=
-=9jLp
------END PGP SIGNATURE-----
diff --git a/net-wireless/kdebluetooth/files/digest-kdebluetooth-1.0_beta1-r2 b/net-wireless/kdebluetooth/files/digest-kdebluetooth-1.0_beta1-r2
new file mode 100644
index 000000000000..a798586824df
--- /dev/null
+++ b/net-wireless/kdebluetooth/files/digest-kdebluetooth-1.0_beta1-r2
@@ -0,0 +1 @@
+MD5 11244d5acf07a79e04a447ff2a3bccdf kdebluetooth-1.0_beta1.tar.bz2 819384
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
new file mode 100644
index 000000000000..422228c325d8
--- /dev/null
+++ b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-openobex-1.1.patch
@@ -0,0 +1,119 @@
+diff -Nru kdebluetooth-1.0_beta1.orig/configure.in kdebluetooth-1.0_beta1/configure.in
+--- kdebluetooth-1.0_beta1.orig/configure.in	2005-03-20 18:46:50.000000000 +0200
++++ kdebluetooth-1.0_beta1/configure.in	2006-04-23 20:42:41.850121250 +0300
+@@ -200,75 +200,7 @@
+ fi
+ 
+ 
+-
+-
+-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"
+ 
+@@ -519,14 +451,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
+-
+ 
+ 
+ 
+diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobex.h kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobex.h
+--- kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobex.h	2005-03-20 18:46:48.000000000 +0200
++++ kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobex.h	2006-04-23 20:58:31.657480500 +0300
+@@ -30,7 +30,7 @@
+ {
+ #include <sys/socket.h>
+ #include <bluetooth/bluetooth.h>
+-#include <obex.h>
++#include <openobex/obex.h>
+ }
+ 
+ extern "C" void Obex_handleEvent(obex_t *, obex_object_t *, int, int, int, int);
+diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobexheader.h
+--- kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h	2005-03-20 18:46:48.000000000 +0200
++++ kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobexheader.h	2006-04-23 20:58:43.326209750 +0300
+@@ -20,7 +20,7 @@
+ #define KOBEXHEADER_H
+ 
+ extern "C" {
+-	#include <obex.h>
++	#include <openobex/obex.h>
+ }
+ 
+ class ObexObject;
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta1-r2.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta1-r2.ebuild
new file mode 100644
index 000000000000..300e7178c987
--- /dev/null
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta1-r2.ebuild,v 1.1 2006/04/23 18:35:25 mrness Exp $
+
+inherit kde autotools
+
+MY_PV=${PV}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="KDE Bluetooth Framework"
+HOMEPAGE="http://kde-bluetooth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kde-bluetooth/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="xmms irmc"
+
+DEPEND=">=dev-libs/openobex-1
+	>=net-wireless/bluez-libs-2.15
+	>=media-libs/libvorbis-1.0
+	xmms? ( >=media-sound/xmms-1.2.10 )
+	irmc? ( || ( >=kde-base/kitchensync-3.4_beta1 >=kde-base/kdepim-3.4_beta1 ) )"
+
+RDEPEND="|| ( ( kde-base/kdialog kde-base/konqueror )  kde-base/kdebase )
+	net-wireless/bluez-utils"
+
+PATCHES="${FILESDIR}/${P}-gcc41.patch
+	${FILESDIR}/${P}-kde3.5.2.patch
+	${FILESDIR}/${P}-openobex-1.1.patch"
+
+need-kde 3
+
+src_unpack() {
+	kde_src_unpack
+
+	eaclocal && eautoconf || die "autotools failed"
+}
+
+src_compile() {
+	# Change defaults to match our bluez-utils setup
+	sed -i -e 's,/etc/init\.d/bluez-utils,/etc/init\.d/bluetooth,' \
+		"${S}/kdebluetooth/kbluetoothd/kcm_btpaired/pairedtab.cpp" || die
+
+	local myconf="$(use_with xmms) $(use_enable irmc irmcsynckonnector)"
+
+	kde_src_compile
+}
+
+pkg_postinst() {
+	einfo 'This new version of kde-bluetooth provides a replacement for the'
+	einfo 'standard bluepin program "kbluepin". If you want to use this version,'
+	einfo 'you have to edit "/etc/bluetooth/hcid.conf" and change the line'
+	einfo '"pin_helper oldbluepin;" to "pin_helper /usr/lib/kdebluetooth/kbluepin;".'
+	einfo 'Then restart hcid to make the change take effect.'
+	einfo ''
+	einfo 'The bemused server (avaible with the "xmms" USE flag enabled) only works with'
+	einfo 'Symbian OS phones'
+}