Version bump (bug #300230)

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64
RepoMan-Options: --force

6 files changed, 55 insertions, 34 deletions

diff --git a/net-misc/connman/ChangeLog b/net-misc/connman/ChangeLog
index f7953779d8d0..17a52e2c09aa 100644
--- a/net-misc/connman/ChangeLog
+++ b/net-misc/connman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/connman
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.8 2009/11/26 15:59:06 dagger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.9 2010/02/01 14:12:26 dagger Exp $
+
+*connman-0.48 (01 Feb 2010)
+
+  01 Feb 2010; Robert Piasek <dagger@gentoo.org> -connman-0.44.ebuild,
+  +connman-0.48.ebuild, +files/connman.confd, files/connman.initd:
+  Version bump to 0.48 (bug #300230)
+  Big thank you to Gustavo Sverzut Barbieri for updates to ebuild.
 
 *connman-0.47 (26 Nov 2009)
 
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 2505586181af..7b4c018f9c02 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,9 +1,10 @@
-AUX connman.initd 559 RMD160 813607edcf0733a6ec07ad71b66e89387a9343bc SHA1 dfeda0fd4a09ae60073adccfe615a4976ec139be SHA256 201627938f094f4343da0cfc69b8dc3a3f40137e164204faeccfb933ea1dc25b
-DIST connman-0.44.tar.gz 475137 RMD160 11df8f2bf041bb98af97ae5c675317a2571d1af7 SHA1 1ca1af967c58c8bfd62104821aaf2a344507df07 SHA256 ac423e6e4570c6ffc04577c24eee5ac4c4fbdde7e70f903dcaf0177a27d23eab
+AUX connman.confd 736 RMD160 39d3ca8e40a0759ad2b2ce1612e647a5affef809 SHA1 b2b6b4648587e01683e82864c1bee74f828f820b SHA256 2094ece185cfda54f899075c2d82ae3ded896b602cdf4e00da224f9b52af23d8
+AUX connman.initd 578 RMD160 5648875b3ff9f94f13725e16189a4cfee4faa475 SHA1 efd731b8771d97435d1740941363e1fbc7e7bf3d SHA256 10deff4d07f2a631ef7d797ed420a917c00312381ee69f60346e94cf9a3fa25a
 DIST connman-0.46.tar.gz 475440 RMD160 cc0ce12874078dc707f62b7c3565f8d206449598 SHA1 7f2db0649d6364767e23c5485888b646e29c2624 SHA256 1853ed3d6400e25ef61ba1c98a7ef0f3984a2bf59aaf3485721cbc1de036b75c
 DIST connman-0.47.tar.gz 478821 RMD160 85797438a3d49af0463b14bde907551bd83ec675 SHA1 763c928d516802b1f2a4a161d82ef9ed13a135f5 SHA256 6a77e7c63fd3de634d42fbf0c10b34e45670c25486406247c2e6ea9f0f141dbc
-EBUILD connman-0.44.ebuild 1913 RMD160 b1daa15271e045327686735866f9cddfe5509639 SHA1 16c9146b3f02e618e2ce8adad713a0a0679e6668 SHA256 8872525826114f20c35bc5063c13be8c38089ab30b915ea000b48bf7cf0ccc7a
+DIST connman-0.48.tar.gz 501176 RMD160 94766824fd981ab7d3613b7edd52ee871a075b4a SHA1 c19ebe5c2829dee88c3da660d3ae15c69975c59b SHA256 ace34e5cb114487a28d5d2f1273e62e215a292a16ad5ac54c848c69a81590b68
 EBUILD connman-0.46.ebuild 1913 RMD160 ff9a2718d44363e8536488413d080aeed9f1df8e SHA1 c3f449bacb6e353333c0eafe59f9b6fdd7dc29e1 SHA256 e0cb2e3320e422f0d5f92c5629f07d8e1e111aa9e8cd1c02716c21d5d6af1ac1
 EBUILD connman-0.47.ebuild 1913 RMD160 f107e69000fec86b99fa0fe6a08e50c717cf321d SHA1 0261ef7d0c8e1dc983d3618172e6a0aea0b04bfc SHA256 bcd2dec0ce63e54a6a955b06a1aa60d3473de5be2518da0d732ebff7ed4b4db5
-MISC ChangeLog 1527 RMD160 d32907e15d8af5b71dca35d9139faf8e9e60e1e0 SHA1 4ab3728403ef9af2cfd9f3e82e05eefba0c121cb SHA256 cc50403a7f372033ef0f32b517b9d42ae8820f0f1e86e84acba1a12a2156579e
-MISC metadata.xml 1036 RMD160 ad19a383cfc149c26bd7763c6493b8da99e57968 SHA1 c52964e0f07b09fdb129e21085e82eebc34d72d7 SHA256 e47f4ff2fcca96df2661332c0e1abf346100e6193b692005732018e7045b41ab
+EBUILD connman-0.48.ebuild 1919 RMD160 a9871214aadb2bfee43a6247ade0d573815a2cb1 SHA1 0f329ad69495dbb9e8b831304f8593fa96a4f49a SHA256 d9b0b4afe1ffe91f5e9eb46c95be2c781614e1ff325155dcd2b03a2309adc77b
+MISC ChangeLog 1799 RMD160 7ed513d990ef398f9cf243b3b4c8c54a4c5477df SHA1 b89e4c077109455c24b94874858630d08e34786b SHA256 a77eaf749e57269389bdd9bbb3c883e9f1ba5f3b4adf07f2a45466e3424eea4d
+MISC metadata.xml 1160 RMD160 d720e369e62973830c385c94effcd5f4cd6fde6d SHA1 808425038915e7f50bc4187cf7cdef7c9cf5abc8 SHA256 3845d52f2feb03a8783057376d79a09ceec4e250c70209933e0bab836ec5db51
diff --git a/net-misc/connman/connman-0.44.ebuild b/net-misc/connman/connman-0.48.ebuild
index c7a6a01cfa23..1bd55d1c8309 100644
--- a/net-misc/connman/connman-0.44.ebuild
+++ b/net-misc/connman/connman-0.48.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-0.44.ebuild,v 1.1 2009/10/22 14:58:52 dagger Exp $
+# $Header $
 
 EAPI="2"
 
@@ -11,20 +11,18 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
-IUSE="3G bluetooth debug +dhclient dnsproxy doc +ethernet modemmanager ofono policykit ppp resolvconf threads tools +udev +wifi"
+IUSE="3G bluetooth debug +dhclient dnsproxy doc +ethernet google moblin ofono policykit resolvconf threads tools +udev +wifi"
 # ospm wimax
 
 RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2
+	>=sys-apps/dbus-1.3
 	bluetooth? ( net-wireless/bluez )
 	dhclient? ( net-misc/dhcp )
-	modemmanager? ( net-misc/modemmanager )
 	ofono? ( net-misc/ofono )
 	policykit? ( >=sys-auth/policykit-0.7 )
-	ppp? ( net-dialup/ppp )
 	resolvconf? ( net-dns/openresolv )
 	udev? ( >=sys-fs/udev-141 )
-	wifi? ( net-wireless/wpa_supplicant[dbus] )"
+	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )"
 
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
@@ -32,29 +30,27 @@ DEPEND="${RDEPEND}
 src_configure() {
 	econf \
 		--localstatedir=/var \
-		--enable-loopback \
 		--enable-client \
 		--enable-fake \
 		--enable-datafiles \
-		$(use_enable 3G novatel) \
-		$(use_enable 3G huawei) \
-		$(use_enable 3G hso) \
-		$(use_enable 3G mbm) \
-		$(use_enable bluetooth) \
+		--enable-loopback=builtin \
+		$(use_enable ethernet ethernet =builtin) \
+		$(use_enable wifi wifi =builtin) \
+		$(use_enable bluetooth bluetooth =builtin) \
+		$(use_enable ofono ofono =builtin) \
+		$(use_enable dhclient dhclient =builtin) \
+		$(use_enable resolvconf resolvconf =builtin) \
+		$(use_enable dnsproxy dnsproxy =builtin) \
+		$(use_enable google google =builtin) \
+		$(use_enable moblin moblin =builtin) \
+		$(use_enable 3G hso =builtin) \
+		$(use_enable 3G mbm =builtin) \
+		$(use_enable policykit polkit =builtin) \
 		$(use_enable debug) \
-		$(use_enable dhclient) \
-		$(use_enable dnsproxy) \
 		$(use_enable doc gtk-doc) \
-		$(use_enable ethernet) \
-		$(use_enable modemmanager modemmgr) \
-		$(use_enable ofono) \
-		$(use_enable policykit polkit) \
-		$(use_enable ppp) \
-		$(use_enable resolvconf) \
 		$(use_enable threads) \
 		$(use_enable tools) \
 		$(use_enable udev) \
-		$(use_enable wifi) \
 		--disable-udhcp \
 		--disable-iwmx \
 		--disable-iospm
@@ -66,5 +62,5 @@ src_install() {
 
 	keepdir /var/lib/${PN} || die
 	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-
+	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
 }
diff --git a/net-misc/connman/files/connman.confd b/net-misc/connman/files/connman.confd
new file mode 100644
index 000000000000..8b1ea86c46e8
--- /dev/null
+++ b/net-misc/connman/files/connman.confd
@@ -0,0 +1,15 @@
+# conf.d file for connman
+#
+# Please check connmand --help for more information.
+# Useful options are:
+#    -c, --compat: enable NetworkManager compatibility mode.
+#    -W, --wifi=NAME: select wpa_supplicant wifi driver to use.
+#                     This is useful if your wpa_supplicant is < 0.7
+#                     since connmand by default gives wpa_supplicant a
+#                     comma separated list of values and < 0.7 does not
+#                     understand or accept it.
+#    -i, --device=DEV: force use of given interface name.
+#    -I, --nodevice=DEV: force ignore of given interface name.
+#    -p, --plugin=NAME: specify plugins to load.
+#    -P, --noplugin=NAME: specify plugins not to load.
+CONNMAN_OPTS="--compat"
diff --git a/net-misc/connman/files/connman.initd b/net-misc/connman/files/connman.initd
index abcc313ef0a8..cfca1b2263c1 100644
--- a/net-misc/connman/files/connman.initd
+++ b/net-misc/connman/files/connman.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Purpose License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/files/connman.initd,v 1.1 2009/08/24 13:24:08 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/files/connman.initd,v 1.2 2010/02/01 14:12:27 dagger Exp $
 
 depend() {
    need dbus
@@ -9,7 +9,7 @@ depend() {
 
 start() {
    ebegin "Starting Connection Manager"
-   start-stop-daemon --start --quiet --exec /usr/sbin/connmand
+   start-stop-daemon --start --quiet --exec /usr/sbin/connmand -- ${CONNMAN_OPTS}
    eend $?
 }
 
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index 87ab8c03f3f0..a859242282d1 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -11,7 +11,9 @@
 		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting ip.</flag>
 		<flag name="dnsproxy">Enable dnsproxy support.</flag>
 		<flag name="ethernet">Enable ethernet support.</flag>
-		<flag name="modemmanager">Use modemmanager support from	<pkg>net-misc/modemmanager</pkg> package.</flag>
+		<flag name="google">Enable Google Public DNS support.</flag>
+		<flag name="modemmanager">Use modemmanager support from <pkg>net-misc/modemmanager</pkg> package.</flag>
+		<flag name="moblin">enable Moblin features support.</flag>
 		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
 		<flag name="ppp">Enable ppp support.</flag>
 		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing DNS information</flag>