Drop dependency on libnl as requested by Gustavo Sverzut Barbieri in bug #415773. Init script now includes "provide net" as requested by José Romildo Malaquias in bug #438142. Fix up incomplete ip6 type as described by Amadeusz Sławiński in bug #460550. Version bump as requested by Dennis "dlan" Lan in bug #458672. Dropped deprecated wimax support USE-flag.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

9 files changed, 74 insertions, 278 deletions

diff --git a/net-misc/connman/ChangeLog b/net-misc/connman/ChangeLog
index 5493bdb55344..d217245f1381 100644
--- a/net-misc/connman/ChangeLog
+++ b/net-misc/connman/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/connman
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.60 2012/11/15 23:59:46 chainsaw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.61 2013/03/14 12:51:31 chainsaw Exp $
+
+*connman-1.11 (14 Mar 2013)
+
+  14 Mar 2013; Tony Vroon <chainsaw@gentoo.org> -connman-1.4.ebuild,
+  -connman-1.5.ebuild, -connman-1.6.ebuild, -connman-1.7.ebuild,
+  -connman-1.8.ebuild, +connman-1.11.ebuild,
+  +files/connman-1.11-ip6-incomplete-type.patch, +files/connman.initd2:
+  Drop dependency on libnl as requested by Gustavo Sverzut Barbieri in bug
+  #415773. Init script now includes "provide net" as requested by José Romildo
+  Malaquias in bug #438142. Fix up incomplete ip6 type as described by Amadeusz
+  Sławiński in bug #460550. Version bump as requested by Dennis "dlan" Lan in
+  bug #458672. Dropped deprecated wimax support USE-flag.
 
 *connman-1.9 (16 Nov 2012)
 *connman-1.8 (16 Nov 2012)
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 9a764b437b4d..bf378a07a234 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,19 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX connman-0.79-glib-include.patch 384 SHA256 152998da518bb7c5cd824bca05888eb2b4e802fb586d2bd58f9314719f519e1a SHA512 b9abc4b05c3d4328e3dd2e95e5ff98cf39996bbeac2798db765692fc6249120563340970fd9e09f64d156f20731eea9a2d3a2997d2e07f702a9069ac2917a2d8 WHIRLPOOL dd3d7f72e86fa136e8293566f672feecff1c91047696888dd95e8204ab6605723308732d13ac8f408048579cd98c702482d6cce89dd6026098a6067303084336
+AUX connman-1.11-ip6-incomplete-type.patch 395 SHA256 0f026f3785343d3cba01a4dad1ab2b9e4cc1e26213e92e6164f28c6f064707f5 SHA512 c5e752f922d0efd74638c58cb40da3f70955cd2f70f09c5a93f8c4ac85bb1edb3933080c8678f1006cfac3f3b326bb31bf764249b02589121f7b533d8bca08ca WHIRLPOOL c2ba27c0eb155b5e092c29e37f33c433309e38f0a349d95d32f76a702fab87f714a0a36a44649ce73f4423961c87e012b8c324f12b7ce08f7e040bc74e2bacd4
 AUX connman.confd 728 SHA256 767a160c1b3392f0a12d3908a937548a2f604a9a121e744c309ee6f478420b02 SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969 WHIRLPOOL 06098d2fcc27c1bf7dcf73167273cea5e83cc6a4bd5b4ce369974b7295fef6a8c268ea1f548b958c35a569c9c0634cb8ba1c1bc6386d02d02abb76ac396d385a
 AUX connman.initd 578 SHA256 10deff4d07f2a631ef7d797ed420a917c00312381ee69f60346e94cf9a3fa25a SHA512 58c637f7222ce57df35800659154a72b2e6a29f7385ad985373742d56d0fae6e901c214710d20209ab10a304c8f3a987f0fdfb2e23e7cce73fa5c786a015324a WHIRLPOOL b8884223f42faa45b80abc4196510bb3d839ce7c6529cfdad10d21d0c6cd1461e7de8f224a6648867e267fcbdca7e434c7f0cc2cc7fcfa9de035a8666104b69b
