[gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/files/, net-dns/getdns/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     3c2183064edd8be92dae0d57a1e1de6e62e7e679
Author:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
AuthorDate: Mon May 14 21:40:21 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue May 15 01:01:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c218306

net-dns/getdns: Version bump to 1.4.2

 net-dns/getdns/Manifest                                      |  2 +-
 net-dns/getdns/files/stubby.systemd                          | 12 ------------
 net-dns/getdns/files/stubby.tmpfilesd                        |  2 --
 .../getdns/{getdns-1.4.1-r2.ebuild => getdns-1.4.2.ebuild}   |  4 ++--
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 2df8dc169a7..a6b311b8e0b 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1 +1 @@
-DIST getdns-1.4.1.tar.gz 1055348 BLAKE2B 3b664e669327f5d866e6b40defb3ee4b62a09be228cac726478dbc6843b64aaf49faa328e1013700daf554c4df1144a8d56cca9d9405057d35b89b8ab7ae1f43 SHA512 b15da1c898d4bb4e5dcd93b47f481696dd456d8a841b02122c46035f3da27ca13b5513e7b6a00e943d1a5f5cec8c5ce1f13729d3ce0c887d8faa31d201864b27
+DIST getdns-1.4.2.tar.gz 1059122 BLAKE2B 79399bb70e58bf449e99052c9f32ebb9d4e6ac26c753d99963d591661ee04ccfaf58e4f35589187a9a89fd9bccc0bff9d319c8b11da9522fbb17a915612ce9bd SHA512 fbbbe80df0f66e295c590c1751c11fcfc66efa200203ce1fdc11a471130fbaa837fa6bade076e17e1dac03d71c3522a67a660f2bdb4766aead19119da355bdd4

diff --git a/net-dns/getdns/files/stubby.systemd b/net-dns/getdns/files/stubby.systemd
deleted file mode 100644
index b85b8e90b03..00000000000
--- 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 bf70492743a..00000000000
--- 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
similarity index 93%
rename from net-dns/getdns/getdns-1.4.1-r2.ebuild
rename to net-dns/getdns/getdns-1.4.2.ebuild
index bff5d734d08..c0978a76f06 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
 }