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.

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)

6 files changed, 30 insertions, 144 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/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>