Fix LICENSE, bugs 446536 and 426054.

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

14 files changed, 65 insertions, 58 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 5363c247ef23..ea828da98fe8 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.228 2012/11/11 21:42:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.229 2012/12/08 22:01:16 ulm Exp $
+
+  08 Dec 2012; Ulrich Müller <ulm@gentoo.org> dhcp-3.1.2_p1.ebuild,
+  dhcp-3.1.3_p1.ebuild, dhcp-4.2.1_p1.ebuild, dhcp-4.2.2.ebuild,
+  dhcp-4.2.2-r1.ebuild, dhcp-4.2.2-r2.ebuild, dhcp-4.2.2-r3.ebuild,
+  dhcp-4.2.3_p1.ebuild, dhcp-4.2.3_p2.ebuild, dhcp-4.2.4_p1.ebuild,
+  dhcp-4.2.4_p2.ebuild, dhcp-4.2.4_p2-r1.ebuild:
+  Fix LICENSE, bugs 446536 and 426054.
 
   11 Nov 2012; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.4_p2-r1.ebuild,
   files/dhcpd.init5, files/dhcrelay.init3:
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 07dd45cb2caf..213326c98073 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -50,34 +50,34 @@ DIST dhcp-4.2.3-P1.tar.gz 9525670 SHA256 4860625e07c290768d513b9a2260e655ae4bad4
 DIST dhcp-4.2.3-P2.tar.gz 9527546 SHA256 5cf7ae2cad9c4ca0103748b2476ec8ea78484e408f8fe597e4e0a4afb051b469 SHA512 539000628cdd2bc3b092aac545434dadbc74908a67b73adafcd4800ef65d69a004ea2f6a9964a11be00020b683febd071baaa0d371ca08491321bf3264334e2a WHIRLPOOL a824aa30121bfa6d4f41148d18028ad4c459a803cfccf8ce62f4704be0e6ec4d96736dd1a5b7a789a7c9ddb6afcbb97cc4bb02c8a325a0657ced7e03438c01b4
 DIST dhcp-4.2.4-P1.tar.gz 8187359 SHA256 d3baabef27fc006e1ce1c4e3d03d7e5c4b6a34d5a2f45fa47d69235ed25ad420 SHA512 95fec55249bfedbd7cf6cd7c6cc32289a5520ae91f9b3a66e815518e80b0bcfb6cfae1f72db50fff5fa5e1c3ca091b9c8a4272cadc0772af92b88cbdffb2bb6e WHIRLPOOL 1822d61128138f85b38bdf86e6467f8e438f33bba92d4e9f4431e5d5d9dd346b2fed1cd2cd471929ec638cd12c225939a5f1a9b1721591b36de68bdce6b65695
 DIST dhcp-4.2.4-P2.tar.gz 8190209 SHA256 0f75170e323cd9573e6e09a5d9236725f3e56e3cac5a70a01fe2a9d76b436499 SHA512 a1f5d37d7576c1d63e10514b534ed0f595cffc440a7001bf28ad2ed7a023ecfbcae6c7681f3dcbaf76de613a5992d189ca865b018e34c3aae6257ab20a0ec3b8 WHIRLPOOL 115b823cb7fc1246df86fa7d0753b9afc53d260362dbeca4878c5a0d98456edd4fe764b47119d8add957b475c528ffd2671f926d869a51520257cebe45e81cf3
