Bumps to support with different Ice versions... and a new Ice version

17 files changed, 45 insertions, 436 deletions

diff --git a/dev-cpp/slicer/Manifest b/dev-cpp/slicer/Manifest
index c4782a4..e605306 100644
--- a/dev-cpp/slicer/Manifest
+++ b/dev-cpp/slicer/Manifest
@@ -1,15 +1,4 @@
-DIST Ice-3.7.4.tar.gz 10494392 BLAKE2B fec17b0c9b7008f8a6387fadd964c7a1b93502e50501afa3cda50222e2940dda77efcb27cab7e32b73c8a151cb95a8df5f93c51bf3f4d092c1d10423a9999a9b SHA512 a4000a7b0ef042a93f7a4f4e384087c3050a97bd38f9ac593c535307dadb741d173b3f6c8aae8ddcf4c65a0e60531e2dfa2f9f68135d92e3b43b658e620d8d27
-DIST slicer-1.10.1.tar.xz 38736 BLAKE2B 9b8c919c1552a0c26fee40ef29f054d2868bf765a986828c518dfe07aafd7a3c89c4db97d1549b6db153c25d81d10b7c768cbcba91defcba736bdee70919d7aa SHA512 6ab55997bb5fd419e19bfebd71b863bfc29ef14da3e1c91b2a74cf6b92f1184b72e1c90a9fb68575a50e4161973fc91d83342b2a1a4a17fab3ad31e9e6b95e36
-DIST slicer-1.10.2.tar.xz 39408 BLAKE2B f4970341be69abf7697101bc386fd829d645c85e0f83c2a78b579a39588f35ba4cb3e7d14a5fd4cef7e9f4885695598c746f0acea0a501724a74cd12abd41a22 SHA512 300fc475750e389700e5b117e09ba53ff06f024dfaad2d0dde71dcd7e288098321da7127500e265aab6b614c21097a821d7b8504bb1b3f6cd1069175c3f10616
-DIST slicer-1.10.3.tar.xz 39100 BLAKE2B 028964d66506523a7ca58226b9aff146cd63dd19ab79ebb30d3a75576e7ed9efed127efb0a665fbdc24a49a5a8a450b1791fb037eb23943e00b54a9d8375bb09 SHA512 0f281dafa3cc58878528d0c01d177e2d2d553a78726b2f9534a7527cca76c559b119388fa66d88d8b37d7afb24886635b88b133ee183ac1fc50a56238728f0eb
 DIST slicer-1.10.4.tar.xz 39640 BLAKE2B ad570920853f3de0bb32739e44fc92ab2e1a64ed2b348afbf2bc2731be150c6008fcdd5db3b1752db6a0e1cdaa0865c10d85db093d579489c8827128cb6b7501 SHA512 d6e32f0def7132ef378ecbe50498f937b56bf02740514a81faec76000ecd4cbd73fea57808a238df4335fba905c95c891765caa9543b130da725a7051b3d77ee
-DIST slicer-1.10.5.1.tar.xz 42468 BLAKE2B 5b998864d3ff91fe8b23e8455babe0f30f70fc0899a4e994f453d0996eeb26ae182560f40f62449c136bb16cef57809e9f6040a5617e82fd76f19950b6fa32d7 SHA512 41f612d87b61b6292c95fe341575c57945f34921263def94b6b7948157aff475dbe81ae89f8297cf45b0bd05caec817a255553a90bafa0d8b0f827c3e8db9593
-DIST slicer-1.10.5.2.tar.xz 42432 BLAKE2B c34410d345b9e765e44bcc76f6f7fbc824d795cde446281bac9517a6ec031acf1e2ae911c04038ee2e49c7f0186ab96599823870c625e26637359fd55be4c070 SHA512 9dd300805195f6909123cbcb68040e8402eb4851a3c477c9a337811b2e64ba7c5d35ebb4c615f3abf83a9847f3001a6f7129acea91c755bbb9eecdb7c7e1c60b
 DIST slicer-1.10.5.3.tar.xz 42452 BLAKE2B 9949a6ada9b5d9836dcc8af6e735e1cc60217a45259abd89d7c77a2f458a07a0c8a6aa666f45acde4b071da6e8880251931e47440effeee0228a688589612d14 SHA512 b9cd94dafd79a09133d9695860eb08ae1ecfd88b3ea2468152828ec19ff4ffd4e9fba207acccbe9bd553ccc9fa941202b1c1af333d6f35a923e9195fd46f0bb7
