Version bump. Add fix from OpenSUSE for parsing "a" options #432998 by Andreas Steinmetz.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 310 insertions, 18 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 7ee983f48e28..ff0119ca513b 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.217 2012/09/20 13:29:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.218 2012/10/07 06:25:42 vapier Exp $
+
+*dhcp-4.2.4_p2 (07 Oct 2012)
+
+  07 Oct 2012; Mike Frysinger <vapier@gentoo.org> +dhcp-4.2.4_p2.ebuild,
+  +files/dhcp-4.2.1-dhclient-parse_option_param-Bad-format-a.patch:
+  Version bump. Add fix from OpenSUSE for parsing "a" options #432998 by Andreas
+  Steinmetz.
 
   20 Sep 2012; Kacper Kowalik <xarthisius@gentoo.org> dhcp-4.2.4_p1.ebuild:
   ppc64 stable wrt #428120
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 590ec6886425..ab313561db15 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -20,6 +20,7 @@ AUX dhcp-3.1.3-dhclient-no-down.patch 2762 SHA256 94c9dbe45063c6c600976ffab4c1fc
 AUX dhcp-4.0-dhclient-ntp.patch 7966 SHA256 e93bda7f2baae9163f96ab0408bfbe885caa96a8698f9e566b8a9dc04de9359b SHA512 548c865988e12d8dbff357d7b5400f7afbb221297765c4de265bc55c016d144d9d7acd0bc6536160d8ca849f7f5b830c2413f407e376216fc05c8bd4b152b927 WHIRLPOOL 2850679345d2da92e3868c47ccbc07b142e51f1c6257c4d8cc4c8736bfc03b23aca3e127e73a43ea0125fd6054796edddcf9d2768d5a52276e5921c6545a07b8
 AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 SHA256 0b25bc74ae258656dd1f0e6f4ffd6b4ef8b4ad56956624c0b6070941a180e57c SHA512 a65ad75be87f71d7e4021b0d875b9c1d123e9bb691ca9b555a0455ac12addfb4fd0c1e42ab9d5ec78ed0c3ffac40754b997b8729ca3e9a7907d989357ad83763 WHIRLPOOL 100e3dfff5ea75eaad636fb7c4519c08ca004ad6580b5dcf6cc73f041e0c96c0905b4157c1a72aae8d4e4f7031b853a8d348ed8334034a186971f57bdde8fd09
 AUX dhcp-4.2.0-errwarn-message.patch 1508 SHA256 e2baa7b6097a6ca20b66afcd7b0e399840a8b0f251b3750a49a03f0d5b714231 SHA512 6471e4b73fd817740118a5db9ac801914f418360c3322e98c4c2417cb9f563729bb88885e12735ad35a9ec404ac345367300b47be0ca6c2a42673f3c6528ce8d WHIRLPOOL 3262c1433aaec67ce0fbd7cb83eaf47a4d2b264b67c082e0db704c47b918bfc8b6284de54ae205220e6ffa3d34cab360e7a94fcdf0aa6160ac9b0b4e5d8e1cf3
+AUX dhcp-4.2.1-dhclient-parse_option_param-Bad-format-a.patch 1440 SHA256 d54d013d5947f8e501b9cce43a04c611e420eec5cbf29ff67f151db6cee6e9c8 SHA512 e897de809d78e2e924ae15dfcfebf94c5ea8e72445f575259305c149f6e6255b820f39d495c7e3457d129cf955ea016282c4fa6b0a6cab57656a8590a889d6d8 WHIRLPOOL b61598aa7cb2885cade07622d63f800bdb69fd6747bd06b607b15c844e4d53db5e4ff7544347e26de59e0feb7f95287433282744f76a70a817455f06239790e7
 AUX dhcp-4.2.1-dhclient-resolvconf.patch 13742 SHA256 ddc284623b421098702d3e0cc1849b37c015e78dc510aa7efdd2e5fc9b6a849c SHA512 edd0b70196650216a669de5cb5661a2b5225e2bbecdf15f8862173cfa821f27448eb30d4ba6b4244e26e1aa898e624a8e3ad3c95c8a192ba12eb9a436fe2e61f WHIRLPOOL dfd18488ff027bfb688877d7634217ddd43ffdbfa8a9230efd82c545aceb514a88def6d7a3a0dbc308c4b21934ab292bb75680e8c243afbb63bf2ad70ab8b5de
 AUX dhcp-4.2.1-nogateway.patch 1648 SHA256 694caca5fbcf900cef2223307a43fb21a66fd672728cebfd873313730029acc4 SHA512 4b2fce7cb99d490f16382c80fb5615a402a3a655c960151ef49b1d7757caedb471445f3333c50707053b6438cc83297def87142824a4e17d4a43ce85b66c2141 WHIRLPOOL 9282d13538ad2f0cbec74bdc073e61c1707515bd6c6a98299ad7d929ac86a2c6755e482fde48a75368bb01cec036e0abc9fd62378c83a636810d0caa0604cc24
 AUX dhcp-4.2.2-bind-build-flags.patch 476 SHA256 a16d9da5fc29c95c46cf7e2401744292b898f692d49dea4753991505e03c1ca8 SHA512 f552f2b8b1e13e22636f8e4548557801273b0ab38f076a141adb72584ad55b4da156401d94abd12e9364b8632a6e75ecbf3cd90af3b6dbad88627ad3f9658059 WHIRLPOOL 3202f614747eaa9b533e36495bfa862eb96b3e884cb4939a8406fdbded56061aabea20e9249d647e6aa8ed5ed5547d5c8f14c46af193c248239a2734dc79411a