+AUX connman.initd2 596 SHA256 f0a561f124cac3791fba6ee7ef5bc3ea46bd7535edf9e864689b0d9cfa65d332 SHA512 7c77dd70b67ead94b8ea6b937e60950e774d9e77045da7af43922763dcca008f9e80f724ab2820e9507b929a44441f9afb76020e4be1e0fd8ebaa5bc04a379b0 WHIRLPOOL 64195fe9b3d7f1d9e7fb162739e7d9b32a6d6212f2a7c9a103a62b2952624ba23f4489bd76bdb967d6893d562395d3a8719559cf57ee29363d7d64f074152423
 DIST connman-1.0.tar.gz 743543 SHA256 62ed6aa093700e393456dfab98f098bc151fc10baccc577bbb7d927221e23e50 SHA512 0baf3d87e26b94e6969dbbf22a465e7dbdea57bd954305a21e2a40d7cac0a4d6aef09ef9a6ba82ba4e7587cf0ee6e8e3ed5f56a0000de9c48c391c3118e6e151 WHIRLPOOL 68bf676ffd73c68dba0bcf9f1ab7819426ea3d4396de32753145ed071c65375b6b2511b25221cf58aeb275e3b3ae7994571e22cd71ade42d818996d84a8172db
-DIST connman-1.4.tar.xz 527076 SHA256 469d49d3665e65110c3f380cf0c9d4ea48bc892b0e7dba9e2c9c405fd1acdd84 SHA512 f0f48835ead4080f5a3c725b5ecb4450a9c54435fa9a631a8bed6a3859671342205a0d3385390427c11529a1ac9a31d750ae531c85793e55f5d0a7798cbd22f5 WHIRLPOOL dc1a8cee4954338773617cbaedec90cb2acf40118e9de75662ed980f2373178a08890011df57ce471a8b14dd4ec59684e0e5be8aaac7eccf429d0a4a80fc157f
-DIST connman-1.5.tar.xz 529284 SHA256 f973198e90083a30a7c8233cfe87ddf77bb40eac1ba8d8733b9b75131aec1e94 SHA512 7e16549f141795660305fe5e5c0a3e6e924664c310ab87d2a01f6970f02a1f65876b7f64a35ee1e7142dd1a16cf278eb65393987127cc315a7bbc5f8b6481d6e WHIRLPOOL be8d42526fcd739c0d7454fa08460b625962a99ebd55292ba4fd21da1e221d879ba8bb28094776e10e5c3768eec1fb7c9f4604b243ed122ccd71b4d8e821a5e3
-DIST connman-1.6.tar.xz 529712 SHA256 43adfbee249f836c7cfb2c75e9e9ff1961c95b0f7ee4c0100196b7e2ecfcca59 SHA512 1598325944faca93fabcbd98b7f3b7d26a923266c50659abae49b86b93771dea603b3337fdffe8221c811d39d1ed4af3f4521791fbcaa95ccb4cb4cc9d00a8d7 WHIRLPOOL 43852a77226360f71b900945e00cde0b8c05a9e536f6936e392d977643620d0facbbf4a210e5960b193714ca1d509ef79c2f2150952bc39ad77684bbc8d4e941
-DIST connman-1.7.tar.xz 536960 SHA256 142fad547452ada7abf5c6a22c5ec2964ee6ffb6d89cec3a53f0f6bd2148e27d SHA512 e7c145512e1859651c80281fe40ad8b23ad3215f5f97bdfc1032ddc9747ea433c1268d9d3110738c6c704a13d30f00b18c11614dd9789b41167d459bd8445d44 WHIRLPOOL e857536ef9f54958d6a1fa5341f0fff2db528394e3a2721feecf1ca9a38f01202da8494da460061632f66672474fd904db3740e06cd2a9bc40c1c1985f8a767e
-DIST connman-1.8.tar.xz 537832 SHA256 f00ae8eeffdfe04ec6047267c503190c428cb7b4bda3bf5bbe77b31bc712d64c SHA512 ade51b4905fa9c57f8ec6b2f8de7d9a86916b9b4d287ee2665c28f5c4ff9e22b005d600d2f52d210dc4f23979bcf9d648fedeb13d7d08b2a4c2f1e5d78b23fa6 WHIRLPOOL 7910ccc1012023e64575f22325ec1c498247b352e0590497b9493a0310b4667afc8e5ffff8e6c15e87e49e1f01a281b4ce9120f14ebbd68e51e675e4b4d4244f
+DIST connman-1.11.tar.xz 567640 SHA256 c977d732c31acbd6bd815b697f02503c885db8e08d8ecd6e9596345c93206687 SHA512 37ddaf18ee21724fb7254c1259619f6ce8f130edd37559aa099bca05dea7c12eb63d9b23c85fed868e4712042d9cf229eadc7321f71b48fe2eff7037567ecc12 WHIRLPOOL c075ee9363dda7dc37e9fb6bc13d7214b1fea4191119dc73496fab044a12ec56285eb07b11fdae6b138c25a6c95d6923fa99f0f285aaa263b9e7aa2dea52a541
 DIST connman-1.9.tar.xz 539476 SHA256 11c438cddd52bfd0d279762631083aaf69989a4c03501c6f6a434b0d0e359ad1 SHA512 5a650ec827b9d7b7c4c3eac9cbae64833a19578b0501da81ee18c667d3c1edab66fc0d7e8f6d28b5b7d42d825e39751bcf125946753ac71e106d86ead56183bd WHIRLPOOL b44cf76c39575555e93eac3d7efaf767ac78a147808bd062c257cee052df1019720f2efec31a15b426e7ed8fff1b7bf0c6f851809ce899c9d0a7ce2f401851cc
 EBUILD connman-1.0-r1.ebuild 1910 SHA256 b71a3004ebd92e6e5f8bf9e1baeb1096f59c71f599bf618b664c3e341f3e287d SHA512 0d69fb7bd6e65f9760e1f9e067ab3b136435c1413f14ebaf6e4c2b041ce71fee8388f7dd1e3cd16375927a7dfe60c7c0db48af954fd5fdee94eba26b4cb3e9b4 WHIRLPOOL e3dc8aa4e418fd6fba7deaa36ad13be05320ee68d2b22fca09a9372cac54e3250f89d6b2f7ac98984d26221c74a9cfeb1b77e0135958604b969fd6b6d2f26227
