Merge remote-tracking branch 'remotes/arcriley/master'

Pull request: https://github.com/gentoo/gentoo/pull

net-dns/knot/Manifest

@@ -1,3 +1,4 @@
 DIST knot-1.5.3.tar.gz 1175445 SHA256 8d82ad5b2c7162750dc40c57d45dcae2665171a862767a350379fe1c4e0afcdd SHA512 4426ed136e5bcdb0d2b1729ab838418c880728a045dc1a40a6b6fc2a3b77ddcd7a375c8ec160efb6d009fc12eaf55587cf00af141f84d0bd1eb9cdac888fd445 WHIRLPOOL dbc1f59e2f2801f61dfbff4f2fcdc33e72647226e300adc85e9b0febd996aaad9615da33e21ebe22f83c6bf4c52cbcb7ca3a60fef8b66a9339d08f255909f16d
 DIST knot-1.6.3.tar.xz 785052 SHA256 48da608e29c2c1ef5937eb692f8ef0462ebb50fa7d128478a23e0a9788533e86 SHA512 c39f74ec49ec13d845705a11cf4b5474f101687db5cc44be0c2c8347faacf2fe4436d684a3e96d99afedd8408da1c7b3ad39fa5dc7bc3e52dafc899ac3a04958 WHIRLPOOL 4d6ae6b05be05c5a0c11f707a2c438801e9e7570d1aa2e946f659d9ccec25728c972cfa6caf96ccedb34f95fa28f4e904179cc123f34a78889961902333ce0f5
-DIST knot-2.0.0-beta.tar.xz 939468 SHA256 7ed997d15b523abcaede51d7ce3670a687d7658b96eb742b9dd87ac5d3e0e9af SHA512 98c872eea28b00b5da52ff8c74c6cf1c88b11e3d68038126a76de99ae2b39c60430294382b14a530fc2912cad419a7d509386deb78b7faa64320cdec21a1bc36 WHIRLPOOL 3b505d757a7591d32e33a07e9a46cb210e886a566bed705b326ce4d5be18d62865fdf165a97e21c8ad756631a5a448ef9ded67bae0002047ad209d7dad2ab5b6
+DIST knot-2.0.2.tar.xz 958800 SHA256 0418a22f9e801503993b3c872f2403bf73eab5ef7266128789b0531b41ea0c7e SHA512 5bb36f01a2f39c97d1278be1bb1be60e842a75b3a0f2bc51651907ad937a42229f0df988a5e865de7f869011eb4ac836bda1c5d92c86357ac2556dcf8134b09f WHIRLPOOL f10c2e35d80b8f05959aec9c18360c9ffb7b3572eff278527131271695efd3ed03b1da52b523ef9330dcece17de6ca3314f59e29d18054c057f6ac1368e75308
+

net-dns/knot/files/2.0.0_beta-spell-enable-vars-correctly.patch

@@ -1,11 +0,0 @@
---- configure.orig	2015-05-10 19:25:43.365929384 +0200
-+++ configure	2015-05-10 19:26:00.452648532 +0200
-@@ -12833,7 +12833,7 @@
- if test "$enable_daemon" = "yes"; then :
- 
- 
--if test "$enable_system" != "no"; then :
-+if test "$enable_systemd" != "no"; then :
- 
-   case $enable_systemd in #(
-   auto) :

net-dns/knot/files/knot.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Knot high-performance DNS Server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/knotd
+ExecReload=/usr/sbin/knotc reload
+ExecStop=/usr/sbin/knotc stop
+PrivateTmp=true
+RuntimeDirectory=knot
+RuntimeDirectoryMode=750
+
+[Install]
+WantedBy=multi-user.target

net-dns/knot/knot-2.0.2.ebuild

@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils user
+inherit bash-completion-r1 eutils systemd user
 
 DESCRIPTION="High-performance authoritative-only DNS server"
 HOMEPAGE="http://www.knot-dns.cz/"
@@ -12,7 +12,7 @@ SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="debug dnstap doc caps +fastparser idn systemd"
 
 RDEPEND="
@@ -34,8 +34,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P/_/-}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-spell-enable-vars-correctly.patch"
-	epatch "${FILESDIR}/${PV}-dont-create-extra-directories.patch"
+	epatch "${FILESDIR}/2.0.2-dont-create-extra-directories.patch"
 }
 
 src_configure() {
@@ -43,6 +42,7 @@ src_configure() {
 		--with-storage="${EPREFIX}/var/lib/${PN}" \
 		--with-rundir="${EPREFIX}/var/run/${PN}" \
 		--with-lmdb \
+		--with-bash-completions="$(get_bashcompdir)" \
 		$(use_enable fastparser) \
 		$(use_enable debug debug server,zones,ns,loader,dnssec) \
 		$(use_enable debug debuglevel details) \
@@ -88,6 +88,7 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}/knot.init" knot
+	systemd_dounit "${FILESDIR}/knot.service"
 }
 
 pkg_postinst() {