Fix conflict with dhcpcd, bug#440614, thanks to Renato Alves

(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

1 files changed, 7 insertions, 5 deletions

diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 1ff349b6263f..a14f0df2e9de 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX openresolv-3.5.4-config-conflict.patch 1378 SHA256 6439ea2b3a2466761739def69af6d67d15085ba3d601f5c02e34a2f7ac64ef16 SHA512 e041771766eb025be6ae9314e951b36218beedf6d4ac9a11815c4512dfbf9d012a0eaadcf2574071f70c94c6726977368cb31ea07ac6cca6f5cc1538b9df7a97 WHIRLPOOL be68f2a8696d116681d27dd301f4cd349a8c808bad8c2417e16d8dbbae1aca0a0d0a035cf9a090a366916c59d3fe908b5b631a54013a07fe57a135a21a37d1fb
 AUX pdnsd 19161 SHA256 a012a090e551c4a73ea0caf801dee2e4b467cb28aaff465890a002f8529e16ed SHA512 44c59eac111053ff90452421e0e2776dfb801edcd4a31c1cb1ac381286757b780b5408a67a934b71f97aadbf906e2d94d9ab34e59c34ba6a140cb09625fa0730 WHIRLPOOL 1c8224d9c60bf4b0946d3b2ae4696465e596f5f1352a6e7db123d2f43eb9d7f8cf4313059c6fbb690e0bd362905dbdc548bd89455a6677b42564ee9a78cdda38
 AUX restartcmd 400 SHA256 ae104531eded1e33bea6267c7422f6c22da3440ab790051182cdd9b2e9ae9e4f SHA512 5d44a9f5814104395cb09b573a03dc70ab15e1a953299df36d072f5189a3954dca05b201d6aa84283f69c4a93d5b2cde6790381718a8a453462329e7f2d1806d WHIRLPOOL 200393aeb8970c0b6679609f7437e34cbcf34d71e2217266ad5c160a1940f97a55a4408f023df9d5cbef0835b9e025a1075606bca1f99c63c61993a51a4e24b1
 DIST openresolv-3.3.4.tar.bz2 10495 SHA256 8288e436c67e0f85bdda25916f6daba78009af353529944eb9fa6cdeb5c38e48 SHA512 9a203cf7ff950740ca75554743da962d5656d41e14803abb4ad34426adfb8baabd2cd4124558e33a66d044a45350f2dffaa864eb64cc281f7554867c6853939e WHIRLPOOL 21b297f8747c3f7e67856d3a124a804eb1e39fa7895ee0eaaf6a1d5b54c289ae1f6ef4d39a7dfb565466230168e44196619d1eb5910355777b821c6a61c08e74
-DIST openresolv-3.4.1.tar.bz2 12741 SHA256 c01c7fee00f8582658753cc15af421b00106e9d7c6ba6c777b535814b2c02e69
+DIST openresolv-3.4.1.tar.bz2 12741 SHA256 c01c7fee00f8582658753cc15af421b00106e9d7c6ba6c777b535814b2c02e69 SHA512 84294efed79e564b2b3d00ea032bb3aa42cedf040255c919fbc4daf256e38b945ae33bbf4091a42019d959a1ea777b891c03d4274b9ca8eddc5df2ed8cd3e76f WHIRLPOOL e6aa5a6ac22e8281710c84e4c5d0ffae58312ba5f8fbcabc380dbc6805786db4bed7d49c130634374c00b4ae942c5da6e1ad95886b6b4ddac82e4187e057ae26
 DIST openresolv-3.4.6.tar.bz2 13446 SHA256 6a41cba441f036045b73c8850715f10431dfbd2bb69acc54b97883354e22df08 SHA512 ca3c583c978e72aba4b635aac176800bfd58ebad005c605a854e8a06430f85b542f2c48e5aef0fcb82571b7e74ce10fb4ff5b1c3929b2d9c9bc1cf9560f5cc01 WHIRLPOOL 3a0de837861a84a485895103d87feaa75f8e0d545f2e7f507ac974f58a6d8b804c1f580876b69ec56ddade5d963ae223673e12397d1988ca952c071a91f19fdb
 DIST openresolv-3.5.2.tar.bz2 13933 SHA256 4a4cf4ef20a1ce207937fb669bbae43f9db36f6298090b5e074c80ed2fe4a996 SHA512 502740bf3cc09f754c1383d1dac9144c701e75c8b6663808778a22be257e15e09bce80623ff7524a90320adcf2f15e4cfa613e7fc74d55039ed250a74e10d2cd WHIRLPOOL 2bce3841febd44ae891f21eb31d140843cf2dc251b9560c5d17ea511d16baf6c51d727a3893208786047c701f983dcf44b12f9caa5bdb25a19180b1be5208a4e
 DIST openresolv-3.5.3.tar.bz2 14691 SHA256 92377c45e6022ddb9948deef4a576ecc2b71051e3259f6d21f58e81618ad7b2e SHA512 27293135594fe6580a2ea5de8d48df403fd928b12bd87c44a3b892b9d13c5f9d81886b2eb36131d1e56d31bacdb1928a929734c88e3d590bb212ea6227bf23cd WHIRLPOOL b288a2bbc7c27ea4adbe6c9dd6576060d69055f32f2508d8e6644a2dc50eb48cc0bdca4df39b020638cdd4b91d2d25414bbac3997918a598fb38e6204a5dcb58
@@ -17,12 +18,13 @@ EBUILD openresolv-3.5.2.ebuild 1163 SHA256 c34f2ebc326fa5ca1a5f797d4531da96335bc
 EBUILD openresolv-3.5.3.ebuild 1163 SHA256 6378405c0ad4f5c54ade4d9cb7dfe2b83e7cbed27ef306c838bc0268f88a5017 SHA512 d75a19d364bfa86f82be9bfb673960cdc4d23028f961865b230093b13f9258935c29baaeb7e5a11c8cac422985d6ce373caa0b237bd0baaba790df23cf691cba WHIRLPOOL 1ad2f4cac1cf80f638457a4aa180c74519092da74648897cf1bed9f3aac1d2ebafd94c09ef3bc78efe03ac4f93c91471d8d5082b102348f8d753c9593e28927d
 EBUILD openresolv-3.5.4-r1.ebuild 1315 SHA256 5c1e688f56771316268a36603d507ec958f07fbdc2144b36fe6d422eced87d41 SHA512 19bbc8bc408b30140ef6fe45b8d34d04c195a6fac20303316365a55bfdcbab0e52e6c108dc88697fa596236064288718589aa7804753cf16f84dc855865eb1fb WHIRLPOOL ecabf1597222412a79f417223c7eb7054c70b72bc2b6cb2a74249aeb5b9c7d405797e642e30dc89d445bb1942912e628d0119fa08d8cca9a7f91982bc1065430
 EBUILD openresolv-3.5.4-r2.ebuild 1278 SHA256 a58050bf29f34f89cd9c4b4326c152735be24226c233312bf40d4f7f0ed991cc SHA512 f31240e5e8e5d394d7e3e3aacaf12bf8a74c0fb8c642e0613d7591fee7e037ba2ae1f2318970afe6a72daf2d024b9adc594d74ca2a893de0dbd5020ea5d4e2da WHIRLPOOL 53d6a45c54d8a2616644c89d833c89d58020c4ba79fc32eec6b0f9a1bdebbd06d530fd1cb21065169371dbb1dbb68eb66812d0d24663b667d2fd7fbb34f357e4
-MISC ChangeLog 10276 SHA256 6bd602c066b3a97dc8c2d7dd0d8a39cb11ec966d94f893c7c413a55065ab05ed SHA512 b65651e8e559c58f55be39b373225cb7109fbfcd24871d59d343cf0d71ed79fccb3b327b55920f3b1596ef3c6d296cb0265835148e8c4c23f05d71cd89cdeab1 WHIRLPOOL 1aba7f606f6690f4f52a57f9ac20a9b80a8368e05ef63620761327f6afac576ffd6bff518b1868d983c9dafa34e0cf87493d285ba01a4277800a4c4320c17fde
+EBUILD openresolv-3.5.4-r3.ebuild 1361 SHA256 a354a87c44a215834d76a4756a1312f82d09cfe52bf02cb1bb952c627d12334c SHA512 5a921362393ed34e474fb3c095ae19fe32dfd8745cdde7de9764b20fdddf0b44432fdf41067dac16ccf329e51fce0ad882e6bf578745e5359a1d43a26c8255df WHIRLPOOL 34af72fb59206a91e9a95e38998d101779a36de5b9dc0476e45964942327ad605d78f858ef1478734eac15e6668c084c1cebec687f4e447b23c1d8f22fcfefaa
+MISC ChangeLog 10501 SHA256 9711a6e674bd06192321565c3df1269097c14da8e291d633636a609ba56b68f4 SHA512 36cde7a4095c57cb5dd5505e06bce7423fe056788d164969cc7cf9382cee1a36b9cbf4cf89a765fd56995036206475c4a108cb99004ccbef730213c3807ca79b WHIRLPOOL 5f0780a3fa9565efbd6f3408a6544a641e22e92b681189a6dc932c673dd4a6a2334502f5c94b96e0e5f506782d3f522da2eca25331403015571372f8d71c2c14
 MISC metadata.xml 319 SHA256 fc85594d02d846f63a1c00b842b393d2cc9bb8f09ede665e7d7e468fff38c011 SHA512 8f25a804a96586af9d5370ca77939fb72df20db034e0749e355759252a78ac271da573e8f0665c6f029c3c498e1c73f8319e494dc349811dc4322b72a439407d WHIRLPOOL 613242aef682edd2076dd1bb5ed3604938dab615eeff739ca465065904df8abf6d0e1694aa827289765b7f875bbe3d93cbdc3afdc89fc9a190b30f246a05f06b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGFKxEACgkQC77qH+pIQ6SccwD/abDCUOckrRb1THwYQpaNbm0+
-mgLP6FKCFdHIlYX6gXwBAJd4Xhjaa/Qo2VIg5OmecSFemvGprGPTeNFE0goE5xaK
-=NxuE
+iF4EAREIAAYFAlGfwPIACgkQXYk9GL8g3FEzzwD5AS9ldE3IuTIpOiBdl++5uNbr
+vrti7sE7Xijd14nquDsA/0Wc0APGr+Aeihj9h718zFuh+UbkZq6nhCTasIsKYVMg
+=ieYc
 -----END PGP SIGNATURE-----