Fix bug 305063

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 65 insertions, 19 deletions

diff --git a/app-mobilephone/obexd/ChangeLog b/app-mobilephone/obexd/ChangeLog
index 4c2b374c45f8..7757a253ff4d 100644
--- a/app-mobilephone/obexd/ChangeLog
+++ b/app-mobilephone/obexd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-mobilephone/obexd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/ChangeLog,v 1.5 2010/02/19 13:26:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/ChangeLog,v 1.6 2010/02/19 18:56:19 pacho Exp $
+
+*obexd-0.21-r2 (19 Feb 2010)
+
+  19 Feb 2010; Pacho Ramos <pacho@gentoo.org> -obexd-0.21-r1.ebuild,
+  +obexd-0.21-r2.ebuild, +files/obexd-0.21-fix_configure.patch:
+  Fixing bug 305063 properly, thanks to Vinicius Costa Gomes for the patch
+  and help. Removing old and buggy version
 
 *obexd-0.21-r1 (19 Feb 2010)
 *obexd-0.18-r1 (19 Feb 2010)
diff --git a/app-mobilephone/obexd/Manifest b/app-mobilephone/obexd/Manifest
index d83d16051d11..8b69e0f85622 100644
--- a/app-mobilephone/obexd/Manifest
+++ b/app-mobilephone/obexd/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX obexd-0.21-fix_configure.patch 1264 RMD160 d89331a85f1c6c868d150df2ff89c18a4adc140e SHA1 212266f59bddc5e66ff33270d18d28f1710a894a SHA256 07691993d59c290974c3ac2236e8db34096568bce0de9ec576c821e7cafc922d
 DIST obexd-0.18.tar.gz 369839 RMD160 87edfdb568b546bf938669e703f8b8bf0b278d4b SHA1 abfb0af0a77a32b16088c6966e79c82accbbef5f SHA256 6dbabd9345967120ad21cc25489a6d244aed7975cee9297cc5716af4debc7228
 DIST obexd-0.21.tar.gz 374601 RMD160 ae89808ae260c24e3f2da965a99a51fb2b5fdd30 SHA1 3266ae601c9a4adc4ce581b4fbc60aa30f83aba3 SHA256 d29e9694e09fc2a504b84e6929768a90ac76ced5492e755d50c55c350df5bf31
 EBUILD obexd-0.18-r1.ebuild 1083 RMD160 fc772bec9f33ab68d853ab63e21bd5c020d044c5 SHA1 9c33e63477b4ec547e12b8d4cf7a71d912a618c5 SHA256 913ab0477257999621bf8e89fec72273c5804622845257f5f48acd185bc50fa8
-EBUILD obexd-0.21-r1.ebuild 1084 RMD160 6a9603d73e19229dd0d927eb1d146cb903b29163 SHA1 10cc31f03837733051461fbdbb38d70b545ed336 SHA256 77b22510cd956503d685124117af5b14209bb044ef58e4b3de4ba6ac91a5ac64
-MISC ChangeLog 1139 RMD160 764a39743af10131a42eb6b25890092141a5a3cf SHA1 4bfdd96cb0cf7221bd6e74e5080c86e0d2b4970a SHA256 77fac60c8eb46f4c5ae95e5f14f0de1f288cede1132bb6d03f719829965f3536
+EBUILD obexd-0.21-r2.ebuild 996 RMD160 3b1bf172c8c6f251164a26c8da044dcba1f79133 SHA1 eb158428ad027f591a66b6ccf9eb953af6fcfca0 SHA256 255229f5871ceb6ca7275135af4c90fc1c1d2400f9f8b661438d404d1b893255
+MISC ChangeLog 1421 RMD160 bd0cf8400334e05e4597ef6f260a2db30b33cc1b SHA1 9f35e002a05520743e1a5877aae655f58755f9c7 SHA256 6bd7deab77dfa1fb8171c667f7cdd90bd55102f27bcb389596070881bd3ccda0
 MISC metadata.xml 391 RMD160 f5c2daea95a82eb454b2aaf7d91b3d5d71e0d483 SHA1 70b3f7f54b20db7e9b587efaf0fe06b0c399c925 SHA256 8434a73da4bb1cf1f27f1e0f9804b063f90b18b43db951eaaf5acdf165dc05f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt+kZsACgkQCaWpQKGI+9RLRwCfUyozTKC3shPtR6k87I5/Bn8Y
