Version bump. Ebuild changes by Tomas Cech of SuSe to properly install documentation and allow openconnect to be used. Removed old versions up to last stable.

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

7 files changed, 39 insertions, 167 deletions

diff --git a/net-misc/connman/ChangeLog b/net-misc/connman/ChangeLog
index 483633541942..68e6f9e9a810 100644
--- a/net-misc/connman/ChangeLog
+++ b/net-misc/connman/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/connman
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.78 2014/01/19 10:26:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/ChangeLog,v 1.79 2014/01/21 08:40:14 chainsaw Exp $
+
+*connman-1.21 (21 Jan 2014)
+*connman-1.20 (21 Jan 2014)
+
+  21 Jan 2014; Tony Vroon <chainsaw@gentoo.org> -connman-1.15.ebuild,
+  -connman-1.16.ebuild, -connman-1.17.ebuild, -connman-1.18.ebuild,
+  +connman-1.20.ebuild, +connman-1.21.ebuild:
+  Version bump. Ebuild changes by Tomas Cech of SuSe to properly install
+  documentation and allow openconnect to be used. Removed old versions up to
+  last stable.
 
   19 Jan 2014; Agostino Sarubbo <ago@gentoo.org> connman-1.19.ebuild:
   Stable for ppc64, wrt bug #495870
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 724039f8b8ef..1682f5c5c499 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -5,32 +5,18 @@ AUX connman-1.16-execinfo-assumptions.patch 1391 SHA256 12c9a6073dddceb5d2088be9
 AUX connman.confd 728 SHA256 767a160c1b3392f0a12d3908a937548a2f604a9a121e744c309ee6f478420b02 SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969 WHIRLPOOL 06098d2fcc27c1bf7dcf73167273cea5e83cc6a4bd5b4ce369974b7295fef6a8c268ea1f548b958c35a569c9c0634cb8ba1c1bc6386d02d02abb76ac396d385a
 AUX connman.initd2 596 SHA256 f0a561f124cac3791fba6ee7ef5bc3ea46bd7535edf9e864689b0d9cfa65d332 SHA512 7c77dd70b67ead94b8ea6b937e60950e774d9e77045da7af43922763dcca008f9e80f724ab2820e9507b929a44441f9afb76020e4be1e0fd8ebaa5bc04a379b0 WHIRLPOOL 64195fe9b3d7f1d9e7fb162739e7d9b32a6d6212f2a7c9a103a62b2952624ba23f4489bd76bdb967d6893d562395d3a8719559cf57ee29363d7d64f074152423
 AUX connman.service 198 SHA256 746a4cb3d4a7083b3165dd69285df4a3f85ec5fd4556d805428b1c13dcd8f0d2 SHA512 a769961922c40b5ed3e5a09d08262b20b84aa27fc278678063b348431ba2976de9f2ebcd9f9b0afa6241540d255ba4cdf7120b75184510d41444b7dd3209b825 WHIRLPOOL 6c91e3fe0045eec718328c5eed31d6109485c41c46ebadf392ecad3c41e97d19e5430b3eaead45844e2364cb3fa9aad2aa904b2b345657f0531c4fc51ea294aa
