Fix path to ifplugd, bug 472682 by Alexander Tsoy.

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

4 files changed, 67 insertions, 8 deletions

diff --git a/net-misc/netctl/ChangeLog b/net-misc/netctl/ChangeLog
index 4e0e9e1b5c43..b0e1e4a5f54a 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.5 2013/05/25 19:07:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/ChangeLog,v 1.6 2013/06/08 17:08:17 floppym Exp $
+
+*netctl-1.1-r1 (08 Jun 2013)
+
+  08 Jun 2013; Mike Gilbert <floppym@gentoo.org> +netctl-1.1-r1.ebuild,
+  netctl-9999.ebuild:
+  Fix path to ifplugd, bug 472682 by Alexander Tsoy.
 
 *netctl-1.1 (25 May 2013)
 
diff --git a/net-misc/netctl/Manifest b/net-misc/netctl/Manifest
index 196d6c954931..72a88d568291 100644
--- a/net-misc/netctl/Manifest
+++ b/net-misc/netctl/Manifest
@@ -6,14 +6,15 @@ DIST netctl-1.0.tar.xz 27512 SHA256 0e18338797e72c355f4da2814a29c21b9f9a3287b19a
 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 1091 SHA256 0fc4eb03bbda91bc25cbfdf96c31d381a40a46572e6d2db5eea9b369e6673726 SHA512 759ee2effaf9eb33d148b38e86aa83df7588f18f2b9b8ba9844c84eb5bbca94aab07d3a7baac8e663bd0ea567933e8d6dbdeaa2c18b8dd070eea410241c45819 WHIRLPOOL 7f85f9353400e460698142b1eee378358e0af50c3581c26a6370e3c971d59abfce46ddbddc6757405b04217a07f0fa42fcfca0853ecd61d1ec9da468a16c35bb
 EBUILD netctl-1.1.ebuild 951 SHA256 3a3ade3490658d189b7aba4bfe1a30298373fbdff7e5ef974cace5fd510a8278 SHA512 aaad237eb83fe553c89800baa2f891df7374e27e31fde420e010fb746816ce80458d4a43fb95f0d0fe86dbf5e134764a205428218ede7b6767ea56cf542c260c WHIRLPOOL e9395cb744d045e1e247dcf976c698749235799f84430498c92d383f9016d7c44ca97339d6bc87dc695a569b79c43af4e627fec54ecbfb34ac9f2b381de768d3
-EBUILD netctl-9999.ebuild 952 SHA256 e290d50d5f97caaa3688c955c10f975d309c086fef7de4012795b3c13f94b196 SHA512 9edada1accb5f832c7df5269f4af7b23aa8aec9711c59364941ba958ebf8ef1e6ae59cde35d8fb3de87e2d71e8e09dfaa01ade1b5c306d263e869f8f66e768fd WHIRLPOOL a7843337c76c0c8fd6c7c997d46baae657f7d843e73e80631c724bdaab284d516376985ea75e63009359ec5f15c3b816106fe9d2343f43d8674868ad06279ee5
-MISC ChangeLog 1160 SHA256 e3b0239cdd1ea96b6778b2deb39eb36e654fdbb42b28daae0c301833f50e0dd5 SHA512 bde16a6f743c19136f894773a46822ea83d954aebc8ed78b96d1cd5006cdf061ca7baf823f138af2c9b641d70584bd8389e32db3f377cba4e54df4482e925f8a WHIRLPOOL 609c25ca780fe899bc9681aa39e1a0f062e3179a0afb669d1e127552f33e5d27b95d6c40a553c42125f49fcd6c27dd05a46cbd2b8b874e9b677da59819521eba
+EBUILD netctl-9999.ebuild 1089 SHA256 c11fc458c14f83e3b8988131f5a03776d905239d42849f4ab462434763de715f SHA512 144ee34ec7b2ebde0353da24c12a700b51f56886b5205d7a41ae507923c73e76398facf822a48e715229bcf9f4694a8b600fbfa3426e0a9a5c320e3de114cf77 WHIRLPOOL a9066120f4e0392ebb040cf0e8a7a1934c886717ff8dcd4945d18e635bbca4640527ec7979508f573485713a95c3ae417308de46b475148e5dbdbc06a27ad012
+MISC ChangeLog 1338 SHA256 459c5d73a07bf2dd77bcca3233acf6dccc908dfe53dd390fd0aac1b3d7d7f2cf SHA512 c44b05519a2feb0ef180122f88e09b9775ba0c5e405088e5317173fdcad780231cc887732580d73a8799599297f3f7e45436de80759d0f56f4b84fe477c97152 WHIRLPOOL 9b512359f0e7851800d0c9a18ee98f46705b43c565e2cf8432f3e7464ca629cef8bb8f33bc6e6ee70efa20e7c64ffd61768862159d8858d3ef3fd128fb4a07d9
 MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGhC/QACgkQC77qH+pIQ6QCSgD/UIOtKV0nl33mZ0D9yQc6eKQG
-acMoRBBaJ5O4lQ85hEYA/RondICjcg1Fw4Au+jKHuP7WogzzWE6oMRyfarRhAndD
-=c+4c
+iF0EAREIAAYFAlGzZQIACgkQC77qH+pIQ6T+3QD0CrfeoWRuC63AhMIMQdlRebzW
+ddgEcCRc3TtSYU3hfQD/bUHd1ZPSVB0wf8dA35ouYBsqJBSkkLRjYGMiyJVl+DQ=
+=OkxU
 -----END PGP SIGNATURE-----
diff --git a/net-misc/netctl/netctl-1.1-r1.ebuild b/net-misc/netctl/netctl-1.1-r1.ebuild
new file mode 100644
index 000000000000..aca207c476f1
--- /dev/null
+++ b/net-misc/netctl/netctl-1.1-r1.ebuild
@@ -0,0 +1,46 @@
+# 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.1 2013/06/08 17:08:17 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://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_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
+}
diff --git a/net-misc/netctl/netctl-9999.ebuild b/net-misc/netctl/netctl-9999.ebuild
index bc830d5ab311..34c0f55b36f0 100644
--- a/net-misc/netctl/netctl-9999.ebuild
+++ b/net-misc/netctl/netctl-9999.ebuild
@@ -1,14 +1,15 @@
 # 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.4 2013/05/25 19:07:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-9999.ebuild,v 1.5 2013/06/08 17:08:17 floppym Exp $
 
 EAPI=5
 
-inherit bash-completion-r1 eutils
+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"
@@ -27,6 +28,11 @@ RDEPEND="
 	sys-apps/systemd
 "
 
+src_prepare() {
+	sed -i -e "s:/usr/bin/ifplugd:/usr/sbin/ifplugd:" \
+		"services/netctl-ifplugd@.service" || die
+}
+
 src_compile() {
 	return 0
 }