@@ -39,13 +40,14 @@ AUX dhcrelay.init 736 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c
 AUX dhcrelay.init2 712 SHA256 6cca726147474c600662b0c2e49eb5aa148a7a9af1358dbc56f16b1d08255ae3 SHA512 13dd120fab5c425987e4dbd2a03fac88822239c178d803b0277fe71b6319aa37b507fc1125a300c916115e725b10866b1f2e10ecc2c05f70345776084e869711 WHIRLPOOL df30792ce247a7fe6dbdc590ea83e196048fcfa53aae67d7402de60ce46662b74da0bd473523fc02cb9a4fee056ca700c0627eb73902eed2f9313cc062ec7ee7
 AUX dhcrelay.init3 800 SHA256 411fea507b997365606538d645b2bc75f5ee166ec805685f68075e49f2126dbd SHA512 4bff694a818c3791e9a853f3c53b4286e63231d4730ead6bac7a87b5839c02a7c9a49d6f9c88443e36edf7e5395bd397fc456c2a1db1e2ec57d36f8846852d13 WHIRLPOOL f5c0b7516db476983ded4cdf3df664925af1435eaf7eed7b0988ca701765fe9b53c55d1974318793884c409c3ccfdfad2e9d9855a57e014d86c0107431aedc55
 AUX dhcrelay6.conf 325 SHA256 099f668e1ad42ed9446b15675032a1186715d1fe9e4a1b24dfb787e68495d2b6 SHA512 40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9 WHIRLPOOL 7fcb1b63d12b066c6fc2668497d18ae33b739cca4dbcbc95530d762c7152c410a0af76e65ebb21f3c9c4a837b999799da4a766315e5eb667ccde64100b66b6fd
-DIST dhcp-3.1-ESV.tar.gz 797454 SHA256 e316b7dc34f05e38724273a473f823719281f229a71a80bc358f8e74687fd7d7
+DIST dhcp-3.1-ESV.tar.gz 797454 SHA256 e316b7dc34f05e38724273a473f823719281f229a71a80bc358f8e74687fd7d7 SHA512 50ed85f486e3db2093e8e92d4119a2fd427ef19bd47667578c8f06c8a432bdf881ef7864661a1ee128a4d25b3eeacaf0f6b79bcee25a8e7748b620b474ef9371 WHIRLPOOL 76ddf080a24babcd71f92f5eac0287a5942b623c172156d52ebfda89742ed55dbba007a7b27bc75dd98d271989b183803c0a8a4b503ae88d248180515335bf29
 DIST dhcp-3.1.2p1.tar.gz 792355 SHA256 e0cb405e0fef0ecebec7aaed294032a06178ff28be87498596e6069ccda4341e
