reinit the tree, so we can have metadata

14 files changed, 608 insertions, 0 deletions

diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
new file mode 100644
index 000000000000..df390c95f2d5
--- /dev/null
+++ b/net-misc/sks/Manifest
@@ -0,0 +1,16 @@
+AUX sks-1.1.6-unbundle-cryptokit.patch 2051 SHA256 2a9a2ad3f3e10c942a842e6905f0a957a53729cf1fbc61c5e8991b7cb285b3cb SHA512 35428b0a6052c45e4fe03fce6474c70c8c3b72e3f611fe86ed3b6055018bbc8d90174ad07748ad42bff1f748eb6a334e09d1c64be7cd23722aa76e8e21d546f4 WHIRLPOOL c7d73f8d74ed1b362e67230c045f3edf880b10188e7cc361c8e6e7b591a51453aded90a0543e495005473de0cf978524642375137d0b5ac729796863832ddd45
+AUX sks-1.1.6-use-ocamlfind.patch 1259 SHA256 dd77b6d7a18535a710deac13fe67db0bfd1b368e2c598b12d26870edfa03e16d SHA512 7fff2dbcad7f3c73e53b99d856cb1da52125e5dc51b84959be9ddc555dc34e1e39a049aa3946f350a15d9a5ed74f4bc0a58f2ea3523c4cc3675bf3901db11238 WHIRLPOOL 3378764c50d952436330707dcb7922d7a030e23e927af530ca6958fb6b582406c7cb2507850eaefc7cf6c6bc1de369e74f30d5e6283923bb1a49fa8e634d4355
+AUX sks-1.1.6-use-ocamlfind2.patch 671 SHA256 6c1493c9fcda5b7a1746e802ac333013eac3d3e5d71132416734b45cd69e704a SHA512 555a688be1e4bb1c7fb2e1bbeb4661e6dd0bc04d94a2ff3c5a12e7979549efc79531ee8cba01f6150610b633cce20072367a42eda2870f0755adf69b24cfaa7f WHIRLPOOL cfe2ffcaf9d53cd3344fbb043ec682f397304a6f95027abaac4625d9a7c56d9d5882ce4bbc533cde2c293c1503fe7c0fb84ec4a60e8acb5a79949d073771c6fa
+AUX sks-1.1.6-use-ocamlfind3.patch 665 SHA256 4a36db614b4c172d2ed4693dfeed696e8407e5e2322ee9ffd362010b165c06ed SHA512 cae267036bbe65701f06a1aec4f3cfb30d7a8f5bd8859d8eaa73b2d66438b5fe0c6ceb42cc810951dd4233b0b162091dcfd760ff9c22b3a3e39ed99e239ca13a WHIRLPOOL 0be780383a032aa376bc3efc2b2da68a240c3a65101703a8304c953f7f2cb1a35768173c2927f890c202fb75c2fe2b35ab5f05274c88ff717d83ab7017c20fc4
+AUX sks-db.initd 520 SHA256 37ee314d861184462ce3b626f1c18f593a42f04472d325acd2d38dd4931456ee SHA512 60335298f05f9917a960b5759c4e45e0ecca53455a7cd8dc9181175bf75dc1916ce2f33663f342d7b6f5f3bfa6fc4cc41bbcdc94afcfc424e31189afd40193f6 WHIRLPOOL e004ad7ccf33f0780fd3e26ccd59e7ac913d40e6f1bc6e61a29384fa7d7c29b3a89a2b0775788da7a9923caa5793426155f8fa68f3d0db1da510d029e46d3998
+AUX sks-db.service 174 SHA256 a6ae25f8f4b4ead48046ce31af89cbc0cd2fb7acc80d6ae241d301dc0059bce8 SHA512 bf90ca8a5c14ccdddb9bc0c4a7493fe10ce54ae8df7ba32773cc3f59d018f74afd3c5302794deb69186cdddbaadc82d7db8d0c3d8862f37862a3c8c104b2365e WHIRLPOOL e03a2329ed423e1d557ad9a37491285ca29f9f677ca05d4b8ae09c912b4a87958e12f70282e56d3c0350183702fafa0ba74b5019bb13d89ecf6e1ca336d22ad5
+AUX sks-recon.initd 583 SHA256 cd4c27ac6096aaafc85707e36b17ee6c0a320f31cda9c37db7bde8da019b82c7 SHA512 5d26e2196428a76bb454e2bf9e0d3813e96f894ef4f326650300874efb71a303eeb7267270327036da38960a8b68e420ce7e7e61cf21f7be85c80612c00a0f6c WHIRLPOOL 251d68c9f614262bf96d738cccf89e1acd198fe2c4117f19d52893bdf15346ab481015dea715f9b618cc14ab2690573bf9c9fe22996a7f897d4519928cabb9b2
+AUX sks-recon.service 187 SHA256 bb68920796fb0fd22ccc433306b65ff988125884988bb3d5beb0449d7e30389d SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef WHIRLPOOL b260bc4bc1091e96aed0d5e94e80574b3679449962b0dc4953e40a222cc050fc08751d33b64200de01af964b054ee65e15c4d52f7c45f8f01d80cd27e7d0df0a
+AUX sks.confd 87 SHA256 811498c2c964ee109dcbf617682addf0631172bb75e9b221af5b4084f4720214 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660 WHIRLPOOL 0ee221d86ca478af20aa9e8530eff79ecd0181dbf52da282d41fed6881a6649335281f1907e486bdc1dd4877b930265aefb3e5d189cd6b5c270d383abf329fc7
+DIST sks-1.1.6.tgz 359499 SHA256 22312dbec6dfd372932075b0b0b1d04f772059a9520faa4937feafc737d5a632 SHA512 f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099 WHIRLPOOL 85714515275c21821ff3bc429d00546f1f3b1cf6b8193edd1b26295ec07861ed1ed8b123deb811b6b915d761e977662398e7509581d8fe0e32d47ea6dd09388a
+EBUILD sks-1.1.6-r2.ebuild 3653 SHA256 2268432342d417f8427a6c0a74d05ce04b32e1d9db29ff018d57cccfae740776 SHA512 93f867791a3b09f58098b1e9047ea5e49c4abf04b2428dc8aabfc1834ae4f71d84f84f4e88ccc4e767c5e4d4171332ba4b16a1d1ab098314e58f29e664f9642f WHIRLPOOL 5ea9d509fb32f782912cdf6a39a579671a0e3e1150593dfab83dfff1837a50a0e6297cb912ddadd0d04702f1dac2436ba80396c5b91487b5063740592b2059f0
+EBUILD sks-1.1.6-r4.ebuild 3522 SHA256 6a3d58269a92408e356f3763805248759235b865f0f91dc9c3853f2a0a7ce3c8 SHA512 b93fdc43971b4d736da706189e4a300ae5d68100b52b41acbdc8930936893add99a33744b2733131ba8d0ddf861f5b81d6d53d3d25d633215a6b3298a7ed5fa7 WHIRLPOOL dc52ca8f7a5e39948c1587254eefbaca4414db9108989436f40a64210b87539f545a3a30e9522c4e380307176e37f9573d1e4e85b924d85524d0a3b0553bb4bf
+EBUILD sks-1.1.6-r5.ebuild 3665 SHA256 b224689e63c3df96d6b7f4b566d9cc63c68ff8f51b0950cfde6f3b98dd40184f SHA512 24e6a92cb17628a01e389db2fe8cadef24baa5071c68529f99f9fb4e30ceece6752069f8a58159bb5a07f28921ef6c58e325e273c3940f4d13ef0b9b0a4cd7f0 WHIRLPOOL 4839ea0e6c583dd851347bd0889d0211fab2f33acaf2e5c2e5604917ba37c9b1cf9d4e5945cfcf38b1759aebf42d7d1bb54acb3757728df96052368193ca4f6f
+MISC ChangeLog 4487 SHA256 8fe441f2077a20d5bd7fdf434f32c22c2220028f9f924a454f4366101293afe2 SHA512 15e30ad8fa51153bddb45c17c9858ce498031fa69ce1cb213b7b4c0dc14514ded3786fd655178d139de4160e29a6caeb239f3430b6520ccd8255a77c6de5f292 WHIRLPOOL c9d6da6705fe77a302e6b0d044b7355bebeec347296dd12402981feb067bf0665debcb36846bf18ef7c25ebf376bdb35b07b470b4c5f615b580fbb5d14e08166
+MISC ChangeLog-2015 2667 SHA256 0de86eb3e2bbd497955ff6c85fb314697b4d311d4e9a8af345faa8e42f0ea55e SHA512 1f32a184953872dee9085e4dea926b186fb70562af45bbdd519fa11e6e235362d70b38c38d4184c3832baa2fcdfe0a0329ab48b285b35077a8e20a80a41ff76f WHIRLPOOL 3b1fd053cbe4c23eaa8c9a241ef4eaecef356d3321bf8484fa72a51b4241b92fa0f04fa5865c028ed27ea6fb66fba9f3f1568edc8aaa00b3ec73560218814463
+MISC metadata.xml 461 SHA256 8812c3266c80ecc6cd2670b4ffe5fbbc9983e00d28a9e4ee558a94bc724d71f0 SHA512 9000d37a7cbfa59227f68c7791c3ad8d3c373da5376eab9a03c8bda742f0253143b56ad9ae492fbccabcf54f17f931c052fffc4d9991e2c5f1620afcb5da23ca WHIRLPOOL c608e724497f950b41b4e40a049bd38c45a20ef3a8f680f22c68df93158be6f31a7c2d08325152fe0f2c8da2fb3ef01bf916285239fffbdd92a617fef8b5c64a
diff --git a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
new file mode 100644
index 000000000000..bf3d19010337
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
@@ -0,0 +1,72 @@
+From: Christoph Martin <christoph.martin@uni-mainz.de>
+Date: Fri, 6 May 2016 14:55:01 -0400
+Subject: use system cryptokit
+
+Use the system cryptokit instead of the one shipped in upstream source
+---
+ Makefile | 31 ++-----------------------------
+ 1 file changed, 2 insertions(+), 29 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 15ab3ea..eb56758 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ WARNERR=-warn-error A
+ endif
+ 
+ CAMLP4=-pp $(CAMLP4O)
+-CAMLINCLUDE= -I lib -I bdb
++CAMLINCLUDE= -I lib -I bdb -I +cryptokit
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+ CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
+@@ -109,7 +109,7 @@ ALLOBJS=$(ALLOBJS.bc:.cmo=.cmx)
+ 
+ EXEOBJS.bc=$(RSERVOBJS.bc) build.cmo fastbuild.cmo dbserver.cmo pdiskTest.cmo
+ 
+-LIBS.bc= lib/cryptokit.cma bdb/bdb.cma
++LIBS.bc= bdb/bdb.cma
+ LIBS=$(LIBS.bc:.cma=.cmxa)
+ 
+ VERSION := $(shell cat VERSION)
+@@ -280,32 +280,6 @@ prepared:
+ 	touch prepared
+ 
+ 
+-CKVER=cryptokit-1.7
+-CKDIR=$(CKVER)/src
+-
+-$(CKVER)/README.txt:
+-	tar xmvfz $(CKVER).tar.gz
+-	patch -p 0 < $(CKVER)-sks.patch
+-	patch -p 0 < $(CKVER)-sks-custom_compare.patch
+-
+-$(CKDIR)/cryptokit.cma: $(CKVER)/README.txt
+-	cd $(CKDIR) && $(MAKE) all
+-
+-$(CKDIR)/cryptokit.cmxa: $(CKVER)/README.txt
+-	cd $(CKDIR) && $(MAKE) allopt
+-
+-lib/cryptokit.cma: $(CKDIR)/cryptokit.cma $(CKDIR)/cryptokit.cmxa prepared
+-	cp $(CKDIR)/cryptokit.cmi $(CKDIR)/cryptokit.cma \
+-	   $(CKDIR)/cryptokit.mli lib
+-	cp $(CKDIR)/libcryptokit.a lib
+-	if test -f $(CKDIR)/dllcryptokit.so; then \
+-	   cp $(CKDIR)/dllcryptokit.so lib; fi
+-	if test -f $(CKDIR)/cryptokit.cmxa; then \
+-	   cp $(CKDIR)/cryptokit.cmxa $(CKDIR)/cryptokit.cmx \
+-	   $(CKDIR)/cryptokit.a lib; fi
+-
+-lib/cryptokit.cmxa: lib/cryptokit.cma
+-
+ ################################
+ # old stuff
+ ################################
+@@ -404,7 +378,6 @@ clean: mlclean
+ 
+ cleanall: clean bdbclean
+ 	rm -f lib/*
+-	rm -rf $(CKVER)
+ 
+ distclean: cleanall
+ 	rm -rf Makefile.local
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch
new file mode 100644
index 000000000000..c9afc2594091
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch
@@ -0,0 +1,39 @@
+Use ocamlfind for finding dependencies, esp. for doing their transitive closure.
+
+Ideally the build system should be converted to something more modern like
+jbuilder.
+
+Index: sks-1.1.6/Makefile
+===================================================================
+--- sks-1.1.6.orig/Makefile
++++ sks-1.1.6/Makefile
+@@ -21,10 +21,10 @@ CFLAGS=-O3  $(CINCLUDES) -I .
+ CXXFLAGS=-O3 $(CINCLUDES) -I .
+ 
+ ifndef OCAMLC
+-	OCAMLC=ocamlc
++	OCAMLC=ocamlfind ocamlc
+ endif
+ ifndef OCAMLOPT
+-	OCAMLOPT=ocamlopt
++	OCAMLOPT=ocamlfind ocamlopt
+ endif
+ ifndef CAMLP4O
+ 	CAMLP4O=camlp4o
+@@ -55,12 +55,12 @@ WARNERR=-warn-error A
+ endif
+ 
+ CAMLP4=-pp $(CAMLP4O)
+-CAMLINCLUDE= -I lib -I bdb -I +cryptokit
++CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+-CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
+-OCAMLFLAGS=$(COMMONCAMLFLAGS) -g $(CAMLLIBS)
+-OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa)
++CAMLLIBS=bdb.cma nums.cma
++OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
++OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa)
+ 
+ EXE=sks sks_add_mail
+ ALL=$(EXE) sks.8.gz
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch
new file mode 100644
index 000000000000..1fba250fd4b3
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Kristian Fiskerstrand <kf@sumptuouscapital.com>
+# Date 1499610580 -7200
+# Node ID 719ffdf628a81a2f052f3b6dc746a3e1d37afe30
+# Parent  6352f0dbcadf35aac29c2fbf10fb218ae50d9c77
+Fix nums specification
+
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,7 @@
+ CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+-CAMLLIBS=bdb.cma nums.cma
++CAMLLIBS=bdb.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa)
+ 
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch
new file mode 100644
index 000000000000..ea5a82db6530
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Kristian Fiskerstrand <kf@sumptuouscapital.com>
+# Date 1499612080 -7200
+# Node ID 0106ba2f6abc8ee2f685026d3f218730114a60fa
+# Parent  719ffdf628a81a2f052f3b6dc746a3e1d37afe30
+Add num to findlib packages
+
+Although nums is detected, making this explicit
+
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,7 @@
+ endif
+ 
+ CAMLP4=-pp $(CAMLP4O)
+-CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
++CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I lib -I bdb
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
+ OCAMLDEP=ocamldep $(CAMLP4)
+ CAMLLIBS=bdb.cma
diff --git a/net-misc/sks/files/sks-db.initd b/net-misc/sks/files/sks-db.initd
new file mode 100644
index 000000000000..9384cca7ddb2
--- /dev/null
+++ b/net-misc/sks/files/sks-db.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+source /etc/conf.d/sks
+
+command=/usr/bin/sks
+command_args="db ${SKS_ARGS}"
+command_background=1
+description="SKS database thread"
+name="SKS db"
+pidfile="/var/run/sks-db.pid"
+required_files="${SKS_DIR}/sksconf"
+start_stop_daemon_args="--chdir ${SKS_DIR} --user sks"
+
+
+depend()
+{
+	use net
+}
+
+start_pre()
+{
+    checkpath --owner sks:sks --directory \
+        ${SKS_DIR} ${SKS_DIR}/KDB ${SKS_DIR}/PTree
+    checkpath --owner sks:sks --file \
+        ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
+}
diff --git a/net-misc/sks/files/sks-db.service b/net-misc/sks/files/sks-db.service
new file mode 100644
index 000000000000..bbc3ba7e2b2d
--- /dev/null
+++ b/net-misc/sks/files/sks-db.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SKS database thread
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sks db
+User=sks
+WorkingDirectory=/var/lib/sks
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/sks/files/sks-recon.initd b/net-misc/sks/files/sks-recon.initd
new file mode 100644
index 000000000000..86de8c790b4b
--- /dev/null
+++ b/net-misc/sks/files/sks-recon.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+source /etc/conf.d/sks
+
+command=/usr/bin/sks
+command_args="recon ${SKS_ARGS}"
+command_background=1
+description="Reconnoiters SKS peers for keys"
+name="SKS recon"
+pidfile="/var/run/sks-recon.pid"
+required_files="${SKS_DIR}/sksconf ${SKS_DIR}/membership"
+start_stop_daemon_args="--chdir ${SKS_DIR} --user sks"
+
+
+depend()
+{
+    after sks-db
+    use net
+}
+
+start_pre()
+{
+    checkpath --owner sks:sks --directory \
+        ${SKS_DIR} ${SKS_DIR}/KDB ${SKS_DIR}/PTree
+    checkpath --owner sks:sks --file \
+        ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
+}
diff --git a/net-misc/sks/files/sks-recon.service b/net-misc/sks/files/sks-recon.service
new file mode 100644
index 000000000000..97ee52ffc0ed
--- /dev/null
+++ b/net-misc/sks/files/sks-recon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SKS key reconnaissance thread
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/sks recon
+User=sks
+WorkingDirectory=/var/lib/sks
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/sks/files/sks.confd b/net-misc/sks/files/sks.confd
new file mode 100644
index 000000000000..64eef24ecc52
--- /dev/null
+++ b/net-misc/sks/files/sks.confd
@@ -0,0 +1,4 @@
+SKS_DIR="/var/lib/sks"
+
+# Set common options for sks db and sks recon here.
+SKS_ARGS=""
\ No newline at end of file
diff --git a/net-misc/sks/metadata.xml b/net-misc/sks/metadata.xml
new file mode 100644
index 000000000000..a4ac7ae76892
--- /dev/null
+++ b/net-misc/sks/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+		<description>Maintainer</description>
+	</maintainer>
+	<use>
+		<flag name="optimize">Enables bytecode optimization</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">skskeyserver/sks-keyserver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/sks/sks-1.1.6-r2.ebuild b/net-misc/sks/sks-1.1.6-r2.ebuild
new file mode 100644
index 000000000000..b51abaff4132
--- /dev/null
+++ b/net-misc/sks/sks-1.1.6-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib user readme.gentoo-r1 systemd
+
+DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
+HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
+SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="optimize test"
+DOC_CONTENTS="To get sks running, first build the database,
+start the database, import atleast one key, then
+run a cleandb. See the sks man page for more information
+Typical DB_CONFIG file and sksconf has been installed
+in /var/lib/sks and can be used as templates by renaming
+to remove the .typical extension. The DB_CONFIG file has
+to be in place before doing the database build, or the BDB
+environment has to be manually cleared from both KDB and PTree.
+The same applies if you are upgrading to this version with an existing KDB/Ptree,
+using another version of BDB than 4.8; you need to clear the environment
+using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
+Additionally a sample web interface has been installed as
+web.typical in /var/lib/sks that can be used by renaming it to web
+Important: It is strongly recommended to set up SKS behind a
+reverse proxy. Instructions on properly configuring SKS can be
+found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
+
+DEPEND=">=dev-lang/ocaml-4.0:=
+	dev-ml/findlib
+	dev-ml/camlp4
+	dev-ml/cryptokit:0/1.10
+	sys-libs/db:5.3"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup sks
+	enewuser sks -1 -1 /var/lib/sks sks
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch"
+	cp Makefile.local.unused Makefile.local || die
+	sed -i \
+		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
+		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
+		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
+		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+		Makefile.local || die
+	sed -i \
+		-e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
+		-e 's:-Werror-implicit-function-declaration::g' \
+		Makefile bdb/Makefile || die
+	sed -i \
+		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+		sks_build.sh || die
+	eapply_user
+}
+
+src_compile() {
+	emake dep
+	# sks build fails with paralell build in module Bdb
+	emake -j1 all
+	if use optimize; then
+		emake all.bc
+	fi
+}
+
+src_test() {
+	./sks unit_test || die
+}
+
+src_install() {
+	if use optimize; then
+		emake install.bc
+		dosym /usr/bin/sks.bc usr/bin/sks
+		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
+	else
+		emake install
+	fi
+
+	dodoc README.md
+
+	newinitd "${FILESDIR}/sks-db.initd" sks-db
+	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
+	newconfd "${FILESDIR}/sks.confd" sks
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
+
+	dodir "/var/lib/sks/web.typical"
+	insinto /var/lib/sks
+	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
+	newins sampleConfig/sksconf.typical sksconf.typical
+	insinto /var/lib/sks/web.typical
+	doins sampleWeb/HTML5/*
+
+	keepdir /var/lib/sks
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
+		einfo "The default values for pagesize settings have changed. To continue"
+		einfo "using an existing DB without rebuilding, explicit settings have to be"
+		einfo "added to the sksconf file."
+		einfo "pagesize:       4"
+		einfo "ptree_pagesize: 1"
+	fi;
+}
diff --git a/net-misc/sks/sks-1.1.6-r4.ebuild b/net-misc/sks/sks-1.1.6-r4.ebuild
new file mode 100644
index 000000000000..d08143afcd76
--- /dev/null
+++ b/net-misc/sks/sks-1.1.6-r4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib user readme.gentoo-r1 systemd
+
+DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
+HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
+SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="optimize test"
+DOC_CONTENTS="To get sks running, first build the database,
+start the database, import atleast one key, then
+run a cleandb. See the sks man page for more information
+Typical DB_CONFIG file and sksconf has been installed
+in /var/lib/sks and can be used as templates by renaming
+to remove the .typical extension. The DB_CONFIG file has
+to be in place before doing the database build, or the BDB
+environment has to be manually cleared from both KDB and PTree.
+The same applies if you are upgrading to this version with an existing KDB/Ptree,
+using another version of BDB than 4.8; you need to clear the environment
+using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
+Additionally a sample web interface has been installed as
+web.typical in /var/lib/sks that can be used by renaming it to web
+Important: It is strongly recommended to set up SKS behind a
+reverse proxy. Instructions on properly configuring SKS can be
+found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
+
+RDEPEND=">=dev-lang/ocaml-4.0:=
+	dev-ml/camlp4:=
+	dev-ml/cryptokit:=
+	sys-libs/db:5.3"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup sks
+	enewuser sks -1 -1 /var/lib/sks sks
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
+		   "${FILESDIR}/${P}-use-ocamlfind.patch"
+	cp Makefile.local.unused Makefile.local || die
+	sed -i \
+		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
+		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
+		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
+		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+		Makefile.local || die
+	sed -i \
+		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+		sks_build.sh || die
+	eapply_user
+}
+
+src_compile() {
+	emake dep
+	# sks build fails with paralell build in module Bdb
+	emake -j1 all
+	if use optimize; then
+		emake all.bc
+	fi
+}
+
+src_test() {
+	./sks unit_test || die
+}
+
+src_install() {
+	if use optimize; then
+		emake install.bc
+		dosym /usr/bin/sks.bc usr/bin/sks
+		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
+	else
+		emake install
+	fi
+
+	dodoc README.md
+
+	newinitd "${FILESDIR}/sks-db.initd" sks-db
+	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
+	newconfd "${FILESDIR}/sks.confd" sks
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
+
+	dodir "/var/lib/sks/web.typical"
+	insinto /var/lib/sks
+	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
+	newins sampleConfig/sksconf.typical sksconf.typical
+	insinto /var/lib/sks/web.typical
+	doins sampleWeb/HTML5/*
+
+	keepdir /var/lib/sks
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
+		einfo "The default values for pagesize settings have changed. To continue"
+		einfo "using an existing DB without rebuilding, explicit settings have to be"
+		einfo "added to the sksconf file."
+		einfo "pagesize:       4"
+		einfo "ptree_pagesize: 1"
+	fi;
+}
diff --git a/net-misc/sks/sks-1.1.6-r5.ebuild b/net-misc/sks/sks-1.1.6-r5.ebuild
new file mode 100644
index 000000000000..8b50b33a7cf5
--- /dev/null
+++ b/net-misc/sks/sks-1.1.6-r5.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib user readme.gentoo-r1 systemd
+
+DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
+HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
+SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="optimize test"
+DOC_CONTENTS="To get sks running, first build the database,
+start the database, import atleast one key, then
+run a cleandb. See the sks man page for more information
+Typical DB_CONFIG file and sksconf has been installed
+in /var/lib/sks and can be used as templates by renaming
+to remove the .typical extension. The DB_CONFIG file has
+to be in place before doing the database build, or the BDB
+environment has to be manually cleared from both KDB and PTree.
+The same applies if you are upgrading to this version with an existing KDB/Ptree,
+using another version of BDB than 4.8; you need to clear the environment
+using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
+Additionally a sample web interface has been installed as
+web.typical in /var/lib/sks that can be used by renaming it to web
+Important: It is strongly recommended to set up SKS behind a
+reverse proxy. Instructions on properly configuring SKS can be
+found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
+
+RDEPEND=">=dev-lang/ocaml-4.0:=
+	dev-ml/camlp4:=
+	dev-ml/cryptokit:=
+	sys-libs/db:5.3"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup sks
+	enewuser sks -1 -1 /var/lib/sks sks
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
+			"${FILESDIR}/${P}-use-ocamlfind.patch" \
+			"${FILESDIR}/${P}-use-ocamlfind2.patch" \
+			"${FILESDIR}/${P}-use-ocamlfind3.patch"
+
+	cp Makefile.local.unused Makefile.local || die
+	sed -i \
+		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
+		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
+		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
+		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
+		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
+		Makefile.local || die
+	sed -i \
+		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
+		sks_build.sh || die
+	dosym /usr/bin/sks_build.sh /usr/bin/sks_build.bc.sh
+	eapply_user
+}
+
+src_compile() {
+	emake dep
+	# sks build fails with paralell build in module Bdb
+	emake -j1 all
+	if use optimize; then
+		emake all.bc
+	fi
+}
+
+src_test() {
+	./sks unit_test || die
+}
+
+src_install() {
+	if use optimize; then
+		emake install.bc
+		dosym /usr/bin/sks.bc usr/bin/sks
+		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
+	else
+		emake install
+	fi
+
+	dodoc README.md
+
+	newinitd "${FILESDIR}/sks-db.initd" sks-db
+	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
+	newconfd "${FILESDIR}/sks.confd" sks
+	systemd_dounit "${FILESDIR}"/sks-db.service
+	systemd_dounit "${FILESDIR}"/sks-recon.service
+
+	dodir "/var/lib/sks/web.typical"
+	insinto /var/lib/sks
+	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
+	newins sampleConfig/sksconf.typical sksconf.typical
+	insinto /var/lib/sks/web.typical
+	doins sampleWeb/HTML5/*
+
+	keepdir /var/lib/sks
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
+		einfo "The default values for pagesize settings have changed. To continue"
+		einfo "using an existing DB without rebuilding, explicit settings have to be"
+		einfo "added to the sksconf file."
+		einfo "pagesize:       4"
+		einfo "ptree_pagesize: 1"
+	fi;
+}