-EBUILD connman-1.4.ebuild 1912 SHA256 81205cb82ab98b69d1667aef37d52dc5105abd4a604844d522eeaeba19d68bbb SHA512 8a70bacb2d7fa8aa43f2b78254d9c8e10d811d73f524767ee8ce9876dd97c32588c511ef7510d050415b66e1964f34502acb13409730c8d571688c80c1be4c91 WHIRLPOOL c090ae56080d26d5357aa6d34ad63e0c9f1871b3549086c06f9e12829aa8031cfb0618fdaafec354377ae2b638653ddd3175e263f6b795a05fe7e04e127babeb
-EBUILD connman-1.5.ebuild 1912 SHA256 4b60e22afabc37ab0be7e70c497fb094b56012c685d5ca2f1b34a8443605fbbd SHA512 5c188860921048a2365444a0873080ca9a32d4dccfbed1f5f65e042826b78c720f2ee2e05dfda12bb5ed4094358c3ebec19cebad65deb50ff6f68661c5d8ca83 WHIRLPOOL 62557b365c643f8847334b31304f05f2918c6ffced4d220122eb956eeb45b6cd130b806758d7d89e1ac34bbd05e95f916226d5acb445576c30e85b709e3b6b8a
-EBUILD connman-1.6.ebuild 1912 SHA256 cb0f8fd14fbb91e822b49d5ac09592d4b3e0c4e25fb57a21ea00d378f100d0c1 SHA512 371862ae9ded8db2ce6303cbeed1c233ceb71e6868ae3022bfd52f8c8f75cc70cbbae9c4eff3d1d27a85548f4b92908a464cb44888d7789abf67a4ef5889c059 WHIRLPOOL 281fc8fb7179e27b96123b09d6ac0172c3dd0215b7eb330438ff09afdcf5582f7ba339d240cfecb8e9890a64348de5f223d5b96a0feb81b6c1d630cb020d817c
-EBUILD connman-1.7.ebuild 1920 SHA256 e11335632415835b6db304355414b2bd117699e3a8b572df4fc403ecac1b5d00 SHA512 fb921561b64380d2354f9c6851bee1600ef8facf8cd85adb97da9be92138bd13e928fbb218ca39f2b451132d32c1a464ba53ab6f40007519e616effa94a96202 WHIRLPOOL 839704b0d10239b8b2b7765c7d5bb6759b29d515916144d098787ab8bf47392e63b271169f7625a9fcde972d57d4794a29c602ea634d4e8e2586cd5c66ab8637
-EBUILD connman-1.8.ebuild 1920 SHA256 6868bfe17a4b0679521b7e8559cc8700eab4cd7bbfc221497cf5b509c8565d53 SHA512 4c35236fdce0d537843edbbb485f52a8e6812cc914920dfd2896f2b1aa20d37c92b7c9e6a14b42d988bf200996ac2261bcb3260b8f4a134b221ab0e295c338fb WHIRLPOOL be461c1cc418421cc632fd1b4fd9f541f0b5617d3f1b1ee33882452e637c4aacca1a41fbc19e856349e77844513096b84eea17b9d57c61b124ce8e87b567bb7f
+EBUILD connman-1.11.ebuild 1898 SHA256 ed5c6b81e1119f35cf7e73e4932b3a2dad0a7da9a12887d3994ed8b201c048df SHA512 b2e422c17c7326ee9cc9005de583eeff0ad48f3ada931938e3f4ee9c16fe79bb9fbb0c0dad65915bfdcd2e0db353a9395c9a1b9f5aa0a97119fd25247ceb383e WHIRLPOOL 54bb1fa0cc5b10884868bc6536d64c565c2293baeb8dbc780565861f8a7616ea1740ac351af5189c64d15eae3acf24f0d05d31155c9c78667fbe0505694cb995
 EBUILD connman-1.9.ebuild 1920 SHA256 093ec7e35626d1bc507f69ba4d8b2d356ab4ae3fb8987e6a15a5560020960051 SHA512 5f12b3f2807c97345c6d76821f3d51b80aa8cadc6b7142b0d8771702ad573f7bfb048006e2fc7bbc3bb01d21fb526b59e7c9e39fd009f9384fec0235e87382ff WHIRLPOOL ca483fa5fea419cc768c54438f57657a0aabcb3d70ec21bc153d5bdcd6427521ef626c7947a9b0ae0f11d5285fe65a0c77ddd3d9d0748759f42c058a8f2e1c03
