Merged my changes to include additional conditional deps and use net-wireless/bluez instead of net-wireless/bluez-{libs,utils}

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27.5 x86_64

3 files changed, 26 insertions, 24 deletions

diff --git a/app-mobilephone/obex-data-server/ChangeLog b/app-mobilephone/obex-data-server/ChangeLog
index 04ca85da831f..63635ce4d8f2 100644
--- a/app-mobilephone/obex-data-server/ChangeLog
+++ b/app-mobilephone/obex-data-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-mobilephone/obex-data-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/ChangeLog,v 1.8 2008/11/08 09:33:47 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/ChangeLog,v 1.9 2008/11/28 21:35:04 dev-zero Exp $
+
+  28 Nov 2008; Tiziano Müller <dev-zero@gentoo.org>
+  obex-data-server-0.4.2.ebuild:
+  Merged my changes to include additional conditional deps and use
+  net-wireless/bluez instead of net-wireless/bluez-{libs,utils}
 
   08 Nov 2008; Alin Năstac <mrness@gentoo.org>
   obex-data-server-0.4.2.ebuild:
diff --git a/app-mobilephone/obex-data-server/Manifest b/app-mobilephone/obex-data-server/Manifest
index 489c9ea7bf20..7dff8ef6aee8 100644
--- a/app-mobilephone/obex-data-server/Manifest
+++ b/app-mobilephone/obex-data-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST obex-data-server-0.1.tar.gz 137128 RMD160 6966a668d0a66a6f9f96fada94bc37b469769f1c SHA1 ea32302a62142c53f05b3e530b10f39a8a592c5f SHA256 7d7f9905bd19677ea66e7ff45d1e660b0cd305046971c7c589649a98e31a5cf2
 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
@@ -8,13 +5,6 @@ DIST obex-data-server-0.4.2.tar.gz 184206 RMD160 92195419ee4dfb9e621ece953393e89
 EBUILD obex-data-server-0.1.ebuild 714 RMD160 fbfe20fff4a672f27722db2219e47982a8ea570b SHA1 aa46b3e51f06212f7f0398ca1be4800bf2f83354 SHA256 52893a4ba5193ffb1977311e81bc3bb9b03aefb3f65e1886a0ac5e75b18142ad
 EBUILD obex-data-server-0.3.2.ebuild 833 RMD160 9fbc59ff9c46beaab81c7ead6b7969846245cf53 SHA1 55d4efeb27f72e9b75e6bdbe8790c64f7ff56b14 SHA256 76106900839e6293f6d68cc876f4b85f0f5da1f30bc6fcaba1d62b6c0d5bb0da
 EBUILD obex-data-server-0.3.ebuild 826 RMD160 92b5d6ba880d5101c3016008d73c570086092cf0 SHA1 851163ea32afdef1686271ec3f0967bc1ffc88ae SHA256 52249030bf103cd0ea45b80d77ea06da136f806ca6e0dd32bbceef5834bc5fca
-EBUILD obex-data-server-0.4.2.ebuild 831 RMD160 d4bb382f5b01161d7577a600a29fd3a3bb127e68 SHA1 613938c13397660a18da1f67223a42e5c7eb7945 SHA256 97b349f496152894e3d7f28da584bce313ef1e23d4be9e6a867107c293214f28
-MISC ChangeLog 1323 RMD160 ae6cac1d4803fa916bc1b7ebb62d073420d17753 SHA1 ae20b195bc06cf8d69719744ef177ba84876f471 SHA256 5774b4e5de2cfed73d44ed7af318222c57f2b5e577b5dc4de432f65f0b89bece
+EBUILD obex-data-server-0.4.2.ebuild 1125 RMD160 45c48ed8e4dbec42bd908f94350a6a0534aa04de SHA1 98e86146e88768b7f3b00157e60309ef679edafc SHA256 16b633d80fddc484e00dd33c1c32812376fa5fea0d94a6b91984c78a3a0d0511
+MISC ChangeLog 1543 RMD160 f09b4f0fc92f5c67dbc61ec73840a46be46f0bf1 SHA1 5f1a9a55f914aef2e0fd3a2ccfa6d31af9448910 SHA256 3835461c2480a76199401dcdf0d52b5bf7c954c50d0cfe22152a292532aa0062
 MISC metadata.xml 717 RMD160 164ecbbfe51637eeb9dc8e03cfe4c7cd61c76a31 SHA1 f77b0d4e6e0ca39b726db8c029c57b8768be12ba SHA256 4ffd4af8dd2480f5e6d50c306e5dd7f730649fd50f8497eb99b338e40d125623
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFJFV0G9A5kJBGSrssRApUwAJoDIOmnfqO669gmkICKAMHNFhCHyACfREnv
-2k8TB3TVLflCXWezTXnHNOM=
-=yKXi
------END PGP SIGNATURE-----
diff --git a/app-mobilephone/obex-data-server/obex-data-server-0.4.2.ebuild b/app-mobilephone/obex-data-server/obex-data-server-0.4.2.ebuild
index ec66c5b73903..aa6f92475483 100644
--- a/app-mobilephone/obex-data-server/obex-data-server-0.4.2.ebuild
+++ b/app-mobilephone/obex-data-server/obex-data-server-0.4.2.ebuild
@@ -1,30 +1,37 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/obex-data-server-0.4.2.ebuild,v 1.2 2008/11/08 09:33:47 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/obex-data-server-0.4.2.ebuild,v 1.3 2008/11/28 21:35:04 dev-zero Exp $
 
-EAPI=1
+EAPI="1"
 
 DESCRIPTION="a DBus service providing easy to use API for using OBEX"
 HOMEPAGE="http://tadas.dailyda.com/blog/category/obex-data-server/"
 SRC_URI="http://tadas.dailyda.com/software/${P}.tar.gz"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 
-IUSE="debug"
+IUSE="debug gtk imagemagick"
 
-RDEPEND="
-	dev-libs/glib:2
+RDEPEND="dev-libs/glib:2
 	>=dev-libs/dbus-glib-0.7
-	>=net-wireless/bluez-libs-3.34
-	>=dev-libs/openobex-1.3"
-DEPEND="
-	dev-util/pkgconfig
+	sys-apps/dbus
+	|| ( >=net-wireless/bluez-4.18 >=net-wireless/bluez-libs-3.34 )
+	>=dev-libs/openobex-1.3
+	imagemagick? ( !gtk? ( media-gfx/imagemagick ) )
+	gtk? ( x11-libs/gtk+ )
+	!app-mobilephone/obexd"
+DEPEND="dev-util/pkgconfig
 	${RDEPEND}"
 
 src_compile() {
-	econf $(use_enable debug)
+	local bip="no"
+	use imagemagick && bip="magick"
+	use gtk && bip="gdk-pixbuf"
+	econf \
+		$(use_enable debug) \
+		--enable-system-config \
+		--enable-bip=${bip}
 	emake || die "emake failed"
 }