net-dns/knot: Clean ebuilds

Package-Manager: portage-2.2.28

net-dns/knot/Manifest

@@ -1,9 +1,10 @@
 AUX 1.6.3-dont-create-extra-directories.patch 499 SHA256 9c8a18a56117830b9b9c50d95503928a08450cb8864d93cb72be98f532711a82 SHA512 69def6e4c5282dfaa070c41275ec6cdeccccf90c96ccb6c570e410ac3fba6cdf569468c9bdbcb3604de0c1c128d51d28846f5daa0f411a0c62d1fd2e5093795f WHIRLPOOL ccfdb194a1c0622939acf206ecd3e1dc0b33b03fb0a899364f15f1b920b08bdfab918f20f812da08c504fc9c98d132080272c7e249abf44c75a0d2da13d25cbb
 AUX 2.0.2-dont-create-extra-directories.patch 595 SHA256 27e9e307dfca4a534efca368689d5bf8738d7019991a064f3d9e4f32ca6331c6 SHA512 942a063102fe0d5273b1727432111798375a0cc3f9131e85184226a7de194c5bcfa96c64f3440dfcee3949ac8ecd9afd67ac75b5b47a677e09ad6e50db8bb083 WHIRLPOOL 1bf8403474b7e950b2a519d3f0122166dd290627a45e728afd9439f2a6bcc181df81b65a390a61a7a69b523d4a2294fcad834608f4cbe7a72499e620686076ec
+AUX 2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch 10653 SHA256 aa9c0c3439bc5544716350b480763fbc745c9f9e3de3f117d41984eafd1c3e71 SHA512 fe60493d96b245788ca36bec57c6885542c4795ae3789bcd7a30ba046129a1696827768451257a6ce83a46ab077acbba6f9f4b219747a86306517790eed736fa WHIRLPOOL 77e053c4f69661017fb92fa89e3eb3576ccb42946bc6db112d2d118fd761e37fe677809852a294fa54818f6a30e2103cf5e83c4fa3c2adcb954f8cc7aa2b862a
 AUX knot.init 868 SHA256 de555f2361a96e31ca908bba442c83b641f15bcfc54866d822128ba122cdddaa SHA512 f926af80a41e172ac97fe6c7684c80d64625f26af4a9148a1ccf13b8731428aa1fd88997e0b0f9ea4260442380fef3deea9848f765e29bb9fa5dea42e4c9a93f WHIRLPOOL 2e5841989772eb646b4376fae8c160868c4616e20462e66100ab00686c60dedd0089773a2f1e213a2f020f94fdb4a17ebf09850079a144ddbf2f34af58a67eb8
 AUX knot.service 275 SHA256 3b091f61652f7d91189659e1d297e5ead76c79f4b0515c9eb4c7f054894e6810 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86 WHIRLPOOL 39623f669bf141e785b630cd5caa71f47e67d6aa923cbfda074a4644faf83f05214484d133618a2c3731342f5bb44ef942d7559f36e7e2cade3c2318e8461dcb
 DIST knot-1.6.8.tar.xz 806748 SHA256 8d95dfd359fb187289d7d085e217d8fabb6022135d358134ed4165418a269237 SHA512 ee205a0813729bea712b0ac550209538382a2f0a7698607c3baa045a345f08e118e1b927116ad00fa58939051db70a6b21e154259276f3647acc80edf043efc8 WHIRLPOOL ed33ebdf99ba402b18550a880fb10e24f428108e297cb007d48ebbc0eea3f2e803034fe72052989e2eeb22859e3d47a5f93303b363bb50daddec868fd030e1a4
 DIST knot-2.3.0.tar.xz 1066852 SHA256 8abf9a6562ecf2f7f4222d16ca6c75463399870db360eda7caa40530b469533c SHA512 28f0f6a00af3feb95ebd9af0c324ffeff1093f8e74136ce81f5a6e7f4434f22b9e371715b4b116de9b8faf39776be4d943c2ae09fb786e6061cc0394a767e8b6 WHIRLPOOL b0cc054c79d6b2ef7e9e0c2dba727042d92d235a08a0b15c56189c06f69087aee36d21947e1bf33304bbe0834d50421e9f01a4b4d7597aed05ed1b552c5ea52c