-EBUILD dhcp-3.1.2_p1.ebuild 7582 SHA256 4ebe414e6dc4ce6f6b9ebf4f0bfd44b6af03330ff48c39ad7c9987ac1cae624f SHA512 c00bb45b8fb4f404db1be2c1d1e153fd93e2633e8a66dfc7c6dec929813b9e831bac9ded142398471dfbef74e21c864527a315880c0cca5dbf9bbe6648e601cd WHIRLPOOL 530ac45367464ca2eb6a26a6a584d90e782e5e311b945b0fd1e4ba0dba42aca90364c9fa41ef90b7334ede6490ae8aee7926aaefcb9b21be3edd604e96b2b3e0
-EBUILD dhcp-3.1.3_p1.ebuild 7741 SHA256 7a71c86e1685858826a09f28dff77d69a98ec1d37c93bbb6e4dd216af00ce96c SHA512 8be7381eede64146e6e64f04eb6d4c4258e4cfdef81ac14473f674fc816311f15fc4c619965e07459cfab80f937f69fe03e63fb8123707e4621a3e7b985f3080 WHIRLPOOL 8bd951f3f51da40bff701f3957468688c30bff295c865383c0991ec305e39c11477b0e139468acc0fc3a2edceb31fba3e6271a746ee98f371ddd81759b33aecd
-EBUILD dhcp-4.2.1_p1.ebuild 6610 SHA256 70534d654d5a2d02ea009d87f77bf86724ee94b7587f5b6959eef90475e5062a SHA512 930023113e1d8eb630b87f88622dce959f6c83ec51d8ec79963f8f34dd6c31904152372092f68bf4c193e362c1bef7900ab6056ec1de12792f9088687d9e3b89 WHIRLPOOL d81ed1dc1e71a4211d7be0482c0e99de16afdec85ad718c1c11b449d6522b70b9c507849092a4a7c987793729ce9ceef51b117cff4381d2568d2b8c684fb147e
-EBUILD dhcp-4.2.2-r1.ebuild 7892 SHA256 fbdd748e82fb55d4e222dd3846488fd273227540cd098badbc4be1bf0d7b7071 SHA512 233246f3fbadf3ea81053b035f67b97d03e28ab35cbbaac7f5cf3911f518bbb03e38afd011f2253cee0945a576cb88c6f874546c9401d62aec3eb51d06f296f2 WHIRLPOOL 36255391687edb3c5322256687711c050413be658f663f6cad82324b29f8f2df9277d5f1e2896bd0153041d9b2ceeb03786535a2f26f35b3af716b767a175a20
-EBUILD dhcp-4.2.2-r2.ebuild 7107 SHA256 c9ecc844f738beb83667633adce767783e00b92b500a25cf01131d081f8d626b SHA512 a775aec5885eaaafb9930723f8e586d95be75920dabe956bee0f25f0673718b548134c06cd1f6b182ff7a6576de790e342cf9c1db5e03f20ad1f537c83bf433d WHIRLPOOL 0f6d64f5797684f03d93854ea7c7861920765b54931a14c22d747da2f1323e9c651011c6c45d614ce06dd4fd431fcc50dc91be5a055c39ca3b53658c2038dfd7
-EBUILD dhcp-4.2.2-r3.ebuild 7143 SHA256 f2ce7dd86a7f37b03c832216adb08cc6b2302bb45575ba6328aeabbcc3ccfb86 SHA512 d2484755c7aad3e3ea747309174b47f2817c5503e896d464228f35ccb4c62619eafe11568699ebe8cfe39cf7727eb16c3e8c0583b5efb88e96e756bbba8a0b54 WHIRLPOOL 36630b017173c72c5b7bb3e9c56bb5c941f9e15f38535baf00e2daca8dfa1e906a7575f2c287fb20fa0a5815058256c7091f32da124963f3ce245d9529d16fb4
-EBUILD dhcp-4.2.2.ebuild 7474 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc99ea4d16e5abd74ccf9755 SHA512 dd436ff5478f4d5c280be91e226491b4588c292313e7ad7f627aa961dad437e057a58c4abd7be67411d15c48336ffdadf0e07430f01d5e7729629973b71a5c29 WHIRLPOOL 70f73858d6b5e8f549162b4668ed22fbe9868168d39c5bfeb525589c58c7594489efb24c83bf5172aaad69bb8280572d894d66277a4877fbd7a8711a95caae1a
-EBUILD dhcp-4.2.3_p1.ebuild 7211 SHA256 663b373b3661a23ae1364ba18a52ade63022aad8229bc1b275cc82d110b07253 SHA512 469187bbf12ab52530e85a9227ae9d52aa617aa9a16732f21cb22e3987e681dd44b69f7c4dd3c5eb9ec207d8ab9ad34d1a61504d8a24c23eb3a494845ae6564d WHIRLPOOL 23a042697190429f090e31daedc663059c00e6228e8b9193e78f30e3799fa24bb7a3e25a3b58bed3e2e70d2ff5d625916a06b91d33580527005d96357082ee18
-EBUILD dhcp-4.2.3_p2.ebuild 7242 SHA256 cb357fc0589a09af61868fedcfc31dad70df8278a5ef78a1cd23ae96170ded9e SHA512 69eefa262861c301d5de344eaf45dfc88d211a1b0434d6898fc8bc802ec8804b7e588d5dec524183c193c2a8d41e95eaa0f2272ba3fb64a37641ce45df3fc86a WHIRLPOOL 5b0263ae207a72874c4d3576845d8f973cb768c22b2b19993b0eaa78f83f20984da74fbb35ec45725fa7f2b56666c26b7c26e39112414da194e640a901f248a1
-EBUILD dhcp-4.2.4_p1.ebuild 7236 SHA256 3d49361c1f952bbc3e14a46b872f33ae6cac102842ea6c6ac2f5ad326dd90da0 SHA512 d00831932a3cfdb7ff0cf451ccb29a22812a79c82800b4faad9d82289002728744bfa58046f60dcaaa08da21657ea10818a8eaf75f7ee24bb8d8d6fac3c136f5 WHIRLPOOL 47259067563ecb691837308974f57c98a4c79339ee19f6f2afc8b18e6d3e20425d70fda4a5ce731680ebc901357607315dfc7e82b6e1e54dfc6c4be0324d02f7
-EBUILD dhcp-4.2.4_p2-r1.ebuild 7372 SHA256 5090acec8bf6ba1667998b5d2b9cc6cb0357939c56afb969623e64723b796543 SHA512 46ec853bf1688d82834bc1f95d08c8e5f80c064e7de1c4eaa8343ba7eadd2aed4cfb1ae971b730250e0bf808535c36f799cd3b7e7875b2b60d7b1c0b4c3e0beb WHIRLPOOL dd9035ed298bc9cda5869920919029872484ef10035da9089a942d61dcd5c5afd60603c07d351dd735113ed19e4fcf8fa879e828b8889b7e4ef6b5a799942f1c
-EBUILD dhcp-4.2.4_p2.ebuild 7322 SHA256 87f59acbe90dc2d3120913a5b9d4d68fb32babf6ed97a68f56772f33b79854b9 SHA512 1cdb9a5a42f0110854a8ede59aebb657cdf4532c8a7d0ee0b8401f32c112a630a2ff78eace8ba2f357936e68ed4242e8244c4e2aa93c1eccb8471c91f6cf5199 WHIRLPOOL e501e3ba4f3bf1647017d43c1c9fd4a45853e0d6d9a43d9aaddec5bf7075b0757f95d471bec6797bb9e2c02e55991d31dcd928c711ca6079ae5f9806685c4ab6
-MISC ChangeLog 38363 SHA256 b20d581984ea0f7ac5dbf7d7718b04a4a4f0626bf4712edeed07d63b365a4597 SHA512 05d9175af2f963fcb6e0481d0c6c6b3b8782d21b390832580630628a7b0a14e8bd6121ba8b0e64d5ffaefa56a704b569de905f0af63d745edde1615c399fd6b6 WHIRLPOOL e556d1215c6d9ed8281676007c1e6802321a926543593a7335d373dd8eb03bb4863f7c91dc87ccefff26cdc00fbb401776102b6d0ef06fe27a1b1f262f6d4e5c
+EBUILD dhcp-3.1.2_p1.ebuild 7615 SHA256 27c752fbe570102d7315906b77753dada3ca6766b7f06e473340e3aef9c2cebd SHA512 7f917020d21710eef677ef8974889180853675e231cd5a3b2a43e48add34ba387b8962c3293b5e34f8f046231064af7f0822f8ade417725b8ec2e68439c493e6 WHIRLPOOL da23cddb71bb5d6b7e3f9ac80ff22f5355cb5ca4b7e6f4061f7a568f289a3e570b407d65e9fe792e650e93740e6c070a3b258006939286bc7aed5ec68edcb7fe
+EBUILD dhcp-3.1.3_p1.ebuild 7767 SHA256 9082ce275b959d3a309260f6839e383accab7672cab653d71a8f179acd092333 SHA512 c8d2ea4e940fef3a53ac3c3ddf331c5821d4484080d655054c271a34957307c0b412bde3fad767cdf2b89c7e266ad8fc6c2b7e7b9567e3dc9c0c44f453b6d5db WHIRLPOOL 08ecc8140a9cfd6081728189af274208742bfeb02a487e427b3d9bc33a4dd11b62ff78126e48cc01d62de71aa2817d6ea978f66e97223d060a1cf252fb6c614f
+EBUILD dhcp-4.2.1_p1.ebuild 6643 SHA256 69857d202dc292ce72e47942c2d016df49f56af86f8b6f4a0d6961b8bceba73a SHA512 320ddf3c065b28914ea92d719ea43fb6c46d06059909d7bf3e1a5b4e5eb1930db6185857669750db54104b597e3c7720b397d5ebc23c433c4f281d989e85ab0f WHIRLPOOL a5cfa74b6e503003b30db63f13947dbc4d676d507f0fd5982378df033073007f7c20b7aa35ebfe2d4383b22bf9c352798752d204973251eb1a0f5d6d54c74a65
+EBUILD dhcp-4.2.2-r1.ebuild 7920 SHA256 abfd77d3ea90c52e6aa36f41610c7e56a29c924a3fdcbe881a19fd09a2497c91 SHA512 6b8fa2e35c583fc73e3db062989f5e019d7b8a120fa47f83aaa77a629b9a96aa5953b23ca5468f30dbfc66ea33466277bb367027efa91698d5feed37a489746b WHIRLPOOL ffdee7db25db18eeb79596b2f4998e89bb47f9fa4614f3323d5d5a8e9a82a95ddb516345bc9e14f10c1a992aeb885a3ba02fbb766d5592005dc728d27c66493d
+EBUILD dhcp-4.2.2-r2.ebuild 7140 SHA256 fa3a11c52eb046ad91430e67b799e45d095da2908e33fd29a365791b5262767f SHA512 b255986bfec54a010b040d3ab0bb8f4c2619bc41818411f00618dda8c4ea4c556cd1003f9b78cbc825e7e52952363af32902a0bc360c1931787f9b6ca8d0833c WHIRLPOOL 4f79f4c25a3d537c1c1dbbe0c32bc11aa77b3555156f19847ed269f88d1d5a391c8860664a67740e0849caa4927daa7ec5f7dff4b887482bb7e562f41af8e6b5
+EBUILD dhcp-4.2.2-r3.ebuild 7173 SHA256 87dbc5ae15468331b4a96af320c7390bb49883fca3baa732bd45cd816409ed48 SHA512 24b04cee230200cfa3023bde61a2ce56b640f343c9b6361a268b2765d3a55c14ed8091ed7a86fca128002da1de4d326684937333bfc235ff91a508526f62045e WHIRLPOOL 936bc60978c664b95962b8bd7b1de58020e73611cd7551bb49c94803176a4df5860e25dd824164bce8bb7f3ab14aeeed9cb3f5e2d00dfb4ad7ba01a295932efb
+EBUILD dhcp-4.2.2.ebuild 7504 SHA256 d9faf80cfd52d5d5635e56b71ebe80c641c47f1adcba6e00d2897565d6c491f2 SHA512 73e2f17bc31ab7d4dd48af4df8da41ecbc6658f324e0991b63d1977e974561a5dea34f926705d1607d0e9e5f89de3d001d4d4d39c6a5bcd6df8d9a27b10db0b1 WHIRLPOOL 3fde7dd5498a32764c9e03d26ce914d82ab824c77d606355d22ec291081b05d9fc8f9d2e3e7c5dd45a518a963fcfad1cf13817f27a81195ee20dcde1c6d70c76
+EBUILD dhcp-4.2.3_p1.ebuild 7240 SHA256 91cce92dfc3b4dc21d2d5717f34dab7bf9c74916a89e35e3928de5fe995bfe25 SHA512 81ef7a565ddb7e59e7e51343b0d3d1befd612e491fb9824b76050b5ae77bc96a5415d4d3c800a1b01bd7ea425f6463279e4a476f77fb15694989527b946562c0 WHIRLPOOL c71469cf6ef62e06566aa0505d3e2c8240ff26ba1d2d3a5e7dad015607f95add18d37fa682eaff1338a6762b01e1cc5d894fbf08b99d1fcced122f3b8edc17cb
+EBUILD dhcp-4.2.3_p2.ebuild 7272 SHA256 8fdb92a71217368f29bb69e8cbaa59653287e01db6f60633aae84f692ebd59f0 SHA512 c65fcf9c72a33e23a8984e010db52a5605c1af6caa33076c8088f33226bc553d94d1b18a86578b94658f610695883e1b021b8891edd4a2488366f04024a7e6da WHIRLPOOL 12476baaa1aec25856cea0b20bc821d1acc922dbe140b00d0c75c0cf9d3ffa07fbb6072013748c93938471a20e87bd4aad1adf52632127fb4d023c9f88d16f9a
+EBUILD dhcp-4.2.4_p1.ebuild 7262 SHA256 b9ce6d0c568ed8c5809fe536e61946fbbb06ef0f053b24fb285cf926903513cd SHA512 c8a9a8f8a3d54a68aa4e279c5cb940b41e2e5d2fdecce6065f621a8f906a8857916bdf2ac5043e5e7790c1deeadd00abcb1aa9fe4e8981f3b5e4ca2f06aef744 WHIRLPOOL 75a9f5f2d8465b9e23dcb8d2e86faddba43809ff4aa8aaabe9ed037737d33da4ad90c5296683b95dd100ae541e07e23f27133d32338d00741fe8eaecc7ec5f11
+EBUILD dhcp-4.2.4_p2-r1.ebuild 7402 SHA256 50422f2141cdfe1ce7780bb456327ad23b2f7193b2bd3945ca545086b4aaa2b2 SHA512 8faccfb9e2279133dfeed409b70d3500038df352ff178ff848f9d55feb44c187567c54b782603dba0a4dd7706a67230e678a2af292d26985bb7ea7975b6f2797 WHIRLPOOL 045d82bc230e11b73c0cafcc109e2656f3001070d1756f23aee597e52052066ab5a71882f6f879f645a8e5a5b9dfe18785d842d75fcce5fb64fece0e39c2ffb3
+EBUILD dhcp-4.2.4_p2.ebuild 7351 SHA256 22d37fadc80082b6cb5694f706b9ba9af2ca764f68b696bc821e73772123c9b1 SHA512 79723441a9dc75d123290fecab5325c04b5ca6391d5f92465c2d3339107a49a0215d7e0c81e48aaa00958817b11aa34c1f52aa3ac209212d1af3434c266b880d WHIRLPOOL 12dac2d3375a7cae6db743d09c33a9d38b889a93c50ca4da01d8effe671a37c81b1293a846557248d45802123b38febb1e008f38feed5d996d4ec37f38cd2c75
+MISC ChangeLog 38719 SHA256 160949b0a74481cbe346d5db2452d8b380d5ffc5a83574a3712a6373c85d04ef SHA512 0b71c0338af8ce9bc6a36e7fdfdf268a798a376db4b1e8bd31f296e0e3fe53fb01d37603d13a424d785c4c643fcf2e759f442183eb742557dda39470eaecbc27 WHIRLPOOL bd38a749a6d846de08b3ae7b770efc6272160a488ef7b3d45488740c68522eaf74d26ce19936d132003efa1308a639832fd2b4a14fefb1f9a312201c97c2d0e4
 MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQoBusAAoJELEHsLL7fEFWo3UP/RHU0l1O4ZjcWQRdZTqMoNME
