Version bump. Adjust openresolv dependency, bug 467762 by Francisco Vazquez.

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

6 files changed, 14 insertions, 85 deletions

diff --git a/net-misc/netctl/ChangeLog b/net-misc/netctl/ChangeLog
index 3abf40d2e7a2..63f62f66da71 100644
--- a/net-misc/netctl/ChangeLog
+++ b/net-misc/netctl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2013/04/07 04:11:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/ChangeLog,v 1.4 2013/04/30 14:27:32 floppym Exp $
+
+*netctl-1.0 (30 Apr 2013)
+
+  30 Apr 2013; Mike Gilbert <floppym@gentoo.org> +netctl-1.0.ebuild,
+  -files/netctl-util-paths.patch, -netctl-0.6.ebuild, -netctl-0.7.ebuild,
+  netctl-0.8.ebuild, netctl-9999.ebuild:
+  Version bump. Adjust openresolv dependency, bug 467762 by Francisco Vazquez.
 
 *netctl-0.8 (07 Apr 2013)
 
diff --git a/net-misc/netctl/files/netctl-util-paths.patch b/net-misc/netctl/files/netctl-util-paths.patch
deleted file mode 100644
index 11284087fdab..000000000000
--- a/net-misc/netctl/files/netctl-util-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Remove hard-coded utility paths
-
---- a/src/lib/connections/bond
-+++ b/src/lib/connections/bond
-@@ -2,7 +2,7 @@
- 
- . "$SUBR_DIR/ip"
- 
--IFENSLAVE="/sbin/ifenslave"
-+IFENSLAVE="ifenslave"
- 
- bond_up() {
-     if is_interface "$Interface"; then
---- a/src/lib/connections/bridge
-+++ b/src/lib/connections/bridge
-@@ -2,7 +2,7 @@
- 
- . "$SUBR_DIR/ip"
- 
--BRCTL="/usr/sbin/brctl"
-+BRCTL="brctl"
- 
- bridge_up() {
-     if is_interface "$Interface"; then
---- a/src/lib/connections/pppoe
-+++ b/src/lib/connections/pppoe
-@@ -43,8 +43,8 @@ pppoe_up() {
-     [[ -n ${PPPoEMAC} ]] && echo "pppoe-mac $(_quotestring "${PPPoEMAC}")" >> "${cfg}"
-     [[ ${PPPoEIP6} == yes ]] && echo "+ipv6" >> "${cfg}"
- 
--    /sbin/ip link set dev "${Interface}" up
--    /usr/sbin/pppd file "${cfg}"
-+    ip link set dev "${Interface}" up
-+    pppd file "${cfg}"
- 
-     if [[ $? -ne 0 ]]; then
-         rm "${cfg}"
diff --git a/net-misc/netctl/netctl-0.6.ebuild b/net-misc/netctl/netctl-0.6.ebuild
deleted file mode 100644
index 8abc6c48f28e..000000000000
--- a/net-misc/netctl/netctl-0.6.ebuild
+++ /dev/null
@@ -1,41 +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.6.ebuild,v 1.1 2013/03/10 22:56:40 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[systemd]
-	sys-apps/iproute2
-	sys-apps/systemd
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-util-paths.patch"
-}
-
-src_compile() {
-	return 0
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" SHELL=bash install
-	dodoc AUTHORS NEWS README
-}
diff --git a/net-misc/netctl/netctl-0.8.ebuild b/net-misc/netctl/netctl-0.8.ebuild
index 6990e022b612..4901df0198a4 100644
--- a/net-misc/netctl/netctl-0.8.ebuild
+++ b/net-misc/netctl/netctl-0.8.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-0.8.ebuild,v 1.1 2013/04/07 04:11:42 floppym Exp $
+# $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
 
@@ -22,7 +22,7 @@ IUSE=""
 
 RDEPEND="
 	>=app-shells/bash-4.0
-	>=net-dns/openresolv-3.5.4[systemd]
+	>=net-dns/openresolv-3.5.4-r1
 	sys-apps/iproute2
 	sys-apps/systemd
 "
diff --git a/net-misc/netctl/netctl-0.7.ebuild b/net-misc/netctl/netctl-1.0.ebuild
index 6a31282f23f7..0124e23f421b 100644
--- a/net-misc/netctl/netctl-0.7.ebuild
+++ b/net-misc/netctl/netctl-1.0.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-0.7.ebuild,v 1.1 2013/03/20 00:01:10 floppym Exp $
+# $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
 
@@ -22,7 +22,7 @@ IUSE=""
 
 RDEPEND="
 	>=app-shells/bash-4.0
-	>=net-dns/openresolv-3.5.4[systemd]
+	>=net-dns/openresolv-3.5.4-r1
 	sys-apps/iproute2
 	sys-apps/systemd
 "
diff --git a/net-misc/netctl/netctl-9999.ebuild b/net-misc/netctl/netctl-9999.ebuild
index d6e53a6ba442..219cb9131a6c 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.2 2013/03/20 00:01:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-9999.ebuild,v 1.3 2013/04/30 14:27:32 floppym Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ IUSE=""
 
 RDEPEND="
 	>=app-shells/bash-4.0
-	>=net-dns/openresolv-3.5.4[systemd]
+	>=net-dns/openresolv-3.5.4-r1
 	sys-apps/iproute2
 	sys-apps/systemd
 "