gentoo resync : 01.12.2017

3 files changed, 5 insertions, 84 deletions

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index f9223aa0132e..21d4e503b52d 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,11 +1,10 @@
 AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e05dbd44c8b8c5c87a01d500d5ac328fdee1cae3f9dd126448a8b82b979e13a4ff5285fa48b983d5 SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
-DIST knot-2.4.5.tar.xz 1111536 SHA256 87ce8ccc83511c5a1f4eadd3f0122f2f5ae86fb68e9b72f0700c6f5340ba95cb SHA512 db4919dbe2dc688f401e6611d784d47e1d40a0f8ec8c8cd6240d89ab9dd2ce7dd1976ac7cb24c712ed8aa074e0026ff0a10e9d6d5e685929d271ae554d9a1cff WHIRLPOOL cdfdf0bc2591df8436f8ab0959581129cb1a4d86138f6bb75b507d83280c7d567eb794e3b76b8374d4087721de53e4afd7566411b8e51fa2655e9e5462357ef4
-DIST knot-2.5.6.tar.xz 1081756 SHA256 37d1625c2aaefe2394c85f6742a6ae9421e8348318c13119a6c451796c387cfc SHA512 dcc58791469c8e4724a47b47105bf0c047bcf62611d6803a07a856bb281d72a397b186210087ff8f145232315bbd9baa194a7cdef10d1ebb36ca3b8c0a0c7379 WHIRLPOOL 199470662eb55971f5581a97d396342664789eb5803ae570598b4254bc14ad8f8fb9ca21198a42a26506fb7d29ed9417c42730651bd9ec38c48c50dbedf4726a
-DIST knot-2.6.1.tar.xz 1112956 SHA256 3013d45b4c7484268f3cad078f66f730a5bc9606e6b1061488dd821c1dce41e3 SHA512 f4eaf311adcdfd13628c7174333bcc766b300be573f7df32eaaf162c5857e0ba35ce5a5e022f799c95618203abbe8db93e2364f172a87c4dd4eaf90b30ef8428 WHIRLPOOL f69c58c9211b18e512e851044ba830c4011618175f6b78a37702e1afe9ed70ab244b1077a2d6ece745d064d2ad0131f61405c5fe811b108e85d86cd428fa4d7b
-EBUILD knot-2.4.5.ebuild 1531 BLAKE2B 3b35f384213778ef51d951a3096cb229da09605980ef3d7852d93a0c6b55faddbace2bc8aeeed9e215f44bd89d78524b960d02c49f7999fb5324cb2e7ef9e479 SHA512 908ebfce7b6ecd87171efe02b39ac43b8fd91aabf17da072fddd270b8bb10063e161dad188036dcf68d21046b56c8611fc9f443ebea39949747e1d4403a94405
+DIST knot-2.5.6.tar.xz 1081756 BLAKE2B a016be4b7080175cc83bacc23cbf08b15e5c8dcdd63da0d6ca61dcbd8aa2d75952a2becf7c9f2f65b43e004bd54641198afc6402a0714046a4f631aaa193ae2d SHA512 dcc58791469c8e4724a47b47105bf0c047bcf62611d6803a07a856bb281d72a397b186210087ff8f145232315bbd9baa194a7cdef10d1ebb36ca3b8c0a0c7379
+DIST knot-2.6.1.tar.xz 1112956 BLAKE2B 28c2c2318713c63ce389ab768bedbcf3b2799d9d660d978e77ba68e40aff40de8eb0e31cc7b42d00230beff418ba2d20032e2e01c5dc26a6813e02e10711195a SHA512 f4eaf311adcdfd13628c7174333bcc766b300be573f7df32eaaf162c5857e0ba35ce5a5e022f799c95618203abbe8db93e2364f172a87c4dd4eaf90b30ef8428
+DIST knot-2.6.3.tar.xz 1112408 BLAKE2B c2a04e951427fe667b1bef63f4ca4fca8fa099f7c7a0a7e61562a5a5f9f44208118f59debbf67eabba72c5f924412c54f650450e71c592f033d99d061060f103 SHA512 51e1c2abe6149173ded2c48e70ca9a563f76013aae95e53e9c4b5c2325bce44b21b410f7ce773012bc6e6d0b3db21aeffd697669fbeb34137af70af5dcd3f157
 EBUILD knot-2.5.6.ebuild 1913 BLAKE2B 86572fd9237d904d497bf488eaa5c97d1d3b3800ab5d0ea9b198f9a5a32b945d384dc7f683ea0530712f1bba6a3cfbf20e7534b0b317736d2b3f078f5ceaa0c0 SHA512 d2c4e59cb2ba96561f23b8b22be8c494689549d569d2fe785793723ed7035bf778db5494ad2c5ce0e90e72b41bf3080ef7cd3791d4b943cede97a9428bc7aee6
 EBUILD knot-2.6.1-r1.ebuild 1921 BLAKE2B 30e12315e77029da6f88dbfbbe262ca0f800f5599b7ffc093adf7ac7897dcd212dbc445c8666899ab8705370ac81b0324950a889fbcc370e8ecdf555972f29e7 SHA512 78467d6a4ab72ca5e310865324f953d8f57a2f96be2eeb2b3212684b25d449639d99ec8df24daab6f43ef853394dbf7ce047faacce9547c86adcde946975fadf
