Fix LICENSE, bug 301123.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

8 files changed, 42 insertions, 27 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index dde79a0f6b37..75184308e700 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.164 2009/07/26 12:45:08 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.165 2010/01/15 19:00:22 ulm Exp $
+
+  15 Jan 2010; Ulrich Mueller <ulm@gentoo.org> dhcp-3.1.1.ebuild,
+  dhcp-3.1.1-r1.ebuild, dhcp-3.1.2.ebuild, dhcp-3.1.2_p1.ebuild,
+  dhcp-4.0.1.ebuild, dhcp-4.1.0.ebuild:
+  Fix LICENSE, bug 301123.
 
   26 Jul 2009; Brent Baude <ranger@gentoo.org> dhcp-3.1.2_p1.ebuild:
   Marking dhcp-3.1.2_p1 ppc64 for bug 275231
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index e44e9bde452a..2637e2d3146e 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dhcp-3.0-ddns-example.patch 401 RMD160 0188ae91fb58fc6f8c0d1b5bcbed58582dfed099 SHA1 c9e0f4c9ccbf1ff89076ff1bec37fb6d1276b7f0 SHA256 cf136ce92ea8f3337b9ded9c6f4f019db9782a68c63a3e8b712d26a04c2c9584
 AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018
 AUX dhcp-3.0-paranoia.patch 5366 RMD160 7c64e3dac5b07ff3859fcaa7a8b0e52a0c50446c SHA1 a30103c138e480766f84644fffb1d0897709c27d SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae
@@ -40,11 +43,18 @@ DIST dhcp-3.1.2.tar.gz 799626 RMD160 026ac48b176ec273397fafa8a834a21fd6331681 SH
 DIST dhcp-3.1.2p1.tar.gz 792355 RMD160 53434f8404c69e8e113cad030ec975cf13b467cc SHA1 730214fa6e70d187f1492aa3d4f1c2868ffcc8de SHA256 e0cb405e0fef0ecebec7aaed294032a06178ff28be87498596e6069ccda4341e
 DIST dhcp-4.0.1.tar.gz 1050570 RMD160 a9764a76d105778362fe4b58e77783331ee3448a SHA1 7d813740ab4a64e474f1c01b1395617987532ed1 SHA256 965d09a7759250eff7d6d06d37425ea085c14edb5b405f8357ef5ec72ded28ef
 DIST dhcp-4.1.0.tar.gz 1086815 RMD160 bf96fa9d135a65b4d9b27f8caf4f3744f0636c80 SHA1 46e161892140a3b60cd56e62b442f48f51bc605f SHA256 688741e970410efdb177513550f8cd1ee52032eb109313ab316a852f40310914
