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

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

6 files changed, 64 insertions, 22 deletions

diff --git a/app-mobilephone/obex-data-server/Manifest b/app-mobilephone/obex-data-server/Manifest
index 08439dc9cff7..82ec05818e9b 100644
--- a/app-mobilephone/obex-data-server/Manifest
+++ b/app-mobilephone/obex-data-server/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST obex-data-server-0.3.2.tar.gz 144376 RMD160 d4e827c30ac7899fb1991d8df801a154d7262576 SHA1 f5aa76d7f87c2f8d972b1750260f5187bf6660c4 SHA256 aca06248a22cefa65c0170c3f4c6d8811dd2e9f880e30479f8ab6aebca4839ba
 DIST obex-data-server-0.3.tar.gz 141190 RMD160 a3b3e1bbffc8845c1e64fa7262f5f21f8f3902e3 SHA1 799bd645c9d814ded5f74dd9e09cad7baa8c1f20 SHA256 6bcf8ab06d4ac76125edc02e639056252c32d06aa32b5c0967d72c31339f581d
 DIST obex-data-server-0.4.4.tar.gz 196213 RMD160 f2b13569f6cefa5bed9a60f8cb700d9f9bf162fb SHA1 137f053a67c95ac35b0d02c66272e57d7bf34d96 SHA256 aa567d986c74a4c8b4abb1cc454c099f67ab01b049b4c69aa6e703c7f18b594d
 DIST obex-data-server-0.4.5.tar.gz 192084 RMD160 42cf8ba0a25a970f617d846fe2b28add36c0725a SHA1 960784c8dc3690c6c19ce444acb5c65343d47f1f SHA256 e741277bc12742f555f2250022ac4cf9a8e6638427e14c3ba3d7f59179aec763
 EBUILD obex-data-server-0.3.2.ebuild 829 RMD160 e4e6f51b2e353c92bcac5ced4864bbd109bb82b8 SHA1 7132c0c954a464245fca1d05401e1a589f1c0bd3 SHA256 0203629fc9a2f43a2604d07fba68c3f0992827838ebc22529922d356c718feb9
 EBUILD obex-data-server-0.3.ebuild 826 RMD160 a828b860c945ab3c7b7978203a00a898126866b6 SHA1 5eaa45665f92b9e1170c72c58566d82b44ab75a7 SHA256 d7652524b57bc9ab92ec59543c4b17afb6352fe5268ecebd1b099aadfc00467e
-EBUILD obex-data-server-0.4.4.ebuild 1104 RMD160 d97564c61cbfe2f5fb0a8ef4b54bf3154f60be28 SHA1 787d73f7a78a6e5304cb167b123759136d8f2995 SHA256 61764cca3cb3e16750df3eea1970793627567479b41e3ecdd086573dd0983465
-EBUILD obex-data-server-0.4.5.ebuild 1128 RMD160 cdb7135efa7d9bc1d129c5660f601bcbd030458f SHA1 10a2a40cbb4fe83fb8a478b2ab73e12c0c07e6cd SHA256 79b05d86c2e987606189af6b0edf385f898e31177723ce2b92b7ec6c12b87c7d
-MISC ChangeLog 4032 RMD160 6e92fec35ed741f06cbc4ade8b96772d76fd1449 SHA1 73cb677da9e87ad0d04c52ac6b407585cda08b7c SHA256 0b0af34f4f73c56aaca977777e4a3f4d242b9064aa0d80c5da34f949d86bff45
+EBUILD obex-data-server-0.4.4.ebuild 1114 RMD160 ae949dc1f0536eb553464c5eef3d1f6d8c8f12c5 SHA1 343cb624f0f10d36443c41a81118dad719f4c612 SHA256 3e8bcdef2826ba352736f9d3b1cef7fc3a557fdf73b48f3ee355ecc38e4e5abc
+EBUILD obex-data-server-0.4.5.ebuild 1135 RMD160 71fcfd113fcaeeca49598e4046a8ca3e4ff999a1 SHA1 de3a6697fbf0d7f9a00e1edca05985cd3fcf1292 SHA256 f6d8d18181c29174bb82a0d16bff7cbb2c27eae94cbab98e12140e5cf6f1b763
+MISC ChangeLog 4183 RMD160 b15beda6ce35112dfb75139b21f14167c1df6f68 SHA1 368e036c97235cae66c9cf5a86767e6086ee078f SHA256 a1f42d2d5bd37946e92f40deacf5702a24932234308eed4dd8f8dde9befd4f01
 MISC metadata.xml 717 RMD160 164ecbbfe51637eeb9dc8e03cfe4c7cd61c76a31 SHA1 f77b0d4e6e0ca39b726db8c029c57b8768be12ba SHA256 4ffd4af8dd2480f5e6d50c306e5dd7f730649fd50f8497eb99b338e40d125623
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt+kkIACgkQCaWpQKGI+9T9OQCdEnlz2pCvakLsaSvF0c/f++gQ
+QzwAnA08H1I2DzZS0dfSMCw3a4tHhn08
+=izVv
+-----END PGP SIGNATURE-----
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/Manifest b/app-mobilephone/obexd/Manifest
index 8324c601de04..d83d16051d11 100644
--- a/app-mobilephone/obexd/Manifest
+++ b/app-mobilephone/obexd/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 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.ebuild 871 RMD160 de034e589019e4fbbb72528eefa5fa0a90c407aa SHA1 77bfb7412e242fa0bfaaf1804e7f8b157598f6a8 SHA256 1f1d5d9aae8d51e952a12dc2bdb9fc144392dd9ec649c80e747c00f8b72677fa
-EBUILD obexd-0.21.ebuild 841 RMD160 70149d816c75c44fdba8828188c920e8910cf9d6 SHA1 cf296075b6b215d03ac92140598041cf7e159e5e SHA256 3b1a82002712db914685d2802c8bd9ddccb9a31ad3427c6ff4610bece45e34b9
-MISC ChangeLog 691 RMD160 8bfc0b262e359d70d352ba3585ea2c1496d68908 SHA1 0ad8367435fd72768a490b82ff62d3f2174d1913 SHA256 629797f2bb90d43714a0b3751ad7330a8655edcfd5a70a2c03a72f40dca194cb
-MISC metadata.xml 259 RMD160 7c546d1120f27db0a3525ef080fbed645f604d95 SHA1 f7292e12d084da2decf46d8676cde440db4f318e SHA256 95916bdec1b103d1764ef57938e3b1b74348610ff3b26ea3c899b57fca44985f
+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
+MISC metadata.xml 391 RMD160 f5c2daea95a82eb454b2aaf7d91b3d5d71e0d483 SHA1 70b3f7f54b20db7e9b587efaf0fe06b0c399c925 SHA256 8434a73da4bb1cf1f27f1e0f9804b063f90b18b43db951eaaf5acdf165dc05f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt28HcACgkQCaWpQKGI+9SrrACfWFSVCXdqq6lF4xkQJp5hpcLo
-rdoAmwVeegq2LFaUMLerQ0uoR58A99H9
-=LZ0k
+iEYEARECAAYFAkt+kZsACgkQCaWpQKGI+9RLRwCfUyozTKC3shPtR6k87I5/Bn8Y
+JsUAn3gwEWN6G+jeSCI14wvEkFqfLLOs
+=PwsN
 -----END PGP SIGNATURE-----
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() {