Update LICENSE to GPL-3. Remove old.

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

6 files changed, 18 insertions, 175 deletions

diff --git a/net-misc/netctl/ChangeLog b/net-misc/netctl/ChangeLog
index e1d1bf86ae5d..101d0e381a93 100644
--- a/net-misc/netctl/ChangeLog
+++ b/net-misc/netctl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2013/09/28 16:00:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/ChangeLog,v 1.14 2013/10/19 19:26:07 floppym Exp $
+
+  19 Oct 2013; Mike Gilbert <floppym@gentoo.org> -netctl-1.1-r1.ebuild,
+  -netctl-1.2.ebuild, netctl-1.3.ebuild, netctl-9999.ebuild:
+  Update LICENSE to GPL-3. Remove old.
 
 *netctl-1.3 (28 Sep 2013)
 
diff --git a/net-misc/netctl/Manifest b/net-misc/netctl/Manifest
index a98eab306620..72c03aca8b40 100644
--- a/net-misc/netctl/Manifest
+++ b/net-misc/netctl/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST netctl-1.1.tar.xz 27748 SHA256 54a4891250f53190758b4c67ca397b963e1b7cc460e85cbe6677d541f1b8894d SHA512 62ebf33bdb8c5244fe3ab86532f0d04bca2a04bf5c557fbdc7a003b7fabe02cb778bc4379117f035044159909f8d5a187673cdc3e4cc222a8b265726de0a0e0a WHIRLPOOL f618b0e5ed4ca9ee3a02b89c42ff5365480e7abaadf1bd2a7ef9f48e873dee66ea042a41e66df611276ae85c1f39b7da0710d987136669427e160820b74be302
-DIST netctl-1.2.tar.xz 27940 SHA256 49489097a64e9e4ff160ca531c9859de5a5475a73a070a8e6bce4eccba5e964b SHA512 fd588e79d28e0d7fd94c625f262847c909bb3bee596c48f0d20d2a4bb3535694d732a3d7d8f0c4ff8df065583872e2d607ee5f48b79c2fa7a9a562645a6f28c2 WHIRLPOOL e4b6ec74c6f69c6491e2d51349c1af5c9ec2e1c16b40131fa0618695abce77094ad531755223476e2e3f590298479600654e6831f4cbb3d9d0913421241d55f9
 DIST netctl-1.3.tar.xz 40560 SHA256 f0019cca3a87c03253f18251f7157c2c43d2468ee541ac0fdab8f8aeecec8488 SHA512 5c737a690f863f53c86bec2e52c8fcfc7d650ceb1c4960e31629b923a7f0e2a8b4eafd98514092a92c720f77254337a05b6d45990e6e2dd87361590d600ea90d WHIRLPOOL 92b8acc9174fe8d170e3fbe7a596242f1f85c7bec198135a2562811e09cf6ac6164f0728e4a2a94a2250d894da57ed2d07a72b0c42ef1c7dddb86fe0c86dfdc0