-EBUILD slicer-1.10.1.ebuild 1181 BLAKE2B e0cf4b585e9f1151481ef86acf07610a016e49807e2e86d86e45e8a549c0ff41c458de07258fb75694cd45235751f801cbeb312ef259eae7a567760c97439652 SHA512 87a759ae52f45ffa6e6d7e292846b84d04e71b7e0abf0881900ab2654e45c269a7976a04728054a8533de147ec2642e785975c895e0f0cff70fa97f89a08cfcd
-EBUILD slicer-1.10.2.ebuild 1181 BLAKE2B e0cf4b585e9f1151481ef86acf07610a016e49807e2e86d86e45e8a549c0ff41c458de07258fb75694cd45235751f801cbeb312ef259eae7a567760c97439652 SHA512 87a759ae52f45ffa6e6d7e292846b84d04e71b7e0abf0881900ab2654e45c269a7976a04728054a8533de147ec2642e785975c895e0f0cff70fa97f89a08cfcd
-EBUILD slicer-1.10.3.ebuild 1046 BLAKE2B 126573bcde3fc17a1c4c0bd6f1d96dcc9c54f3db0bd25c9b2e4a1083f26c034ee2ab457aef28340120b258409d1ab92e6a61727b4d1ac7efd1ac3a8ccb35731f SHA512 fa3570f75ad499f09079d9159475b0884dbbf2f95b1ab945ea7ac05970b8d13a362595dfc488c0702a984131ad359c0df91d92515ab0ba89fa914c66995ef07a
 EBUILD slicer-1.10.4.ebuild 1046 BLAKE2B 126573bcde3fc17a1c4c0bd6f1d96dcc9c54f3db0bd25c9b2e4a1083f26c034ee2ab457aef28340120b258409d1ab92e6a61727b4d1ac7efd1ac3a8ccb35731f SHA512 fa3570f75ad499f09079d9159475b0884dbbf2f95b1ab945ea7ac05970b8d13a362595dfc488c0702a984131ad359c0df91d92515ab0ba89fa914c66995ef07a