-DIST dhcp-4.2.1-P1.tar.gz 8797289 SHA256 6cd5e06512c53ad43d71400f39071ce0bd07f074e416c727d5bc7e5949ec55ec
+DIST dhcp-4.2.1-P1.tar.gz 8797289 SHA256 6cd5e06512c53ad43d71400f39071ce0bd07f074e416c727d5bc7e5949ec55ec SHA512 ebc0af1fd2877820018740fc006d9c8905b09275ba3b1e06ac6c70455c55b4a53ee244a8e3ceb5abd0d29ca8864c4bfed85756dfe145c42bbadfd539c7ca304c WHIRLPOOL 810249973166377444ca888e1e4957fbcb9814e1bc56e21ec20e4ab1dab25c355247548930482a7befa11c9c98c25fc1c0831defa45f83cbc6879a2fc0a51e66
 DIST dhcp-4.2.2.tar.gz 8764108 SHA256 846ee115bd3a789ef4d8d051e1078b920b152c5644179c1a28ed59aa1b5ee38c SHA512 b2eeb8675414a94126e40bea5846be739488e38991f69e2c65c227756a156d6d1d337ed2fbffae7fff400b7fead2280cdbc88d8340401676b21a3e7e3cc65223 WHIRLPOOL 32c0b5dc1da38e577d3fa771bb29ea2a7fe9ebcf25583e4ee817db8db402e0bf7b56aa1e507e3f9ed62eb195677fcf66c23818674adf37c591e3393b19ebf06d
 DIST dhcp-4.2.3-P1.tar.gz 9525670 SHA256 4860625e07c290768d513b9a2260e655ae4bad4cc5c4c8f5eaaeb4f9cbfa96af SHA512 3036775e49e2843992122fb4fdd90be1544c93634a0b8582581d4740e14f8a8afa5fa627e5f5f7ec0908bd4aa7112cc97d53ca065c27a04a28699fcd374739c8 WHIRLPOOL f52de3d74c9fec5d1ac1ef0e6fa9c8886e30ce9e8df006212d84995d42118651443399ff23b1a93884ef25a2f0d089ec9db2b358f00eba30bbddf06170b2739c
-DIST dhcp-4.2.3-P2.tar.gz 9527546 SHA256 5cf7ae2cad9c4ca0103748b2476ec8ea78484e408f8fe597e4e0a4afb051b469
+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
@@ -56,22 +58,23 @@ EBUILD dhcp-4.2.2.ebuild 7474 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc9
 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
-MISC ChangeLog 36584 SHA256 80fe996ef5b3704ab2201605dd2361543357691b90fd1ae27d1d2cb1dc124f4b SHA512 4946fe04a335f94d5ef5e7a1f2d1d965591831df1baea0161939e217c5bb37ef3bd29637f6e693114273a3556aba7b36cf04f3d50cd9468ed6e3414b2e4904e2 WHIRLPOOL 479ed1361c99217b5e9b5e723f6006419ac6afcf20a6441764abde2c3246f5e787ffa5bbecffffb044c0e25ebff9b125544c209e846d7d172c3e1ed44b68e4b5
+EBUILD dhcp-4.2.4_p2.ebuild 7331 SHA256 13044c2c3be4889c5dcc82447722cd8cb049b47d3f3076d0b16ee7fdac313c35 SHA512 a15dde74681b7774706e7b10d5e93f0b87a8884f403dbde6139bb3103c478bd16399ffacec0b08bc47dcfd984b9baa48ed2ff534a1da92661566d66f23504723 WHIRLPOOL 6ec6f841639a6c3575f104819bb2ee15931db7c06ab4c448bbcbf2d7dcc64e2a0739fd708e23eedec431a1733347f8b724f1cabe0812ce052b20111265f95c1e
+MISC ChangeLog 36846 SHA256 f299fdf78eeb62c322520f0bdfda9478ce360ba746d09bb904c05b5f4b8f558c SHA512 bc800a150a79bda47eaa49da5a8518a0366b67b19c20593092d23e5ebbe7dedf1b0261111bd8da4ab53bf4dc85e58cc4989fb371619f665b2d4efa68a096953c WHIRLPOOL 09b43fab292a918b2bf0fa36998ebc802c2f696415651a375c3ca6c50a4109516efc2d1616dbaa9773f61e4248dc27b6f1aed1cdba1c055cc1839e915651fe7b
 MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQWxpEAAoJEF0huFKJUZL5lhQP/13RuF/yebRb1g5zVI8HnsvF