-nLVgRnq2v0LOevOP5AlOl5xK+XkKASsI4wN0VPBeKXqXau1dRNPJQvAl+yMQGhQe
-BnXOF2p4b5BAtDh1c/QZUCzpFjH/eoF7LHv4CvvMzrHJttdvoQUiW21mB6OK2rFk
-8zUlVQZAEHdR0ckCVYd82G3o9egiXqEA6j/bAOpCbPZxJnMDmkzh+gkR6AaYtoIB
-eC6E36jvU3m1bCFrPzSk3OzNLILU/oj79Ydxh1kHQ01hOyEWIvqgDEQ5yx7aGMGx
-/TSGKpIXjdFidjRDNTpjWUuIz9DY/ydY05OAlgew0LRy3DZw8Id9suPWj+CZqFcl
-EcIR0seADvPVUrCZ+GsupygU/wgWgp3Jt9BELNvX1JihbT8pSAse/x9bKHTADUFq
-CyaNm7ZU8/IHRdWYvFKI0sFIYwULRDHhR/6gadHn67PtoS3xM4Z4mXawMHWL9b9X
-hoE4fJx40CxVMNDnrN29wM1NhBwxxHm1uixouE3SVo/YTOWD74sk1KpeogiUXlni
-DTAQAjrDn7/1SX1Y5dBs/BjuUG0ELpNCYl0TUqA9Kt2sCYmUuppFLiSDTOGTGMC5
-GOmkq9I4OAvXq2qBp40QtyR+L5Clbe0iFt6qPo1p42ReHzz9taaO5Wb80lcPkFVa
-W2TRhUBJ5D5wSdBXVCVK
-=zYH3
+iQIcBAEBCAAGBQJQw7kMAAoJEDxpGckxwJCBVfwP/1AVSSdZ6iful3iZHhuaoGHr
+sog7F/zWWU1w+ZsEvUuDy6ZoA2odQYeS2PulGg/2YlATqVFOyPUtTqL5MFLkUaWr
+irr0IXL6QO/uiKKbdwT86mhQlZQnAAmCt9ufU95qOKCbAQ1FKo7NgpEvcWKVQ297
+sZemSgGJGgIC4yzzE4zmA8RcWuc5Ii82Qq0ErlVSVHMPWPdtDtFx1m0gMPiaIjKy
+IhvqiqqXath3nCIwFHzQN2TmZnS/sWwK8HNPaqunQtFMDstSrRNk6t4mMDfq34KN
+AM1pu09CrxSisj0pNQ9X83o2Czm+WodwrMgcM2YM5OozFKU4i3n2+84dMG91bbGp
+rvGod00CAEpHDOT2AxV/Hl3sD47902PeGqYgF/PKkVNy1r3KAsB94mB2XZz3yMzY
+OBmwpJ1zfWiO8VZb5znQxRY/DAP4rrmBopyIW4EKLk07YVqskuza7pSoqjQq07L3
+MZED260pGLfWgL5B5jMz394jSz/RryVlijCCkxfKt/kD+cDv9Xjo+VR/FSfiLmVz
+tZ2H9JWG1ApderG2NN3Jhl4sRj4hQWdJ3zXRKaPKFuXacLm9ctlDEklXV8RN3cEt
+Zjn8Ql+MIogewkzq7dUgxvWvANfoshZEqSd5iZtEb0k7OrJpjiOYdHSbOEgA36ks
+NmHwFpF8jCD06jOEQ/I2
+=1cPT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-3.1.2_p1.ebuild b/net-misc/dhcp/dhcp-3.1.2_p1.ebuild
index f71242fa1cb8..13c0ece6312f 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-2011 Gentoo Foundation
+# Copyright 1999-2012 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.10 2011/04/15 21:40:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.2_p1.ebuild,v 1.11 2012/12/08 22:01:16 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="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 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.3_p1.ebuild b/net-misc/dhcp/dhcp-3.1.3_p1.ebuild
index 1a25581bb0aa..1a44d3ef1ea3 100644
--- a/net-misc/dhcp/dhcp-3.1.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.3_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.3_p1.ebuild,v 1.10 2011/05/01 09:50:20 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.3_p1.ebuild,v 1.11 2012/12/08 22:01:16 ulm Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -14,7 +14,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="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc minimal static selinux kernel_linux"
diff --git a/net-misc/dhcp/dhcp-4.2.1_p1.ebuild b/net-misc/dhcp/dhcp-4.2.1_p1.ebuild
index 24b554924bed..a442100aaab1 100644
--- a/net-misc/dhcp/dhcp-4.2.1_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.1_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.1_p1.ebuild,v 1.2 2011/04/15 21:40:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.1_p1.ebuild,v 1.3 2012/12/08 22:01:16 ulm Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
diff --git a/net-misc/dhcp/dhcp-4.2.2-r1.ebuild b/net-misc/dhcp/dhcp-4.2.2-r1.ebuild
index 439b716cf7a1..466458d8c342 100644
--- a/net-misc/dhcp/dhcp-4.2.2-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.3 2011/09/19 17:14:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.4 2012/12/08 22:01:16 ulm Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
diff --git a/net-misc/dhcp/dhcp-4.2.2-r2.ebuild b/net-misc/dhcp/dhcp-4.2.2-r2.ebuild
index 4db66418d3b5..e21941e7e701 100644
--- a/net-misc/dhcp/dhcp-4.2.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r2.ebuild,v 1.10 2011/10/11 16:28:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r2.ebuild,v 1.11 2012/12/08 22:01:16 ulm Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
diff --git a/net-misc/dhcp/dhcp-4.2.2-r3.ebuild b/net-misc/dhcp/dhcp-4.2.2-r3.ebuild
index eea1ab424a05..249d35f11bf8 100644
--- a/net-misc/dhcp/dhcp-4.2.2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r3.ebuild,v 1.1 2011/12/04 22:45:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r3.ebuild,v 1.2 2012/12/08 22:01:16 ulm Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
diff --git a/net-misc/dhcp/dhcp-4.2.2.ebuild b/net-misc/dhcp/dhcp-4.2.2.ebuild
index 8aa447569557..82c5dc3fdfac 100644
--- a/net-misc/dhcp/dhcp-4.2.2.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2.ebuild,v 1.3 2011/08/27 04:58:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2.ebuild,v 1.4 2012/12/08 22:01:16 ulm Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
diff --git a/net-misc/dhcp/dhcp-4.2.3_p1.ebuild b/net-misc/dhcp/dhcp-4.2.3_p1.ebuild
index 2143e4f60e10..5f75ac9c41be 100644
--- a/net-misc/dhcp/dhcp-4.2.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.3_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.3_p1.ebuild,v 1.9 2012/04/28 01:13:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.3_p1.ebuild,v 1.10 2012/12/08 22:01:16 ulm Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
diff --git a/net-misc/dhcp/dhcp-4.2.3_p2.ebuild b/net-misc/dhcp/dhcp-4.2.3_p2.ebuild
index ec51f79d6e13..7bb0609c9059 100644
--- a/net-misc/dhcp/dhcp-4.2.3_p2.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.3_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.3_p2.ebuild,v 1.1 2012/05/16 05:08:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.3_p2.ebuild,v 1.2 2012/12/08 22:01:16 ulm Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
diff --git a/net-misc/dhcp/dhcp-4.2.4_p1.ebuild b/net-misc/dhcp/dhcp-4.2.4_p1.ebuild
index 9c923f566f83..3f107d6d50e8 100644
--- a/net-misc/dhcp/dhcp-4.2.4_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.4_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p1.ebuild,v 1.8 2012/09/20 13:29:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p1.ebuild,v 1.9 2012/12/08 22:01:16 ulm Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
diff --git a/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild b/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
index f508bb1308f0..a89b518c5a7a 100644
--- a/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.4 2012/11/11 21:42:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.5 2012/12/08 22:01:16 ulm Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
diff --git a/net-misc/dhcp/dhcp-4.2.4_p2.ebuild b/net-misc/dhcp/dhcp-4.2.4_p2.ebuild
index 106f98e5eb76..bb50f4f6cca0 100644
--- a/net-misc/dhcp/dhcp-4.2.4_p2.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.4_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2.ebuild,v 1.7 2012/10/13 17:00:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2.ebuild,v 1.8 2012/12/08 22:01:16 ulm Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+LICENSE="ISC BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"