Bump slicer, icespider, gentoobrowse

10 files changed, 66 insertions, 92 deletions

diff --git a/dev-cpp/slicer/Manifest b/dev-cpp/slicer/Manifest
index 3588dc3..e17a27c 100644
--- a/dev-cpp/slicer/Manifest
+++ b/dev-cpp/slicer/Manifest
@@ -1,3 +1,6 @@
 DIST Ice-3.7.2.tar.gz 9427121 BLAKE2B 08c87ce6aa773374871779f025108accb295e2df23dc1b23a7a8ca0184e25f9ef600140df67a4b229db9013f81efa8c0467c8afddab5a00ba2acfe2dfed7b077 SHA512 01ff41a249b4b240d9168e7c1859b5d304281577110704787f5c05c2c93ae4f4a2e79a87f9b652f3d19b01e21615d5ee80fdcb6b531b21cca6598b79ce27358b
+DIST Ice-3.7.3.tar.gz 10471057 BLAKE2B 4b24abfafd411a9d9f0a50e05d8f3081301fd395b5c14fedf775726f9c75048c0e598cc58a27f9f10cd596e5dfcfd85be7f6771d6160208bbf99503a82d9becc SHA512 ef43bb28b4a20dcca5078ca2b0ad81269a435317761fc00b4d4bdf85bcdf4dddbf3b3ee6729477bd0957ea519a3705416883ba404386a05914a2c010cb785e27
 DIST slicer-1.9.2.tar.xz 41304 BLAKE2B 408688edc8b234ec5c41a843f16b10aa1f40311c38be180af26edadb125080561b6fd09506468a7f58c72f02185eb9556848684148acb36d233e675c6509e372 SHA512 f0be8870f7d8c5ce231a1691f7fd889ddc7ef8146e4b27e11d3dc3a888b993c2d704cd18ca0496dc9bb8c0dfb29cec069c5372d9f555917c81369b224ff1be87
-EBUILD slicer-1.9.2.ebuild 1167 BLAKE2B 386f2faae485dce5ab2b7972c8cf3f1025776a099fcd0fbb6df2ac7ea4dd44e70fdaf737f8c7411ac732d9a3b36f7887a02b521c7f5dea3347720cb95f843116 SHA512 a89fd83068cb9dfeaae1688d5ecdabb207b953c9e499ab88a4844212fcf723a2f33bebea937a9f5f55df524f580a9142110a6bc60a4d2c7a27717ab111d1e5c2
+DIST slicer-1.9.3.tar.xz 37900 BLAKE2B 1f8ca1d06503763d5a1d2b948f81d50847655f2e196de9d00464c3416175e278e44a276d5768835a8f66403f4cd8e040da410269c5a743c8ff916400886cfd9b SHA512 5527133bca61424b20bb05e6cbf1308a105cf14a59750aecd3a59f0dfc949e826993164bc3214aeb2cda00eef7bcb65ac95c0091fd5c464f35ea352bd70a980f
+EBUILD slicer-1.9.2.ebuild 1178 BLAKE2B 107321cb2599ada6c73aa239a1c32cd40f2998d9c85cdb6364a49ed01efb03f231b926b7c8f181a01d69ff21349e6a44ad3f17ab1e43891846cc71b97d65f0a7 SHA512 e6ac67c1d115ab73bd5f9f11be25f314c88960c9bc2dc28550acf16dacaf106987b727daf08c71e6a126a1fedee9b87ea917c683acf621cebee97d23c022fc1a
+EBUILD slicer-1.9.3.ebuild 1180 BLAKE2B 9084873214d662b276584f7cfa820f2216b1c16eb0b8b4bbe3ff09d3036f0aef951017cbe59866c8f822316edbd3a7dd635a80f7dab05145f141a4acf91b2e19 SHA512 c101ac9a58589a2bfe6a68885bc78f404af095daa9538221c76c1993c4630c36834af97c44df0ff6fce01bbbf626617b782f132d468f695529e973b925ab2a19
diff --git a/dev-cpp/slicer/slicer-1.9.2.ebuild b/dev-cpp/slicer/slicer-1.9.2.ebuild
index 39453ea..3c1bea8 100644
--- a/dev-cpp/slicer/slicer-1.9.2.ebuild
+++ b/dev-cpp/slicer/slicer-1.9.2.ebuild
@@ -13,7 +13,7 @@ SLOT="0/1.9.0"
 KEYWORDS="x86 amd64"
 IUSE="db xml json"
 
-RDEPEND="=dev-libs/Ice-3.7*
+RDEPEND="=dev-libs/Ice-${ICE_VERSION}*
 	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.9.3.ebuild b/dev-cpp/slicer/slicer-1.9.3.ebuild
