Revision bump to allow parallel installation with obex-data-server when possible

(Portage version: 2.1.7.17/cvs/Linux x86_64)

4 files changed, 44 insertions, 12 deletions

diff --git a/app-mobilephone/obexd/ChangeLog b/app-mobilephone/obexd/ChangeLog
index 42d0b644bcc4..4c2b374c45f8 100644
--- a/app-mobilephone/obexd/ChangeLog
+++ b/app-mobilephone/obexd/ChangeLog
@@ -1,6 +1,17 @@
 # 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.4 2010/02/13 18:33:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/ChangeLog,v 1.5 2010/02/19 13:26:39 pacho Exp $
+
+*obexd-0.21-r1 (19 Feb 2010)
+*obexd-0.18-r1 (19 Feb 2010)
+
+  19 Feb 2010; Pacho Ramos <pacho@gentoo.org> -obexd-0.18.ebuild,
+  +obexd-0.18-r1.ebuild, -obexd-0.21.ebuild, +obexd-0.21-r1.ebuild,
+  metadata.xml:
+  Revision bump to allow parallel installation with
+  app-mobilephone/obex-data-server when possible, being able to disable
+  server installation. Removing old. Revision bump for 0.21 disabling 'eds'
+  until upstream bug 305063 is fixed.
 
 *obexd-0.21 (13 Feb 2010)
 
diff --git a/app-mobilephone/obexd/metadata.xml b/app-mobilephone/obexd/metadata.xml
index a353a6e16336..9644dad31d33 100644
--- a/app-mobilephone/obexd/metadata.xml
+++ b/app-mobilephone/obexd/metadata.xml
@@ -6,5 +6,9 @@
 		<email>dev-zero@gentoo.org</email>
 		<name>Tiziano Müller</name>
 	</maintainer>
+	<use>
+  		<flag name='server'>Enables server installation, it's
+  		incompatible with obex-data-server provided one</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/app-mobilephone/obexd/obexd-0.18.ebuild b/app-mobilephone/obexd/obexd-0.18-r1.ebuild
index 8b7e4777a972..b64fd560ff9a 100644
--- a/app-mobilephone/obexd/obexd-0.18.ebuild
+++ b/app-mobilephone/obexd/obexd-0.18-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.18.ebuild,v 1.3 2010/02/04 17:58:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/obexd-0.18-r1.ebuild,v 1.1 2010/02/19 13:26:39 pacho Exp $
 
 EAPI="2"
 
@@ -10,23 +10,30 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="debug eds"
+IUSE="debug -eds -server"
 
 RDEPEND="eds? ( gnome-extra/evolution-data-server )
 	net-wireless/bluez
 	>=dev-libs/openobex-1.4
 	dev-libs/glib:2
 	sys-apps/dbus
-	!app-mobilephone/obex-data-server"
+	server? ( !app-mobilephone/obex-data-server )"
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_configure() {
+	local myconf
+	if use eds && ! use server ; then
+		ewarn "The 'eds' USE flah needs 'server' one to be enabled, disabling 'eds' for now then..."
+		myconf="${myconf} --disable-ebook"
+	fi
+
 	econf \
 		$(use_enable debug) \
 		$(use_enable eds ebook) \
-		--enable-server \
-		--enable-client
+		$(use_enable server) \
+		${myconf}
 }
 
 src_install() {
diff --git a/app-mobilephone/obexd/obexd-0.21.ebuild b/app-mobilephone/obexd/obexd-0.21-r1.ebuild
index 06ea465b6881..88834dd12bd2 100644
--- a/app-mobilephone/obexd/obexd-0.21.ebuild
+++ b/app-mobilephone/obexd/obexd-0.21-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2010/02/13 18:33:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/obexd-0.21-r1.ebuild,v 1.1 2010/02/19 13:26:39 pacho Exp $
 
 EAPI="2"
 
@@ -10,21 +10,31 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="debug eds"
+#IUSE="debug eds -server"
+# 'eds' USE flag disabled until upstream fixes bug 305063
+IUSE="debug -server"
 
-RDEPEND="eds? ( gnome-extra/evolution-data-server )
-	net-wireless/bluez
+RDEPEND="net-wireless/bluez
 	>=dev-libs/openobex-1.4
 	dev-libs/glib:2
 	sys-apps/dbus
-	!app-mobilephone/obex-data-server"
+	server? ( !app-mobilephone/obex-data-server )"
+#	eds? ( gnome-extra/evolution-data-server )
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 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() {