Document optional runtime deps, bug 473186 by Alexander Tsoy.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

7 files changed, 69 insertions, 129 deletions

diff --git a/net-misc/netctl/ChangeLog b/net-misc/netctl/ChangeLog
index 714fb98aa6bb..b54bd43c9110 100644
--- a/net-misc/netctl/ChangeLog
+++ b/net-misc/netctl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/netctl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/ChangeLog,v 1.10 2013/06/08 17:24:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/ChangeLog,v 1.11 2013/06/14 00:00:09 floppym Exp $
+
+  14 Jun 2013; Mike Gilbert <floppym@gentoo.org> -netctl-0.8.ebuild,
+  -netctl-1.0.ebuild, -netctl-1.1.ebuild, netctl-1.1-r1.ebuild,
+  netctl-9999.ebuild:
+  Document optional runtime deps, bug 473186 by Alexander Tsoy.
 
   08 Jun 2013; Mike Gilbert <floppym@gentoo.org> netctl-1.1-r1.ebuild,
   netctl-9999.ebuild:
diff --git a/net-misc/netctl/Manifest b/net-misc/netctl/Manifest
index d9e6273b3199..7cd36d36e941 100644
--- a/net-misc/netctl/Manifest
+++ b/net-misc/netctl/Manifest
@@ -1,20 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST netctl-0.8.tar.xz 25456 SHA256 014333e4feb1ca0d70e5f11f342c0dfe4b66acdd9e51737311e86b65088e9bf3 SHA512 60b08b5d380741e926d049e3ded387c1f28de5ecf86eeb6832cf96a3cf6b0994f1dba25222d38dbc5100b5e2510717a1622cf64d652a521592e38fc17efd9041 WHIRLPOOL 0ac69705fa4997ef770cab9da30f39b81e624f0f5fe282d39387c330be2d2980fe6e27fa6907133713575f1129d28873f3570504032808372ad8aabd331aba4d
-DIST netctl-1.0.tar.xz 27512 SHA256 0e18338797e72c355f4da2814a29c21b9f9a3287b19a2efca061a26e2ab3d34a SHA512 274570291b48e70be96cc507b896341c8f2b4a2bf2d5b771762bbccb39fcdbb2e03c7913c0a7930db7851d35b351982c7321cc6758385c3f8baf4079f5f399fa WHIRLPOOL 3404a5460e018426cb0408765c560b86c13da53425e14bca993410d5ed2281c2402410017ee47b3886f4ae124d187c191e86bc26148f6ade2fab2389c22afdfa
 DIST netctl-1.1.tar.xz 27748 SHA256 54a4891250f53190758b4c67ca397b963e1b7cc460e85cbe6677d541f1b8894d SHA512 62ebf33bdb8c5244fe3ab86532f0d04bca2a04bf5c557fbdc7a003b7fabe02cb778bc4379117f035044159909f8d5a187673cdc3e4cc222a8b265726de0a0e0a WHIRLPOOL f618b0e5ed4ca9ee3a02b89c42ff5365480e7abaadf1bd2a7ef9f48e873dee66ea042a41e66df611276ae85c1f39b7da0710d987136669427e160820b74be302