-EBUILD slicer-1.10.5.1.ebuild 1050 BLAKE2B d623d0d9fedf279ce01d1a91b2d1e1db6597fb49e10b9eb0ab7f74121d272c4fb02dc8cf7e13e5c5ee705d4b627fce44d51142d89f82238546aa34e1cfab4e23 SHA512 bb03afd073c16dfef5ebb6bf887d338ecf3119fddbce9d9fd17403b57012e082b1f5c65b6676f891138471bc12438e2cfb71a1e643b0f5f3d5e147a39355dd57
-EBUILD slicer-1.10.5.2.ebuild 1050 BLAKE2B d623d0d9fedf279ce01d1a91b2d1e1db6597fb49e10b9eb0ab7f74121d272c4fb02dc8cf7e13e5c5ee705d4b627fce44d51142d89f82238546aa34e1cfab4e23 SHA512 bb03afd073c16dfef5ebb6bf887d338ecf3119fddbce9d9fd17403b57012e082b1f5c65b6676f891138471bc12438e2cfb71a1e643b0f5f3d5e147a39355dd57
-EBUILD slicer-1.10.5.3.ebuild 1050 BLAKE2B d623d0d9fedf279ce01d1a91b2d1e1db6597fb49e10b9eb0ab7f74121d272c4fb02dc8cf7e13e5c5ee705d4b627fce44d51142d89f82238546aa34e1cfab4e23 SHA512 bb03afd073c16dfef5ebb6bf887d338ecf3119fddbce9d9fd17403b57012e082b1f5c65b6676f891138471bc12438e2cfb71a1e643b0f5f3d5e147a39355dd57
+EBUILD slicer-1.10.5.3-r1.ebuild 1012 BLAKE2B 446b0e99edd688502b9637f3a1a25617053c34162a87c30ee7b8751b2e6ce634b6ef0a1925cdeb7223c2d61d0d05710483bd926d3719ea56e27dcef273cb1839 SHA512 b67d19f11b6979b5395aa75757579fcd382ec3639857dd968d470c88bfb38f4ed4f712ef45b40040224a298188530995b1c2a66bb258277032a321dde678e4ed
diff --git a/dev-cpp/slicer/slicer-1.10.1.ebuild b/dev-cpp/slicer/slicer-1.10.1.ebuild
deleted file mode 100644
index d94add0..0000000
--- a/dev-cpp/slicer/slicer-1.10.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI="7"
-
-inherit bjam
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-ICE_VERSION=3.7.4
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz
-	https://github.com/zeroc-ice/ice/archive/v${ICE_VERSION}.tar.gz -> Ice-${ICE_VERSION}.tar.gz"
-LICENSE="MIT"
-SLOT="0/1.10.0"
-KEYWORDS="~x86 ~amd64"
-IUSE="db xml json"
-
-RDEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	xml? ( dev-cpp/libxmlpp:3.0 )
-	json? ( >=dev-cpp/libjsonpp-0.11 )
-	db? ( =dev-libs/libdbpp-1.4*:= )
-	>=dev-libs/libadhocutil-0.8:=
-	dev-libs/boost:="
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/boost-build"
-
-src_unpack() {
-	default
-	ln -s ${WORKDIR}/ice-${ICE_VERSION}/cpp ${S}/ice/cpp
-}
-
-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-cpp/slicer/slicer-1.10.2.ebuild b/dev-cpp/slicer/slicer-1.10.2.ebuild
deleted file mode 100644
index d94add0..0000000
--- a/dev-cpp/slicer/slicer-1.10.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI="7"
-
-inherit bjam
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-ICE_VERSION=3.7.4
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz
-	https://github.com/zeroc-ice/ice/archive/v${ICE_VERSION}.tar.gz -> Ice-${ICE_VERSION}.tar.gz"
-LICENSE="MIT"
-SLOT="0/1.10.0"
-KEYWORDS="~x86 ~amd64"
-IUSE="db xml json"
-
-RDEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	xml? ( dev-cpp/libxmlpp:3.0 )
-	json? ( >=dev-cpp/libjsonpp-0.11 )
-	db? ( =dev-libs/libdbpp-1.4*:= )
-	>=dev-libs/libadhocutil-0.8:=
-	dev-libs/boost:="
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/boost-build"
-
-src_unpack() {
-	default
-	ln -s ${WORKDIR}/ice-${ICE_VERSION}/cpp ${S}/ice/cpp
-}
-
-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-cpp/slicer/slicer-1.10.3.ebuild b/dev-cpp/slicer/slicer-1.10.3.ebuild
deleted file mode 100644
index aa15a13..0000000
--- a/dev-cpp/slicer/slicer-1.10.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-EAPI="7"
-
-inherit bjam
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-ICE_VERSION=3.7.4
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="MIT"
-SLOT="0/1.10.0"
-KEYWORDS="~x86 ~amd64"
-IUSE="db xml json"
-
-RDEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	=dev-libs/slice-parser-${ICE_VERSION}*
-	xml? ( dev-cpp/libxmlpp:3.0 )
-	json? ( >=dev-cpp/libjsonpp-0.11 )
-	db? ( =dev-libs/libdbpp-1.4*:= )
-	>=dev-libs/libadhocutil-0.8:=
-	dev-libs/boost:="
-DEPEND="${RDEPEND}
-	dev-util/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-cpp/slicer/slicer-1.10.5.1.ebuild b/dev-cpp/slicer/slicer-1.10.5.1.ebuild
deleted file mode 100644
index 51818df..0000000
--- a/dev-cpp/slicer/slicer-1.10.5.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-EAPI="7"
-
-inherit bjam
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-ICE_VERSION=3.7.4
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="MIT"
-SLOT="0/1.10.5.1"
-KEYWORDS="~x86 ~amd64"
-IUSE="db xml json"
-
-RDEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	=dev-libs/slice-parser-${ICE_VERSION}*
-	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}
-	dev-util/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-cpp/slicer/slicer-1.10.5.2.ebuild b/dev-cpp/slicer/slicer-1.10.5.3-r1.ebuild
index 51818df..a41adbb 100644
--- a/dev-cpp/slicer/slicer-1.10.5.2.ebuild
+++ b/dev-cpp/slicer/slicer-1.10.5.3-r1.ebuild
@@ -5,15 +5,14 @@ inherit bjam
 DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
 HOMEPAGE="http://slicer.randomdan.homeip.net/"
 