-DIST connman-1.15.tar.xz 598304 SHA256 8229cc5e3e75197453ba2a644c03860a7cf9f4f27fcbf111bb589530d4efb58f SHA512 bc7e1a883112b6a4a1f6efbaf522e729f76b3c63678eee0301012c7be10c31648afc390c05c0916d2f2432eb87fcb7bd8a331ce52844c09f32bc3057e3130f98 WHIRLPOOL 9a570f1a20033216436921b7d4b93eca49fc4601fc2569e8046aa739e22dcc4cf7f0a53ca2262548d0091d5d0fb348450898797621d83dd96b10b3caf2a8d7a7
-DIST connman-1.16.tar.xz 616496 SHA256 7273e88e6a6338be1e51b0e4c685d556386897cba9317cd83370bfb3f009982a SHA512 90366424c974a8c11e857bdf7596cb28174472e0bf9dd41d5c0f8b96f91ec443b81448db4701a1c3db3ed6b3cb2d627bb445ed69dfc2095cd5145172a95bbba1 WHIRLPOOL f9786235d4651673869b178a5b5c9e775eae971bee2c68f1ee6b3bb2e171f72eced6b9bb719454ff32a84c5883159c799d7e29585475727ea93f1bb705063818
-DIST connman-1.17.tar.xz 618104 SHA256 d31aa2e7dc9fa817c93aba973995b63506a8c83f55afe507028f09b580ef0b00 SHA512 5bc15c0b2c38b189428e590b604428685db8c698a5e1c32e1a0b460f1433ef26fbbe42a0bd6821b134b03c80e9c78d5fbf22a37af9ed28ec37b8dfcd315ac3f7 WHIRLPOOL 9599601a19562e57f672d71ac2822cb9b40f7595d349c9ee2a5320b04afaeb101de711d15f0944bb153569085027e235d0758756fdf04c45d26f4b60f041036a
-DIST connman-1.18.tar.xz 621968 SHA256 56c2ca7842be2100b6b59367845d5beec125f231af6ea505604992e0c5a69992 SHA512 376614dabe671ae12080e5d97bc40e9e2b2b6cd6906275c9fe62cdc0755e89720890ccac812f729890f52908e69231c1c72c68f7add6be78d560527a04c2a8aa WHIRLPOOL 7c584276db1ee93c31daf3d90cf475e879e985f905ffdf98f38e0c107b9f98d2a5b2f7385813260a2a8ccb8093854be2c270dfd9ba946d4a5107fe302fc550f8
 DIST connman-1.19.tar.xz 622444 SHA256 7e4e624cadf42feed18e783351b10f81ef23d7e298bddc7ffe26fe5e69f25b8b SHA512 88d2cda11b23d60554601698692596281f316d6612f027f5b504e9c827e7dec32e6ddf735ba445a8069a09ce1dc4f0c3ac73d21eb3fe1282ba0c6ba0c7de4edc WHIRLPOOL f011bc9aa52bd0e5d928e4ddc2df21e992fababe443705323846590264ed5fab8ad5feedef0fa98cef2f42fd4168c28bac626897721b444fa6c04f83845a4795
-EBUILD connman-1.15.ebuild 1839 SHA256 a3a4ca3a4685f8e9e5858ae2ff8ebb6c21339d79442ed88a780361f4d4de29fd SHA512 01db6f155a0e88ec59d154bbd68726665e69903404ccfdfbca26d999dece7eff713903d80741af2feb0ea7634aa251402af09055becc375490c6f8bbdca4da8a WHIRLPOOL 9dcde816bfbdd3078508ed8905ca97380951840051402ccd3ea130da672d590f6258babcbc3276ec5320f431d1855a28ec9adbb520c35f0ba9709406873476f7
-EBUILD connman-1.16.ebuild 1867 SHA256 a86f3838aa548065561f8723d515089f2590c536d0865a30fb10b9b6cbd84b1b SHA512 8f65d99d6719a336e3813a06433d33ca5447c0d806409778cddda4b547818a148f86553ef11abe1a619116dc305ef3215ed0342559272bf0ab00cf7f9d1b092c WHIRLPOOL 799c4ae241c2eb537049c4008ddb77b74d3031ea2bb950fb68f78e63726b052cb8b0d82e628d447e4c299c798381c78a783188279715b5d5d302a4e98773c0e8
-EBUILD connman-1.17.ebuild 1873 SHA256 cf4971b8df5b11d357a52f88ea78423b6369c362af1f1a11e944d526f16eb9f6 SHA512 3032f4f386f63149014effe793acbd91af17d6944a5a038da31d632f700e107c49ed5f527946f175f5097efbd8ceb320467a3d53321d6c95500f531ff0a13f01 WHIRLPOOL 743ea0208abfc0d00cab1008236f673c3d0756aee4e43c2803f6967d23214d408514a354767023b954018bc4d7385465801acb48c43122acde515ca29a43bb63
-EBUILD connman-1.18.ebuild 1873 SHA256 9834a0ba7f978dd243ed74ea28dde55a26b124b27673684534f8f056e983767e SHA512 e5bef5a28948ea7bbd69d01d4d9ceb5a1d4ab4218cf069fa1f26dc6cde30ab16e9c3cb94ecd0e48ddacd3801826e9a38fb368ca506cc824d34d0d9f4a3973943 WHIRLPOOL e2831e484a554ab91ec3bd784c72f60d475fe280207b2ece81e8808ca5ea86a1ebce8f3975db6950ef7a2e85da35714a8b98c7beae7c5b51a9d9ea7edd2f0de3
+DIST connman-1.20.tar.xz 623756 SHA256 4e638443be959913a5ce0d51df10018448ed08d06e4f8a47ce4b3c705bc78ac1 SHA512 c811350785523114c1d46958cd92918ee88ddef82932570be75b9be1ecc17d54784beccd6840d5e29ce620cc1dc9cdf64171a4540f15f879a6254c4a240727f6 WHIRLPOOL 59eacde34ca5d597ff54d3d05b4b979a384682bc66730f72c3fafe9b1233f2318ee10e0134c11bb6d494a12028484e26e216b0ce2c9b0a9a83d1ee63d3f2706c
+DIST connman-1.21.tar.xz 623392 SHA256 e80f4e9c639ef016e9c497c122c349dbc9e6dc78a9976f986134739ee208c08a SHA512 dc26e5cd7dfcdf7e0540af6a092f592df6682ff16d2811cf0cbca73442239bc742d1f80a638a67b3358316ab0858e924b720b53629a412df2bf4487c51a7bc39 WHIRLPOOL e32d1b858725d1aa2c3b48fd12da9702723050404c8dbd71c6ea5a8b66d91c59fe9114bf8065eb56de31e8838cf924c1a953ed65d9e94f3a8de8b83f92e7404a
 EBUILD connman-1.19.ebuild 1863 SHA256 78067e2900007e7c71b52fbebc47149a2673b967365430c4272814372306e9af SHA512 30735c919ed09aab43ebbb06ffc94ce0f9122d74f7fbbf39a1a09e562340b0d814d08b2475d0f2acc7266647433dab291ce8173a9346041f6957e75e06963f74 WHIRLPOOL aac3f4a2db72699fcc6abc5e0e9f6f4c641df4703db51df239a24c50b3863ace2a67fd65f469f4bbfd41755f09b3bc98c47395b5cd8ad2c52b3ec59f4ac4283d