-EBUILD netctl-0.8.ebuild 810 SHA256 140a0139e0e1cc76df64403e9bb5811dc5b5c217346d68dfb6cd82e8d266dc34 SHA512 791fc57901a859a7f6b28280812fb54fdd96e23243b958343c48e1554f2f44e19c85cae7e7fe6b0cb557fc213da10bd9121c665a6066e07b6fc66885f1cde9a1 WHIRLPOOL 5e32d943b92821aee22403c4a0f7cc1e7e8e853d5459e77429e0374332b906506d1f1db531f6dfe98eb41b0256f2a5c1d23455873519135c0e658d5265e834e4
-EBUILD netctl-1.0.ebuild 810 SHA256 7ce9eab744b9aa08675c3ce3c53e4e3f37cfc507ede117cb033a18bfb78785e7 SHA512 717f4810e1ad6955bd852dffc666eed5c16eb9221db5d79d16fae91aefa7cec02e9b0f2dc54787b0df68e4e80f382f60c1e751530d83b000dd77ffba4d4e3617 WHIRLPOOL 8e267efa2ddfb9ba70f761c54d07989d3249d600c720557f820003f4279c5c64037eb15753d66b7ee43eb34627ebdca2ca713e8b208cb026dc88dcb498bf95ba
-EBUILD netctl-1.1-r1.ebuild 1165 SHA256 5ba36bd2fc088bdda294c9b287b9573e4c62be306d94c5a11a18937c7ec30894 SHA512 dfa08c7e06f05198e5e2c079643acba383bde5c85904ad967990b71598dc50740703dd49b9352522502f4860cb072d8f7e3bf3919bb801f912b6d074742cd225 WHIRLPOOL 58d23984178e31632c967705f695f28cd560a9f8ca156d060e9ef149eb7f87c31c0a1e08dadbb629e54d30870f1f5d270539930a036391f862535d756444e784
-EBUILD netctl-1.1.ebuild 951 SHA256 3a3ade3490658d189b7aba4bfe1a30298373fbdff7e5ef974cace5fd510a8278 SHA512 aaad237eb83fe553c89800baa2f891df7374e27e31fde420e010fb746816ce80458d4a43fb95f0d0fe86dbf5e134764a205428218ede7b6767ea56cf542c260c WHIRLPOOL e9395cb744d045e1e247dcf976c698749235799f84430498c92d383f9016d7c44ca97339d6bc87dc695a569b79c43af4e627fec54ecbfb34ac9f2b381de768d3
-EBUILD netctl-9999.ebuild 1163 SHA256 2572f65cb100af949e451289b31f42ae48a2d46072d651f5f6e0af3b75c31e74 SHA512 4e34fb95badb4d9205863c70b04a677cb7bce9dcd61fa7d96d17b8d3f390ca11470ba8fcf40f295d1d92c4e637eaec48fe145972760ee83819950b4dd6dc7a92 WHIRLPOOL 4624cc51da9c5018a512b9ae5b6bedd0021b5bc10060385654d0e0e9e35ac1ef8694227f374961f6dab7aa11323ad8782bae53a27406a92514ff1caafcd018a6
-MISC ChangeLog 1879 SHA256 be7f0cc89fdede3dc257786896049e5147ac73551c7097b5e2535416e497b13b SHA512 068652eb3ae5be9f64ed906820e6261ca2fa1153c23b934d593e629f73bced7cc2831d10b5d2d2bb94674b3332e7066332171002774659136c1154f5e8d6420e WHIRLPOOL c08bb66a1e2cd858f49e538ae3501b6f81e088f17138762ea8240678e7f5ccb5b14d136673f85fa3d7a5d97cdf460f27e79cd1520b2b9bb5c5e8db11e84937c6
+EBUILD netctl-1.1-r1.ebuild 1894 SHA256 39f15df985b509a81b9fb7967320f9776cdcaf7f29a5a387ffa52d201d5e6965 SHA512 e10a6340d233efd0ab16629a39cae8a28d67f945b2e44755c1985d7c77ef6c2ea604786375ac651f195392e3c589efbaa90aea6e67ec665f8e5f7c33ecd1e24a WHIRLPOOL 22afb2fa5f35b7e90b03ee77b7c41db7658b08fc2b943b660c5b155e82f39bf62553a8aa8ce54bda9426a8718f31ee334e5a7f5efafcea6fff586815954735d6
+EBUILD netctl-9999.ebuild 1892 SHA256 7c2e8b248e1d3804aeb04386bffa265a2735cdaf012510e92d5f0a1e9c550a23 SHA512 7868b8eb36341ffc5f9e7d044042718a8c93d1f7f75db3ff9c52ade04ebaba2af5f5673cdc50ce0bd7e9436b903edea616b9f817fb9ad7786f538cd6c2f22e3a WHIRLPOOL 64c3cd1977d29b8dbb63e6eace7b58a00ef11318e30f67cf030f4104c02c2234c01434d4a4c490b033e0f3ed0faabb48895518f6e61023c2d2bede81bb07bef7
+MISC ChangeLog 2099 SHA256 0da1a5baced2ada929e73fe539fa1421c44f1b9493da72ef7e45ce0acd7ec0d4 SHA512 5f549dad335f4315c1cfe186824c1071816d7ae2de3dc70d46e7d7b35e5db09a5dcfd6cfb653741432e9eea2ba7ae69390314495fa1e292389d9e18fb4d4b790 WHIRLPOOL 21d8cbe38696e106a6f9fbcf0475c0521daeae699d9b6589023f3d0055a26e15c782ba5341177462b5293b2a9ae623adcfeb27f72eda11e694985255fba16343
 MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGzaNUACgkQC77qH+pIQ6T8PQD9F6quD4+Ugd8XU7x1G5BcEr4k