-EBUILD dhcp-3.1.1-r1.ebuild 7585 RMD160 1716a17f3666c46d4f1ec3a6e8ccd417c720e592 SHA1 4a8410bf4962ad6cbb44d2cdb33f5662046640b2 SHA256 9ae786ffce4d66b4e9ec91478f983078b77a7b2237fa99ab91b8d1a32f8d6bad
-EBUILD dhcp-3.1.1.ebuild 7431 RMD160 34ec0d733c3d424877748970a92c9f38fbd18730 SHA1 39a0cb8773100a2b436007a6196d65bb4519b29a SHA256 d040e4ee5f081bd585d17fb62136ab3d4aaa95b0044672eafe3364ae26b2fe32
-EBUILD dhcp-3.1.2.ebuild 7474 RMD160 78d2bdccab808591b1c0ba6adc5d788dc71b95dc SHA1 4777e8b4da41bb19a0b7581190804cce9dae4b6c SHA256 5605c8e752bd1b4d338d3cba623f648ec672b25e99f75fd3f1d3ece397a13bbc
-EBUILD dhcp-3.1.2_p1.ebuild 7608 RMD160 a06a533f1d52abb2be310b257ad0ab836abb5fa3 SHA1 d9fd19e0b388c4efbc3ef6785575e34ca8c02b24 SHA256 da14d5c5878aaaa4fd03e82734ef29d623770190d80c42c0202d4a22deea0f71
-EBUILD dhcp-4.0.1.ebuild 6748 RMD160 65a827140787fd302acb9970930d14576a0b5ba6 SHA1 27fcb9e7a64f1d5f7b4a96f6d2c8f3aa5f0b1679 SHA256 43d87d271aeaaf23095e601359d49eb9253c91b07376d7720b5d03e1530ffe6c
-EBUILD dhcp-4.1.0.ebuild 6707 RMD160 e8d9c13d570cdce1b3f57c595be6de5fffd5659b SHA1 c6c03fd3d3555524ffa8d7b8a1dee0c65f62fbc2 SHA256 5ee24d452738644c0213970e9d2ba1cb8ccb946de41f2e2627481acd99f58828
-MISC ChangeLog 28069 RMD160 fcd9c4c6a3da5decd6cc1427018836a84fe5ffb5 SHA1 31a56a138f53f663075e00fe0812458a9f402d3d SHA256 d2518de3140562bb3aef9a18a66115e138a87c5d6cb32af184efd304c1bb0066
+EBUILD dhcp-3.1.1-r1.ebuild 7581 RMD160 e3012da6c7602544a882dcc99059394eceb0ad1d SHA1 a78bf9beee75424a4c0dbdeeb79113a8d66b49b9 SHA256 2dbc3118d7955e0b31e63737732e413923810485ea929499231d41091379dc64
+EBUILD dhcp-3.1.1.ebuild 7430 RMD160 33dd30be2b4e210493421f4a50767f81ec7edb29 SHA1 33493ba5fbc4f8fbf03cad5218b7e53c413872ac SHA256 a594c7c0e519a8b9a1522c8a4033abf8d392f2675a159c4351bf41f1a5ba586d
+EBUILD dhcp-3.1.2.ebuild 7470 RMD160 ce4c0c3c3122040ca19103c37981444a1429c160 SHA1 dca8a1670ffb298c32089ca58bfdc4019f3a357e SHA256 40e5f159eff7a142f64d2511d06536bd97e46170cf371d9ad2ebd9c74d61b02f
+EBUILD dhcp-3.1.2_p1.ebuild 7606 RMD160 4a092fb0f8337065432ad475193633dca2b381e1 SHA1 e883fef011969302fad6ede0977cb6e1a8387dc7 SHA256 765bcec429ccff09c85b0e466da0673813ed4440cdf31c316698e798892dc37d
+EBUILD dhcp-4.0.1.ebuild 6744 RMD160 dcd9eb3251fdeb283b9ef285cc63b7253dcf01c9 SHA1 c3f78ed12faf8924e43cb35cfc81f9096ede35f5 SHA256 68f9a416ba63c1403265c12a42d86b10e6d0aca3591e85d6beb419c082e433de
+EBUILD dhcp-4.1.0.ebuild 6703 RMD160 095f3abdab681e9ad7fd6820e159d295eb0e4892 SHA1 ef553a729eb8cd8f66a1bdca6024b5edb5864393 SHA256 a70d305090bc716e807861e154363f4b478852ad7c7d5f1ef8d5f45fb4ffea4d
+MISC ChangeLog 28265 RMD160 768b44e541144dfb932d3ba683892f09d7c19e6c SHA1 0f175a343512d70cfe4fb297c392a9a4b9f56a33 SHA256 b41c9d60d45090833707b398e332dbf885c24385d6d59a42ff8358f7b6511598
 MISC metadata.xml 358 RMD160 97ecd4b6ee0a24352a71a66d5ad4fd82481156b4 SHA1 d80da2cf7c6892cdad6b681fda29e46472d68871 SHA256 8665f24cdfcc09576b595f8bd257333ff5f9ea7ee0ca2925ba6fb74d90e12415
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktQvFAACgkQOeoy/oIi7uyUfwCgqndUo03W1zmR4Bczi980Z0AZ
+a3kAn0QukYp1WvowBPponudOdoJZe3QS
+=MUFV
+-----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-3.1.1-r1.ebuild b/net-misc/dhcp/dhcp-3.1.1-r1.ebuild
index 0dc23e575243..366e310796b9 100644
--- a/net-misc/dhcp/dhcp-3.1.1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.1-r1.ebuild,v 1.1 2009/07/14 17:35:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.1-r1.ebuild,v 1.2 2010/01/15 19:00:22 ulm Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -12,7 +12,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="isc-dhcp"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="doc minimal static selinux kernel_linux"
diff --git a/net-misc/dhcp/dhcp-3.1.1.ebuild b/net-misc/dhcp/dhcp-3.1.1.ebuild
index e7c0077c38f0..bcb1e39c4eb6 100644
--- a/net-misc/dhcp/dhcp-3.1.1.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.1.ebuild,v 1.9 2008/11/05 00:41:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.1.ebuild,v 1.10 2010/01/15 19:00:22 ulm Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -12,7 +12,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="isc-dhcp"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="doc minimal static selinux kernel_linux"
diff --git a/net-misc/dhcp/dhcp-3.1.2.ebuild b/net-misc/dhcp/dhcp-3.1.2.ebuild
index 60708d6c5dc6..d76877971bf9 100644
--- a/net-misc/dhcp/dhcp-3.1.2.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.2.ebuild,v 1.1 2009/07/09 14:45:21 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.2.ebuild,v 1.2 2010/01/15 19:00:22 ulm Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -12,7 +12,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="isc-dhcp"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="doc minimal static selinux kernel_linux"
diff --git a/net-misc/dhcp/dhcp-3.1.2_p1.ebuild b/net-misc/dhcp/dhcp-3.1.2_p1.ebuild
index a651e37ec093..33f7894ecd72 100644
--- a/net-misc/dhcp/dhcp-3.1.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.2_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.2_p1.ebuild,v 1.8 2009/07/26 12:45:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.2_p1.ebuild,v 1.9 2010/01/15 19:00:22 ulm Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -13,7 +13,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="isc-dhcp"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="doc minimal static selinux kernel_linux"
diff --git a/net-misc/dhcp/dhcp-4.0.1.ebuild b/net-misc/dhcp/dhcp-4.0.1.ebuild
index 8b20567f7ad8..82206fb6523d 100644
--- a/net-misc/dhcp/dhcp-4.0.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.0.1.ebuild,v 1.1 2009/03/30 13:13:28 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.0.1.ebuild,v 1.2 2010/01/15 19:00:22 ulm Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -12,7 +12,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="isc-dhcp"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="doc ipv6 selinux kernel_linux vim-syntax"
diff --git a/net-misc/dhcp/dhcp-4.1.0.ebuild b/net-misc/dhcp/dhcp-4.1.0.ebuild
index fd621d562d11..6ea566a9942d 100644
--- a/net-misc/dhcp/dhcp-4.1.0.ebuild
+++ b/net-misc/dhcp/dhcp-4.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.1.0.ebuild,v 1.1 2009/07/09 14:45:21 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.1.0.ebuild,v 1.2 2010/01/15 19:00:22 ulm Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -12,7 +12,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="isc-dhcp"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="doc ipv6 selinux kernel_linux vim-syntax"