-MISC ChangeLog 10827 SHA256 33ac6e464a3f89465181436ffb0ca4106d886e6f4f483471227daa3fe1ea49ca SHA512 59db6d189db7b45d5bd02dabb7aeb0c0985f9f73c650844c492f111cba8d6d88e24c1fb56e7431fff1a4c4a76c6a656c9cd8d0452bd60745ed8efe8c918dacd8 WHIRLPOOL 28398791154c2830794eafa66a380aad53252c8c6191e092cf5bd4aa97f051202220f872f790f6d4ec4c6f758395ef9c79648bccb8a0d234fc7a162b2c4cdcd7
+MISC ChangeLog 11481 SHA256 0b167ad56623eade8b7bd5d5cdf1c94b4c47f4f5c5ff4828165ab95ddeb5f998 SHA512 f0f76a47d6cbd652f78c9107920c9537a8deddff35386f5e55bfcfc2a846cabbe31d49bf0fe36d7fab619bd5f46d32247d8922fcbde80b0c3eb1a6720a75b3de WHIRLPOOL 77a715ec247bab9e44319a64ca9d29436e3a34e7f63799d8de78ee069ac7d1715f5a376485dd0f1df3bf92c7f5633b8436566995b28f0947f29f1b310e95dfa4
 MISC metadata.xml 718 SHA256 b32b96a3697f0993c06d1dde70f88365042453ab3499201933f01db7b094fa38 SHA512 e81544a48765ebf42557b15ed79b189cbfee4b23018bac6fc1e0bf39f29ed13d9bc460edacd76d4ef8b8239e772bb9b70ba59f429da8eb1aebe3269f7930ce28 WHIRLPOOL 64a2cbf9e9b67ab2bf0cc79f8cc6e8aed2137240685dc5abf0eee045a817ef8494bbcbee6d27932533f718a037f802970e71a8f5ccf1400e0572f9e7ba8b733e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlFBx94ACgkQp5vW4rUFj5qrhwCdEBt3GoJoRjP85Z366A5iC70I