-EBUILD knot-1.6.8.ebuild 2253 SHA256 37759aedb2d568592e975ebbf83b162bffb8ed5cf633ee53d20b319b1eebf187 SHA512 6d788148df3c62ce55c2ff0940ab3e4e190107386bc453c65a5c83c748f22908e9f575b522a9abbebbe28a0912ff10fdfd8af53a9c5cb4491ca61ae2b6e85609 WHIRLPOOL 98e0b9b9d0391570255235be68af35ec7866f9e451a3dea4a7931fb9133199749c0332fe87dfccd45743453b67b0aff2a1dc2e409eca952da46a653457f0748d
+EBUILD knot-1.6.8.ebuild 1782 SHA256 c7a47d5c0cf7400007d3827ad7283b82d8db1907c8eb70cd058a61c2faf5a3f3 SHA512 adb625746a03d8e450723c09638b21f7c4d85c294c44ce86a2c11acba08c84516c5c03165ac22ff81eb26368d1899f7310efa4a8d47337a4e2c023e76168678d WHIRLPOOL 74c2ea9bfb10bb195455b4f710f6550e679cc461a4df6a5612aa8c34d6a6ac24324925a6fd493be51e8f57cc712516fefaad06ba9fd64769110c66aa6ea5e43b
-EBUILD knot-2.3.0.ebuild 2387 SHA256 eaa4736590941b0833ebd931d62cd8aaa7cfe20f260481f1fb4d9de59b933cec SHA512 8720f73aa5e4a7eddc71177024bdda354a9d26f7e96cc3d94f93c8e1482defa319ad9df10a360da3a528a65871ceef3b31099e75707f62e4d7fbf2c327a50695 WHIRLPOOL e22d7bb1094ab2be863f6bbeed6b3b03b51eb6a2ee9931229e98e15a763783b91174e05e72167c24a10103d503be1183d655185b5aae6e932c5eeb29234bdd58
+EBUILD knot-2.3.0.ebuild 1970 SHA256 7b93dcae34f1e706a75c5521cb12e743f287ab713728ab508119f171c29a7bb5 SHA512 e7572b95893096c7a8742c2aa8b1cc7445692e4505ad30d378ed1cc06f80d18ba5578550fc3b245fb547b9e6a6608501b62a76388265e7f77b872fb88af82181 WHIRLPOOL 7676d574dea7709b77b43e4f4143b25886777b750965a9f467886de58e8c3a26781dc5631a30dce3c6e84849be41c025fdfbd0bc1e20e73a24cf7bc7aae8a1b2
 MISC metadata.xml 860 SHA256 fe726aad8fcb32cf2af9a862edb095dbc78b142124b154bc9e4467af9fdc068c SHA512 6c9094cbfd9ba5dde5a07ec21bfdceb8da8ad008ab34fcc76fe5b8478ab1439e887ae2c1f6ce9143d0f4b9a190fad4df50e6c57cf41c928f7095917557fa33b2 WHIRLPOOL db84dd7cb1c2206e026cb73119c3970256479d34e6548a123bc399a1b55abe02459797763791b9c695c4b42df313b4b17e9b47e26695dd01aa00b463abbfe2b4

net-dns/knot/files/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch

@@ -0,0 +1,216 @@
+From 84849be189c49ef9556bd84d5e5103317372e8a7 Mon Sep 17 00:00:00 2001
+From: Karel Slany <karel.slany@nic.cz>
+Date: Thu, 11 Aug 2016 11:39:39 +0200
+Subject: [PATCH] Added conversion to wire format when writing FNV64 hash values.
+
+Test on big-endian machines have been failing.
+---
+ src/libknot/cookies/alg-fnv64.c     |  6 +++---
+ tests/libknot/test_cookies-client.c | 20 ++++++++++----------
+ tests/libknot/test_cookies-server.c | 20 ++++++++++----------
+ 3 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/libknot/cookies/alg-fnv64.c b/src/libknot/cookies/alg-fnv64.c
+index 9989a4f..5e263c1 100644
+--- a/src/libknot/cookies/alg-fnv64.c
++++ b/src/libknot/cookies/alg-fnv64.c
+@@ -17,10 +17,10 @@
+ #include <assert.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+-#include <string.h>
+ 
+ #include "contrib/fnv/fnv.h"
+ #include "contrib/sockaddr.h"
++#include "contrib/wire.h"
+ #include "libknot/attribute.h"
+ #include "libknot/cookies/alg-fnv64.h"
+ #include "libknot/rrtype/opt-cookie.h"
+@@ -80,7 +80,7 @@ static uint16_t cc_gen_fnv64(const struct knot_cc_input *input,
+ 	assert(KNOT_OPT_COOKIE_CLNT == sizeof(hash_val));
+ 
+ 	cc_len = sizeof(hash_val);
+-	memcpy(cc_out, &hash_val, cc_len);
++	wire_write_u64(cc_out, hash_val);
+ 
+ 	return cc_len;
+ }
+@@ -127,7 +127,7 @@ static uint16_t sc_gen_fnv64(const struct knot_sc_input *input,
+ 	assert(SRVR_FNV64_HASH_SIZE == sizeof(hash_val));
+ 
+ 	hash_len = sizeof(hash_val);
+-	memcpy(hash_out, &hash_val, hash_len);
++	wire_write_u64(hash_out, hash_val);
+ 
+ 	return hash_len;
+ }
+diff --git a/tests/libknot/test_cookies-client.c b/tests/libknot/test_cookies-client.c
+index 44be903..712dbba 100644
+--- a/tests/libknot/test_cookies-client.c
++++ b/tests/libknot/test_cookies-client.c
+@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
+ 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
+ 	{
+-		uint8_t expected[] = { 0x74, 0x31, 0xf9, 0xa8, 0x03, 0xef, 0x15, 0xb1 };
++		uint8_t expected[] = { 0xb1, 0x15, 0xef, 0x03, 0xa8, 0xf9, 0x31, 0x74 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
+ 	}
+ 
+@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
+ 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
+ 	{
+-		uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 };
++		uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
+ 	}
+ 
+@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
+ 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
+ 	{
+-		uint8_t expected[] = { 0x7c, 0x62, 0x25, 0xd2, 0x43, 0xdd, 0x09, 0xe7 };
++		uint8_t expected[] = { 0xe7, 0x09, 0xdd, 0x43, 0xd2, 0x25, 0x62, 0x7c };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
+ 	}
+ 
+@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
+ 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
+ 	{
+-		uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa };
++		uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
+ 	}
+ 
+@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_cc_alg_fnv64.gen_func(&cc_in, hash, hash_len);
+ 	ok(hash_len != 0 && hash_len == knot_cc_alg_fnv64.cc_size, "cookies: FNV64 client cookie output");
+ 	{
+-		uint8_t expected[] = { 0x05, 0xa9, 0xd1, 0x08, 0x1b, 0x98, 0xe0, 0xaa };
++		uint8_t expected[] = { 0xaa, 0xe0, 0x98, 0x1b, 0x08, 0xd1, 0xa9, 0x05 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 client cookie content");
+ 	}
+ 
+@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
+ 	}
+ 
+ 	{
+-		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
++		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
+ 		ret = knot_cc_check(cookie, sizeof(cookie), NULL, &knot_cc_alg_fnv64);
+ 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no input");
+ 	}
+@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
+ 	cc_in.secret_data = secret;
+ 	cc_in.secret_len = sizeof(secret);
+ 	{
+-		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
++		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
+ 		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, NULL);
+ 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check no algorithm");
+ 	}
+@@ -201,7 +201,7 @@ int main(int argc, char *argv[])
+ 	cc_in.secret_data = secret;
+ 	cc_in.secret_len = sizeof(secret);
+ 	{
+-		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
++		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
+ 		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64);
+ 		ok(ret == KNOT_EOK, "cookies: FNV64 client good cookie check");
+ 	}
+@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
+ 	cc_in.secret_data = secret;
+ 	cc_in.secret_len = sizeof(secret);
+ 	{
+-		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xaf };
++		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x33 };
+ 		ret = knot_cc_check(cookie, sizeof(cookie) - 1, &cc_in, &knot_cc_alg_fnv64);
+ 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid length");
+ 	}
+@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
+ 	cc_in.secret_data = secret;
+ 	cc_in.secret_len = sizeof(secret);
+ 	{
+-		uint8_t cookie[] = { 0x33, 0x0c, 0xa6, 0x80, 0x94, 0x17, 0xe5, 0xae };
++		uint8_t cookie[] = { 0xaf, 0xe5, 0x17, 0x94, 0x80, 0xa6, 0x0c, 0x32 };
+ 		ret = knot_cc_check(cookie, sizeof(cookie), &cc_in, &knot_cc_alg_fnv64);
+ 		ok(ret == KNOT_EINVAL, "cookies: FNV64 client cookie check invalid cookie");
+ 	}
+diff --git a/tests/libknot/test_cookies-server.c b/tests/libknot/test_cookies-server.c
+index 32001c1..66a54ba 100644
+--- a/tests/libknot/test_cookies-server.c
++++ b/tests/libknot/test_cookies-server.c
+@@ -28,10 +28,10 @@
+ #include "libknot/rrtype/opt-cookie.h"
+ 
+ const char *cookie_opts[] = {
+-	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x18", /* 8 octets long wrong server cookie. */
+-	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\xe0\xd9\x95\x4e\xbc\xc3\x99\x19", /* 8 octets long OK server cookie. */
+-	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x38", /* 8B nonce 8B hash long wrong server cookie. */
+-	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\xc0\xbd\xdb\xec\x19\x78\x88\x39" /* 8B nonce 8B hash long OK server cookie. */
++	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xdf", /* 8 octets long wrong server cookie. */
++	"\x00\x0a" "\x00\x10" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x19\x99\xc3\xbc\x4e\x95\xd9\xe0", /* 8 octets long OK server cookie. */
++	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xbf", /* 8B nonce 8B hash long wrong server cookie. */
++	"\x00\x0a" "\x00\x18" "\x00\x01\x02\x03\x04\x05\x06\x07" "\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x39\x88\x78\x19\xec\xdb\xbd\xc0"/* 8B nonce 8B hash long OK server cookie. */
+ };
+ 
+ #define ROPT(i) ((const uint8_t *)cookie_opts[(i)])
+@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0x75, 0x45, 0x7c, 0x9a, 0xe0, 0x13, 0xa8, 0xea };
++		uint8_t expected[] = { 0xea, 0xa8, 0x13, 0xe0, 0x9a, 0x7c, 0x45, 0x75 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0xc0, 0xbd, 0xdb, 0xec, 0x19, 0x78, 0x88, 0x39 };
++		uint8_t expected[] = { 0x39, 0x88, 0x78, 0x19, 0xec, 0xdb, 0xbd, 0xc0 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0xe0, 0xd9, 0x95, 0x4e, 0xbc, 0xc3, 0x99, 0x19 };
++		uint8_t expected[] = { 0x19, 0x99, 0xc3, 0xbc, 0x4e, 0x95, 0xd9, 0xe0 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+@@ -244,7 +244,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0x4d, 0xde, 0xfa, 0x22, 0xb9, 0x0a, 0xcc, 0xd8 };
++		uint8_t expected[] = { 0xd8, 0xcc, 0x0a, 0xb9, 0x22, 0xfa, 0xde, 0x4d };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+@@ -261,7 +261,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0xa0, 0x35, 0xe3, 0xe0, 0x78, 0x7a, 0x91, 0xaf };
++		uint8_t expected[] = { 0xaf, 0x91, 0x7a, 0x78, 0xe0, 0xe3, 0x35, 0xa0 };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
+ 	hash_len = knot_sc_alg_fnv64.hash_func(&sc_in, hash, hash_len);
+ 	ok(hash_len != 0, "cookies: FNV64 server cookie output");
+ 	{
+-		uint8_t expected[] = { 0x8e, 0xa3, 0xf8, 0x97, 0x84, 0x0a, 0x3d, 0x8b };
++		uint8_t expected[] = { 0x8b, 0x3d, 0x0a, 0x84, 0x97, 0xf8, 0xa3, 0x8e };
+ 		ok(sizeof(expected) == hash_len && 0 == memcmp(expected, hash, hash_len), "cookies: FNV64 server cookie content");
+ 	}
+ 
+--
+libgit2 0.24.0
+