-z00VpunfZYyYwqAJdNsA/3YC27CsukeGTCBd0qmzM+VGGnCFsX+lZaT9dHWTlmpw
-=oxK6
+iF4EAREIAAYFAlG6XQoACgkQC77qH+pIQ6ScmAD/VnBTp48Ufg9vaUrjWGBI00KL
+A81UXr93oJQh6JONQSQA/0HBDLLY0LxzsF09kDZu7R5q7nRHUUiAn+eJtfhNszN+
+=LI/Y
 -----END PGP SIGNATURE-----
diff --git a/net-misc/netctl/netctl-0.8.ebuild b/net-misc/netctl/netctl-0.8.ebuild
deleted file mode 100644
index 4901df0198a4..000000000000
--- a/net-misc/netctl/netctl-0.8.ebuild
+++ /dev/null
@@ -1,37 +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/netctl/netctl-0.8.ebuild,v 1.2 2013/04/30 14:27:32 floppym Exp $
-
-EAPI=5
-
-inherit eutils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://projects.archlinux.org/netctl.git"
-	inherit git-2
-else
-	SRC_URI="ftp://ftp.archlinux.org/other/packages/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Profile based network connection tool from Arch Linux"
-HOMEPAGE="https://www.archlinux.org/netctl/"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-shells/bash-4.0
-	>=net-dns/openresolv-3.5.4-r1
-	sys-apps/iproute2
-	sys-apps/systemd
-"
-
-src_compile() {
-	return 0
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" SHELL=bash install
-	dodoc AUTHORS NEWS README
-}
diff --git a/net-misc/netctl/netctl-1.0.ebuild b/net-misc/netctl/netctl-1.0.ebuild
deleted file mode 100644
index 0124e23f421b..000000000000
--- a/net-misc/netctl/netctl-1.0.ebuild
+++ /dev/null
@@ -1,37 +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/netctl/netctl-1.0.ebuild,v 1.1 2013/04/30 14:27:32 floppym Exp $
-
-EAPI=5
-
-inherit eutils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://projects.archlinux.org/netctl.git"
-	inherit git-2
-else
-	SRC_URI="ftp://ftp.archlinux.org/other/packages/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Profile based network connection tool from Arch Linux"
-HOMEPAGE="https://www.archlinux.org/netctl/"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-shells/bash-4.0
-	>=net-dns/openresolv-3.5.4-r1
-	sys-apps/iproute2
-	sys-apps/systemd
-"
-
-src_compile() {
-	return 0
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" SHELL=bash install
-	dodoc AUTHORS NEWS README
-}
diff --git a/net-misc/netctl/netctl-1.1-r1.ebuild b/net-misc/netctl/netctl-1.1-r1.ebuild
index 7185a4068a8b..2519714899f8 100644
--- a/net-misc/netctl/netctl-1.1-r1.ebuild
+++ b/net-misc/netctl/netctl-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-1.1-r1.ebuild,v 1.4 2013/06/08 17:24:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-1.1-r1.ebuild,v 1.5 2013/06/14 00:00:09 floppym Exp $
 
 EAPI=5
 
