Version bump.

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

5 files changed, 103 insertions, 13 deletions

diff --git a/net-misc/netctl/ChangeLog b/net-misc/netctl/ChangeLog
index b54bd43c9110..0e349627a3eb 100644
--- a/net-misc/netctl/ChangeLog
+++ b/net-misc/netctl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2013/06/14 00:00:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/ChangeLog,v 1.12 2013/08/02 16:26:09 floppym Exp $
+
+*netctl-1.2 (02 Aug 2013)
+
+  02 Aug 2013; Mike Gilbert <floppym@gentoo.org> +netctl-1.2.ebuild,
+  netctl-1.1-r1.ebuild, netctl-9999.ebuild:
+  Version bump.
 
   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,
diff --git a/net-misc/netctl/Manifest b/net-misc/netctl/Manifest
index 7cd36d36e941..9796b92766d5 100644
--- a/net-misc/netctl/Manifest
+++ b/net-misc/netctl/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA256
 
 DIST netctl-1.1.tar.xz 27748 SHA256 54a4891250f53190758b4c67ca397b963e1b7cc460e85cbe6677d541f1b8894d SHA512 62ebf33bdb8c5244fe3ab86532f0d04bca2a04bf5c557fbdc7a003b7fabe02cb778bc4379117f035044159909f8d5a187673cdc3e4cc222a8b265726de0a0e0a WHIRLPOOL f618b0e5ed4ca9ee3a02b89c42ff5365480e7abaadf1bd2a7ef9f48e873dee66ea042a41e66df611276ae85c1f39b7da0710d987136669427e160820b74be302
-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
+DIST netctl-1.2.tar.xz 27940 SHA256 49489097a64e9e4ff160ca531c9859de5a5475a73a070a8e6bce4eccba5e964b SHA512 fd588e79d28e0d7fd94c625f262847c909bb3bee596c48f0d20d2a4bb3535694d732a3d7d8f0c4ff8df065583872e2d607ee5f48b79c2fa7a9a562645a6f28c2 WHIRLPOOL e4b6ec74c6f69c6491e2d51349c1af5c9ec2e1c16b40131fa0618695abce77094ad531755223476e2e3f590298479600654e6831f4cbb3d9d0913421241d55f9
+EBUILD netctl-1.1-r1.ebuild 2001 SHA256 51db7a4dd0740f000568dfd45b0f60a62476efe1f0b1a0c55764bc50f61ad1df SHA512 c8ddf7a4aac6983fb78a9440ed0ebc8cf8cd86cd319068aab7dad9e829728832960fb282ec3919b8356982f3db78dd0a30f17dd95528d74fb4eb950acc885223 WHIRLPOOL 468d69e8b91b4c79d3eb337d975c4aac5025d7b74014c3ca274c3bdb23b967ed8f8561c1fded6c658f1753e428cf6c2efdebe809c73ed515ac473f17228972a0
+EBUILD netctl-1.2.ebuild 1948 SHA256 d5b733f056f9e339e44f8ebbb3cf2971940afb49ef9fbc014dd39004732e75e5 SHA512 6522dc57773dd0d6ba96c0975c1c8e85bf4da40039f56a29c24a004911c080a3ef40f0aa72b99a645c149a31eaa09bfc54216c603c6308d47fa63f79360de156 WHIRLPOOL af7d173c5ea73684c13d885634a9061d624ba1ef8edae8881fa90663240ce9ab338b20e37a315e6caa8344a3c369fb8f6371a1d3d30f395dc30159b0f2d67e51
+EBUILD netctl-9999.ebuild 1950 SHA256 270a8026886483f239d427fbbbef27a86309ca3e3b321fcb25f23ebbe6f1ea16 SHA512 263f97c4fd4442ffe74d65c19633e7a8ef489451d9c276da696b468eda4687364ffd6e6790b4d4e34db461c865e3f262a8631f1d5e5718fae707d39b4bf41946 WHIRLPOOL 35933f8bd7a2099c5bd34440616ff9ec8bcbde34b8d022965ee4db65111dcb1ec1f06596c8bdd6e9cda8b8c178a1797438d6adf2ee790515d589a0e97d5e8e97
+MISC ChangeLog 2256 SHA256 838d0dcbf89bef874d06c7f3aefc1f1df3b2486ea8614ff141c92d8ba02505dc SHA512 1bdefb892e2cdce6eb4741db34d23bd7f3dd62ad83442e30f88edb01f57c05ebf8e6b7dd9c08d4eccae25eb6afe5bfdb89d0ae71e039d3465ef706af47b7292a WHIRLPOOL 54f7094080f273ca1b58b3d1d19158e407bac84d80138d67edc7e7d17f2cd90d77e3cca56f0ed6498b276f21a0628d291e075f796b7e9fa2aeb30e6a52fa35c5
 MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG6XQoACgkQC77qH+pIQ6ScmAD/VnBTp48Ufg9vaUrjWGBI00KL
-A81UXr93oJQh6JONQSQA/0HBDLLY0LxzsF09kDZu7R5q7nRHUUiAn+eJtfhNszN+
-=LI/Y
+iF4EAREIAAYFAlH73aIACgkQC77qH+pIQ6RNCAD8CaCXyCyRJdFYNMTnxccTnZ5o
+7j8fsWbDUWHwyQTqDP8A/1BkpNgT16+Ei54PG+/B8Zlkkis+uGtHX8a6xDDQudhW
+=H1XM
 -----END PGP SIGNATURE-----
diff --git a/net-misc/netctl/netctl-1.1-r1.ebuild b/net-misc/netctl/netctl-1.1-r1.ebuild
index 2519714899f8..a7e9a9f0318a 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.5 2013/06/14 00:00:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-1.1-r1.ebuild,v 1.6 2013/08/02 16:26:09 floppym Exp $
 
 EAPI=5
 
@@ -16,7 +16,9 @@ else
 fi
 
 DESCRIPTION="Profile based network connection tool from Arch Linux"
-HOMEPAGE="https://www.archlinux.org/netctl/"
+HOMEPAGE="https://wiki.archlinux.org/index.php/Netctl
+	https://www.archlinux.org/packages/core/any/netctl/
+	https://projects.archlinux.org/netctl.git/"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/net-misc/netctl/netctl-1.2.ebuild b/net-misc/netctl/netctl-1.2.ebuild
new file mode 100644
index 000000000000..1cab12543055
--- /dev/null
+++ b/net-misc/netctl/netctl-1.2.ebuild
@@ -0,0 +1,79 @@
+# 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.2.ebuild,v 1.1 2013/08/02 16:26:09 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="BSD"
+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-9999.ebuild b/net-misc/netctl/netctl-9999.ebuild
index 642982932a74..35aefb29ecbc 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.9 2013/06/14 00:00:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-9999.ebuild,v 1.10 2013/08/02 16:26:09 floppym Exp $
 
 EAPI=5
 
@@ -16,7 +16,9 @@ else
 fi
 
 DESCRIPTION="Profile based network connection tool from Arch Linux"
-HOMEPAGE="https://www.archlinux.org/netctl/"
+HOMEPAGE="https://wiki.archlinux.org/index.php/Netctl
+	https://www.archlinux.org/packages/core/any/netctl/
+	https://projects.archlinux.org/netctl.git/"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -65,14 +67,13 @@ optfeature() {
 
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To get additional features, a number of option runtime dependencies may be"
+		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 "bridge support" net-misc/bridge-utils
 		optfeature "dialup support" net-dialup/ppp
 	fi
 }