Fix configure error when build against >=dev-libs/openobex-1.1

Package-Manager: portage-2.0.54

7 files changed, 156 insertions, 67 deletions

diff --git a/net-wireless/libbtctl/ChangeLog b/net-wireless/libbtctl/ChangeLog
index 5d0cf4103844..c8aed1b13587 100644
--- a/net-wireless/libbtctl/ChangeLog
+++ b/net-wireless/libbtctl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/libbtctl
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/ChangeLog,v 1.22 2006/02/17 19:43:17 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/ChangeLog,v 1.23 2006/04/22 09:24:38 mrness Exp $
+
+*libbtctl-0.6.0-r1 (22 Apr 2006)
+
+  22 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  -files/libbtctl-0.4.1-enable_python.patch,
+  +files/libbtctl-0.6.0-aclocal_openobex.patch,
+  +files/libbtctl-0.6.0-libdir.patch, +libbtctl-0.6.0-r1.ebuild:
+  Fix configure error when build against >=dev-libs/openobex-1.1.
 
   17 Feb 2006; Michael Hanselmann <hansmi@gentoo.org> libbtctl-0.5.0.ebuild:
   Stable on ppc.
diff --git a/net-wireless/libbtctl/Manifest b/net-wireless/libbtctl/Manifest
index 30061edb39ae..0e3135dbb5b4 100644
--- a/net-wireless/libbtctl/Manifest
+++ b/net-wireless/libbtctl/Manifest
@@ -1,42 +1,27 @@
-MD5 843a023bffa4656400b3aad96c302f0d ChangeLog 3455
-RMD160 f7f6415246ecb8f1c8b1801f7c8306c334d624ca ChangeLog 3455
-SHA256 f57c176af045fc3a4e19bfadace0cf6f5e99bd4d503261d8117970887d151f6f ChangeLog 3455
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 68ca8a26434de3433d579a63dc6892e4 ChangeLog 3761
 MD5 6fd25ef01add3d4f6b205a586233e783 files/digest-libbtctl-0.3 64
-RMD160 37d650bde141ad53c10d81888bc1766031635f4f files/digest-libbtctl-0.3 64
-SHA256 8b830abcf8b9ad682f506b607993945de5a7264a7bda507847f69a8ae0614b4f files/digest-libbtctl-0.3 64
 MD5 89c026311c1c9a92f14e59fe40698804 files/digest-libbtctl-0.4.1 66
-RMD160 c28d997ba20b6fa95841286fd958fd60482485e4 files/digest-libbtctl-0.4.1 66
-SHA256 f57fd748dd7c31ad3af3304807b4d088940275294e1f50b3ecf2572c5c110667 files/digest-libbtctl-0.4.1 66
 MD5 89c026311c1c9a92f14e59fe40698804 files/digest-libbtctl-0.4.1-r1 66
-RMD160 c28d997ba20b6fa95841286fd958fd60482485e4 files/digest-libbtctl-0.4.1-r1 66
-SHA256 f57fd748dd7c31ad3af3304807b4d088940275294e1f50b3ecf2572c5c110667 files/digest-libbtctl-0.4.1-r1 66
 MD5 9e76d5367d574ddb57a5e088d64dbba9 files/digest-libbtctl-0.5.0 67
-RMD160 7e30c8fdb29d03217a703109d0869e0ab50ec086 files/digest-libbtctl-0.5.0 67
-SHA256 f099e127ac1ee613aeda2ec6d2de7c26bee4b6d91dc59f67981f6adac0b9ca9d files/digest-libbtctl-0.5.0 67
 MD5 dae467de8ac583c4512f0e2d90b20a73 files/digest-libbtctl-0.6.0 67
-RMD160 1125f788b1cef0d19bfbc7dc4b79d65c5e63e924 files/digest-libbtctl-0.6.0 67
-SHA256 fd121a988d7bf71014187dc34fcc01cbea89e6b3daa7ca3cc5d1b4972f3e22e4 files/digest-libbtctl-0.6.0 67
-MD5 2f18fdc85cff32fc3b1eb5dcf7376b3a files/libbtctl-0.4.1-enable_python.patch 1292
-RMD160 c5c602b2b4f2b1e432cbf65d6c94bd9b47c16c35 files/libbtctl-0.4.1-enable_python.patch 1292
-SHA256 e1945bc62f6e95a64bdc1c685651352a4559011c3724c4ec66581875c58a2077 files/libbtctl-0.4.1-enable_python.patch 1292
+MD5 dae467de8ac583c4512f0e2d90b20a73 files/digest-libbtctl-0.6.0-r1 67
 MD5 8b20bd211db6ab172f04eb2e0a682bf8 files/libbtctl-0.4.1-libdir.patch 467