@@ -49,3 +49,30 @@ src_install() {
 	insinto /usr/share/zsh/site-functions
 	newins contrib/zsh-completion _netctl
 }
+
+optfeature() {
+	local desc=$1
+	shift
+	while (( $# )); do
+		if has_version "$1"; then
+			elog "  [I] $1 for ${desc}"
+		else
+			elog "  [ ] $1 for ${desc}"
+		fi
+		shift
+	done
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To get additional features, a number of option runtime dependencies may be"
+		elog "installed."
+		optfeature "DHCP support" net-misc/dhcpcd ">=net-misc/dhcp-5.6.7[client]"
+		optfeature "WPA support" net-wireless/wpa_supplicant
+		optfeature "interactive assistant" dev-util/dialog
+		optfeature "automatic connection" sys-apps/ifplugd
+		optfeature "bonding support" net-misc/ifenslave
+		optfeature "bridge support" net-misc/bridge-utils
+		optfeature "dialup support" net-dialup/ppp
+	fi
+}
diff --git a/net-misc/netctl/netctl-1.1.ebuild b/net-misc/netctl/netctl-1.1.ebuild
deleted file mode 100644
index 8287d3f60dad..000000000000
--- a/net-misc/netctl/netctl-1.1.ebuild
+++ /dev/null
@@ -1,40 +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/netctl/netctl-1.1.ebuild,v 1.1 2013/05/25 19:07:31 floppym Exp $
-
-EAPI=5
-
-inherit bash-completion-r1 eutils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://projects.archlinux.org/netctl.git"
-	inherit git-2
-else
-	SRC_URI="ftp://ftp.archlinux.org/other/packages/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Profile based network connection tool from Arch Linux"
-HOMEPAGE="https://www.archlinux.org/netctl/"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-shells/bash-4.0
-	>=net-dns/openresolv-3.5.4-r1
-	sys-apps/iproute2
-	sys-apps/systemd
-"
-
-src_compile() {
-	return 0
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" SHELL=bash install
-	dodoc AUTHORS NEWS README
-	newbashcomp contrib/bash-completion netctl
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh-completion _netctl
-}
diff --git a/net-misc/netctl/netctl-9999.ebuild b/net-misc/netctl/netctl-9999.ebuild
index 9637ca655f77..642982932a74 100644
--- a/net-misc/netctl/netctl-9999.ebuild
+++ b/net-misc/netctl/netctl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-9999.ebuild,v 1.8 2013/06/08 17:24:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-9999.ebuild,v 1.9 2013/06/14 00:00:09 floppym Exp $
 
 EAPI=5
 
@@ -49,3 +49,30 @@ src_install() {
 	insinto /usr/share/zsh/site-functions
 	newins contrib/zsh-completion _netctl
 }
+
+optfeature() {
+	local desc=$1
+	shift
+	while (( $# )); do
+		if has_version "$1"; then
+			elog "  [I] $1 for ${desc}"
+		else
+			elog "  [ ] $1 for ${desc}"
+		fi
+		shift
+	done
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To get additional features, a number of option runtime dependencies may be"
+		elog "installed."
+		optfeature "DHCP support" net-misc/dhcpcd ">=net-misc/dhcp-5.6.7[client]"
+		optfeature "WPA support" net-wireless/wpa_supplicant
+		optfeature "interactive assistant" dev-util/dialog
+		optfeature "automatic connection" sys-apps/ifplugd
+		optfeature "bonding support" net-misc/ifenslave
+		optfeature "bridge support" net-misc/bridge-utils
+		optfeature "dialup support" net-dialup/ppp
+	fi
+}