-MISC ChangeLog 14318 SHA256 d77a85fd4c955f2fedc2938123cb840fe6a70e6785e9c6e2f913785f1276f9e5 SHA512 9d8939a406f3ee2d8e369e362edf0cd6c60e0d20a52aa3b05e9f94668b61255f2b9d2f2ed966752f73741eff95d1e5499cf87dc9084c7035dd9d84df645fa99d WHIRLPOOL 6fb76edd1e20163cbaae8845f1e0cf1df3a8cf3c443f3042c6f59969ecf3ccd7435869ffaae43a12f3d2c6a08852539fd26e66edb787a3ba9a9154bdc21f13c9
-MISC metadata.xml 637 SHA256 9259e2dbc97d51a1aaa1209e523b91fe444716109f1b8433e714da6a28fac1db SHA512 198456dc9c45bed30c7f37e38f68cb3444976b78a0e5530d007d6f1909f6177511deb8217ce9b8c5a04b466c11ba9e7098aa84c66ed214a3e7ebb792b537c714 WHIRLPOOL e9593cdf128486f64241223241fc051faca055f62e62c932961a345b81c62de4d23ffed8381aa8827fff950addff8cab910e5973a8723b4e978747760d3e49d9
+EBUILD connman-1.20.ebuild 1892 SHA256 bd1ccf7f62dd7dc228510f35ae1b2c2e3d3ed459f34aee28d6d982d2e116025d SHA512 4e069f2185a04e88279b5db7f0853e1cb72510dd1e37009d8731fd9a9b22ce27add5373acec6ffae5120fce2177f600633a90e9b8d28116e61de626577fe45a8 WHIRLPOOL c2e340f1fd6d7365c752e5d5fa97045c5653258a8b68b203da3418660a7408f7081d7597bd1108e5824350aa6fc9ec7aa523901b3fec7fdbf5bef7fb4994da16
+EBUILD connman-1.21.ebuild 1892 SHA256 9051023e06ae19d39042dc70424327897db6545cd0f39bc92626a4c38fbdd89b SHA512 cdea823e4b243d2d8bc81d47599da073758fba9c2898710718cb6cff80b4652b7470d8410c530c22c05188e32af31e4a800be8316e1d0059e95f0a52c1cbb091 WHIRLPOOL 8f83bcdde2611f59c45bfc45b08f35eded63f76a2f81641f3061b68cee05f9e0310e0713d92d03b41aec7afeeed1efd047d0303e82590d8ced38807f817cce5b
+MISC ChangeLog 14730 SHA256 501cd7efecb5e4b18cfd5a433ef8344b712131c4deed80b542341e3cf2ca6c23 SHA512 f11a3c7a6358da918e279c906e6fe9d05322dc4becb454f53b0acf760d16249ea444890dbfccd464806653795eae36630b6c30bbc9a4917bad4a17fe646eacb4 WHIRLPOOL ee1d51515c5b28b1720fe26388c8525216ed1c5ca72b0bab08c3fc8a57041c48edc838083ef5c97745ada400c5c2360107d6f9142e5e55f2b97a144a7a779f73
+MISC metadata.xml 724 SHA256 d29a254c220abec6fdd104f489a6b81a1f30f541081a3f909e1145ed65ceecd4 SHA512 bd41bca30d616d6ba012c07cba64721bc3ff7b9fcf571d02515d3d91d376a1a212f09fa3351fa3d09512ac81426aa81c2ddb45401c73305f994d8c147de48700 WHIRLPOOL b150ed7f11b17237a8e0b8ab799d2f4d811c1ae8aad2fe1976478271d12d129c417d39349623970ae798345611d0e242f78670527fd3139b99ef9e347bdcbabe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS26hAAAoJELp701BxlEWfK+cP/RKLkgmAQvxVjXyDPRjgE2z3
-oS46l0/geQpx277yhQEZKlL+TW4ON/3L8cec80JuunUPWGlxiJkiPHfS5fMl+FOP
-onTdGOM45JgKVa9s509P/abNr++01tflAWQ8dLGicDHQ4KGcJdN4Esnj225DNO5k
-F9YNiRsdnwbHEM6JUfoZMtuT+Z7F4rZ/iQi+/sENtSrbxadTaUNmAfep80C7qudb
-ywQOf6NxL9KaKK9K4LsjsvlYjYLXS0UU02O1+se1qzq0ydYEL4heCyQm4uu8mSGt
-lEYES57JYPFonHCqG7iQ7/gZabwXBY/H4O6gJvGqNHdLr2VPiYiw9PWn792DkqbH
-8J+pcU5ricSrZ5fmNYByTo9+jBz6hXEV3xT0T7PedlOpeg8cxk9A/6ILfPPrEIyP
-tdAYbxlAQ72uLcqc6EHkxB6/qLXY9JnD4d5pEM1t8A1KNQWXQaaFI/LGhdyVCoxm
-G0q9Kw/Up2vpHZKwncZYxMae4Sz3X2mxiGd06MYAbNezrsW1GwAGWjhb+PZKbRnB
-POt14FomHUJQSIoQcTZWd8VC65vka3yT92s15y4CsCHvFVvzgEx2LDVQsYGz953h
-7L+4QGn6HuDR2leEzLtUrSFc1J+waWiGm3vj3XKRQQrO9MB7ttwM2ZgUYEy1vdjJ
-2Sh0WNrU7DTo+CLm9D3C
-=bURH
+iEYEAREIAAYFAlLeMl4ACgkQp5vW4rUFj5pTpACghXyfjdpYiOkPdN+N8CCNzPOF
+PdcAniWMi8jze1kKn0BlbHMD5+5SSs2M
+=fcsQ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/connman/connman-1.15.ebuild b/net-misc/connman/connman-1.15.ebuild
deleted file mode 100644
index 8128844bc58d..000000000000
--- a/net-misc/connman/connman-1.15.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.15.ebuild,v 1.7 2013/10/04 04:04:13 phajdan.jr Exp $
-
-EAPI="5"
-inherit base systemd
-
-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"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=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] )"
-
-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 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
-	dobin client/connmanctl || die "client installation failed"
-
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/connman.service
-}
diff --git a/net-misc/connman/connman-1.16.ebuild b/net-misc/connman/connman-1.16.ebuild
deleted file mode 100644
index f62a2eb3049b..000000000000
--- a/net-misc/connman/connman-1.16.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.16.ebuild,v 1.1 2013/10/06 20:28:00 chainsaw Exp $
-
-EAPI="5"
-inherit base systemd
-
-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 tools vpnc +wifi"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=sys-apps/dbus-1.2.24
-	>=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] )"
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
-
-PATCHES=( "${FILESDIR}/${P}-execinfo-assumptions.patch" )
-
-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 debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable tools) \
-		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin client/connmanctl || die "client installation failed"
-
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/connman.service
-}
diff --git a/net-misc/connman/connman-1.17.ebuild b/net-misc/connman/connman-1.20.ebuild
index 9b9a1ded7728..dd9feab129d7 100644
--- a/net-misc/connman/connman-1.17.ebuild
+++ b/net-misc/connman/connman-1.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.17.ebuild,v 1.1 2013/10/06 20:28:00 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.20.ebuild,v 1.1 2014/01/21 08:40:14 chainsaw Exp $
 
 EAPI="5"
 inherit base systemd