new file mode 100644
index 0000000..ced97a2
--- /dev/null
+++ b/dev-cpp/slicer/slicer-1.9.3.ebuild
@@ -0,0 +1,46 @@
+EAPI="5"
+
+inherit bjam
+
+DESCRIPTION="Zeroc ICE helper to create generic serialization code for slice types"
+HOMEPAGE="http://slicer.randomdan.homeip.net/"
+
+ICE_VERSION=3.7.3
+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.9.3"
+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.7:=
+	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/www-apps/gentoobrowse/Manifest b/www-apps/gentoobrowse/Manifest
index e3f4d73..6e4f50a 100644
--- a/www-apps/gentoobrowse/Manifest
+++ b/www-apps/gentoobrowse/Manifest
@@ -1,8 +1,4 @@
-DIST gentoobrowse-2.1.1.tar.xz 61964 BLAKE2B 295c50581b6a245fdc90222f70f1b5e1c840351781f2c2a747ed0b8f3743dde731fef348298449d623a322976ceae4c970045b6ff841342e1aec268218ba084d SHA512 9a908d24a4bf3a6283de57538e7a80ca041c1c9306a9b7f2614222d96a988b8dbf57aa468455360067d240e86d68fd11cbf28b73dee8be5d52a7131c3ef9ff05
-DIST gentoobrowse-2.1.2.tar.xz 61952 BLAKE2B ac3e8c9d7d1ba15ca763d90f2d6d42a5f46c92f3a88d7d6f11283af0a3e1d58acd6711a285ce8b7447053493e61b156054392f6355c0bd25f13a79906d113ce0 SHA512 1b68d628abb74a08c890bca9fc4da82ae96b064546506e95d9b3dee39c094b658dd1d8cec38b174ea450a54e0e42f878e69227ac73609dfbf1e2c81b55b5a015
 DIST gentoobrowse-2.1.3.tar.xz 65540 BLAKE2B e2b527db3e7da220ef6cf0365818059521e466892e197b43327ea4c300b986ff51da5d81137a228f183c7ea85c2b18c140b933dd34df1e937bb228607056775e SHA512 17eae1c2f254dfee98508c8c771d7963cc4d252538115f67c4cf22d887b2584b5f32f1465bc1160a8a8f6f4e0bbbe5ebf9f852e8c40a0b77a04a6cfcbc085d37
-DIST gentoobrowse-2.1.tar.xz 61940 BLAKE2B 7c240cd4de9dced1359617b4c81f0da85f317dee49af28c57fbcd02cdca3cd52399d71ebb61cfe8f972d49af1eb348a9660d76c257007901a11b4a680b1c4dcd SHA512 3313d964fa6100a43b10d0bc43821c120125bc9b64f86fd697858e10caf9e88c63101204dfa0bfb17f360f1a3e7684de98367d3b77c315035a261a644342d568
-EBUILD gentoobrowse-2.1.1.ebuild 788 BLAKE2B 50696986888e895fa46fdd56434a4b6a99c396e90e4f40e70f3d0859842ec56c83cf4efebad162d09077d3e01891f9cf97eb00d733647b44c4659ecc9355edf9 SHA512 18a9ebc35de3a60a6f2d4c85a38470eae9f00f0ac00e3b2bf455434f5d9af6aebc6f44b6fb24a90cd3b609367fd7394ec6beb9091e2ccf8e9ddfc098ed69e6af
-EBUILD gentoobrowse-2.1.2.ebuild 788 BLAKE2B cd95376d2583d904fb9915eae9e11cdc52abee62f7e0f94bed75f00628f21555a7e46384c7c890707bb03b5659725a569e02dccac74359024a22b3cd914041b2 SHA512 ba3a9e6046837745f7d8f2275dc7faf1db77ef24bb89d88e74b49433a07f47078b6e376e56fae67ea777ec8a7740badaa98e2b7fe26937e26c7604dbe9ec81fd
+DIST gentoobrowse-2.1.4.tar.xz 61908 BLAKE2B 192f831b2a2fa611b4a06db98b3fda0db474d6496de6486438d0c50baa06cf2d31761e11ab73d1d1046db47cd526b3d6eccfe112af73b50e49004551e46768be SHA512 4ed947aa82e9da180b978cf10bf8a7a6186a962b888a77b8ad1df39962154f08176feb1cfab6f2ba05c4cc6bd77e3846fac0633ce38b45720033cc7b7dd6d86b
 EBUILD gentoobrowse-2.1.3.ebuild 808 BLAKE2B 86885a85aaeeeec0f42f88aa1119e76ba188367fc0e897f016613e392f26ce3e42eb7639b4cb9923c6a5fbd2dae82e3999e70ab0faa2cfab6f06c15fb887cfb9 SHA512 dda24d6b0a60225c298d4671eb2613f47c494c8440b448cdadee71e6f042553678e58b16ec6a2a565c32527e9d66a27c389d3a37928fe96dba975039069733ea
-EBUILD gentoobrowse-2.1.ebuild 788 BLAKE2B 038cac75a552386c0545fd7eea62e8bf4d9c28dc5d20a6ef0ce85bb56e7d2827f2d5bd9201022e4e36b2ba9b94da3187e8eab855569ea88d35c58965338cb7ff SHA512 8fbf5a858e566b6fa0d1f4da13e5d1519015afd372f8662db74a1d0dfc6d7a0ba600b7fbd92a4bf6321ace9b91e12db10b4f805f5e9de61996ee675364a393b9
+EBUILD gentoobrowse-2.1.4.ebuild 808 BLAKE2B 86885a85aaeeeec0f42f88aa1119e76ba188367fc0e897f016613e392f26ce3e42eb7639b4cb9923c6a5fbd2dae82e3999e70ab0faa2cfab6f06c15fb887cfb9 SHA512 dda24d6b0a60225c298d4671eb2613f47c494c8440b448cdadee71e6f042553678e58b16ec6a2a565c32527e9d66a27c389d3a37928fe96dba975039069733ea
diff --git a/www-apps/gentoobrowse/gentoobrowse-2.1.1.ebuild b/www-apps/gentoobrowse/gentoobrowse-2.1.1.ebuild
deleted file mode 100644
index 839360c..0000000
--- a/www-apps/gentoobrowse/gentoobrowse-2.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-EAPI=5
-
-inherit webapp depend.apache 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="
-	>=www-misc/icespider-0.5:=
-	>=net-misc/gentoobrowse-api-0.10
-"
-
-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/gentoobrowse/gentoobrowse-2.1.2.ebuild b/www-apps/gentoobrowse/gentoobrowse-2.1.4.ebuild
index 215e9ac..7e98aa1 100644
--- a/www-apps/gentoobrowse/gentoobrowse-2.1.2.ebuild
+++ b/www-apps/gentoobrowse/gentoobrowse-2.1.4.ebuild
@@ -12,6 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
+	dev-util/pkgconfig
 	>=www-misc/icespider-0.6:=
 	>=net-misc/gentoobrowse-api-0.10
 "
diff --git a/www-apps/gentoobrowse/gentoobrowse-2.1.ebuild b/www-apps/gentoobrowse/gentoobrowse-2.1.ebuild
deleted file mode 100644
index 4378575..0000000
--- a/www-apps/gentoobrowse/gentoobrowse-2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-EAPI=5
-
-inherit webapp depend.apache 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="
-	>=www-misc/icespider-0.4:=
-	>=net-misc/gentoobrowse-api-0.10
-"
-
-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-misc/icespider/Manifest b/www-misc/icespider/Manifest
index 5ca5011..3ff5db4 100644
--- a/www-misc/icespider/Manifest
+++ b/www-misc/icespider/Manifest
@@ -1,5 +1,6 @@
 DIST Ice-3.7.2.tar.gz 9427121 BLAKE2B 08c87ce6aa773374871779f025108accb295e2df23dc1b23a7a8ca0184e25f9ef600140df67a4b229db9013f81efa8c0467c8afddab5a00ba2acfe2dfed7b077 SHA512 01ff41a249b4b240d9168e7c1859b5d304281577110704787f5c05c2c93ae4f4a2e79a87f9b652f3d19b01e21615d5ee80fdcb6b531b21cca6598b79ce27358b
+DIST Ice-3.7.3.tar.gz 10471057 BLAKE2B 4b24abfafd411a9d9f0a50e05d8f3081301fd395b5c14fedf775726f9c75048c0e598cc58a27f9f10cd596e5dfcfd85be7f6771d6160208bbf99503a82d9becc SHA512 ef43bb28b4a20dcca5078ca2b0ad81269a435317761fc00b4d4bdf85bcdf4dddbf3b3ee6729477bd0957ea519a3705416883ba404386a05914a2c010cb785e27
 DIST icespider-0.6.1.1.tar.xz 31052 BLAKE2B 9ee2ac779af341aad5b00998d23b95353e974e2932f934f31e211eca92eb683b1e6a238faaf230c53408813e04d8ea4b7e9a8cfe6ddcb322831bafbf5e68c31f SHA512 f3db4e30edf1bd866545eed742c214e1db666a37be28a4159cfcd9e9eda16453bc0a8bf085f0f97c513966ab21a5f4032105c6595443c33769dca8c6017375f0
-DIST icespider-0.6.tar.xz 27032 BLAKE2B 32f74e12f95d9f33e0a0d48a222cb6817ad99ee6a5306a8cbde8df22b728b9ab608fc186fe998767e430c6ba169359051cba560ce9910352911d7aa9cf4c7428 SHA512 3ad0d4fa3453f987234c9ae7cfaa08df53893991fe2d4597fd736dc7d9b004abd27ae19952349da6e8d02128cec70deed8c473a66b651f55118b05128240cfa9
-EBUILD icespider-0.6.1.1-r1.ebuild 1048 BLAKE2B 6bcea328393c999111702bf2a5688c55d5f82e8a4edb3d5706e312ded1bf96d5287bb5c82219b6c57f467a971c01f61bb837923ab8be27d3e5262f5d92a02a9c SHA512 5e59421886706a6b6dfda577f5400c94df7e881d680e7b28ff580a20f9e9588842c2c6b10012f8fa3154615f0d559003e623f3ccd1cf612810d678506b3aed6c
-EBUILD icespider-0.6.ebuild 983 BLAKE2B 8395c740a7cee27b7dd9f6a2578cad8183a721c7ecb0bfa3dad6fdfffbc841da0c744784e7320540a95918db5bf228b5610598b42c990b59da9bc599c871b380 SHA512 f4f1e03a138b3364b56b3ed0f80df1fa0fcd5996a4d2136b1ef0f3981de1bb82c701037acec4922647636e1563e54426ca1ef9474b5b86e5b63e12513e4c295d
+DIST icespider-0.6.2.tar.xz 28112 BLAKE2B 9064e5ce8c62a0ad4be8012891a0ad2f846d8ea6bdc975cf1fbcd592058503011af3f9382bbda7b254d199d02474bb988d4c05ae13cfb91ca532d21e0e445d5e SHA512 809ed2ab75b2388a54709d30c6be6c5b469a027db90907bf93ad8646652c65996e42b320a57c75e8f52cfbd96c75d6bbc00b4a413e17fc48e09492b1ce2ab7eb
+EBUILD icespider-0.6.1.1-r1.ebuild 1059 BLAKE2B 201d24e802c19717f9dbca61d3e226fcb21c7445b7fd75bd880da29809f8e270932b931aee55937e001b63e5d05536fa0be9604bb496277c4cd29e4557a7d929 SHA512 2c6758cee29c8b86c0680222cbc999c1495a102b0e203c9ba810660af673f9dbda46b3caca4c9f9903acd004d7016161802a800ef2af57be92a0169365600f23
+EBUILD icespider-0.6.2.ebuild 1059 BLAKE2B 0b51750f19103cbfe15f6861c4a8a8333e880a3cd0046b926e8adcfa6549f653c41600779b84a212ef9745249acd2ec72e00b67d0399a45ea910c7b60c33193f SHA512 292d359ceb793ba609960c43c2c5fa396c7112b0a14a80dd39f7d6b899e858f28d9ddcde043a835dcbfedeb8047465c897e8269a24d245bc8393719ae27c6f86
diff --git a/www-misc/icespider/icespider-0.6.1.1-r1.ebuild b/www-misc/icespider/icespider-0.6.1.1-r1.ebuild
index 5af864b..86bbd00 100644
--- a/www-misc/icespider/icespider-0.6.1.1-r1.ebuild
+++ b/www-misc/icespider/icespider-0.6.1.1-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0/0.6.1"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND="=dev-libs/Ice-3.7*
+DEPEND="=dev-libs/Ice-${ICE_VERSION}*
 	>=dev-libs/libadhocutil-0.7:=
 	dev-cpp/libxmlpp:3.0
 	>=dev-cpp/slicer-1.9.0:=
diff --git a/www-misc/icespider/icespider-0.6.ebuild b/www-misc/icespider/icespider-0.6.2.ebuild
index a864609..c722ce8 100644
--- a/www-misc/icespider/icespider-0.6.ebuild
+++ b/www-misc/icespider/icespider-0.6.2.ebuild
@@ -5,22 +5,25 @@ 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.2
+ICE_VERSION=3.7.3
 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"
+SLOT="0/0.6.1"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-RDEPEND="=dev-libs/Ice-3.7*
+DEPEND="=dev-libs/Ice-${ICE_VERSION}*
 	>=dev-libs/libadhocutil-0.7:=
 	dev-cpp/libxmlpp:3.0
 	>=dev-cpp/slicer-1.9.0:=
 	dev-libs/fcgi
 	>=dev-libs/boost-1.66:="
-DEPEND="${DEPEND}
+BDEPEND="${DEPEND}
+	dev-util/pkgconfig
 	dev-util/boost-build"
+RDEPEND="${DEPEND}
+	virtual/httpd-fastcgi"
 
 src_unpack() {
 	default