Version bump, rework configuration a bit to use a helper function. Add lua and script USE flags, and enable dhcpv6 if both the dhcp and ipv6 USE flags are enabled. Drop some older versions. Update copyright headers.

(Portage version: 2.1.10.49/cvs/Linux x86_64, signed Manifest commit with key 5C350883)

1 files changed, 23 insertions, 17 deletions

diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index b188602a63ed..46cd30f47b89 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,30 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX dnsmasq-2.47-fbsd-config.patch 505 RMD160 a19a17e94d924a21f79d50420faa4c2ed3ec40d0 SHA1 723580b460c93e2f7829627dee15bb758730b848 SHA256 4e05e46b59254e718550cda505986b9b572a0716636fb6a5405a54df25cfa84a
 AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359
 AUX dnsmasq-init 853 RMD160 1942e8d7297832df01bf35770d4b79b60141803e SHA1 693b8a9f17409d445dbf15399d94b253d6065c67 SHA256 da777f7e0093503dc3e17d674c5d512bd0a4b009bb8a455ffaa587b19b454c91
 AUX dnsmasq-init-r1 855 RMD160 5bfdbf2077c84ab974d3c5644b8cee9af12e6266 SHA1 5e0be1eb63df70a7e30b157d42ed1ec12080f958 SHA256 3722169ffed553293ff41208b0f1a87f93c7b036e82da48b26b81500aab25d2d
+AUX dnsmasq-init-r2 655 RMD160 c18401f4602ac7ce66b9dd29d3ec74e66b4b0ad2 SHA1 8805217aa268343a5c12fca98ec3f98766aa762f SHA256 6c8cf3c414a3eb3f57cc96a19ae24f228cd3a82c3fc7ae3504dd888848d777e8
 AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461d2964dc3f0db777fc26141b07f6f3f5a762 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746
 AUX dnsmasq.confd-r1 170 RMD160 1863748117f626416a44b653110fb82dadb52352 SHA1 9b63416e44dea85586803862cd9f4759cc05d5a4 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5
-AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1 70f4ca6e6cbd91b700e7e82696d5508f3c1686dd SHA256 c3cf0b2249267aaf921f335ec10cf140db570b2aa4009be789a215c47323a1d5
-DIST dnsmasq-2.52.tar.lzma 304860 RMD160 38e05bfd746d618c0ac51ae245540b008474bde7 SHA1 5f4a7b52b3459a4f98ef25f3c95aef910c89dc21 SHA256 1f7834618181ef2a2feadb65a8a71e6fb75f5dfa07759df295726c2db765cca0
-DIST dnsmasq-2.55.tar.lzma 320116 RMD160 2e6f623da3f453a2c6086dc80315a9308a4245ef SHA1 0bd62b3846bad2ed5e243b1b8aae59c2e0e20da5 SHA256 ae36d8031640b3202d196170025ee13e6d9240cb6d523a2a3e4f7ab1289e1473
-DIST dnsmasq-2.56.tar.lzma 331543 RMD160 448787766684dc354582423e234825c808df557f SHA1 f6e6f488798c5b0d84698abf4801f922ff78e36c SHA256 36341d2534801cae3463489b79d912f9db8b5dbf5527efd69821a7984def2c33
 DIST dnsmasq-2.57.tar.lzma 333348 RMD160 e78d2f87804e88b2021da3c593191338d0deaed4 SHA1 cbf0c22a7b856746b23f2d894070c60d32c4a97e SHA256 b35c5a31afce2b7c4bd62566d5dc87e1ce62d0d2ebd9c2baf15b5ea16bcc279d
 DIST dnsmasq-2.59.tar.lzma 340720 RMD160 ca7b841d97e0ef7ab5a8c2c099ecb79de28633b3 SHA1 41de5a8187210d7473a084c27526d47853c2017f SHA256 3bba1f637d04145e756ffc31a5076961a0aaf4716d097fa0d4a9a24dc8869391