-JsUAn3gwEWN6G+jeSCI14wvEkFqfLLOs
-=PwsN
+iEYEARECAAYFAkt+3tsACgkQCaWpQKGI+9Rp4ACeIHsDB3gBlkMbulDLCyhxKCIc
+uFAAniSNVrn7vOUp/OSGuqgPnAJDKQ/6
+=WweD
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexd/files/obexd-0.21-fix_configure.patch b/app-mobilephone/obexd/files/obexd-0.21-fix_configure.patch
new file mode 100644
index 000000000000..2f26bb0baa81
--- /dev/null
+++ b/app-mobilephone/obexd/files/obexd-0.21-fix_configure.patch
@@ -0,0 +1,39 @@
+From a35b4a2330ff042f362c8af69e6bbd3909a128d3 Mon Sep 17 00:00:00 2001
+From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
+Date: Fri, 19 Feb 2010 11:34:55 -0300
+Subject: [PATCH 1/1] Fix compilation when passing the --without-<driver> option
+
+When we pass the --without-* option, the {withval} variable
+was being set to "no".
+---
+ configure.ac |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ba0f8a1..cca5ce9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -105,10 +105,9 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
+ 		CFLAGS="$CFLAGS -g"
+ 	fi
+ ])
+-
+ phonebook_driver=dummy
+ AC_ARG_WITH(phonebook, AC_HELP_STRING([--with-phonebook=DRIVER], [select phonebook driver]), [
+-	phonebook_driver=${withval}
++	phonebook_driver=${withval}, phonebook_driver=dummy
+ ])
+ 
+ if (test "${phonebook_driver}" = "ebook"); then
+@@ -129,7 +128,7 @@ AC_SUBST([PHONEBOOK_DRIVER], [phonebook-${phonebook_driver}.c])
+ 
+ telephony_driver=dummy
+ AC_ARG_WITH(telephony, AC_HELP_STRING([--with-telephony=DRIVER], [select telephony driver]), [
+-	telephony_driver=${withval}
++	telephony_driver=${withval}, telephony_driver=dummy
+ ])
+ 
+ AC_SUBST([TELEPHONY_DRIVER], [telephony-${telephony_driver}.c])
+-- 
+1.6.2.5
+
diff --git a/app-mobilephone/obexd/obexd-0.21-r1.ebuild b/app-mobilephone/obexd/obexd-0.21-r2.ebuild
index 88834dd12bd2..f84ce8c02a62 100644
--- a/app-mobilephone/obexd/obexd-0.21-r1.ebuild
+++ b/app-mobilephone/obexd/obexd-0.21-r2.ebuild
@@ -1,40 +1,39 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/obexd-0.21-r1.ebuild,v 1.1 2010/02/19 13:26:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/obexd-0.21-r2.ebuild,v 1.1 2010/02/19 18:56:19 pacho Exp $
 
 EAPI="2"
 
+inherit eutils autotools
+
 DESCRIPTION="OBEX Server and Client"
 HOMEPAGE="http://www.bluez.org/"
 SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-#IUSE="debug eds -server"
-# 'eds' USE flag disabled until upstream fixes bug 305063
-IUSE="debug -server"
+IUSE="debug -eds -server"
 
-RDEPEND="net-wireless/bluez
+RDEPEND="eds? ( gnome-extra/evolution-data-server )
+	net-wireless/bluez
 	>=dev-libs/openobex-1.4
 	dev-libs/glib:2
 	sys-apps/dbus
 	server? ( !app-mobilephone/obex-data-server )"
-#	eds? ( gnome-extra/evolution-data-server )
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix_configure.patch"
+	eautoreconf
+}
+
 src_configure() {
-#	local myconf
-#	if use eds; then
-#		myconf="${myconf} --with-phonebook=ebook"
-#	else
-#		myconf="${myconf} --with-phonebook=dummy"
-#	fi
 	econf \
 		$(use_enable debug) \
+		$(use_with eds phonebook ebook) \
 		$(use_enable server)
-#		${myconf}
 }
 
 src_install() {