-GJ29sI2H0JcjVaQXj2sY3Iedku2M45jSSqXmiYN6ru2d/D7lDJzsFK08qCvQRPt9
-bHVh6D6sm743w0tKuavxvzAeZAS27G0DhIKPxzLO95DWwoHl6tkclQrYOpcmqUc8
-Suvm7ZyQipFpRvz0g3GW7QjlUiDhauRBb1mxPOt1Q6Oif0HKdr7E+5V9MCbkq+Aw
-pOXJRvByYOMoci8VFjLsPYzfIQt53RQB4EXmq2OsWWYMbmYKo9sbe84F8eb1L4sg
-Ci7VMpND3AEd2Y5SEDr7sKuYF0usRDjStzkq85IUjIFZCKMU1FGl8FhL2y/0nU7r
-YbuWU7FTvBfZy4xC9AHZbB0KBAz1tAt+qcHa3CPHP/Ui+nHJNgUoBZJmjsV2vv9l
-mTJ3LgDHLnGaGYL6rhxYXeNJFfx9+wzGPkEJMTjCdv9bnarTHDgG2H/bifDbXRgQ
-4hqj1jFwvb7XTngRnZ+6DvSdDqfP4qsdnf3B0YZByam4noIZ0osElQzPaUwyyIyC
-b8W4CAiujPgSMsQ9cv/TfnYICH2hY7MTjtU0tDs3xW1ylggrzJcp/z4IUmyV1MpV
-fJMnYrAP88gRNYlkSD2sH0qUIed82BGqRm/Y5SgzCf0dA4VN/b5IPkVZP5a869N/
-HQbo48WMJEl+NmU8b//c
-=JKTL
+iQIcBAEBCAAGBQJQcSBzAAoJELEHsLL7fEFWZhwP/1KtRBXbdmHotw5EpFc9eRPX
+/N85G8DlqYpE8tEXtGJ1Oq7IKm5Jv3tyiBV5YRBMtNAjHjB/FmAOiOfhgp3gUoFF
+kD6mkbZ8E8Y5hZZ3ss31vTyT3DEkGXKntXyxxhDv76j140R8Bp+fTn47pDgfzYZk
+JkM2aVJEUQ7NgmiTlr7xIGD3wplKp7PdVvTNHwFWRbDsQNCsB5kjQwNBSsRRJmsV
+HQ+8M02DPdd50poCblUWQp9k9kXTMfg4Y++21DzdR93Q+qk181QvrCQF2MAefUjF
+brP5gC2+FOWZfM8M0rn9/aKoiFDfzAvTSfYGRxGYRUIA/mYILN0YRLMXAceoaETR
+3qzxplY1pLzn2jagcD8/8m8yHWWDvkBqWQ5u63XEeGb+C/lsZKMZT5YJTh2Bgius
+UavO93pnD+3P25fInVa6aE7QA/udiRy0/Z7xHtAyUJVU4HCPYrCcL8oIzPw4TNqD
+LMO1s5PpL3s6FCzhjlEOLg9CF1o86Bt4My+/Nm/QZDl7Ea+wvLyhhJfjm6QYMeAa
++Fahj10R03bHBxC0YT4MJs+LMuQRcCyYaPsaa1JA6Wbj6sWQjqY16+FIm9HhHe1H
+3UTKGsrYqkfjadQWYprSgdFiPJ089qbBbxSmZE4kZzqPLQJlLUSafNO5omnDPhoT
+WfQx3fzSWvplhV75eXhe
+=JZKY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-4.2.4_p2.ebuild b/net-misc/dhcp/dhcp-4.2.4_p2.ebuild
new file mode 100644
index 000000000000..a54f1a14724c
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.2.4_p2.ebuild
@@ -0,0 +1,238 @@
+# 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.1 2012/10/07 06:25:42 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+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
+	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="as-is BSD"
+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"
+
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+	client? ( kernel_linux? ( sys-apps/net-tools ) )
+	ldap? (
+		net-nds/openldap
+		ssl? ( dev-libs/openssl )
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind
+	unpack ./bind.tar.gz
+}
+
+src_prepare() {
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
+	# Enable dhclient to equery NTP servers
+	epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
+	# resolvconf support in dhclient-script
+	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-resolvconf.patch
+	# Stop downing the interface on Linux as that breaks link daemons
+	# such as wpa_supplicant and netplug
+	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
+	epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
+	# Enable dhclient to get extra configuration from stdin
+	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
+	epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
+	epatch "${FILESDIR}"/${PN}-4.2.1-dhclient-parse_option_param-Bad-format-a.patch #432998
+
+	# NetworkManager support patches
+	# If they fail to apply to future versions they will be dropped
+	# Add dbus support to dhclient
+	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# Change the hook script locations of the scripts
+	sed -i \
+		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash #158540
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i \
+		-e "/\(script\|host-name\|domain-name\) / d" \
+		client/dhclient.conf || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client
+			cp doc/ja_JP.eucJP/dhcp* common
+		fi
+	fi
+	# Now remove the non-english docs so there are no errors later
+	rm -rf doc/ja_JP.eucJP
+
+	# make the bind build work
+	binddir=${S}/bind
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
+	binddir=${binddir}
+	GMAKE=${MAKE:-gmake}
+	EOF
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
+	cd bind-*/
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
+}
+
+src_configure() {
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
+
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
+	# Use FHS sane paths ... some of these have configure options,
+	# but not all, so just do it all here.
+	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+	cat <<-EOF >> includes/site.h
+	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
+	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
+	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
+	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
+	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
+	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
+	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
+	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
+	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
+	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
+	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
+	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
+	EOF
+
+	econf \
+		--enable-paranoia \
+		--enable-early-chroot \
+		--sysconfdir=${e} \
+		$(use_enable ipv6 dhcpv6) \
+		$(use_with ldap) \
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+	# configure local bind cruft.  symtable option requires
+	# perl and we don't want to require that #383837.
+	cd bind/bind-*/ || die
+	eval econf \
+		$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
+		--disable-symtable \
+		--without-make-clean
+}
+
+src_compile() {
+	# build local bind cruft first
+	emake -C bind/bind-*/lib/export install
+	# then build standard dhcp code
+	emake
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	dohtml doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# move the client to /
+		dodir /sbin
+		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script
+		fi
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.*
+			dosbin contrib/ldap/dhcpd-conf-to-ldap
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+	fi
+
+	# the default config files aren't terribly useful #384087
+	sed -i '/^[^#]/s:^:#:' "${D}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
+		if [ -e "${ROOT}"${f} ] ; then
+			case $(md5sum "${ROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${ROOT}"${f} "${D}"${f};;
+			esac
+		fi
+	done
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+}
diff --git a/net-misc/dhcp/files/dhcp-4.2.1-dhclient-parse_option_param-Bad-format-a.patch b/net-misc/dhcp/files/dhcp-4.2.1-dhclient-parse_option_param-Bad-format-a.patch
new file mode 100644
index 000000000000..991dddcc48d7
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.1-dhclient-parse_option_param-Bad-format-a.patch
@@ -0,0 +1,44 @@
+https://bugs.gentoo.org/432998
+
+snipped from OpenSUSE
+
+From 19248f4207e55ecb1f5cdd9eb084f1a69470afaf Mon Sep 17 00:00:00 2001
+From: Marius Tomaschewski <mt@suse.de>
+Date: Thu, 5 Jan 2012 16:20:42 +0100
+Subject: [PATCH] dhclient: parse_option_param: Bad format a
+
+When the server provides options using the "a" array type, such as:
+option rfc3442-classless-routes code 121 = array of unsigned integer 8;
+the option is stored into the lease file, but when the client reads the
+lease file next time, it complains about, because "a" array type aren't
+recognized in the parsing loop and the option (lease?) discarded.
+
+Signed-off-by: Marius Tomaschewski <mt@suse.de>
+---
+ common/parse.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common/parse.c b/common/parse.c
+index 865522e..b4a821b 100644
+--- a/common/parse.c
++++ b/common/parse.c
+@@ -5409,7 +5409,7 @@ int parse_option_decl (oc, cfile)
+ 	/* Parse the option data... */
+ 	do {
+ 		for (fmt = option -> format; *fmt; fmt++) {
+-			if (*fmt == 'A')
++			if (*fmt == 'A' || *fmt == 'a')
+ 				break;
+ 			if (*fmt == 'o' && fmt != option -> format)
+ 				continue;
+@@ -5623,7 +5623,7 @@ int parse_option_decl (oc, cfile)
+ 			}
+ 		}
+ 		token = next_token (&val, (unsigned *)0, cfile);
+-	} while (*fmt == 'A' && token == COMMA);
++	} while ((*fmt == 'A' || *fmt == 'a') && token == COMMA);
+ 
+ 	if (token != SEMI) {
+ 		parse_warn (cfile, "semicolon expected.");
+-- 
+1.7.7