@@ -12,7 +12,7 @@ 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 tools vpnc +wifi"
+IUSE="bluetooth debug doc examples +ethernet ofono openvpn openconnect policykit tools vpnc +wifi"
 
 RDEPEND=">=dev-libs/glib-2.16
 	>=sys-apps/dbus-1.2.24
@@ -26,8 +26,7 @@ RDEPEND=">=dev-libs/glib-2.16
 	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )"
 
 DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
+	>=sys-kernel/linux-headers-2.6.39"
 
 PATCHES=( "${FILESDIR}/${PN}-1.16-execinfo-assumptions.patch" )
 
@@ -42,21 +41,23 @@ src_configure() {
 		$(use_enable wifi wifi builtin) \
 		$(use_enable bluetooth bluetooth builtin) \
 		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
 		$(use_enable openvpn openvpn builtin) \
 		$(use_enable policykit polkit builtin) \
 		$(use_enable vpnc vpnc builtin) \
 		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
 		$(use_enable tools) \
 		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
+		--disable-hh2serial-gps
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 	dobin client/connmanctl || die "client installation failed"
 
+	if use doc; then
+		dodoc doc/*.txt
+	fi
 	keepdir /var/lib/${PN}
 	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
diff --git a/net-misc/connman/connman-1.18.ebuild b/net-misc/connman/connman-1.21.ebuild
index a24388cbfad2..744e61da1a08 100644
--- a/net-misc/connman/connman-1.18.ebuild
+++ b/net-misc/connman/connman-1.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.18.ebuild,v 1.1 2013/10/06 20:28:00 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connman/connman-1.21.ebuild,v 1.1 2014/01/21 08:40:14 chainsaw Exp $
 
 EAPI="5"
 inherit base systemd
@@ -12,7 +12,7 @@ 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 tools vpnc +wifi"
+IUSE="bluetooth debug doc examples +ethernet ofono openvpn openconnect policykit tools vpnc +wifi"
 
 RDEPEND=">=dev-libs/glib-2.16
 	>=sys-apps/dbus-1.2.24
@@ -26,8 +26,7 @@ RDEPEND=">=dev-libs/glib-2.16
 	wifi? ( >=net-wireless/wpa_supplicant-0.7[dbus] )"
 
 DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39
-	doc? ( dev-util/gtk-doc )"
+	>=sys-kernel/linux-headers-2.6.39"
 
 PATCHES=( "${FILESDIR}/${PN}-1.16-execinfo-assumptions.patch" )
 
@@ -42,21 +41,23 @@ src_configure() {
 		$(use_enable wifi wifi builtin) \
 		$(use_enable bluetooth bluetooth builtin) \
 		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
 		$(use_enable openvpn openvpn builtin) \
 		$(use_enable policykit polkit builtin) \
 		$(use_enable vpnc vpnc builtin) \
 		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
 		$(use_enable tools) \
 		--disable-iospm \
-		--disable-hh2serial-gps \
-		--disable-openconnect
+		--disable-hh2serial-gps
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 	dobin client/connmanctl || die "client installation failed"
 
+	if use doc; then
+		dodoc doc/*.txt
+	fi
 	keepdir /var/lib/${PN}
 	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index 32b3ffa12c91..c870b1a4d4e7 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="ethernet">Enable ethernet support.</flag>
 		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
+		<flag name="openconnect">Use <pkg>net-misc/openconnect</pkg> for VPN support.</flag>
 		<flag name="openvpn">Use <pkg>net-misc/openvpn</pkg> for openvpn support.</flag>
 		<flag name="tools">Enable testing tools.</flag>
 		<flag name="vpnc">Use <pkg>net-misc/vpnc</pkg> for cisco VPN support.</flag>