-RMD160 580a5736240e2adf3fc63796f63300fa08fb7928 files/libbtctl-0.4.1-libdir.patch 467
-SHA256 62bc887cf83e58b6b5fd4fec8ab241f9eb19a26999a68b39ca11790d1e94378a files/libbtctl-0.4.1-libdir.patch 467
+MD5 d3fe396aae87eb4dc70db1b5441dc984 files/libbtctl-0.6.0-aclocal_openobex.patch 2478
+MD5 9a7c7103474fa10267eb4e0eb791db2d files/libbtctl-0.6.0-libdir.patch 579
 MD5 b6d146ee15ee1b84bb14b9564b072000 libbtctl-0.3.ebuild 875
-RMD160 cf15122a1b0a73b4c668f43f6bb6e282433a78d0 libbtctl-0.3.ebuild 875
-SHA256 2526b07fa307f9e0307e2d536b0efceb61ba225198f68db19599c70394b2e2e0 libbtctl-0.3.ebuild 875
 MD5 335a33b28ec9cfe8087fd383477ee4d8 libbtctl-0.4.1-r1.ebuild 1138
-RMD160 4f76b38104a4c398cc497c8a2872bda20ea3c34e libbtctl-0.4.1-r1.ebuild 1138
-SHA256 3f2c3f1a757179245abdd5aef4843e1e9a26da365599d300edeb8b87168b571e libbtctl-0.4.1-r1.ebuild 1138
 MD5 9b0385b4591ffdb2ac70a14bdbc0d2e8 libbtctl-0.4.1.ebuild 1249
-RMD160 84c32b0191b1a52af0d20052db2e6276462af98b libbtctl-0.4.1.ebuild 1249
-SHA256 2108cfacdc47ca4442a518be0f435bba218f1fde99bb65a19cba1370deb241a6 libbtctl-0.4.1.ebuild 1249
 MD5 55254f4675a641caac5f81b35f227f66 libbtctl-0.5.0.ebuild 1115
-RMD160 01d647876651673d4022576f9b7195e5ca7185c7 libbtctl-0.5.0.ebuild 1115
-SHA256 46d891a5329f845071209f5ad5f9de7b283621cb88c852a5d2b7ed135f9bc653 libbtctl-0.5.0.ebuild 1115
+MD5 34c0d6da9bc9d5aa1236bf14da4fa400 libbtctl-0.6.0-r1.ebuild 1188
 MD5 63e663db1b2d215f43454436f3365d55 libbtctl-0.6.0.ebuild 1118
-RMD160 71f2f0f0cdafbe5fb37fd5c8b85a63e7603584bb libbtctl-0.6.0.ebuild 1118
-SHA256 80805655b2eb5d7b369d9071e034d96df65d9489424f843f49869e664982fd0b libbtctl-0.6.0.ebuild 1118
 MD5 7a66fef4deb08f29b7cf0de1c2e3a4de metadata.xml 254