-ICE_VERSION=3.7.4
 SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/1.10.5.1"
 KEYWORDS="~x86 ~amd64"
 IUSE="db xml json"
 
-RDEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	=dev-libs/slice-parser-${ICE_VERSION}*
+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*:= )
diff --git a/dev-cpp/slicer/slicer-1.10.5.3.ebuild b/dev-cpp/slicer/slicer-1.10.5.3.ebuild
deleted file mode 100644
index 51818df..0000000
--- a/dev-cpp/slicer/slicer-1.10.5.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-EAPI="7"
-
-inherit bjam
-
-DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
-HOMEPAGE="http://slicer.randomdan.homeip.net/"
-
-ICE_VERSION=3.7.4
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="MIT"
-SLOT="0/1.10.5.1"
-KEYWORDS="~x86 ~amd64"
-IUSE="db xml json"
-
-RDEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	=dev-libs/slice-parser-${ICE_VERSION}*
-	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}
-	dev-util/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/Ice/Ice-3.7.3.ebuild b/dev-libs/Ice/Ice-3.7.5.ebuild
index 3ed4032..15d2cc2 100644
--- a/dev-libs/Ice/Ice-3.7.3.ebuild
+++ b/dev-libs/Ice/Ice-3.7.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7,3_8,3_9} pypy )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby22"
@@ -35,6 +35,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libedit
 	|| (
 		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
 	)
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 9a565b5..4c66aa1 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,4 +1,4 @@
-DIST Ice-3.7.3.tar.gz 10471057 BLAKE2B 4b24abfafd411a9d9f0a50e05d8f3081301fd395b5c14fedf775726f9c75048c0e598cc58a27f9f10cd596e5dfcfd85be7f6771d6160208bbf99503a82d9becc SHA512 ef43bb28b4a20dcca5078ca2b0ad81269a435317761fc00b4d4bdf85bcdf4dddbf3b3ee6729477bd0957ea519a3705416883ba404386a05914a2c010cb785e27
 DIST Ice-3.7.4.tar.gz 10494392 BLAKE2B fec17b0c9b7008f8a6387fadd964c7a1b93502e50501afa3cda50222e2940dda77efcb27cab7e32b73c8a151cb95a8df5f93c51bf3f4d092c1d10423a9999a9b SHA512 a4000a7b0ef042a93f7a4f4e384087c3050a97bd38f9ac593c535307dadb741d173b3f6c8aae8ddcf4c65a0e60531e2dfa2f9f68135d92e3b43b658e620d8d27
-EBUILD Ice-3.7.3.ebuild 7422 BLAKE2B 9bdf902c7700350b6f44761f4b37a42753509dc0098bf7b6eeaaaa34852f2d0217f621bd22c6e4a05dc669b03d9ef9f87be2fb2b8087f7dc331342dc3189d495 SHA512 b17afda5baf33020eda7563a550790f1a35d361542cda603c567395be470156f9101400aa78ecc37c27f930bd0d4abd89738b9a93f43218099467b6e5c5d673a
+DIST Ice-3.7.5.tar.gz 10560299 BLAKE2B 7760fd794ba0b7af22d7b89ad1b454a46144c8ea1975bd16bdc6a0fd7d0150c62f0b23d20f8d1f5323c7c2e816c922fb2eade255010883d6045c65b451d54f1e SHA512 586bc0fc575c53444e94592d4b31b1d4aa134a050d5448e8a76576d5c79f2e596f1640edf480f2ccbc94f38f33e6007ed5056144327f6efba644f73a95b15b9a
 EBUILD Ice-3.7.4.ebuild 7434 BLAKE2B aa48196bbebdb53ceb6c359fba913c16921da290656e3fab5c7fcdea1ce69cd3ec9ffeca25ea9e540e6983e9beb03640789d53b2e611a22dd791d420de368bfc SHA512 6cb4d5b70e23f06c7c71ee3dfc9dc8a8f2848f7bf0aa410ecc1c7d75a9cf021725acc0a56124fc8fb9eb31b9d78cd2e5e4b3a9e278f52f8be341faed50f75130