-EBUILD dnsmasq-2.52.ebuild 1697 RMD160 059361530d2c65008fc39757a96c0f70ee9ab18d SHA1 a09dd2685ddc664e3f2b8065be82afcd61082250 SHA256 4dcd5cafff159a8377381a28b438b7604fed1e959d4d120d8f0175665e7e55ae
-EBUILD dnsmasq-2.55.ebuild 1728 RMD160 87ab8a4440f21c7ae141f25fa06e9606e1971b4d SHA1 e5b69d5a3dbce4ef3f117d0107e6bdb8291472d3 SHA256 c9cc19c5ab05fe73e028a34c6d5456f7032d04b77c86f497a70a07002fcadfd3
-EBUILD dnsmasq-2.56.ebuild 1728 RMD160 31d2a20a181e719ec84c176c53577e125a293ffa SHA1 83df230db44bdfe939d0f7046eb7000876d0965a SHA256 de365c3cbd2b0deea2cd5ddac0570f91c12da8e5a69f1905133a3bbe358b9bbc
-EBUILD dnsmasq-2.57-r1.ebuild 1816 RMD160 92a368fb9fca8514c9761194a5ab8f207214d341 SHA1 7685150873559ea1d350076c48e6a9cebf8bc553 SHA256 f538f5002da97f597ac93d6ed659bbc1d42fb60a26d0ab534f2f3ee2b2ad0bfc
-EBUILD dnsmasq-2.57.ebuild 1731 RMD160 7f92ffb61551dac3d0d9d13228b46bf83d851717 SHA1 5c15ac0caff3c15e6040e96655952bed901360a9 SHA256 e4b6300897aaf76588f936488e2be83321d34fc0d62bc9d95fc909a220d4ae0b
-EBUILD dnsmasq-2.59.ebuild 1930 RMD160 f031ae3426b6e3ea73f135eeeb848b72a7095078 SHA1 87fe8cb2236b70def59dc24276ebcd39865e1c21 SHA256 c2969f963383b8e3b8e2190084050d36ab6db411f37be002b9e10a990c234851
-MISC ChangeLog 27472 RMD160 81b8727805fa865ef06986373b2aea974e75a15e SHA1 87bb6676ebf30ace619b6e1cfc086f474476cf3e SHA256 a40a852dd761d1d41f3a0a29d337aaae6a0830a4a8422fcd59ebe068437b157b
-MISC metadata.xml 471 RMD160 953fece7a2f3907d83cfe4088b75df3f071f3b30 SHA1 f1da6a50832ac27686d9c52e6134d14d0d10c3cf SHA256 49aaabcc1581f5e5955e0b7a8fc60c0917fa0bb966d604fe2fdc4a3b6c16c6de
+DIST dnsmasq-2.60.tar.lzma 365513 RMD160 fb898487a4bac06e725b4182b04e196e3c5c92e0 SHA1 a6794d708a6fd530d046e4adaec41e7fd51e27a0 SHA256 aa5ada47e71a1fc83050d7e8569f03bc060c6a506ecc27a30832ef888e6d4c92
+EBUILD dnsmasq-2.57-r1.ebuild 1808 RMD160 a3da887b372461bde5ac68a5470eb0b9f25e9ea7 SHA1 61640f3f85b3b85158d4d7f8df4b30d21b5bbc7a SHA256 5e8cd0c7eb5c9e35d5a309835816ced3e84956c08fa0dbf3b3d5e58f68d2f8b9
+EBUILD dnsmasq-2.57.ebuild 1727 RMD160 1e88b07ae8232fd32fea4bb12f7bb328192db262 SHA1 76b27384b19faf48f9375d355ab23ec8d671b03a SHA256 9de48e4a588c1dafbc76f40d7d2c81ecb04f3b1b5c3d8dd2baa9eb5489872689
+EBUILD dnsmasq-2.59.ebuild 1924 RMD160 847e38e6a362adadfc8af8a467116b6df6e26f3b SHA1 aa967d74511bf578f2adafc95f42cc4fc82b971d SHA256 caf88fe6e5fa3f490570c0e8b1954da5a9cde652093fd4721f1ffe641ba88160
+EBUILD dnsmasq-2.60.ebuild 2395 RMD160 4d124435da847fa0b5492302fbedaacdf5dc34ab SHA1 0c844c38eaaf157cead2b1b2f5fd367194a6f46b SHA256 bb1bb538c43a297adb80cff2c9588034b8cf59fc6deb1566757816e750286a7d
+MISC ChangeLog 28001 RMD160 a393a6b9b2d588a354949cbc724ca477b82a2c15 SHA1 ff1318b61b4b4f432332de511866e70822c74d53 SHA256 a3644ab5489e3c5a17367e8fac06e3bee235361f2f8b4806b361377350356ca8
+MISC metadata.xml 553 RMD160 3aeaf5b60c4bcbd87b42716a6645b229c1df6101 SHA1 bc2aaba4f287048cc9d8d9c0ea95449b17941d94 SHA256 56f56d4e1e01017bf60f2971c8da9c5e536d58fad955413e38ac3428831129ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7bS2QACgkQI1lqEGTUzySKbgCgmq2VCraPPrGIsy/BxyyFB2Az
-BfcAnR/zswvT7p++F5vyHo/I5D3a8/bb
-=nEz8
+iQIcBAEBCAAGBQJPV9o9AAoJEHy/RO9cNQiD7poP/AnRW1KwHzq70K143Alq7Z8W
+WT4dZ+xNrAKrSFfoAsDt07vHeKMTaGtVrs2iP/9e2V80gTGGANU/06jCZAewou5V
+NM8gf90wqzOGwqRvoO9KsstlHRawK/jY7Gb1CC5OwtXR9jKzLXuJ+pZtkepDIWWg
+vqGX+5TSPanBwhQzO6B1bxdy8QBjtnaYHi6oePyLjTllOIggvIDmpPBSh7JZ8CEo
+uh4hUArbmHYvYs7V+zsQxdnck8rqSaAzMT8jlYCsgmR/cMjR65USX5XgBT09biXs
+j/JpxAW2eWqrTNlQmIlHOA07EXylJjNlBzRUswZaTRrzirIwFI5o76bbQpB40PAO
+XOUr/v5lt/I/38QJLTzrbspy3nI+S9AEVNiEjbZsQtrAKswXTM7++LZPJ4tROoZE
+34vgnln2k+RSTX3KkCsG3s82MN1QOJx7OwFJ7ZHkfDpmUeL3HRgrViYwO737GAeM
+u1iwpAU2LxMMNhWJ7N9/n2KWenDNBiCUXSrtPSFk79xcAIB2fNErynRa9CrYD1TN
+BmwsbXXbKZg9NXYgTgmZard4Zu3EXqy1ZClAMlHyAcDIs5jUvZhczm2tL3ti0S4M
+XjD2+vCGLS49YsLDBKJsMCUItjPRWSv9BCNAEOUqMW3AUj+/mWN2scSyaatIffWC
+iAlZIfFdDA0mYzp8Ufdw
+=9xXJ
 -----END PGP SIGNATURE-----