-EBUILD knot-2.6.1.ebuild 1913 BLAKE2B 86572fd9237d904d497bf488eaa5c97d1d3b3800ab5d0ea9b198f9a5a32b945d384dc7f683ea0530712f1bba6a3cfbf20e7534b0b317736d2b3f078f5ceaa0c0 SHA512 d2c4e59cb2ba96561f23b8b22be8c494689549d569d2fe785793723ed7035bf778db5494ad2c5ce0e90e72b41bf3080ef7cd3791d4b943cede97a9428bc7aee6
+EBUILD knot-2.6.3.ebuild 1921 BLAKE2B 30e12315e77029da6f88dbfbbe262ca0f800f5599b7ffc093adf7ac7897dcd212dbc445c8666899ab8705370ac81b0324950a889fbcc370e8ecdf555972f29e7 SHA512 78467d6a4ab72ca5e310865324f953d8f57a2f96be2eeb2b3212684b25d449639d99ec8df24daab6f43ef853394dbf7ce047faacce9547c86adcde946975fadf
 MISC metadata.xml 1539 BLAKE2B c07704f4bbf249b7953403a33c71d7565ef2219b019dbccdc15d9d459ff57f0aa200ed5ae9ab74b07e352d8dcd12f62f5d7bb392b064dbeedad3257ced653675 SHA512 8b39c687fb8b9fb4bf25e0baa8c851ffb4980c0028bf0f64a3c642146139429e292c6ca3fbd01b7bb311ecbbe7bf1df128885b53971b836f541fe97bedf6f056
diff --git a/net-dns/knot/knot-2.4.5.ebuild b/net-dns/knot/knot-2.4.5.ebuild
deleted file mode 100644
index 50af785a49d1..000000000000
--- a/net-dns/knot/knot-2.4.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils systemd user
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="http://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dnstap doc caps +fastparser idn systemd"
-
-RDEPEND="
-	>=net-libs/gnutls-3.3:=
-	>=dev-libs/jansson-2.3
-	>=dev-db/lmdb-0.9.15
-	>=dev-libs/userspace-rcu-0.5.4
-	caps? ( >=sys-libs/libcap-ng-0.6.4 )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	idn? ( net-dns/libidn )
-	dev-libs/libedit
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	econf \
-		--with-storage="${EPREFIX}/var/lib/${PN}" \
-		--with-rundir="${EPREFIX}/var/run/${PN}" \
-		--with-lmdb \
-		--with-bash-completions="$(get_bashcompdir)" \
-		$(use_enable fastparser) \
-		$(use_enable dnstap) \
-		$(use_enable doc documentation) \
-		$(use_with idn libidn) \
-		--enable-systemd=$(usex systemd)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/knot.init" knot
-	systemd_dounit "${FILESDIR}/knot.service"
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	enewgroup knot 53
-	enewuser knot 53 -1 /var/lib/knot knot
-}
diff --git a/net-dns/knot/knot-2.6.1.ebuild b/net-dns/knot/knot-2.6.3.ebuild
index 0baf4877502e..90e03e2d7048 100644
--- a/net-dns/knot/knot-2.6.1.ebuild
+++ b/net-dns/knot/knot-2.6.3.ebuild
@@ -90,7 +90,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/knot.init" knot
 	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
 	fi
 
 	find "${D}" -name '*.la' -delete || die