net-dns/knot/knot-1.6.8.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils user
 
@@ -19,7 +19,10 @@ RDEPEND="
 	>=dev-libs/openssl-1.0.1
 	>=dev-libs/userspace-rcu-0.5.4
 	caps? ( >=sys-libs/libcap-ng-0.6.4 )
-	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
 	idn? ( net-dns/libidn )
 	lmdb? ( dev-db/lmdb )
 	systemd? ( sys-apps/systemd )
@@ -29,13 +32,14 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/flex
 	sys-devel/bison
-	doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo )
+	doc? ( dev-python/sphinx )
 "
 
 S="${WORKDIR}/${P/_/-}"
 
 src_prepare() {
 	epatch "${FILESDIR}/1.6.3-dont-create-extra-directories.patch"
+	eapply_user
 }
 
 src_configure() {
@@ -53,15 +57,11 @@ src_configure() {
 
 src_compile() {
 	default
-	use doc && emake -C doc html-local singlehtml pdf-local info-local
+	use doc && emake -C doc html
 }
 
-# Portage's automatic test code runs "make -n check" to see if there
-# is a "check" target, but that fails here because the test
-# infrastructure hasn't been built yet. Just run "make check", which
-# will build it and then run the tests.
 src_test() {
-	emake -j1 check
+	emake check
 }
 
 src_install() {
@@ -69,24 +69,16 @@ src_install() {
 	keepdir /var/lib/${PN}
 
 	if use doc; then
-		dodoc doc/_build/latex/KnotDNS.pdf
-
 		docinto html
 		dodoc doc/_build/html/*.html doc/_build/html/*.js
 		docinto html/_sources
 		dodoc doc/_build/html/_sources/*
 		docinto html/_static
 		dodoc doc/_build/html/_static/*
-
-		docinto singlehtml
-		dodoc doc/_build/singlehtml/index.html
-		docinto singlehtml/_static/
-		dodoc doc/_build/singlehtml/_static/*
-
-		doinfo doc/_build/texinfo/KnotDNS.info
 	fi
 
 	newinitd "${FILESDIR}/knot.init" knot
+	systemd_dounit "${FILESDIR}/knot.service"
 }
 
 pkg_postinst() {

net-dns/knot/knot-2.3.0.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit bash-completion-r1 eutils systemd user
 
@@ -21,7 +21,10 @@ RDEPEND="
 	>=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 )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
 	idn? ( net-dns/libidn )
 	dev-libs/libedit
 	systemd? ( sys-apps/systemd )
@@ -29,13 +32,15 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( dev-python/sphinx app-text/texlive-core sys-apps/texinfo )
+	doc? ( dev-python/sphinx )
 "
 
 S="${WORKDIR}/${P/_/-}"
 
 src_prepare() {
 	epatch "${FILESDIR}/2.0.2-dont-create-extra-directories.patch"
+	epatch "${FILESDIR}/2.3.0-added-conversion-to-wire-format-when-writing-FNV64-hash-values.patch"
+	eapply_user
 }
 
 src_configure() {
@@ -55,15 +60,11 @@ src_configure() {
 
 src_compile() {
 	default
-	use doc && emake -C doc html-local singlehtml pdf-local info-local
+	use doc && emake -C doc html
 }
 
-# Portage's automatic test code runs "make -n check" to see if there
-# is a "check" target, but that fails here because the test
-# infrastructure hasn't been built yet. Just run "make check", which
-# will build it and then run the tests.
 src_test() {
-	emake -j1 check
+	emake check
 }
 
 src_install() {
@@ -71,21 +72,12 @@ src_install() {
 	keepdir /var/lib/${PN}
 
 	if use doc; then
-		dodoc doc/_build/latex/KnotDNS.pdf
-
 		docinto html
 		dodoc doc/_build/html/*.html doc/_build/html/*.js
 		docinto html/_sources
 		dodoc doc/_build/html/_sources/*
 		docinto html/_static
 		dodoc doc/_build/html/_static/*
-
-		docinto singlehtml
-		dodoc doc/_build/singlehtml/index.html
-		docinto singlehtml/_static/
-		dodoc doc/_build/singlehtml/_static/*
-
-		doinfo doc/_build/texinfo/KnotDNS.info
 	fi
 
 	newinitd "${FILESDIR}/knot.init" knot