+TSUAoI7sipZNzkDV84A9/n02qmSQhHwk
+=oyCG
+-----END PGP SIGNATURE-----
diff --git a/net-misc/connman/connman-1.8.ebuild b/net-misc/connman/connman-1.11.ebuild
index 8b93cac0ec3f..10d3cafb7152 100644
--- a/net-misc/connman/connman-1.8.ebuild
+++ b/net-misc/connman/connman-1.11.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.8.ebuild,v 1.1 2012/11/15 23:59:46 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.11.ebuild,v 1.1 2013/03/14 12:51:31 chainsaw Exp $
 
-EAPI="4"
+EAPI="5"
+inherit base
 
 DESCRIPTION="Provides a daemon for managing internet connections"
 HOMEPAGE="http://connman.net"
@@ -11,11 +12,10 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
+IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi"
 
 RDEPEND=">=dev-libs/glib-2.16
 	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
 	>=net-firewall/iptables-1.4.8
 	net-libs/gnutls
 	bluetooth? ( net-wireless/bluez )
@@ -23,13 +23,16 @@ RDEPEND=">=dev-libs/glib-2.16
 	policykit? ( sys-auth/polkit )
 	openvpn? ( net-misc/openvpn )
 	vpnc? ( net-misc/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
+	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )"
 
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.39
 	doc? ( dev-util/gtk-doc )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-ip6-incomplete-type.patch"
+)
+
 src_configure() {
 	econf \
 		--localstatedir=/var \
@@ -44,7 +47,6 @@ src_configure() {
 		$(use_enable openvpn openvpn builtin) \
 		$(use_enable policykit polkit builtin) \
 		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wimax iwmx builtin) \
 		$(use_enable debug) \
 		$(use_enable doc gtk-doc) \
 		$(use_enable threads) \
@@ -59,6 +61,6 @@ src_install() {
 	dobin client/connmanctl || die "client installation failed"
 
 	keepdir /var/lib/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN} || die
 	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
 }