+EBUILD Ice-3.7.5.ebuild 7452 BLAKE2B 12538eaf18db7a9945867fffe90b680ebb1679c2ae253b3dad5572a66163e767a5da916e762c12758e0ba6345b2d82f7cca9181405afacfbf708114b6f946934 SHA512 18d5ca3dd7dc60beab51f076ef87b96911acd36f85f8badf4b50b85506f24f3c0c2ea9bce02b037e90348127376f1075d094bb5a9834ae14fd2f243cc986db52
diff --git a/dev-libs/slice-parser/Manifest b/dev-libs/slice-parser/Manifest
index 69850a7..68f13a6 100644
--- a/dev-libs/slice-parser/Manifest
+++ b/dev-libs/slice-parser/Manifest
@@ -1,3 +1,6 @@
 DIST Ice-3.7.4.tar.gz 10494392 BLAKE2B fec17b0c9b7008f8a6387fadd964c7a1b93502e50501afa3cda50222e2940dda77efcb27cab7e32b73c8a151cb95a8df5f93c51bf3f4d092c1d10423a9999a9b SHA512 a4000a7b0ef042a93f7a4f4e384087c3050a97bd38f9ac593c535307dadb741d173b3f6c8aae8ddcf4c65a0e60531e2dfa2f9f68135d92e3b43b658e620d8d27
+DIST Ice-3.7.5.tar.gz 10560299 BLAKE2B 7760fd794ba0b7af22d7b89ad1b454a46144c8ea1975bd16bdc6a0fd7d0150c62f0b23d20f8d1f5323c7c2e816c922fb2eade255010883d6045c65b451d54f1e SHA512 586bc0fc575c53444e94592d4b31b1d4aa134a050d5448e8a76576d5c79f2e596f1640edf480f2ccbc94f38f33e6007ed5056144327f6efba644f73a95b15b9a
 DIST slice-parser-3.7.4.tar.xz 652 BLAKE2B 2f7ee8a078d857e74827f55f62cb8d4a39ba81772f140ea9d858367e50230ef2bc84d73ccc9f55e42c242a3c0ab338163e9e0fe4581d085a56f1201c7e0fe568 SHA512 2bcad0a450efef7d9d79ddcbf272bcc59bc533dcf6f70c232fe8e873a6dffb651bf73eeda3bdab0beb57bff8f33accfeb499cfb518e61c48d77297b538e318b2
+DIST slice-parser-3.7.5.tar.xz 652 BLAKE2B 0a7c7174c8e190c80839326fd848e404fe2ecfbc68a257ec045bc3ff64659b13493e6f6fe4f9900b24e72b450c28e970a2c76e2e8844bc5f3099e25a1b356256 SHA512 583dc8bf57ac3d2792b5535beb6d3a13e8322e3cd8749af80167d5b799f8e89772c8a34d1e06ae6f5c336c6df787a64b1bda15e8a0d2ba6b1d5c79bdbf2b249c
 EBUILD slice-parser-3.7.4.ebuild 665 BLAKE2B 5ce2a34ca058152c2ed7f09ae95c507ae032c7bb0a95b84ebcd8d68da165bcd96ab003a8bfc2387012d1aaeca0a0d046d29f0185046cf6b6b68e03f4e8d08622 SHA512 17ad4ba8b015f8c8ad2032c7ee6d05dfd89c6bcf74a7c0077086deb40bd8268e1abf672e80bc5147d8389bb555514747018e1b0a5b4d40fe62524ade1f1cdd87
