Fixed build-issue without net-wireless/bluez, added USE flags for cdmamodem, phonesim and tools support.

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

4 files changed, 34 insertions, 17 deletions

diff --git a/net-misc/ofono/ChangeLog b/net-misc/ofono/ChangeLog
index 954c108775f6..e47e4f837047 100644
--- a/net-misc/ofono/ChangeLog
+++ b/net-misc/ofono/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/ofono
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ChangeLog,v 1.25 2011/01/21 15:09:58 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ChangeLog,v 1.26 2011/01/25 13:46:03 dev-zero Exp $
+
+  25 Jan 2011; Tiziano Müller <dev-zero@gentoo.org> ofono-0.39.ebuild,
+  metadata.xml:
+  Fixed build-issue without net-wireless/bluez, added USE flags for cdmamodem,
+  phonesim and tools support.
 
 *ofono-0.39 (21 Jan 2011)
 
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 100a99db906d..61596dcddd6e 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -2,6 +2,6 @@ AUX ofono.initd 525 RMD160 7b8d389ba73792ee5f695331fadb92e819255b15 SHA1 26ed525
 DIST ofono-0.36.tar.gz 927784 RMD160 377eb3aa6346d2a22d07114202bff35de86a09cb SHA1 a5a8668df5e79c566a6c595c3e678d057abde2fb SHA256 0f5bc05f428581806d6ab3db0d536c23cdf87a67169bdec45b0135a3962991b1
 DIST ofono-0.39.tar.bz2 739802 RMD160 7837f52f3fe3e01d438f90cac87d0904f569424c SHA1 84aa363e7c1f85168e719ecacd49e4e2e4b92772 SHA256 e3893ae0618b52fdd19f14ed0ec1c787ef24d6f2a718a459075d3408d09c9367
 EBUILD ofono-0.36.ebuild 1189 RMD160 8ab6b9cff33c448e18ff5be7576c4429e4e565ec SHA1 b4758052297e9296d72eb1f7e671323420300162 SHA256 9d3495ef1b279e78aae855566ebdf940240ca92d31a5bd82fe7321adbb20446a
-EBUILD ofono-0.39.ebuild 1190 RMD160 6a91fe44daf0f3f86b36c24c8db0fd0bcbefb790 SHA1 11222b8d688251d61f4af495f8e77bd5dcc75ff2 SHA256 8d33385d86f579f0cf985bc5cf8bdc9a27f75b8389b72bf951fd53eecdb33503
-MISC ChangeLog 3887 RMD160 d7e28ccbf0a37edd9e2a3b27ffb856c78e0b1302 SHA1 59f0e3106f2bf21106eaaeb7abd2974bb1dd20ce SHA256 9bb1c2bcfe1e1c42a0772196a001cd7ec3f8a1ff73b84398f496511e05792bad
-MISC metadata.xml 465 RMD160 95625154e90b7f2abfeb978a7f8e5c8a5e7af7cb SHA1 8aaa6180a239948c94c027b2878fcfc2c48db8ea SHA256 923cfd877a9cae71a34069015c3ed178d9eac109cfb4d88905b6958f026d8d26
+EBUILD ofono-0.39.ebuild 1429 RMD160 541e2f4e19dcf8a85980e45bd8d50e782a5809a6 SHA1 1ce3342d7c4d366be2bdb0977b0ee2f00e79f9c2 SHA256 d71c8325d3be1b06672d4b3ad4068baa35eb6a125c8889049db84deeb45c7f4c
+MISC ChangeLog 4087 RMD160 1fd9c14410ff5af573ba7edcb5deb0eb3d800ac8 SHA1 e6a7954b1c4d3c5229427043fc40f61846bf158c SHA256 577a386af51b6fc73e5adbc50b0bbc28645966fde067c1910c9cbb05e3edf772
+MISC metadata.xml 665 RMD160 1eb9e5ec48ab7def1caabecf627c829e3ec0c8a6 SHA1 40a7c09b89f5aa21e4be3fa84868d4f6608dcb49 SHA256 08dad5bf86b0b43f05d08ecb2984f864a3935acdf3ff9621eeeafd0d346aae74
diff --git a/net-misc/ofono/metadata.xml b/net-misc/ofono/metadata.xml
index 50833489a7d7..671775c80566 100644
--- a/net-misc/ofono/metadata.xml
+++ b/net-misc/ofono/metadata.xml
@@ -2,13 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>no-herd</herd>
-        <maintainer>
-                <email>dagger@gentoo.org</email>
-                <name>Robert Piasek</name>
-        </maintainer>
-        <use>
-                <flag name="atmodem">ETSI AT modem support.</flag>
+	<maintainer>
+		<email>dagger@gentoo.org</email>
+		<name>Robert Piasek</name>
+	</maintainer>
+	<use>
+		<flag name="atmodem">ETSI AT modem support.</flag>
 		<flag name="isimodem">Enable PhoNet/ISI modem support.</flag>
-        </use>        
+		<flag name="cdmamodem">Enable CDMA modem support.</flag>
+		<flag name="bluetooth">Enable Bluetooth modem support using <pkg>net-wireless/bluez</pkg>.</flag>
+		<flag name="phonesim">Enable phone Simulator support</flag>
+		<flag name="tools">Enable testing tools</flag>
+	</use>        
 </pkgmetadata>
 
diff --git a/net-misc/ofono/ofono-0.39.ebuild b/net-misc/ofono/ofono-0.39.ebuild
index 5d316c449c91..33e9a0188c6f 100644
--- a/net-misc/ofono/ofono-0.39.ebuild
+++ b/net-misc/ofono/ofono-0.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ofono-0.39.ebuild,v 1.1 2011/01/21 15:09:58 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ofono-0.39.ebuild,v 1.2 2011/01/25 13:46:03 dev-zero Exp $
 
 EAPI="2"
 
@@ -13,15 +13,15 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
-IUSE="+atmodem bluetooth +caps examples +isimodem threads +udev"
+IUSE="+atmodem bluetooth +caps +cdmamodem examples +isimodem +phonesim threads tools +udev"
 
 RDEPEND=">=sys-apps/dbus-1.2.24
+	>=dev-libs/glib-2.16
 	bluetooth? ( >=net-wireless/bluez-4.61 )
 	caps? ( sys-libs/libcap-ng )
-	>=dev-libs/glib-2.16
 	udev? ( >=sys-fs/udev-143 )
-	examples? ( dev-python/dbus-python )"
-
+	examples? ( dev-python/dbus-python )
+	tools? ( dev-libs/libusb:1 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -32,6 +32,10 @@ src_configure() {
 		$(use_enable udev) \
 		$(use_enable isimodem) \
 		$(use_enable atmodem) \
+		$(use_enable cdmamodem) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable tools) \
 		--enable-test \
 		--localstatedir=/var
 }
@@ -40,7 +44,11 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	if ! use examples ; then
-		rm -rf ${D}/usr/"$(get_libdir)"/ofono/test
+		rm -rf "${D}/usr/$(get_libdir)/ofono/test"
+	fi
+
+	if use tools ; then
+		dobin tools/{auto-enable,huawei-audio} || die
 	fi
 
 	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die