Version bump. Add blockers to ensure we have a usable version of dhcpcd, bug 514166. Remove old.

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

6 files changed, 19 insertions, 89 deletions

diff --git a/net-misc/netctl/ChangeLog b/net-misc/netctl/ChangeLog
index 147f18566f08..657de338ed94 100644
--- a/net-misc/netctl/ChangeLog
+++ b/net-misc/netctl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/netctl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/ChangeLog,v 1.21 2014/06/14 10:43:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/ChangeLog,v 1.22 2014/06/21 17:55:44 floppym Exp $
+
+*netctl-1.8 (21 Jun 2014)
+
+  21 Jun 2014; Mike Gilbert <floppym@gentoo.org> +netctl-1.8.ebuild,
+  -netctl-1.3.ebuild, -netctl-1.4.ebuild, netctl-1.6.ebuild, netctl-1.7.ebuild,
+  netctl-9999.ebuild:
+  Version bump. Add blockers to ensure we have a usable version of dhcpcd, bug
+  514166. Remove old.
 
   14 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> netctl-1.6.ebuild:
   x86 stable wrt bug #510880
diff --git a/net-misc/netctl/netctl-1.3.ebuild b/net-misc/netctl/netctl-1.3.ebuild
deleted file mode 100644
index 3f68eaba41d9..000000000000
--- a/net-misc/netctl/netctl-1.3.ebuild
+++ /dev/null
@@ -1,80 +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.3.ebuild,v 1.2 2013/10/19 19:26:07 floppym Exp $
-
-EAPI=5
-
-inherit bash-completion-r1
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://projects.archlinux.org/netctl.git"
-	inherit git-2
-	DEPEND="app-text/asciidoc"
-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://wiki.archlinux.org/index.php/Netctl
-	https://www.archlinux.org/packages/core/any/netctl/
-	https://projects.archlinux.org/netctl.git/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	virtual/pkgconfig
-	sys-apps/systemd
-"
-RDEPEND="
-	>=app-shells/bash-4.0
-	>=net-dns/openresolv-3.5.4-r1
-	sys-apps/iproute2
-	sys-apps/systemd
-	!<net-misc/dhcpcd-5.6.7
-"
-
-src_prepare() {
-	sed -i -e "s:/usr/bin/ifplugd:/usr/sbin/ifplugd:" \
-		"services/netctl-ifplugd@.service" || die
-}
-
-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
-}
-
-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 optional 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 "dialup support" net-dialup/ppp
-	fi
-}
diff --git a/net-misc/netctl/netctl-1.6.ebuild b/net-misc/netctl/netctl-1.6.ebuild
index 66caf89074f9..f183b32a9305 100644
--- a/net-misc/netctl/netctl-1.6.ebuild
+++ b/net-misc/netctl/netctl-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-1.6.ebuild,v 1.3 2014/06/14 10:43:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-1.6.ebuild,v 1.4 2014/06/21 17:55:44 floppym Exp $
 
 EAPI=5
 
@@ -34,6 +34,7 @@ RDEPEND="
 	sys-apps/iproute2
 	sys-apps/systemd
 	!<net-misc/dhcpcd-5.6.7
+	!>=net-misc/dhcpcd-6.4.0
 "
 
 src_prepare() {
diff --git a/net-misc/netctl/netctl-1.7.ebuild b/net-misc/netctl/netctl-1.7.ebuild
index aed8409ebd10..32fc9c76f9ef 100644
--- a/net-misc/netctl/netctl-1.7.ebuild
+++ b/net-misc/netctl/netctl-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-1.7.ebuild,v 1.1 2014/05/20 20:11:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-1.7.ebuild,v 1.2 2014/06/21 17:55:44 floppym Exp $
 
 EAPI=5
 
@@ -34,6 +34,7 @@ RDEPEND="
 	sys-apps/iproute2
 	sys-apps/systemd
 	!<net-misc/dhcpcd-5.6.7
+	!>=net-misc/dhcpcd-6.4.0
 "
 
 src_prepare() {
diff --git a/net-misc/netctl/netctl-1.4.ebuild b/net-misc/netctl/netctl-1.8.ebuild
index 948d1536257e..89565982d791 100644
--- a/net-misc/netctl/netctl-1.4.ebuild
+++ b/net-misc/netctl/netctl-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-1.4.ebuild,v 1.3 2014/01/18 18:38:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-1.8.ebuild,v 1.1 2014/06/21 17:55:44 floppym Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	DEPEND="app-text/asciidoc"
 else
 	SRC_URI="ftp://ftp.archlinux.org/other/packages/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Profile based network connection tool from Arch Linux"
@@ -33,7 +33,7 @@ RDEPEND="
 	>=net-dns/openresolv-3.5.4-r1
 	sys-apps/iproute2
 	sys-apps/systemd
-	!<net-misc/dhcpcd-5.6.7
+	!<net-misc/dhcpcd-6.4.0
 "
 
 src_prepare() {
diff --git a/net-misc/netctl/netctl-9999.ebuild b/net-misc/netctl/netctl-9999.ebuild
index 7ce5267aef5a..22453dfffa0c 100644
--- a/net-misc/netctl/netctl-9999.ebuild
+++ b/net-misc/netctl/netctl-9999.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/netctl/netctl-9999.ebuild,v 1.11 2013/10/19 19:26:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-9999.ebuild,v 1.12 2014/06/21 17:55:44 floppym Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ RDEPEND="
 	>=net-dns/openresolv-3.5.4-r1
 	sys-apps/iproute2
 	sys-apps/systemd
-	!<net-misc/dhcpcd-5.6.7
+	!<net-misc/dhcpcd-6.4.0
 "
 
 src_prepare() {