-RMD160 c42ccca4af4411270b321cd3cc5266b765e182ee metadata.xml 254
-SHA256 4c4f1c26f05f433f3231f8fe529a049da897b80aaca3ee4c1bfa30d99a527f1d metadata.xml 254
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFESfZnjG8pv1lIUX4RAmPLAJ0QsqIbBN5D2QeLzcQR9QeZZHNn8ACfVq1V
+2TNiYvn6hGNYLykoGTPbiRY=
+=7SqF
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/libbtctl/files/digest-libbtctl-0.6.0-r1 b/net-wireless/libbtctl/files/digest-libbtctl-0.6.0-r1
new file mode 100644
index 000000000000..75aa57d86241
--- /dev/null
+++ b/net-wireless/libbtctl/files/digest-libbtctl-0.6.0-r1
@@ -0,0 +1 @@
+MD5 d58b47204794628e7fd674ece8e6e631 libbtctl-0.6.0.tar.bz2 324347
diff --git a/net-wireless/libbtctl/files/libbtctl-0.4.1-enable_python.patch b/net-wireless/libbtctl/files/libbtctl-0.4.1-enable_python.patch
deleted file mode 100644
index c89c9db53857..000000000000
--- a/net-wireless/libbtctl/files/libbtctl-0.4.1-enable_python.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.in	2004-06-12 08:47:29.000000000 -0400
-+++ /liquidx/configure.in	2004-06-26 23:20:12.785893120 -0400
-@@ -70,15 +70,24 @@
- AC_SUBST(ADDSDPLIB)
- 
- dnl Python bindings
--PKG_CHECK_MODULES(BTCTLPY, pygtk-2.0, HAVE_PYTHON=yes, HAVE_PYTHON=no)
--AC_MSG_CHECKING(for python support)
--if test "x$HAVE_PYTHON" = "xyes"; then
--    AM_PATH_PYTHON(2.2)
--    AC_MSG_RESULT(yes)
--    DEFSDIR=`pkg-config --variable=defsdir pygtk-2.0`
--    AC_SUBST(DEFSDIR)
--    AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
--else
-+dnl Mono bindings
-+AC_ARG_ENABLE(python, [  --enable-python  Build Python bindings [default=yes]], enable_python="$enableval", enable_python=yes)
-+
-+if test "x$enable_python" = "xyes"; then
-+   PKG_CHECK_MODULES(BTCTLPY, pygtk-2.0, HAVE_PYTHON=yes, HAVE_PYTHON=no)
-+   AC_MSG_CHECKING(for python support)
-+   if test "x$HAVE_PYTHON" = "xyes"; then
-+	   AM_PATH_PYTHON(2.2)
-+       AC_MSG_RESULT(yes)
-+       DEFSDIR=`pkg-config --variable=defsdir pygtk-2.0`
-+	   AC_SUBST(DEFSDIR)
-+       AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-+   else
-+       AC_MSG_RESULT(no)
-+   fi
-+else 
-+   AC_MSG_CHECKING(for python support)
-+    HAVE_PYTHON=no
-     AC_MSG_RESULT(no)
- fi
- AM_CONDITIONAL(HAVE_PYTHON, [test $HAVE_PYTHON = yes])
diff --git a/net-wireless/libbtctl/files/libbtctl-0.6.0-aclocal_openobex.patch b/net-wireless/libbtctl/files/libbtctl-0.6.0-aclocal_openobex.patch
new file mode 100644
index 000000000000..28d2094288d8
--- /dev/null
+++ b/net-wireless/libbtctl/files/libbtctl-0.6.0-aclocal_openobex.patch
@@ -0,0 +1,67 @@
+diff -Nru libbtctl-0.6.0.orig/aclocal.m4 libbtctl-0.6.0/aclocal.m4
+--- libbtctl-0.6.0.orig/aclocal.m4	2005-11-22 00:02:42.000000000 +0200
++++ libbtctl-0.6.0/aclocal.m4	2006-04-22 12:13:21.922401250 +0300
+@@ -8268,63 +8268,3 @@
+      ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+   fi
+ ])
+-
+-
+-
+-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. Pehaps 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/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch b/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch
new file mode 100644
index 000000000000..78cbfbc42b18
--- /dev/null
+++ b/net-wireless/libbtctl/files/libbtctl-0.6.0-libdir.patch
@@ -0,0 +1,12 @@
+diff -Nru libbtctl-0.6.0.orig/src/Makefile.in libbtctl-0.6.0/src/Makefile.in
+--- libbtctl-0.6.0.orig/src/Makefile.in	2005-11-22 00:02:52.000000000 +0200
++++ libbtctl-0.6.0/src/Makefile.in	2006-04-22 12:11:12.586318250 +0300
+@@ -239,7 +239,7 @@
+ btctl.defs btctl.override
+ 
+ lib_LTLIBRARIES = libbtctl.la
+-@HAVE_PYTHON_TRUE@pydir = $(PYTHON_PREFIX)/lib/python$(PYTHON_VERSION)/site-packages/
++@HAVE_PYTHON_TRUE@pydir = $(libdir)/python$(PYTHON_VERSION)/site-packages/
+ @HAVE_PYTHON_FALSE@pydir = 
+ @HAVE_PYTHON_TRUE@py_LTLIBRARIES = btctl.la
+ @HAVE_PYTHON_FALSE@py_LTLIBRARIES = 
diff --git a/net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild b/net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..44a60b0a0233
--- /dev/null
+++ b/net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/libbtctl/libbtctl-0.6.0-r1.ebuild,v 1.1 2006/04/22 09:24:38 mrness Exp $
+
+inherit gnome2 mono multilib eutils autotools
+
+DESCRIPTION="A GObject wrapper for Bluetooth functionality"
+HOMEPAGE="http://usefulinc.com/software/gnome-bluetooth/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="mono doc"
+
+RDEPEND=">=dev-libs/glib-2
+	>=net-wireless/bluez-utils-2.7
+	>=net-wireless/bluez-libs-2.7
+	>=dev-libs/openobex-1
+	>=dev-lang/python-2.3
+	>=dev-python/pygtk-2.0
+	!sparc? (
+		mono? (
+			>=dev-lang/mono-0.96
+			=dev-dotnet/gtk-sharp-1.0*
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+DOCS="README NEWS ChangeLog AUTHORS COPYING"
+USE_DESTDIR="yes"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-libdir.patch"
+	epatch "${FILESDIR}/${P}-aclocal_openobex.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	use sparc || G2CONF=$(use_enable mono)
+	gnome2_src_configure
+	sed -i -e 's/libext="a/& la/' libtool
+	emake || die "make failed"
+}