+EBUILD slice-parser-3.7.5.ebuild 671 BLAKE2B 6ed3a2d00dc36e7f0581730884f9b4dbe314040f6e445c84539b38ddeeb90cd26332a289325902fb55e3eb690c0ee929b4086499bbb17d492894d2504fb83591 SHA512 c2f7905c9e134dd8e5ee9e97036d109f266f200fa6facb7c6040bcc65c616331555fe894a18821a7b1fa212e5befeed57c02611053a95587df66eddc44d681af
diff --git a/dev-libs/slice-parser/slice-parser-3.7.5.ebuild b/dev-libs/slice-parser/slice-parser-3.7.5.ebuild
new file mode 100644
index 0000000..478736e
--- /dev/null
+++ b/dev-libs/slice-parser/slice-parser-3.7.5.ebuild
@@ -0,0 +1,32 @@
+EAPI="7"
+
+inherit bjam unpacker
+
+DESCRIPTION="Zeroc ICE slice parser as a standalone dynamic library"
+HOMEPAGE="https://zeroc.com/products/ice"
+
+SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz
+	https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> Ice-${PV}.tar.gz"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~x86 ~amd64"
+
+RDEPEND="=dev-libs/Ice-${PV}*"
+DEPEND="${RDEPEND}
+	dev-util/boost-build"
+
+src_unpack() {
+	unpack ${P}.tar.xz
+	unpack_banner Ice-${P}.tar.xz
+	tar -xzf ${DISTDIR}/Ice-${PV}.tar.gz -C "${S}"/ice --strip-components=1 ice-${PV}/cpp || die
+}
+
+src_compile() {
+	bjambuild
+}
+
+src_install() {
+	bjaminstall install \
+		-i "Slice"
+}
+
diff --git a/www-misc/icespider/Manifest b/www-misc/icespider/Manifest
index 7b1d87a..3d8b18d 100644
--- a/www-misc/icespider/Manifest
+++ b/www-misc/icespider/Manifest
@@ -1,11 +1,2 @@
-DIST Ice-3.7.4.tar.gz 10494392 BLAKE2B fec17b0c9b7008f8a6387fadd964c7a1b93502e50501afa3cda50222e2940dda77efcb27cab7e32b73c8a151cb95a8df5f93c51bf3f4d092c1d10423a9999a9b SHA512 a4000a7b0ef042a93f7a4f4e384087c3050a97bd38f9ac593c535307dadb741d173b3f6c8aae8ddcf4c65a0e60531e2dfa2f9f68135d92e3b43b658e620d8d27
-DIST icespider-0.6.2.tar.xz 28112 BLAKE2B 9064e5ce8c62a0ad4be8012891a0ad2f846d8ea6bdc975cf1fbcd592058503011af3f9382bbda7b254d199d02474bb988d4c05ae13cfb91ca532d21e0e445d5e SHA512 809ed2ab75b2388a54709d30c6be6c5b469a027db90907bf93ad8646652c65996e42b320a57c75e8f52cfbd96c75d6bbc00b4a413e17fc48e09492b1ce2ab7eb
-DIST icespider-0.6.3.tar.xz 28876 BLAKE2B 244251a37c580fa65695be3998d2b23b16935fb9797dccd7fbe9fd5620b8f1efbbdf016387077d3e1991ea9fb3369b57623a1185825eadb37921a931b433463e SHA512 9d84843773816e23183ce13e3e57f8c96a1d2b26fa89bb83b809e9677564133282ea5715d15d09b49475271b8ddf39241839e985d9f8e4e8162fcce2795c3cdd
-DIST icespider-0.6.4.1.tar.xz 28584 BLAKE2B b13e3c57187841edaf894b0b8627c7a5f15915f458252f5e2c0c3faaa73d7d994ed6b5eaeb4bd9e110a865b211b53069b7785e9017c4b77681c96320bd3d23f7 SHA512 0e6998577e5af38dc600e37a88f30200089457da05ebe5d72e9715bb9b10364b856e46dbc6cc4a4fd0982ce00b84d0b3613958de7f189f386d65944fe321d3c6
-DIST icespider-0.6.4.tar.xz 28580 BLAKE2B 6a6d08614808ef03766ff8f7fd849fa6edcf261f64b7b312f9e64d3ff65021b006b9636bca3fad74758d11a0fa4c0f0d826499b649d23c6ab11abd26d6764a3a SHA512 1e60e3defa5a714893a362c6390240f991b7ad90935112a9252c5ef0dbd1bb0d78b123f76867fc4ccd7c9aaa816456995748984392bcc0f232d1a44123107d72
 DIST icespider-0.6.7.tar.xz 29364 BLAKE2B 7237c03eb0fc9a183cfd8f867425d17d6b9733b357a82dd12d06f275b200750a563e41856406797192a9210077f55b6e065ccb82ad5a757bfc6e3bc08affe50f SHA512 160e2fc9eb1f2ec27c05286329fea02132eaf72eba105de90a5167f4a678c7b1a44ad48ccc55048e5eba1c71acb9e707efa69b83c8ea98493f43d101dc8d85dd
