gentoo resync : 15.05.2018

4 files changed, 4 insertions, 20 deletions

diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index b81b6f25b843..1b4a44f3702b 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,8 +1,6 @@
 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
 AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
 AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805
-AUX stubby.systemd 239 BLAKE2B b638a87ce4edfa3a36b1fe5bb4d91fef8aad40bf4bd4ee6d20d377cb2d868f65046521f3c4aada35827db87b67abfdff0ab203890bdb3f3a427e0a1c58bf7b4b SHA512 3c871cb10356b1291c08190ece8ad480bf6dc9bdfdfb079625a02ade0630e18bebdeaf88f4d1548bbabccf4bfe692c91896994297d2569d05a70e8dfe7d1b4fb
-AUX stubby.tmpfilesd 80 BLAKE2B c9afbd1e4b686b448e43a7ba4106351f9cb76c0ba5fe527463000e75090000c5d02cd78e16cc193061af274d53a696abc950019e6d0ec82fe9609b2ee5b006bc SHA512 c6bb320c02d62ecf8663d806318de8dc4a1cc401579a6a1b7ff5d7af8c9d24b8470d8bdecc2a9359ea40e6b3224f95909cb4decbfb9977e5a3ec8898535981fa
-DIST getdns-1.4.1.tar.gz 1055348 BLAKE2B 3b664e669327f5d866e6b40defb3ee4b62a09be228cac726478dbc6843b64aaf49faa328e1013700daf554c4df1144a8d56cca9d9405057d35b89b8ab7ae1f43 SHA512 b15da1c898d4bb4e5dcd93b47f481696dd456d8a841b02122c46035f3da27ca13b5513e7b6a00e943d1a5f5cec8c5ce1f13729d3ce0c887d8faa31d201864b27
-EBUILD getdns-1.4.1-r2.ebuild 1902 BLAKE2B f3b7e70a08dffc4a43ff6a6bf9cbc5651541ccff6467021b99ac7fec3970b3a84bd5c53363ec09a4cbe7ca79e5a234f36520a0c88f04bc9de1bade997ec22970 SHA512 c1b5d9b1eace4bf52274b50bef2ccb47c404475e6963f64141306f67d697b79e997d1b1f9a261edd810fdce74828c944ddef8a9cdd66fe93efdabac406fa6602
+DIST getdns-1.4.2.tar.gz 1059122 BLAKE2B 79399bb70e58bf449e99052c9f32ebb9d4e6ac26c753d99963d591661ee04ccfaf58e4f35589187a9a89fd9bccc0bff9d319c8b11da9522fbb17a915612ce9bd SHA512 fbbbe80df0f66e295c590c1751c11fcfc66efa200203ce1fdc11a471130fbaa837fa6bade076e17e1dac03d71c3522a67a660f2bdb4766aead19119da355bdd4
+EBUILD getdns-1.4.2.ebuild 1884 BLAKE2B 18700c0594d4a5110b821ec97a38bb33130af3b0d7dca311a4fa18442cc88feec11775f7781878d56b6462566c35a0691dca117a056a99cfdcc18a63a2ea61e0 SHA512 89bf649f84c0774189048cdc2608504aeffdf34759e6914c0b75a13b2abd8a5f8ca9c5321f6e06dd872a1acbb58e4f657a80d608c602d4bb5dd713a6abcce4f2
 MISC metadata.xml 857 BLAKE2B 25a516aa2d67d8ce5961b8a99d71f355fb99f163ccbbeee29c7c505729ba76735b7d6977f5aa8cb60b328943c715a9dbb4652b4e3133009e220c1db0de9cf875 SHA512 33065cbe6ddfa2b0382d55a0441a819f2d4795cd458fe6b53d4da444b9542d49781d7dcf7b11615c46e3157bdc1deab89c765a24ee100c67687fb64cd2099bd1
diff --git a/net-dns/getdns/files/stubby.systemd b/net-dns/getdns/files/stubby.systemd
deleted file mode 100644
index b85b8e90b036..000000000000
--- a/net-dns/getdns/files/stubby.systemd
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=stubby DNS resolver
-
-[Service]
-WorkingDirectory=/run/stubby
-ExecStart=/usr/bin/stubby
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-User=stubby
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-dns/getdns/files/stubby.tmpfilesd b/net-dns/getdns/files/stubby.tmpfilesd
deleted file mode 100644
index bf70492743ad..000000000000
--- a/net-dns/getdns/files/stubby.tmpfilesd
+++ /dev/null
@@ -1,2 +0,0 @@
-# tmpfiles.d (5) for use with stubby.service
-d /run/stubby 0750 root stubby - -
diff --git a/net-dns/getdns/getdns-1.4.1-r2.ebuild b/net-dns/getdns/getdns-1.4.2.ebuild
index bff5d734d08e..c0978a76f061 100644
--- a/net-dns/getdns/getdns-1.4.1-r2.ebuild
+++ b/net-dns/getdns/getdns-1.4.2.ebuild
@@ -54,8 +54,8 @@ src_install() {
 		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
 		insinto /etc/logrotate.d
 		newins "${FILESDIR}"/stubby.logrotate stubby
-		systemd_newunit "${FILESDIR}"/stubby.systemd stubby.service
-		systemd_newtmpfilesd "${FILESDIR}"/stubby.tmpfilesd stubby.conf
+		systemd_dounit "${S}"/stubby/systemd/stubby.service
+		systemd_dotmpfilesd "${S}"/stubby/systemd/stubby.conf
 	fi
 }