-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-1.3.ebuild 1948 SHA256 af3874e301f47683863831bccc8ad2e5f20fc4b338c4817b4bb07ce8dd21eaec SHA512 829f514abce3470b5006912d5a008c4b2f737c162dad9c7f8b59a8c312c95cfc30ca2da25d0fe4bf7fcd87a10f7eb5173926245e14f961cede6310561e1b84a2 WHIRLPOOL 98f48ab379b1c5cf1e1e764dc572a3eff42573a1c4c74b35cbb693c73de7dda73043073aca30535c626f1ed27761c58afd6a864e53c9b3a40d6d75fc29e29c2e
-EBUILD netctl-9999.ebuild 1950 SHA256 270a8026886483f239d427fbbbef27a86309ca3e3b321fcb25f23ebbe6f1ea16 SHA512 263f97c4fd4442ffe74d65c19633e7a8ef489451d9c276da696b468eda4687364ffd6e6790b4d4e34db461c865e3f262a8631f1d5e5718fae707d39b4bf41946 WHIRLPOOL 35933f8bd7a2099c5bd34440616ff9ec8bcbde34b8d022965ee4db65111dcb1ec1f06596c8bdd6e9cda8b8c178a1797438d6adf2ee790515d589a0e97d5e8e97
-MISC ChangeLog 2361 SHA256 365310dc4f029f74ff805ebeb27fea17559fc30024b609838b48c5f921752a61 SHA512 0e844ff52b30cfd0fef1894e56892cdd6e7ad9987d64045429c26710c25e50eda3c58667f2567ecb87bbb4220817d82635eb731ecfa596ecbba3bce344e441d4 WHIRLPOOL a52f76b2b77cc77135e9f5b36862e079bbfdf41c852654d9f86efee183e90fc50962d3d59464e773026c9a5759928bcdde29868620607d7a0ef906cf733bf933
+EBUILD netctl-1.3.ebuild 1951 SHA256 b31dc9c234b9ca68b1297492b107c4773220e2271e6bed5dd21b3c47ebc2df7e SHA512 73d0b32876f698706c3a6b7dae15ff455a5b98309e1920185a3f1b99c3618bf49b8ded789969d844895c1a84338ed8645e70da0c232886e69179fcd45c3414e1 WHIRLPOOL ccf42f971962d14331241b110bd6fb66ebeced8344554f2f5eb02c748c1434ef5d2107e1ab0e1a94fa8590841abd80aaa430fea10f0e22f8cd11418e45589f96
+EBUILD netctl-9999.ebuild 1953 SHA256 a0424f7abc26b16f1f327a17f4ea790337342c491620482e64183b1b7e66bf97 SHA512 172f88cf16078e72e0ae24b37e54d0ebe5617a722bd20b192b7b379eec5313fc4350770cac93b3effd215d3652076a5b33a6cca74d46f1dd37945c1a4fca7b18 WHIRLPOOL 2e5c6bb6c9e33be335cdc52f98b3ccb02c36c7b7c7f18a55fa311a1a7e17f499de6d7b9ece62f2c30dbb1eda994234e88150ec7bd9b87c6ebb43bbde94e9bfc8
+MISC ChangeLog 2534 SHA256 6b9e2fc9262469f8bbe619cc0a097fe091dc459860a66001e6f79a4c2ea61898 SHA512 d66f8a645ab572c28e7e3c6838bc2eb7b6233bfa3b2f3695f2dbbeea35f4dbbee6ebd142fdc05b3944e11ad4bf51f02f3161c0f06bea76072ac05722093632b4 WHIRLPOOL 149124d2c70b4a329e61e9c8031ed12f8630047deeb48b4bc0c13f53b67780fcca5381cd738dab932a1cf128bcd5e92e39bdfbe13fd74c6716b86be308a0e846
 MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJG/SQACgkQC77qH+pIQ6T9CwEArBSqi34PV98FmfXIxOqlcLSh
-MSMwbhfhzaF29IGvdVQBAJosdmHNCv7FBtZY06o+8p+reEFR4Dbaa3Ztz1oXicYy
-=Qs47
+iF4EAREIAAYFAlJi3NAACgkQC77qH+pIQ6QwzAEAiO2SlsVVzhuP4do8AZv4qxZM
+bKMY+aTmx4QSzkKqFrEA/0PfMnVMmYiNCRT/iA0s7o1jZRfROFZXwVG3CFJxeKjU
+=TAAH
 -----END PGP SIGNATURE-----
diff --git a/net-misc/netctl/netctl-1.1-r1.ebuild b/net-misc/netctl/netctl-1.1-r1.ebuild
deleted file mode 100644
index a7e9a9f0318a..000000000000
--- a/net-misc/netctl/netctl-1.1-r1.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.1-r1.ebuild,v 1.6 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 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.2.ebuild b/net-misc/netctl/netctl-1.2.ebuild
deleted file mode 100644
index 1cab12543055..000000000000
--- a/net-misc/netctl/netctl-1.2.ebuild
+++ /dev/null
@@ -1,79 +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.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-1.3.ebuild b/net-misc/netctl/netctl-1.3.ebuild
index 5c505da1af51..3f68eaba41d9 100644
--- a/net-misc/netctl/netctl-1.3.ebuild
+++ b/net-misc/netctl/netctl-1.3.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.3.ebuild,v 1.1 2013/09/28 16:00:31 floppym Exp $
+# $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
 
@@ -19,7 +19,8 @@ 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"
+
+LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
diff --git a/net-misc/netctl/netctl-9999.ebuild b/net-misc/netctl/netctl-9999.ebuild
index 35aefb29ecbc..7ce5267aef5a 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.10 2013/08/02 16:26:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netctl/netctl-9999.ebuild,v 1.11 2013/10/19 19:26:07 floppym Exp $
 
 EAPI=5
 
@@ -19,7 +19,8 @@ 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"
+
+LICENSE="GPL-3"
 SLOT="0"
 IUSE=""