diff --git a/net-misc/connman/connman-1.4.ebuild b/net-misc/connman/connman-1.4.ebuild
deleted file mode 100644
index 8f161d91b3d7..000000000000
--- a/net-misc/connman/connman-1.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.4.ebuild,v 1.1 2012/07/31 12:18:01 chainsaw Exp $
-
-EAPI="4"
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="http://connman.net"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
-	>=net-firewall/iptables-1.4.8
-	net-libs/gnutls
-	bluetooth? ( net-wireless/bluez )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	openvpn? ( net-misc/openvpn )
-	vpnc? ( net-misc/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wimax iwmx builtin) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin client/cm || die "client installation failed"
-
-	keepdir /var/lib/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-}
diff --git a/net-misc/connman/connman-1.5.ebuild b/net-misc/connman/connman-1.5.ebuild
deleted file mode 100644
index 8899e4bb20cc..000000000000
--- a/net-misc/connman/connman-1.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.5.ebuild,v 1.1 2012/11/15 23:59:46 chainsaw Exp $
-
-EAPI="4"
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="http://connman.net"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
-	>=net-firewall/iptables-1.4.8
-	net-libs/gnutls
-	bluetooth? ( net-wireless/bluez )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	openvpn? ( net-misc/openvpn )
-	vpnc? ( net-misc/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wimax iwmx builtin) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin client/cm || die "client installation failed"
-
-	keepdir /var/lib/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-}
diff --git a/net-misc/connman/connman-1.6.ebuild b/net-misc/connman/connman-1.6.ebuild
deleted file mode 100644
index afc8c8488d6f..000000000000
--- a/net-misc/connman/connman-1.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.6.ebuild,v 1.1 2012/11/15 23:59:46 chainsaw Exp $
-
-EAPI="4"
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="http://connman.net"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
-	>=net-firewall/iptables-1.4.8
-	net-libs/gnutls
-	bluetooth? ( net-wireless/bluez )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	openvpn? ( net-misc/openvpn )
-	vpnc? ( net-misc/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wimax iwmx builtin) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin client/cm || die "client installation failed"
-
-	keepdir /var/lib/${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-}
diff --git a/net-misc/connman/connman-1.7.ebuild b/net-misc/connman/connman-1.7.ebuild
deleted file mode 100644
index e249b6acbc0b..000000000000
--- a/net-misc/connman/connman-1.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.7.ebuild,v 1.1 2012/11/15 23:59:46 chainsaw Exp $
-
-EAPI="4"
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="http://connman.net"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth debug doc examples +ethernet ofono openvpn policykit threads tools vpnc +wifi wimax"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=dev-libs/libnl-1.1
-	>=net-firewall/iptables-1.4.8
-	net-libs/gnutls
-	bluetooth? ( net-wireless/bluez )
-	ofono? ( net-misc/ofono )
-	policykit? ( sys-auth/polkit )
-	openvpn? ( net-misc/openvpn )
-	vpnc? ( net-misc/vpnc )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )
-	wimax? ( net-wireless/wimax )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--enable-client \
-		--enable-datafiles \
-		--enable-loopback=builtin \
-		$(use_enable examples test) \
-		$(use_enable ethernet ethernet builtin) \
-		$(use_enable wifi wifi builtin) \
-		$(use_enable bluetooth bluetooth builtin) \
-		$(use_enable ofono ofono builtin) \
-		$(use_enable openvpn openvpn builtin) \
-		$(use_enable policykit polkit builtin) \
-		$(use_enable vpnc vpnc builtin) \
-		$(use_enable wimax iwmx builtin) \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable threads) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dobin client/connmanctl || die "client installation failed"
-
-	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-1.11-ip6-incomplete-type.patch b/net-misc/connman/files/connman-1.11-ip6-incomplete-type.patch
new file mode 100644
index 000000000000..f44f2e1e66fa
--- /dev/null
+++ b/net-misc/connman/files/connman-1.11-ip6-incomplete-type.patch
@@ -0,0 +1,11 @@
+diff -uNr connman-1.11.ORIG/src/tethering.c connman-1.11/src/tethering.c
+--- connman-1.11.ORIG/src/tethering.c	2013-03-14 12:41:25.279469705 +0000
++++ connman-1.11/src/tethering.c	2013-03-14 12:42:05.745468258 +0000
+@@ -30,6 +30,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <sys/ioctl.h>
++#include <netinet/ip6.h>
+ #include <net/if.h>
+ #include <linux/sockios.h>
+ #include <string.h>
diff --git a/net-misc/connman/files/connman.initd2 b/net-misc/connman/files/connman.initd2
new file mode 100644
index 000000000000..6525df40f0bb
--- /dev/null
+++ b/net-misc/connman/files/connman.initd2
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Purpose License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/files/connman.initd2,v 1.1 2013/03/14 12:51:31 chainsaw Exp $
+
+depend() {
+   need dbus
+   provide net
+}
+
+start() {
+   ebegin "Starting Connection Manager"
+   start-stop-daemon --start --quiet --exec /usr/sbin/connmand -- ${CONNMAN_OPTS}
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping Connection Manager"
+   start-stop-daemon --stop --quiet --exec /usr/sbin/connmand
+   eend $?
+}
+
+# vim: set ft=gentoo-init-d ts=3 sw=3 et: