Big update

30 files changed, 516 insertions, 55 deletions

diff --git a/dev-cpp/slicer/Manifest b/dev-cpp/slicer/Manifest
index 4277c62..fb8d917 100644
--- a/dev-cpp/slicer/Manifest
+++ b/dev-cpp/slicer/Manifest
@@ -1,2 +1,4 @@
 DIST slicer-1.10.5.3.tar.xz 42452 BLAKE2B 9949a6ada9b5d9836dcc8af6e735e1cc60217a45259abd89d7c77a2f458a07a0c8a6aa666f45acde4b071da6e8880251931e47440effeee0228a688589612d14 SHA512 b9cd94dafd79a09133d9695860eb08ae1ecfd88b3ea2468152828ec19ff4ffd4e9fba207acccbe9bd553ccc9fa941202b1c1af333d6f35a923e9195fd46f0bb7
+DIST slicer-1.10.7.tar.xz 44932 BLAKE2B 826f02e6e6476754aa72adca2e52fd1ae627bd77203b15b1297f354c4977eed229430370b7330d2b23417ae9b3262d5117c115ef92e4067eb26318573876b4d4 SHA512 5815c322dd5339376815d9068bab8ddf5fd3c2bbc605e24f59f4da8656aa04bd30dae5d25b6ddbcaa25148fb1d198302d8a7ce5bdb30f68e14e7a6cd0072c631
 EBUILD slicer-1.10.5.3-r2.ebuild 1009 BLAKE2B c8cea2e9b72cf44e6ab291d9ff7f803c89035ea801a53c4fc2798d3e65d2bb113089ebee13f2b0e161addd74f8f569d36658aba39a835903d3adf15cb0608f51 SHA512 9c4cb0b006b4e7f444ce82759db1ef2499cabbd7aa15fb34b50acffbc86ed8f33420663e67f34f58d50512e0b29b995d0ee9fe076030417e3b66ade90c75806d
+EBUILD slicer-1.10.7.ebuild 1007 BLAKE2B 5cb43bb585057ab122daa4582bc0c7fdf6f97544b3d6d80df2d7f7dba66aee41220bac69e7b7051f8d3affb821a8c861883d61a0246d8d523500844dd7979a1b SHA512 7dced1881687bce175426881189fac9fc34d68dc08375b7094f9da2be7e99b54ea9cb507d37504f5630d57ec242ec63b73b7c36e55054b9e84c0a24448121aaf
diff --git a/dev-cpp/slicer/slicer-1.10.7.ebuild b/dev-cpp/slicer/slicer-1.10.7.ebuild
new file mode 100644
index 0000000..5b08e24
--- /dev/null
+++ b/dev-cpp/slicer/slicer-1.10.7.ebuild
@@ -0,0 +1,40 @@
+EAPI="7"
+
+inherit bjam
+
+DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
+HOMEPAGE="http://slicer.randomdan.homeip.net/"
+
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+LICENSE="MIT"
+SLOT="0/1.10.7"
+KEYWORDS="x86 amd64"
+IUSE="db xml json"
+
+RDEPEND=">=dev-libs/Ice-3.7
+	>=dev-libs/slice-parser-3.7:=
+	xml? ( dev-cpp/libxmlpp:3.0 )
+	json? ( >=dev-cpp/libjsonpp-0.11 )
+	db? ( =dev-libs/libdbpp-1.4*:= )
+	>=dev-libs/libadhocutil-0.8.3:=
+	dev-libs/boost:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/boost-build"
+
+src_compile() {
+	bjambuild \
+		$(use xml && echo slicer/xml//slicer-xml) \
+		$(use json && echo slicer/json//slicer-json) \
+		$(use db && echo slicer/db//slicer-db) \
+		slicer/slicer//slicer slicer/tool//slicer slicer/ice//slicer-ice || die
+}
+
+src_install() {
+	bjaminstall slicer//install \
+		$(use xml && echo slicer//install-xml) \
+		$(use json && echo slicer//install-json) \
+		$(use db && echo slicer//install-db) \
+		-i ""
+}
+
diff --git a/dev-libs/icetray/Manifest b/dev-libs/icetray/Manifest
index 2ca26d2..9e989f3 100644
--- a/dev-libs/icetray/Manifest
+++ b/dev-libs/icetray/Manifest
@@ -1,2 +1,6 @@
 DIST icetray-0.4.3.1.tar.xz 21140 BLAKE2B bb607d2ec8928dd5cc2bc1de985f1ba8c6ebdd7a77711a0d93aa7697453ac8f2e7c4b27eb67a88de1955d5a9d7c8f6f54210b111c5547bdeb0b45caf1b4d83fa SHA512 c7c7303d355afcad1ba9135fb0c9c2dd2c1a6b3c4f419189218c38cf9c2300265a339ed4d878183186103b553500a4154363f68e25b09488228f6b4c05dc4692
+DIST icetray-0.4.4.tar.xz 22348 BLAKE2B 1ca6bbc73ea549a69e7d5fbe88a184e7c04c668a2382e7e09f5e3c1ab6c4c491877d398e56201318e5eed59450696adaeb1954d5dcbb3fccba65467e01f63fd6 SHA512 5e2a37f9128d4e471f06dce47175a50a2b37e6837cb0bdfa51dbcb8224823fcf867b4468ed5dfabe0bc9a7fdb364ffa65e57b9029ba086c0d5fcf8e7ecead305
+DIST icetray-0.5.tar.xz 23056 BLAKE2B 4a610a7a05ba9a3beaf588a101f7de28d950a268d839a97e4bdb8e32a1818cce310fb907933904ded5f601453ef7e7bb1dbf0c12d36144c7d4017446643a95d7 SHA512 7f3c31145364a922d1e53bae14bce9a55e9f354110c843045126d6db0e7e7961526ca31d99c0f83cc8fc284c5acac59585c5503fd9de08d489a50d5a7c04250f
 EBUILD icetray-0.4.3.1-r1.ebuild 822 BLAKE2B 860e264f78fdf66c2a53ef29d7481fce6260eedfe681d5d16c62a97e1dde30f2d1ba2fe86d937ad67069369894288cef679d310d5484047b463eb20487061fca SHA512 b462ec997f409f6099951b8dbb994c9bcc67085459adfa09d184cd89ef90a5c194af57ba35a72478980d407f7e408bc27f73fd07dd90756e5ca6705e2fcc933c
+EBUILD icetray-0.4.4.ebuild 822 BLAKE2B 860e264f78fdf66c2a53ef29d7481fce6260eedfe681d5d16c62a97e1dde30f2d1ba2fe86d937ad67069369894288cef679d310d5484047b463eb20487061fca SHA512 b462ec997f409f6099951b8dbb994c9bcc67085459adfa09d184cd89ef90a5c194af57ba35a72478980d407f7e408bc27f73fd07dd90756e5ca6705e2fcc933c
+EBUILD icetray-0.5.ebuild 822 BLAKE2B 589bc5620f8b31b4861b5a8c5b9a416c7cd4a97eed6c16ef903b5f6c5b73a9a58813c8c891c780349a82ee21229c157fb00c616fdb8ec58c05f347eed9f36d8d SHA512 b0f71be2595a1696f92317df1116ce520d411d60b620c1d4df45000f9aa1a8c91485d0f1cc92a9396b93f572724f2de83e29fe5b3126e33d57ec9a35f4d22efd
diff --git a/dev-libs/icetray/icetray-0.4.4.ebuild b/dev-libs/icetray/icetray-0.4.4.ebuild
new file mode 100644
index 0000000..3c1ca13
--- /dev/null
+++ b/dev-libs/icetray/icetray-0.4.4.ebuild
@@ -0,0 +1,40 @@
+EAPI="7"
+
+inherit bjam
+
+DESCRIPTION="IceTray and DryIce for bootstrapping and dry running IceBox services"
+HOMEPAGE="http://icetray.randomdan.homeip.net/"
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/0.3"
+KEYWORDS="amd64 x86"
+IUSE="ut tools"
+
+RDEPEND="
+	dev-libs/boost:=
+	=dev-libs/Ice-3.7*
+	>=dev-libs/libdbpp-1.4:=
+	>=dev-libs/libadhocutil-0.7.5:=
+	dev-cpp/slicer:=[db]
+	net-libs/libesmtp
+	tools? ( dev-util/boost-build )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/boost-build-1.71
+"
+
+src_compile() {
+	bjambuild icetray/icetray \
+		$(use tools && echo icetray/tool) \
+		$(use ut && echo icetray/dryice)
+}
+
+src_install() {
+	bjaminstall icetray/icetray//install \
+		$(use tools && echo icetray/tool//install) \
+		$(use ut && echo icetray/dryice//install)
+}
+
diff --git a/dev-libs/icetray/icetray-0.5.ebuild b/dev-libs/icetray/icetray-0.5.ebuild
new file mode 100644
index 0000000..f353893
--- /dev/null
+++ b/dev-libs/icetray/icetray-0.5.ebuild
@@ -0,0 +1,40 @@
+EAPI="7"
+
+inherit bjam
+
+DESCRIPTION="IceTray and DryIce for bootstrapping and dry running IceBox services"
+HOMEPAGE="http://icetray.randomdan.homeip.net/"
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/0.5"
+KEYWORDS="amd64 x86"
+IUSE="ut tools"
+
+RDEPEND="
+	dev-libs/boost:=
+	=dev-libs/Ice-3.7*
+	>=dev-libs/libdbpp-1.4:=
+	>=dev-libs/libadhocutil-0.7.5:=
+	dev-cpp/slicer:=[db]
+	net-libs/libesmtp
+	tools? ( dev-util/boost-build )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/boost-build-1.71
+"
+
+src_compile() {
+	bjambuild icetray/icetray \
+		$(use tools && echo icetray/tool) \
+		$(use ut && echo icetray/dryice)
+}
+
+src_install() {
+	bjaminstall icetray/icetray//install \
+		$(use tools && echo icetray/tool//install) \
+		$(use ut && echo icetray/dryice//install)
+}
+
diff --git a/dev-libs/libadhocutil/Manifest b/dev-libs/libadhocutil/Manifest
index 01a5dee..984848b 100644
--- a/dev-libs/libadhocutil/Manifest
+++ b/dev-libs/libadhocutil/Manifest
@@ -1,4 +1,4 @@
-DIST libadhocutil-0.8.4.tar.xz 48128 BLAKE2B 42dd520185cd670d2ac5fe88278ce3c9d5e1ab3b6f7cc2bf103a7e53dc53c28ca7c93a24c0727b1da00164c5f70da429d58e344bbee82d7274915282c56249fe SHA512 3ed7445a7c0bb8639307f01668a6adebf4e0ccb4dc0b36a23d81ec95f1ffc078f6ca2d08034734f6e28d286b01a0b0dfea4daf3da19b5c1ecc8bd937fc2b5fbb
 DIST libadhocutil-0.8.7.tar.xz 50168 BLAKE2B 7ffac83f22373e06c35ed376ab3654f68f76546694e16d1a1998c3fdffed11c0595d30310a9b31642901733135462faaaa1394a333215cbc41e1b23edcc46e27 SHA512 d9d94d68b24cfe8dcccb86f1e99fd388fb13d62723ca26bafed84980eb95aea9679057cce6a42efb709ef6cdd84512ce956a25a9fda776f59e3f19c5b0c15d82
-EBUILD libadhocutil-0.8.4-r1.ebuild 629 BLAKE2B 9192e874f9764129d098d1aa2d3a0227c93019f979a0775b0cf69a52caa8cce380a1ebda1a4cb46fb699488e2f4a1562e8f624089bcde30643e0fe2c904f5c53 SHA512 fc5dc80e3b6315e4ed947e1b1c58efe44d9fd76778d077bdd0dd1f56e81ac2555b7d706b73370f3c30425f07e452ab306858a80b0787b222953d5c1188d6f5f5
+DIST libadhocutil-0.8.8.tar.xz 48480 BLAKE2B a8dab44fa1b4da0ea1be6db597fec2f5a7118ba58aeb186b6e81928f25650d3516774133af43c075802a78cc39d3cef51f458914acc4ae9e504740bcf2730c0d SHA512 26ca50d8729be8d7d115b3582aa3ee15df82e6e023a41f47e723a915c4427fa3612de27144234c5d34bbf2a2810b9339b469d11290f7f59de39fed26e7521d8d
 EBUILD libadhocutil-0.8.7.ebuild 629 BLAKE2B 238ed6532e5debe734ea9f6b2205e690eca388f66b18712c4d88f95d0cba034737a4179f3d003c076efcbf99aa03f4dcc098b63c357d2471f3990b364c4b6ec4 SHA512 919eb26cd82ebc5d06b68cfa9dfc3b2ee126c53c5e0e114ac461849a9725f7a6a9157534c1cecfd8decb15a59842618047468627705e883c3e654165b020660f
+EBUILD libadhocutil-0.8.8.ebuild 629 BLAKE2B 36cb0600c7088cf81506eff16a7c195d9a6c99d7cf6c244ca45f850234b7e0c2eca3bb639c872dae7f2ca86d879d29dd1d4522adcac7435269ce4a8ccae5082e SHA512 7d054bcb3a22a8a2ad6593b01e5c2eb5ed60b7dc1f7cc0911a647a727d47c01a83a4c6b556261341bd0a6f11378f3a5ac933242630db29d3c214df720516dfa6
diff --git a/dev-libs/libadhocutil/libadhocutil-0.8.4-r1.ebuild b/dev-libs/libadhocutil/libadhocutil-0.8.8.ebuild
index 6bd84fc..f239d55 100644
--- a/dev-libs/libadhocutil/libadhocutil-0.8.4-r1.ebuild
+++ b/dev-libs/libadhocutil/libadhocutil-0.8.8.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="http://docs.randomdan.homeip.net/libadhocutil"
 
 SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
 LICENSE="MIT"
-SLOT="0/0.8.0"
+SLOT="0/0.8.8"
 KEYWORDS="x86 amd64"
 IUSE="man test"
 
diff --git a/dev-libs/libdbpp-mysql/Manifest b/dev-libs/libdbpp-mysql/Manifest
index 7121a85..14514b0 100644
--- a/dev-libs/libdbpp-mysql/Manifest
+++ b/dev-libs/libdbpp-mysql/Manifest
@@ -1,2 +1,4 @@
 DIST libdbpp-mysql-1.4.4.tar.xz 12792 BLAKE2B a3772dcb6fe0b5f9e85fa71b4411cda07bebde6fe43de8bfecade2a066b42a2ba3140d6756dec125766a51cbbdb773583aea5170c2f4c3f53ad671213da7c031 SHA512 4b1431e6c4ac4b544ec6f9ce4a1ec4e4235a8ddbaba8109617a9181cc6653672bb56946ed14cd4b1a2440e9dd1fd4f1ba4b228d1e8fac950e8e60bf2f0c5b24f
+DIST libdbpp-mysql-1.4.6.tar.xz 13300 BLAKE2B 180e113d66cd8382dd76557a4701e99234b97fc49193b3a65a5370574da56aafa2f3e45c6be35f6cad099d9029359f6def930c39f01e1d6fcb9d7ca26b5b61cd SHA512 809ab76bccb716f5722b88def356aaf375bd5cc18f8949e28ed1b70c97a9875e1614c5b7d7a0f068c0d08b40894a2bf5a5c2b27f9225f4a248d7f42659360848
 EBUILD libdbpp-mysql-1.4.4-r1.ebuild 559 BLAKE2B 38d1c5995478eaf773608a16b1f7fa5f3d428af39f9b2daa3420d0791cb3bfc98067da40d4759621132736d9153b1d04ae611ffaef3fc84da795ae5d851cc3ab SHA512 d806cd8787ccf5178cf38a3c1ae53d31849279c5c44541fa197bf6ddd0aa9d8395ba8156eeae37ef21ad8786837e079e23100bb8fa247ca02df2756f381c6bba
+EBUILD libdbpp-mysql-1.4.6.ebuild 561 BLAKE2B 44c75a4cebcc30fc00bc39d63ae117537870139b4954d213e254d20b2269eefe52cd830cc2c94524208b5ce61c9a70deb5e2685ff53cec614ae3652bdf1652af SHA512 e54ed93ef8cec9d57252112ad3f9c7f1716fb59708bb6e7516454e238af370db7374f823ad43a1b3f39c7c0d69bc9b8fda993e3e361eb9dbacd91ffe69e6ab8f
diff --git a/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.6.ebuild b/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.6.ebuild
new file mode 100644
index 0000000..fccec86
--- /dev/null
+++ b/dev-libs/libdbpp-mysql/libdbpp-mysql-1.4.6.ebuild
@@ -0,0 +1,32 @@
+EAPI="7"
+inherit bjam
+
+DESCRIPTION="C++ database connectivity MySQL components"
+HOMEPAGE="http://libdbpp.randomdan.homeip.net/mysql"
+
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="x86 amd64"
+
+RDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/libdbpp-1.4.8:=
+	>=dev-db/mysql-connector-c-8
+	>=dev-libs/libadhocutil-0.8:=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-util/boost-build
+"
+
+src_compile() {
+	bjambuild libmysqlpp//dbpp-mysql
+}
+
+src_install() {
+	bjaminstall libmysqlpp//install \
+		-i dbpp-mysql
+}
+
diff --git a/dev-libs/libdbpp-odbc/Manifest b/dev-libs/libdbpp-odbc/Manifest
index 1d55d55..b0e2ae1 100644
--- a/dev-libs/libdbpp-odbc/Manifest
+++ b/dev-libs/libdbpp-odbc/Manifest
@@ -1,2 +1,4 @@
 DIST libdbpp-odbc-1.4.4.tar.xz 14588 BLAKE2B a3fbc7b95c4e1ffb09829aca2a26e77fee46c623ef7388d9fbf41b8b51e8c3c6e9b9e1cbbfc64ff0857b0ab4cb1f54a563946703d85d638a1a2b4dce63937770 SHA512 62fdacf2570eda978e7da68854b873a4b8b595f832c67cbfe3ada1877f5b0343f6811becc84be6aea7d4a65002e125ef3bbcbe85ef8e1d76673da4173dcc7b72
+DIST libdbpp-odbc-1.4.6.tar.xz 14984 BLAKE2B b2a49a67e2ed7606020a3515a5c3ae725d325777f1cebfc46799b4d21a35531c29fdc9d5a24ba7d12ed0ee63425e58c2ca702748d6d3916915e2c763b9172095 SHA512 fe33e578f883166a84f9b8fafaf131de406ab1605207fe3a99dbff3acc9b7f933c698296612977220e9200292d0bbc5ef76a084639b3b110ebf0744d44376668
 EBUILD libdbpp-odbc-1.4.4-r1.ebuild 540 BLAKE2B 5387d405064e2fe98dd5f91ca636e0e40788395371bbc132eadc5fea183e027f701a58b6b440c4e9a5b8112592fc6a190a83f38fe4e0d22860c9aed3bd059b0a SHA512 7f0d24aa6d2ac4fed4d682c5035eb9349ab37951341c9863145ad4d4b228e0bc3e9528b115ec49a3a97c37c189ca26a89937c2d9ab6b5b6b3a01d751bf2b5dc7
+EBUILD libdbpp-odbc-1.4.6.ebuild 542 BLAKE2B c3bd01138503e6e0df3a5194286760f32abe6d4730e1a06d43e2bc7017ed60f50faa9b6990018c324cf07c3ae7c3a7a7bdc8935eb4754ef2a8b64a317a2f3312 SHA512 180e2c71a7645cd90b43eec5998db21a015ec23a206f5db3327bb2a71cdc80a312b6de57c821592e6c9a6fbdeaf290e76f1fc6d7c5bffe574beee81976281fbd
diff --git a/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.6.ebuild b/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.6.ebuild
new file mode 100644
index 0000000..86ae834
--- /dev/null
+++ b/dev-libs/libdbpp-odbc/libdbpp-odbc-1.4.6.ebuild
@@ -0,0 +1,32 @@
+EAPI="7"
+inherit bjam
+
+DESCRIPTION="C++ database connectivity ODBC components"
+HOMEPAGE="http://libdbpp.randomdan.homeip.net/odbc"
+
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="x86 amd64"
+
+RDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/libdbpp-1.4.8:=
+	dev-db/unixODBC
+	>=dev-libs/libadhocutil-0.8:=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-util/boost-build
+"
+
+src_compile() {
+	bjambuild libodbcpp//dbpp-odbc
+}
+
+src_install() {
+	bjaminstall libodbcpp//install \
+		-i dbpp-odbc
+}
+
diff --git a/dev-libs/libdbpp-postgresql/Manifest b/dev-libs/libdbpp-postgresql/Manifest
index 66af734..0c43285 100644
--- a/dev-libs/libdbpp-postgresql/Manifest
+++ b/dev-libs/libdbpp-postgresql/Manifest
@@ -1,2 +1,4 @@
 DIST libdbpp-postgresql-1.4.5.tar.xz 16620 BLAKE2B 8965386aaace62816cc14a66daa61d00f45f5b73a8fb084b5860b8d494ba65de1cbd3590741c8c361fa3374738688000f21e6151231679403de38301e999ef5f SHA512 c0d7abbc133bd5381191c331324a3d9d0c1d085352bbd6eb5ee89db32fc56580b4aaef274e7853771400a0b2d8c6c7ecce78d2a7ae56a6e00c7e2af4e2cede01
+DIST libdbpp-postgresql-1.4.7.tar.xz 17356 BLAKE2B 3407fbf662988b1e98b05e19a6b61587c6b1abcaba7affe2ff7b67654bcc5676904aca205efb0157a9441dfe88700c7995945526733a298ab4c047d32cf75988 SHA512 ee40a34348542d42465c9a82e1837e64fa489c3bda87c0dfd005159162596ba7e87520763fb03767967a9f4baad540bd9717d95c865c1cc53043afcf307b3906
 EBUILD libdbpp-postgresql-1.4.5-r1.ebuild 564 BLAKE2B 9e9677cfb27de3c009bb4c5259919d93af53f04044570e423253fb05a28393cb4a0cc704c588c91e1cc5f795d3b9f81e3c79974865148432241a03e754fe9a9c SHA512 4c5bda6f739e11ba7326b243962816f2fa1512c20e59b80252cc1423b087266c3c9b68f1e79606f76f68dd245540d621885ff0544bd2ffc7ec68b46fca94a160
+EBUILD libdbpp-postgresql-1.4.7.ebuild 566 BLAKE2B 7958db434a58a738dede980e6847f735f2554e9fd08922889f99394074dea5bb43dd1160857a9c4636906bde4803dab8f7e860b40979623ae665c45fb5e50edf SHA512 7766c7d0c14cec0d33dbd628e41d7d3aa384d888d596ee2c4346c78bbec840b57b55ddce7a939003a4925edb6e36aaa9632ba4b5cdbf246723c090effdddd51d
diff --git a/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.7.ebuild b/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.7.ebuild
new file mode 100644
index 0000000..7e4f90a
--- /dev/null
+++ b/dev-libs/libdbpp-postgresql/libdbpp-postgresql-1.4.7.ebuild
@@ -0,0 +1,33 @@
+EAPI="7"
+
+inherit bjam
+
+DESCRIPTION="C++ database connectivity PostgreSQL components"
+HOMEPAGE="http://libdbpp.randomdan.homeip.net/postgresql"
+
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="x86 amd64"
+
+RDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/libdbpp-1.4.8:=
+	dev-db/postgresql
+	>=dev-libs/libadhocutil-0.8:=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-util/boost-build
+"
+
+src_compile() {
+	bjambuild libpqpp//dbpp-postgresql
+}
+
+src_install() {
+	bjaminstall libpqpp//install \
+		-i /dbpp-postgresql
+}
+
diff --git a/dev-libs/libdbpp-sqlite/Manifest b/dev-libs/libdbpp-sqlite/Manifest
index a6f3351..a2da311 100644
--- a/dev-libs/libdbpp-sqlite/Manifest
+++ b/dev-libs/libdbpp-sqlite/Manifest
@@ -1,2 +1,4 @@
 DIST libdbpp-sqlite-1.4.4.tar.xz 9760 BLAKE2B 94b51ee5b8be4004f1e3607a4e58c7fab2033468ce739234bd58519a13159c0d151e03a5b56b66328072beddbe1b3b5d1f92f81e80ca30f67168a46dab0b1730 SHA512 6af48e40feb2b0fb9b8317470d4124280cabc3ed5de3b38f9609a356e34a4f4916126803c1b4ef0e7faf985a509221b8e595938e2c2c582b112d89f2ac22e7d0
+DIST libdbpp-sqlite-1.4.6.tar.xz 10168 BLAKE2B ebe9f837960ffcfea6c163a4af726e74a74f3ca7cd773c088ce554c92d59711df082d3ec99770d01904aed81f4d53e24f195f81d6fe25ac82753ad5e07000ecd SHA512 5368bfde66c2143a80a6538ab9e5a1c0cc0fadca801f801d3fdfb43a7047c4b9c186976507d7d657109cf0b02843d0abd54d63d73836a58c7824f24ad2bc42f0
 EBUILD libdbpp-sqlite-1.4.4-r1.ebuild 545 BLAKE2B 73269204cf7c4567835632327cd4b287e8d6fa13779666daf71d376216ddb8c2f9d20920dc32c7e4816c0197dc47c808d18ab5d9ffd6a9ed17c0542f20a5793c SHA512 15b69e31b73af7aefca48eced407e9f6d713b3ca5a9333495dd629ba3c0aace79704a46f8338e569641f17c4e7709bdec37fee7745b86f27d52f680418bc4ada
+EBUILD libdbpp-sqlite-1.4.6.ebuild 547 BLAKE2B 99a7c3c91259e2d01034684d072662bef8bc06e7d696f1819de5c5aefab70ab300f63428fc7a1a0d3634495540e449b548b227837512d38ba98329c81a9f26a0 SHA512 1b14607fc94b15ec9bc757c94e981603b3c367db749a6da53b171a6b9e312b3671468872c92edebcd00b9c47d914c309403b3b128f1fdca6e775a977b0dbc311
diff --git a/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.6.ebuild b/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.6.ebuild
new file mode 100644
index 0000000..8f51967
--- /dev/null
+++ b/dev-libs/libdbpp-sqlite/libdbpp-sqlite-1.4.6.ebuild
@@ -0,0 +1,32 @@
+EAPI="7"
+inherit bjam
+
+DESCRIPTION="C++ database connectivity SQLite components"
+HOMEPAGE="http://libdbpp.randomdan.homeip.net/sqlite"
+
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="x86 amd64"
+
+RDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/libdbpp-1.4.8:=
+	dev-db/sqlite
+	dev-libs/libadhocutil:=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-util/boost-build
+"
+
+src_compile() {
+	bjambuild libsqlitepp//dbpp-sqlite
+}
+
+src_install() {
+	bjaminstall libsqlitepp//install \
+		-i /dbpp-sqlite
+}
+
diff --git a/dev-libs/libdbpp/Manifest b/dev-libs/libdbpp/Manifest
index e2c7814..543aa22 100644
--- a/dev-libs/libdbpp/Manifest
+++ b/dev-libs/libdbpp/Manifest
@@ -1,2 +1,4 @@
 DIST libdbpp-1.4.6.1.tar.xz 26384 BLAKE2B 0466397b636af5159d3c583312b2bc54c9736b4b71eaaf3ad02e8a94ef97d2390ddf353a28dab73b7a3fe9f677eb025f9e5ba4c8be722cbc7a402410b2cb5b2b SHA512 522cc5dd4565856541dbef9c35406fe78d85bf7482a0baa7ae2bfd6f7adc9eb8f8e20787c4fe531b641ec2e6be857a81e58881f58afe4257e9a62ad3e8a7479f
+DIST libdbpp-1.4.8.tar.xz 27532 BLAKE2B aee031415a35b55efd6fa11fd408185a38c5898fccd46ed6e71cae1a5cc976f5ebfbb15a76bc7c2f115b7f416616511d28a137ba5fa2c00d8fa05c15582a39d7 SHA512 a72d5847d02fceff2f69974aa3cba8e3c2343f9c5922d5c862788d6f01307de7e597220c069579b623a3618a6b39c4774fc8474ecf87ffb2850c5a10ff9686b6
 EBUILD libdbpp-1.4.6.1.ebuild 703 BLAKE2B 2046d300a74f0d0314b0a5844293f5368c66e74e9fa4ee91a64038f6ab717b5aa2f0416a1b74700f09f4efb43efcc89901b271491d8f9711938f46b9db10641d SHA512 6240e209b3d043a5e0a63d2f52b0011b05a5e314ebba85a7a2dc4a914094495c1a6b7eb52366fad8aca7ff8dfb96778af7eec9501d255438d94670fda4026005
+EBUILD libdbpp-1.4.8.ebuild 703 BLAKE2B f3e422dbd404c4c21903ff431e0a06947e4bfa2701fe2c2ee601657abacc5e37c272287caf87924c6a30f60c47484fdc72efd7943761c946e57a9aa5589eec1a SHA512 23f22905f74bc2dd7ecfc25935470ad45f783edc6e4d0e571560c25af7b3914a3b5fdf6909c016de8581eeb2e2ae85a4cc288cf58cf6e34d834a4163731076f3
diff --git a/dev-libs/libdbpp/libdbpp-1.4.8.ebuild b/dev-libs/libdbpp/libdbpp-1.4.8.ebuild
new file mode 100644
index 0000000..5322fd9
--- /dev/null
+++ b/dev-libs/libdbpp/libdbpp-1.4.8.ebuild
@@ -0,0 +1,40 @@
+EAPI="7"
+
+inherit bjam eutils
+
+DESCRIPTION="C++ database connectivity common components"
+HOMEPAGE="http://libdbpp.randomdan.homeip.net/"
+
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+LICENSE="MIT"
+SLOT="0/1.4.8"
+KEYWORDS="x86 amd64"
+IUSE="man ut"
+
+RDEPEND="
+	dev-libs/boost:=
+	>=dev-libs/libadhocutil-0.8:=
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	dev-util/boost-build
+	virtual/pkgconfig
+	man? ( app-doc/doxygen )
+"
+
+src_compile() {
+	bjambuild \
+		libdbpp//dbppcore $(use ut && echo libdbpp//dbpptestcore libdbpp//createmockdb)
+}
+
+src_install() {
+	bjaminstall \
+		libdbpp//install $(use ut && echo libdbpp//installtest) \
+		-i dbpp
+
+	if use man ; then
+		doxygenbuild
+	fi
+}
+
diff --git a/net-misc/gentoobrowse-api/Manifest b/net-misc/gentoobrowse-api/Manifest
index b80d8f9..44fd57b 100644
--- a/net-misc/gentoobrowse-api/Manifest
+++ b/net-misc/gentoobrowse-api/Manifest
@@ -1,2 +1,4 @@
 DIST gentoobrowse-api-0.11.2.1.tar.xz 890372 BLAKE2B 2057130e2e90b659f8ffc02f8dea5cbe63f91ea44bf1d7eae204ecefb23159677cec97385f20614b3df3f2a5e4180690d1732fc091f43ee3d2112b01e7a090f0 SHA512 805110fc8d7ab570cb0aebe99af9cb4b1bbefc91a82ac982bfa6b1c53e79f24cd77967218fdcf7db4ee7a21d7c3413b1651e4ee3faeebc348c98fddfea156b22
+DIST gentoobrowse-api-0.12.tar.xz 893516 BLAKE2B 815e127e41d49e69e17e72ed3fc2f09c5f10170a50b9f5f200440cb53b18f6b337374b25051c07b7967b53cf8f9e2ae64ecd3794ec7bd381e21b0a3d7ce5142c SHA512 595962d9b3e1f1126ba5a29041c3758b03e10a5c71cdb1c8630095eba40607b129f00d57151d2041fe53d44b8c4d6fbaaa68c96e4aa736388f5fd50dba97d516
 EBUILD gentoobrowse-api-0.11.2.1.ebuild 1488 BLAKE2B 9ce0ee0554c5e8c036e99f94232bd2fb9d6705466df1ea2b040e5c577d37549ab017c6a30d452111687d31fce119167a61f7ea9fa924b6d8d61d881851e6f3f7 SHA512 0e88bde36b4a999c5165aa446ed77ac1904333f8f16acebe330a7512c9d4325b78eba557f6d912ca0a3ef3b458d882a99e92314536f3760852993ec009b15c02
+EBUILD gentoobrowse-api-0.12.ebuild 1490 BLAKE2B 68c32bd7f125b939820be8b043710e8dcbf9407c49051981c4b2fa694acee680d6fdc744e48d34e5221163348fa88350e6a2318b8fe475a10bae78bbd9ef4efe SHA512 9f5b472af0d6bac54b59e8d879d1ec56a40ca9e4aed92957ef661ff656833b66dab339480602489e9dfb45aae6aee856e7050682d25fa02251d22d95bd2a8590
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.12.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.12.ebuild
new file mode 100644
index 0000000..94cfd38
--- /dev/null
+++ b/net-misc/gentoobrowse-api/gentoobrowse-api-0.12.ebuild
@@ -0,0 +1,58 @@
+EAPI="7"
+inherit systemd eutils bjam
+
+DESCRIPTION="ICE API and client for Gentoo Browse"
+HOMEPAGE="http://gentoobrowse.randomdan.homeip.net/"
+
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="client server"
+
+DEPEND="=dev-libs/Ice-3.7*
+	server? (
+		dev-util/cproto
+		>=dev-cpp/slicer-1.9:=[db]
+		>=dev-libs/libdbpp-1.4:=
+		>=dev-libs/libdbpp-postgresql-1.4
+		>=dev-libs/icetray-0.5:=[tools]
+		>=dev-libs/boost-1.60:=
+		>=dev-libs/libgit2-0.24.0
+	)
+	>=dev-libs/libadhocutil-0.7.7:=
+	dev-libs/boost:="
+BDEPEND="${DEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-util/boost-build"
+RDEPEND="${DEPEND}
+	server? (
+		=sys-apps/icebox-service-1.11
+	)
+	www-client/lynx"
+
+src_compile() {
+	bjambuild \
+		gentoobrowse-api/api//gentoobrowse-api \
+		gentoobrowse-api/domain//gentoobrowse-domain \
+		$(use client && echo gentoobrowse-api/client//gbcli) \
+		$(use server && echo \
+				gentoobrowse-api/service//gentoobrowse-service++11 \
+				gentoobrowse-api/util)
+}
+
+src_install() {
+	bjaminstall \
+		gentoobrowse-api//install-libs \
+		gentoobrowse-api//install-slice \
+		$(use client && echo gentoobrowse-api//install-client) \
+		$(use server && echo gentoobrowse-api//install-service)
+	if use server ; then
+		insinto /etc/gentoobrowseapi || die
+		doins gentoobrowse-api/etc/icebox.config || die
+		insinto $(systemd_get_systemunitdir)/icebox@gentoobrowseapi.service.d || die
+		doins gentoobrowse-api/etc/service.conf || die
+	fi
+}
+
diff --git a/sys-cluster/netfs/Manifest b/sys-cluster/netfs/Manifest
index 25411fa..00544a6 100644
--- a/sys-cluster/netfs/Manifest
+++ b/sys-cluster/netfs/Manifest
@@ -1,4 +1,6 @@
 AUX icebox.config 147 BLAKE2B 52dce197f018c50740716cd0ff1210cdd371583fe60d5aede3fc3703b61442e63a8c6560893aacf4c604210d527c7551b9fc919482063b5630466e1210078ffc SHA512 0f03533c737935d2a4f08158a312478ad16a8fe0a3aa5117f50b0200b2d83f9d8e8fc5bcc7ccc3dddf7fe66d68e5c015f72f282c891d576421317deebc6c1562
 AUX service.conf 29 BLAKE2B b516d5c184da102bda9b1e9c940b7fc50e062b418cdb25bab278a1e130707c4bb90394701b34525eabea9ce019c677fc641b83e00fa784d98b9a53192e7c0269 SHA512 0b78e9051294ff11abe938ddc0759284dc0eb0ad4a37f90396605248b86c4bb7685ff303c5fda6ee80d95c50c21e0d122fe93914da48ca9ec2e1c5c36ca32507
 DIST netfs-1.4.0.1.tar.xz 25068 BLAKE2B 58fda362dedecb2988a646d95110b0312c4676781d22156682844b9b6e5727dd0bf65ef2f59727ab6367a49f5b23a98a8e43da1e9032cd2bee1f01c06cfc7b35 SHA512 1825d4ff97b324a5b964d4db6362613d98042d716a60127270c569e2591ed5f49ebd27c622ae87361bbd79b0213c6e916e38ae616619d62037c814d4c1932556
+DIST netfs-1.4.1.tar.xz 27216 BLAKE2B becc5351ff402e5a09c1093b43681f48c4d0d84d310cdc3ce271bf87ce2321974db0ed217a8b998c3a7f43e61df8e5015c885542b718d7a9632ebe313c575d40 SHA512 4d2b567b81c8adaede2dca469de66b1aa9e927841dc4996b37fc18562ddba101a8e9e09c74697b249c7c945769d902cfa8aa89bf667dd6e263880496e6b4502b
 EBUILD netfs-1.4.0.1.ebuild 1070 BLAKE2B 9a1f05fc3733f6190185e6349ffde626a38859591dfec3f656e854de1ee8ce4964df38e8729b81724a08ec7a60eeabba0eecaddd1140207312938ba2cb594f8f SHA512 666283600725b5373c3376bbc047abb288163c139b05b948fb6079daa2d17da63162d04a23992ee7ee4cdeff888e0ac1c9fcc3d85aaef8ab0ad06cb87db7fd5c
+EBUILD netfs-1.4.1.ebuild 1070 BLAKE2B 9a1f05fc3733f6190185e6349ffde626a38859591dfec3f656e854de1ee8ce4964df38e8729b81724a08ec7a60eeabba0eecaddd1140207312938ba2cb594f8f SHA512 666283600725b5373c3376bbc047abb288163c139b05b948fb6079daa2d17da63162d04a23992ee7ee4cdeff888e0ac1c9fcc3d85aaef8ab0ad06cb87db7fd5c
diff --git a/sys-cluster/netfs/netfs-1.4.1.ebuild b/sys-cluster/netfs/netfs-1.4.1.ebuild
new file mode 100644
index 0000000..41eb99c
--- /dev/null
+++ b/sys-cluster/netfs/netfs-1.4.1.ebuild
@@ -0,0 +1,52 @@
+EAPI="7"
+
+inherit eutils bjam
+
+DESCRIPTION="Cluster capable network filesytem"
+HOMEPAGE="http://netfs.randomdan.homeip.net/"
+
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="client server"
+
+RDEPEND="=dev-libs/Ice-3.7*
+	>=dev-cpp/slicer-1.9:=[xml]
+	server? (
+			=sys-apps/icebox-service-1.11
+		)
+	>=dev-libs/libadhocutil-0.7:=
+	client? (
+			sys-fs/fuse:3
+			>=dev-libs/boost-1.66:=
+			)
+	dev-libs/boost:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/boost-build"
+
+src_compile() {
+	bjambuild \
+		$(use client && echo netfs/fuse//netfs) \
+		$(use server && echo netfs/daemon//netfsd++11) \
+		netfs/ice//netfs-api
+}
+
+src_install() {
+	bjaminstall \
+		$(use client && echo netfs/fuse//install) \
+		$(use server && echo netfs/daemon//install) \
+		netfs/ice//install
+
+	if use client ; then
+		insinto /etc/netfs
+		doins netfs/etc/client.xml
+		dosym ../usr/bin/netfs /sbin/mount.netfs
+	fi
+	if use server ; then
+		insinto /etc/netfs
+		doins netfs/etc/daemon.xml
+		doins netfs/etc/icebox.config
+	fi
+}
diff --git a/sys-fs/netfs-gitfs/Manifest b/sys-fs/netfs-gitfs/Manifest
index 5d02bd0..4e3839b 100644
--- a/sys-fs/netfs-gitfs/Manifest
+++ b/sys-fs/netfs-gitfs/Manifest
@@ -1,4 +1,4 @@
 DIST netfs-gitfs-0.2.1.tar.xz 8288 BLAKE2B 8307aad12043bd5cffc7a364d03bc3058eed1be9cd24b77fda750d3056b5cd7c70eb941105c44d91b6c551241d4ec0d9fcea0ed9e0d8d54c36dc9f212b19988e SHA512 e95319e70465312f3b5e8f2b484576ba86d6b034850d52d85397b42df50371ea5d5afd22888c521ea58e36e76c95738b67ac489456799cf2725eb6cff5f0b998
-DIST netfs-gitfs-0.2.tar.xz 8304 BLAKE2B 8cf3bc20f64ea01218cabdf2acde764aae0cedc9791caf426405ae787a39f3f6a338c155bb7adeb4df8f3183e240f4e52f3fe850693e2d7b6704101751b18e2e SHA512 fc9eb37883e2b7d02931e06d683b23d1734790ac66a488b1572721b0157c8aa1b91d05d43ce63e3cf82b70fe3d70415991fdbb8a2509f427c3242f4f204539b8
-EBUILD netfs-gitfs-0.2-r1.ebuild 522 BLAKE2B 53045d16623420e35a951946cb4d01ac5132a76d788a73ad4f06de947a8a6c67bb5d7751a68dc5e36621ab72dbedb10826a5d42d105e70eef1de7475de130ea8 SHA512 9c2909ce835c22d29600073630874cb15e7f89450bcb2cee00deb298eba3d57126dcda5765690c4b1df4bafed9b27abc16e3bfd42da5dcad2df5241be977f231
+DIST netfs-gitfs-0.2.2.tar.xz 8872 BLAKE2B 319788b3b89702573f00216d56a22dac711ed8fb1512a28b770254633577fe1004b76c050880409a1668e8e2940851a5f183beefde084e162ac50ce3be310b77 SHA512 c99f64495bebfa283c7fceef9d62b69c8c80dd176f04411a3c7b815cbbbfef71996956a9a8f759138a32e659ea7b7c1a392cf9c50f825d4a3d7b189f818ab6c5
 EBUILD netfs-gitfs-0.2.1.ebuild 524 BLAKE2B 41c28b2bf2e9ae989b766dc98959dbd4bf7981c7e684706d6ed509a0898bd5a9469430fe5c577c070fdcffe74fa0b6f58a7ed180599bfd292376bde7b8b40ad4 SHA512 b3666c335251d6d7ddeb30f144080beebd27dc57e0210b026dd8ede16ac1b1c7a2139a7cc1f301cb545b53260709f3183e6e1c0fa1d570aebb4cae75ae9bec22
+EBUILD netfs-gitfs-0.2.2.ebuild 524 BLAKE2B 41c28b2bf2e9ae989b766dc98959dbd4bf7981c7e684706d6ed509a0898bd5a9469430fe5c577c070fdcffe74fa0b6f58a7ed180599bfd292376bde7b8b40ad4 SHA512 b3666c335251d6d7ddeb30f144080beebd27dc57e0210b026dd8ede16ac1b1c7a2139a7cc1f301cb545b53260709f3183e6e1c0fa1d570aebb4cae75ae9bec22
diff --git a/sys-fs/netfs-gitfs/netfs-gitfs-0.2-r1.ebuild b/sys-fs/netfs-gitfs/netfs-gitfs-0.2.2.ebuild
index 1d99a9f..a1f6f13 100644
--- a/sys-fs/netfs-gitfs/netfs-gitfs-0.2-r1.ebuild
+++ b/sys-fs/netfs-gitfs/netfs-gitfs-0.2.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://netfs.randomdan.homeip.net/git"
 SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="~x86 ~amd64"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/www-apps/gentoobrowse/Manifest b/www-apps/gentoobrowse/Manifest
index a14c658..cb50f65 100644
--- a/www-apps/gentoobrowse/Manifest
+++ b/www-apps/gentoobrowse/Manifest
@@ -1,4 +1,6 @@
 DIST gentoobrowse-2.1.5.tar.xz 62196 BLAKE2B 0d6ca3fe154ba7f44a3eca64079ad111ac3ca84e296ff199fd70c478056527b6461a957592174856a23f089afe8f14c50f61a0ee0d80430872a2846ea5394624 SHA512 cd7b5e973d53312c0e0cb72bba039faaafdcf56ad65b9127129b04bdbc400c5567572be80c7611eb1f277861c2c93aeba3b86cab13f9294ed7677247267edb58
 DIST gentoobrowse-2.1.6.tar.xz 62320 BLAKE2B caac96eceb3e4254f13f855e1265d67c5af85a22fcbfeb690e33b1828283c2c6f48fee1838a2e10edb285bcf8bda163f514594ad02a09ebe94ab078e5cc0931d SHA512 1c7775368d8faa54dbb47104ddab5ce54aed6940da119ad661f8a98df15d599426f4c9f882541127cdb63aba7ac0a4524b5fe28c8497bbc96573e23946577546
+DIST gentoobrowse-2.1.7.tar.xz 62328 BLAKE2B d7bc7e5e6fd25ed1fafae12f3edb5f6e5afa9ce9b207d4ae27d0b24547c0aa7fdd71f6cf580fcf9e862d3acecb5cf1f16aea99ab1538502b11e9dc97e840bbd5 SHA512 07b61098e08d646ed92ff0d7d152c2beb688f8861a728aec50b33a8e2e51f1523f51b415dbdde84e1f28e8d670883377887b2f35fb5a3089be63800106c4238f
 EBUILD gentoobrowse-2.1.5-r1.ebuild 811 BLAKE2B 18f7cf10162231f97c388d47e26507300d958d9c16fcb4425f20bbca15355927a88aaa21495cae58ba954d833d4f5054c20a2bb2f58df489229e83e1b012d374 SHA512 8a88720bb2c8ae3026de3666e78055751716d500a93f1ce3630772f1c3ba89656a150410e355f87dc8ea932f6b519c12ce4a5051052d2cb30a02ba14ebef50bb
 EBUILD gentoobrowse-2.1.6.ebuild 811 BLAKE2B 18f7cf10162231f97c388d47e26507300d958d9c16fcb4425f20bbca15355927a88aaa21495cae58ba954d833d4f5054c20a2bb2f58df489229e83e1b012d374 SHA512 8a88720bb2c8ae3026de3666e78055751716d500a93f1ce3630772f1c3ba89656a150410e355f87dc8ea932f6b519c12ce4a5051052d2cb30a02ba14ebef50bb
+EBUILD gentoobrowse-2.1.7.ebuild 811 BLAKE2B 18f7cf10162231f97c388d47e26507300d958d9c16fcb4425f20bbca15355927a88aaa21495cae58ba954d833d4f5054c20a2bb2f58df489229e83e1b012d374 SHA512 8a88720bb2c8ae3026de3666e78055751716d500a93f1ce3630772f1c3ba89656a150410e355f87dc8ea932f6b519c12ce4a5051052d2cb30a02ba14ebef50bb
diff --git a/www-apps/gentoobrowse/gentoobrowse-2.1.7.ebuild b/www-apps/gentoobrowse/gentoobrowse-2.1.7.ebuild
new file mode 100644
index 0000000..7bdd099
--- /dev/null
+++ b/www-apps/gentoobrowse/gentoobrowse-2.1.7.ebuild
@@ -0,0 +1,40 @@
+EAPI="7"
+
+inherit webapp eutils bjam
+
+DESCRIPTION="Gentoo Browse is an IceSpider based web site for viewing Gentoo content"
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+HOMEPAGE="http://gentoobrowse.randomdan.homip.net/"
+
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+DEPEND="
+	virtual/pkgconfig
+	>=www-misc/icespider-0.6:=
+	>=net-misc/gentoobrowse-api-0.10
+	dev-cpp/slicer:=
+"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_compile() {
+	cd ${S}/${PN} || die
+	bjambuild cgi || die
+}
+
+src_install () {
+	cd ${S}/${PN} || die
+	bjambuild install --bindir=${D}/${MY_CGIBINDIR} || die
+	webapp_src_preinst
+
+	insinto ${MY_HTDOCSDIR}
+	doins -r config css img js xslt *.xml *.ico *.txt .htaccess || die
+	dosym ${MY_CGIBINDIR}/gentoobrowse-cgi ${MY_HTDOCSDIR}/gentoobrowse-cgi
+
+	webapp_src_install
+}
diff --git a/www-apps/mirrorsearch/Manifest b/www-apps/mirrorsearch/Manifest
index c36ebb8..e00cb41 100644
--- a/www-apps/mirrorsearch/Manifest
+++ b/www-apps/mirrorsearch/Manifest
@@ -1,4 +1,2 @@
-DIST mirrorsearch-0.2.1.2.tar.xz 14424 BLAKE2B 38b7cfa04259c6e0d5e8c306c3ef48175fa0c69aec0fa6739a04526748c8ac5198ae00a14f58afee885afe392740dd5bdf4a504ed63e86a2dc8cd4e258b3a4e7 SHA512 511be19d785e83296bdd0c1d992e6fa000c457cf7d58a4a3f5240b5665734629419c2ef43455902fb36a9d47208a42a03022fc71170e3532929329f0c2f745d0
-DIST mirrorsearch-0.2.1.3.tar.xz 10752 BLAKE2B 0d9f649940dd491898244af085cc3331716e2202defafaa1318c78613ea279030b58083c54dd8a1d1964ae2e034ff58b98c0a741f5b3fc12c327272323bda0e4 SHA512 1dba2f6c88720fa4e1270e578cc2815dbbd81f08c9d3e15e427a63123274f056149078bc273e67a27786a8173b90623f16dcaabb4bbf413922c448dc942ef347
-EBUILD mirrorsearch-0.2.1.2.ebuild 925 BLAKE2B bb99a48a4e49cb5e648669f4ac5995572a486697a914d7306c28c15675af607b766b96ff2b987a0d569d008de5fa07798754cd0591ec3c8086d38eaf106fcd35 SHA512 1f9303b8a899d890c76d466b3b000132dc3fc1420a54f1101a7ca1abc3dc573e577712633238395eaa6f4ab7b56aeaab7ea729a976f085e654b8eb7aea9df501
-EBUILD mirrorsearch-0.2.1.3-r1.ebuild 961 BLAKE2B 671f591a6949e2ee636c03925131aa13653f9095bbdef9e66b166cbbcba60a91f7096509d1f609bd457a2b4f5bee921a854b916dedb65ce8e0c863b5957dab96 SHA512 75343afd9fd6950b5c143b815cc661babdf9939f2e3b69320df53714fb15a7a509d0a5800352ac4ad10a5de51589516a378d6331a307bc9b7c71d0f9fbe1ed33
+DIST mirrorsearch-0.2.1.4.tar.xz 10760 BLAKE2B ab57c9f0e4313d7776c269e42d4463254cc9bf53494f402d8ac3a5595a5e82cca79379d1828a2d97a26c5f6361c7ea6fb3b0b8d4d7804293284a65aa94804188 SHA512 650058c6ab487e0552751bbc2e9a29623ba9d3782f71e5dd8321d685671b91fe833f7b64c45e5db5034fac5c6062c27ca79502ee88009ce0fd6ddb8a2339be71
+EBUILD mirrorsearch-0.2.1.4.ebuild 963 BLAKE2B 82577ee70a85372f3f4ef3e0189c21074fdbf10e16824b318575d5954585cd38305b7fe1a015a44ae8f37d12043a8cdd9cc814c08cc316730fc9d2b6fffe4f13 SHA512 f992827ebf7a29ada07b32a237877e1ca196d6d80e21fae86bae11eb77d835e16e740a98ec96cc6a287dcc73fba9fd893e2d3263c7c0c099ee8a948ed6bea94b
diff --git a/www-apps/mirrorsearch/mirrorsearch-0.2.1.2.ebuild b/www-apps/mirrorsearch/mirrorsearch-0.2.1.2.ebuild
deleted file mode 100644
index 5a47e1a..0000000
--- a/www-apps/mirrorsearch/mirrorsearch-0.2.1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-EAPI="7"
-inherit webapp eutils bjam
-
-DESCRIPTION="ICE and web service for locating files for download."
-HOMEPAGE="https://git.randomdan.homeip.net/repo/mirrorsearch/"
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/boost:=
-	>=www-misc/icespider-0.4:=
-	dev-cpp/slicer:=[db]
-	dev-libs/icetray[tools]
-	dev-libs/libdbpp-postgresql
-	=sys-apps/icebox-service-1.11
-"
-BDEPEND="${DEPEND}
-	virtual/pkgconfig
-	dev-util/boost-build
-"
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_compile() {
-	bjambuild service//mirrorsearch-service++11 site//mirrorsearch-cgi
-}
-
-src_install () {
-	bjaminstall install{-bin,-site} \
-		--bindir=${D}/${MY_CGIBINDIR} \
-		--datarootdir=${D}/${MY_HTDOCSDIR}
-	webapp_src_preinst
-	dosym ${MY_CGIBINDIR}/mirrorsearch-cgi ${MY_HTDOCSDIR}/mirrorsearch-cgi
-	webapp_src_install
-
-	insinto /etc/${PN}
-	doins service/icebox.config
-}
-
diff --git a/www-apps/mirrorsearch/mirrorsearch-0.2.1.3-r1.ebuild b/www-apps/mirrorsearch/mirrorsearch-0.2.1.4.ebuild
index 9df48fe..7c10b94 100644
--- a/www-apps/mirrorsearch/mirrorsearch-0.2.1.3-r1.ebuild
+++ b/www-apps/mirrorsearch/mirrorsearch-0.2.1.4.ebuild
@@ -15,7 +15,7 @@ DEPEND="
 	dev-libs/boost:=
 	>=www-misc/icespider-0.4:=
 	dev-cpp/slicer:=[db]
-	dev-libs/icetray[tools]
+	dev-libs/icetray:=[tools]
 	dev-libs/libdbpp-postgresql
 	=sys-apps/icebox-service-1.11
 "
diff --git a/www-misc/icespider/Manifest b/www-misc/icespider/Manifest
index abd4176..f4ce78e 100644
--- a/www-misc/icespider/Manifest
+++ b/www-misc/icespider/Manifest
@@ -1,2 +1,4 @@
 DIST icespider-0.6.7.2.tar.xz 29368 BLAKE2B a041a53b4787225efa89a2d4f6072bb292d190c21abaca3a48d090953bb0d3232598c43dfbc8a482b2344bf120425dcec6b4f1ed1b995d5d4d93269c8ddcbf5c SHA512 55a4b1a716c3bbf95fefff64e8673f7b22cb0d6212db9811c5cb8176f8bd6826ef928597196f616110bbb2a2b4efcc63172823e3aa1de204a3bce5114a582ed1
+DIST icespider-0.7.1.tar.xz 33280 BLAKE2B bff49b3250ec64c0d08a823860052fd810029dc385296471be20fdeb8017cb11c87a6086b89691618ae7426f2852ea155a9086bec95df613e1ed2fda79368366 SHA512 609b1407cae7d56d5f091447ae0eb31fc3a78c9de01189c4b4c7274038b3c4e1091a026819614f4bc56361d962fa06868799700d1e81dfef941b7b4f34b6d957
 EBUILD icespider-0.6.7.2.ebuild 884 BLAKE2B f4d28678d2f68ab27233a33ab485e6838a182bc1d8d13b9bde329ad2190fc22c8bd26e4a7cd07da26c129809a224f62922671e5ae971c5cdbfc53d58918c3b6a SHA512 e4eb19ad341ca63b59cf56a96d4e0fd521e23dd51bdff3f46ca5ad927ba17ab3b0aa8c9cda21648fcb0538fc1759af33462bcd155b46731dfd7b00060dd48954
+EBUILD icespider-0.7.1.ebuild 882 BLAKE2B 44d769c99760bd0bc1f89e7f69d63360c6cf0a6f82380fe2cd17eb7da67602f97c00cfcf47eee862fe0479bf8cd42d50ba0bde5f5d31724c979334f1d038ad48 SHA512 deab11e81e0fb5a7741122960567ea5a85b56603b5295c80c17924e71bd384d9ef42aad813a955fb2e4579ad98a9f2cb74e7d191432083c801e6173dcac20e06
diff --git a/www-misc/icespider/icespider-0.7.1.ebuild b/www-misc/icespider/icespider-0.7.1.ebuild
new file mode 100644
index 0000000..1844fd5
--- /dev/null
+++ b/www-misc/icespider/icespider-0.7.1.ebuild
@@ -0,0 +1,44 @@
+EAPI="7"
+
+inherit bjam
+
+DESCRIPTION="Tools and libs for building web services/sites that are clients of ICE services"
+HOMEPAGE="http://icespider.randomdan.homeip.net/"
+
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
+LICENSE="MIT"
+SLOT="0/0.7"
+KEYWORDS="x86 amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/Ice-3.7
+	>=dev-libs/slice-parser-3.7:=
+	>=dev-libs/libadhocutil-0.8.3:=
+	dev-cpp/libxmlpp:3.0
+	=dev-cpp/slicer-1.10*:=
+	dev-libs/fcgi
+	>=dev-libs/boost-1.66:="
+BDEPEND="${DEPEND}
+	virtual/pkgconfig
+	dev-util/boost-build"
+RDEPEND="${DEPEND}
+	virtual/httpd-fastcgi"
+
+src_compile() {
+	bjambuild \
+		icespider//common \
+		icespider//core \
+		icespider//compile \
+		icespider//fcgi \
+		icespider//xslt \
+		icespider//fileSessions \
+		icespider//testing
+}
+
+src_install() {
+	bjaminstall \
+		icespider//install \
+		icespider//install-ice \
+		icespider//install-tools
+}
+