-EBUILD icespider-0.6.2-r1.ebuild 1057 BLAKE2B 2e2b994bacf897c379a1ae1f8c486692f3ba6462f18bbcd9d7c7f0629e518b832ea60e0eedec8a7bb3932bd924edf9f61a959fbc3d9fe6d35ea56f23149d4268 SHA512 50f3272c1ae2904650a28c56652099e8d4084841c6b310a500a4ea07208bc98fd1ce9457a357bfdb14d0d53d2256f63eea6a01233aa63ae867a21bf89dfd2913
-EBUILD icespider-0.6.3-r1.ebuild 1058 BLAKE2B 6f18706564d038de1fca6bed3aef59e2dcc3c325efb4489cfe9c29f92a0c88dbc0296344cf11cf6417331186a1e3cda83abf3669786880711d3ae557a930caf1 SHA512 891c32aa8cd5acceb4b4a4bea62e4f2f829c296745850117d07c3fda88d84385fd1d2f8356358030b6d52409b36921caa33ea81aba6864200c3b36aef7798e0c
-EBUILD icespider-0.6.4-r1.ebuild 923 BLAKE2B f5fb76008a9d1ebcf3dbdadb0a9202c7b6733150a5bf65edd148ed33c56269bd5426a2be30f51906c8ba7c064aa80d4c64312b469e79c232245fc68793ba2f81 SHA512 27dffa1c9257ae4872c55d3614578c6527fe83ade8baa8dc32cb2eee8e4da1dc19688bccb476568ecce7a1289c8e39dd8f23ab053f729124d6ac5c381fdcb926
-EBUILD icespider-0.6.4.1.ebuild 925 BLAKE2B 660f6ba07f370cc709ad04cef0aeefc3f1363f99e734acdbb44b0e69052c11e2e5f58fe62cb11ad779a9dc77f2f7c2ee4c0337e7c89e5ea147900d6a4c5ef054 SHA512 2bc84d64bf53a7c083d7a83ccc14ffe7d367eed280a83ed26e6ab54347601c427685e7eb0471132e3c35116cd892cc78cf0aa0210115086bcf19f530998255ee
-EBUILD icespider-0.6.7.ebuild 925 BLAKE2B 021455db264cf64788143a6db997602f6c81f99b2f69187e92231455edd501b3f567117be30eedc33dd0ea84560075cdf0be166d2d692ae52e75b7451930c35b SHA512 693d27286a5d824eaef220965419f78c493878086ffae84973d2f0f3a6239715f80110eca9e1be98a5d3f30b4ef4191f226d92ae82fea67d8b1b408cf9dfd877
+EBUILD icespider-0.6.7-r1.ebuild 887 BLAKE2B 1cfd100ca86d952ae2d3ddb09a5c40511174774f087d69afb94ff0e6e0aa88f129f2475ee978ee1483eed1fe92359645aceb71d5ab79afd7b2402c7de0fa011f SHA512 37974ab23ae6af4e1dedb807bbdcf6d64a193ccc669c812d73ea91eea3cd1cf5b5add2348e41dc6b84a518d3d3295a5fbeeb7820c327cc54a2fc4ff49df7b915
diff --git a/www-misc/icespider/icespider-0.6.2-r1.ebuild b/www-misc/icespider/icespider-0.6.2-r1.ebuild
deleted file mode 100644
index 7bc1b5c..0000000
--- a/www-misc/icespider/icespider-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-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/"
-
-ICE_VERSION=3.7.4
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz
-	https://github.com/zeroc-ice/ice/archive/v${ICE_VERSION}.tar.gz -> Ice-${ICE_VERSION}.tar.gz"
-LICENSE="MIT"
-SLOT="0/0.6.1"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	>=dev-libs/libadhocutil-0.7:=
-	dev-cpp/libxmlpp:3.0
-	=dev-cpp/slicer-1.9*:=
-	dev-libs/fcgi
-	>=dev-libs/boost-1.66:="
-BDEPEND="${DEPEND}
-	dev-util/pkgconfig
-	dev-util/boost-build"
-RDEPEND="${DEPEND}
-	virtual/httpd-fastcgi"
-
-src_unpack() {
-	default
-	ln -s ${WORKDIR}/ice-${ICE_VERSION}/cpp ${S}/ice/cpp
-}
-
-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
-}
-
diff --git a/www-misc/icespider/icespider-0.6.3-r1.ebuild b/www-misc/icespider/icespider-0.6.3-r1.ebuild
deleted file mode 100644
index 31395a0..0000000
--- a/www-misc/icespider/icespider-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-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/"
-
-ICE_VERSION=3.7.4
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz
-	https://github.com/zeroc-ice/ice/archive/v${ICE_VERSION}.tar.gz -> Ice-${ICE_VERSION}.tar.gz"
-LICENSE="MIT"
-SLOT="0/0.6.3"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	>=dev-libs/libadhocutil-0.7:=
-	dev-cpp/libxmlpp:3.0
-	=dev-cpp/slicer-1.10*:=
-	dev-libs/fcgi
-	>=dev-libs/boost-1.66:="
-BDEPEND="${DEPEND}
-	dev-util/pkgconfig
-	dev-util/boost-build"
-RDEPEND="${DEPEND}
-	virtual/httpd-fastcgi"
-
-src_unpack() {
-	default
-	ln -s ${WORKDIR}/ice-${ICE_VERSION}/cpp ${S}/ice/cpp
-}
-
-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
-}
-
diff --git a/www-misc/icespider/icespider-0.6.4-r1.ebuild b/www-misc/icespider/icespider-0.6.4-r1.ebuild
deleted file mode 100644
index a2dafea..0000000
--- a/www-misc/icespider/icespider-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-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/"
-
-ICE_VERSION=3.7.4
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="MIT"
-SLOT="0/0.6.3"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	=dev-libs/slice-parser-${ICE_VERSION}*
-	>=dev-libs/libadhocutil-0.7:=
-	dev-cpp/libxmlpp:3.0
-	=dev-cpp/slicer-1.10*:=
-	dev-libs/fcgi
-	>=dev-libs/boost-1.66:="
-BDEPEND="${DEPEND}
-	dev-util/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
-}
-
diff --git a/www-misc/icespider/icespider-0.6.4.1.ebuild b/www-misc/icespider/icespider-0.6.4.1.ebuild
deleted file mode 100644
index 3c2b561..0000000
--- a/www-misc/icespider/icespider-0.6.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-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/"
-
-ICE_VERSION=3.7.4
-SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
-LICENSE="MIT"
-SLOT="0/0.6.3"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	=dev-libs/slice-parser-${ICE_VERSION}*
-	>=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}
-	dev-util/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
-}
-
diff --git a/www-misc/icespider/icespider-0.6.7.ebuild b/www-misc/icespider/icespider-0.6.7-r1.ebuild
index 629d5aa..a5fda6b 100644
--- a/www-misc/icespider/icespider-0.6.7.ebuild
+++ b/www-misc/icespider/icespider-0.6.7-r1.ebuild
@@ -5,15 +5,14 @@ inherit bjam
 DESCRIPTION="Tools and libs for building web services/sites that are clients of ICE services"
 HOMEPAGE="http://icespider.randomdan.homeip.net/"
 
-ICE_VERSION=3.7.4
 SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/0.6.7"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND="=dev-libs/Ice-${ICE_VERSION}*
-	=dev-libs/slice-parser-${ICE_VERSION}*
+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*:=