IceSpider and GentooBrowse 404 handling

5 files changed, 48 insertions, 12 deletions

diff --git a/www-apps/gentoobrowse/Manifest b/www-apps/gentoobrowse/Manifest
index 3371698..ab2d45c 100644
--- a/www-apps/gentoobrowse/Manifest
+++ b/www-apps/gentoobrowse/Manifest
@@ -2,9 +2,9 @@ DIST gentoobrowse-1.1.0.2.tar.bz2 96204 SHA256 b47c14e9256217c7fb04b88febe8ec177
 DIST gentoobrowse-1.1.1.1.tar.bz2 96353 SHA256 9de91dce3d4629b4bc2b94cf1f8b4cd5af096790907eecfaff96ec259bf92062 SHA512 84cf4b911233ca3d83b62f2565a9d826b21ceedff681e2d0fa2d918f5c3f79b9a55cc641af525e9ab34273e5be928f1e814b0295b19daac92a4a44f5beef3c83 WHIRLPOOL 23d96797c9d089dbb98d567e24cc42421d466c8eb0d5022a6e922744b8cffe36a03546b72a787e45ce3e40f2126424b1e5ddf12ad49dcd2297a810bf5a6ef093
 DIST gentoobrowse-1.1.2.tar.bz2 96407 SHA256 3816d33a4f5789f52a530befafb1c49984b7e0e3326bdfa1288bcb2d97d5feec SHA512 1ac303ae149aa21d9e27a56c4503a9935ff91159a5f9662bddff9cee3e890805e4c675f16485f293da887e1a3e1f53e9554bcc2b91e09a1029e3012549c13f3e WHIRLPOOL a4570095e7f58de9eba5d721a56c5cf38c708b0ba4fa8eb666d428b166d1fca9d10e8a709388c2d41339be33a2e676ae524dc79f1c4ded1eb207ef975243eb8c
 DIST gentoobrowse-1.1.3.tar.bz2 96598 SHA256 58d04d22a159c27c835732ab145b5cf771d185f8932723b17c61555621b29fed SHA512 8cea2df04d3dcac70cde375190bbe50ac580055871e2aa016ce8811ad52c2c92713e92dd3beada2cdfb858f5caff6801944e645c0197f590b54505a9091ba62a WHIRLPOOL 454a72346895d4e7329d9f75b6969046e5eb7052747f208610034da17c3d922664254aa7a99d32d88c1e76cfdc5bd93d4d2faf237ac73b41044d777ea7b63164
-DIST gentoobrowse-2.0.0_beta4.tar.bz2 89840 SHA256 7ea0f86d2d822d029402e78326331820de4c428e82293158f27cfde89f4af1ab SHA512 2133c678d112387a24ac25092570fcdafee3a1d3089c7e72ff211e90f63ad923ed3d0b7dcb039f38e4078c2af90dac46d9d91b3b456a80259a444e4d7acda495 WHIRLPOOL fa110393fb577eacd8633fe534866e069d6d9432087864d8b6c659015260a72c60b054f2e9253851a66f2ef248310e7750117aa808c19e11d3183045f7db5c25
+DIST gentoobrowse-2.0.0_beta5.tar.bz2 90383 SHA256 3e24df7ee960e7f7d1a734b4608ddaf6ab24a3e1d041d86baa2f30570098caca SHA512 2d27d7b1d0b0324a1586c2c0dbcb45e858b74751a79387cfe75c6b5486c56a7c999715d0292cd0eaa2d43dbf730770d12187b6b03f601704709ff0f8c8e6e803 WHIRLPOOL cd6352e69a4aee3d852e056b77cbfbbd5f96bd9232d8f4979993b2e63e6b744757a88fc6be70f39390e8ae0fe20e94fb17549b1eb1feda390db66ed452b9686d
 EBUILD gentoobrowse-1.1.0.2.ebuild 661 SHA256 c83a9996662f82660b7284e8630aa8c7cca00517a9307097cee479d66e0eba51 SHA512 058749cf5776c53e2d2f2f0f8a8d96badc7bc7d083aa6eb1d187cdbff1908e23fbcdf9ec46f41c43aa96d4e211c0ed369787345ee71cf38e9f941912d857c392 WHIRLPOOL 1c7b858a2f5303eb563a601b24cd9cdc56e70563d3f37f57815c5d292f821a6b043e5f2164ed5b01721979cc6ba351e6d7d254a79a8d1b581dfedcd66a2a11d9
 EBUILD gentoobrowse-1.1.1.1.ebuild 661 SHA256 c83a9996662f82660b7284e8630aa8c7cca00517a9307097cee479d66e0eba51 SHA512 058749cf5776c53e2d2f2f0f8a8d96badc7bc7d083aa6eb1d187cdbff1908e23fbcdf9ec46f41c43aa96d4e211c0ed369787345ee71cf38e9f941912d857c392 WHIRLPOOL 1c7b858a2f5303eb563a601b24cd9cdc56e70563d3f37f57815c5d292f821a6b043e5f2164ed5b01721979cc6ba351e6d7d254a79a8d1b581dfedcd66a2a11d9
 EBUILD gentoobrowse-1.1.2.ebuild 661 SHA256 c83a9996662f82660b7284e8630aa8c7cca00517a9307097cee479d66e0eba51 SHA512 058749cf5776c53e2d2f2f0f8a8d96badc7bc7d083aa6eb1d187cdbff1908e23fbcdf9ec46f41c43aa96d4e211c0ed369787345ee71cf38e9f941912d857c392 WHIRLPOOL 1c7b858a2f5303eb563a601b24cd9cdc56e70563d3f37f57815c5d292f821a6b043e5f2164ed5b01721979cc6ba351e6d7d254a79a8d1b581dfedcd66a2a11d9
 EBUILD gentoobrowse-1.1.3.ebuild 661 SHA256 c83a9996662f82660b7284e8630aa8c7cca00517a9307097cee479d66e0eba51 SHA512 058749cf5776c53e2d2f2f0f8a8d96badc7bc7d083aa6eb1d187cdbff1908e23fbcdf9ec46f41c43aa96d4e211c0ed369787345ee71cf38e9f941912d857c392 WHIRLPOOL 1c7b858a2f5303eb563a601b24cd9cdc56e70563d3f37f57815c5d292f821a6b043e5f2164ed5b01721979cc6ba351e6d7d254a79a8d1b581dfedcd66a2a11d9
-EBUILD gentoobrowse-2.0.0_beta4.ebuild 951 SHA256 49d4123c367e1189b80bfd5e7af61539ac74faedb8c22f69f0a4366c4a953d0b SHA512 254240b4674e42dccdff0ca819e889c78225a8a014516e5eb553c85048041ebc4212aab03a4d3e652b8660437eeebc6227ebd56e1728eb6bf4629c4ad7190115 WHIRLPOOL 7124ee3803a960efdee7fa28c66057610ddc98e1c2123e1e14755b3770c5b06412a6258c6bcc3501715e6b3e7a338d99e5f0eb40842e3357f4d0a48cb0f3168a
+EBUILD gentoobrowse-2.0.0_beta5.ebuild 959 SHA256 6e401cd868100e6de6a3508b9d994394cf7d4089e0fb39878fb021430b1df1b6 SHA512 0e3e13be484e950610606179f772c869694642a4fc0d38f95cca89d4ffd4b526958df3b9951ea98f9cdc27850918c118d02d23da687b5e491ccf3bbe22c83420 WHIRLPOOL 181b4175f009e71610b4d5f425ef737446a6d49214424a69634c1c9fc6aaf142b604b3c4a02cf944dc4234d541ab1f7b842a06868811d2b45ea25e0ecdde0f60
diff --git a/www-apps/gentoobrowse/gentoobrowse-2.0.0_beta4.ebuild b/www-apps/gentoobrowse/gentoobrowse-2.0.0_beta5.ebuild
index ea69afb..8bda23a 100644
--- a/www-apps/gentoobrowse/gentoobrowse-2.0.0_beta4.ebuild
+++ b/www-apps/gentoobrowse/gentoobrowse-2.0.0_beta5.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	www-misc/icespider
+	>=www-misc/icespider-0.2:=
 	>=net-misc/gentoobrowse-api-0.7.2
 "
 
diff --git a/www-misc/icespider/Manifest b/www-misc/icespider/Manifest
index 0eaf2ff..f01c941 100644
--- a/www-misc/icespider/Manifest
+++ b/www-misc/icespider/Manifest
@@ -1 +1,4 @@
-EBUILD icespider-0.1_beta1.ebuild 990 SHA256 cc0b0fc8f456f6d8dcca84d5833f6467e522583e3d79481fc9c9a58c7519a14d SHA512 977366ecb9b4b2bf85fedec4efd64e7c936e7fa3070499c7303beb345588ab73f658c56814ee5e25ca203f0cebc827ba0773298aa6b6cbada7c851138e8204fa WHIRLPOOL e70fc60948786d3a66e623c7eca81ec3ca61326acd058ac4895ffe39445f50a88ce794e23ed2a59b869204db86f7b519384453368aa2dfb9013216908345f759
+DIST icespider-0.1.tar.bz2 23544 SHA256 5dd0574b498c81d8751217542699e72e9124164d10bee9cee0dc474b8ee7024e SHA512 371101a991d64e6a9d0c6509811439092173914339862b3d4eef7669d509d6ff7b41fa361c802a34a47bb7b5290e4008f9083f6acb9496d8f3181d508137abf6 WHIRLPOOL a4223dbc54c06bd1adcaac5fac10b1cbc54224c65b821be8e504355f57f3e736cbee186a851ff0f3317fc1905d17b938c742742294f8332f599fafbaff470493
+DIST icespider-0.2.tar.bz2 24505 SHA256 2e42de4cdf4e1f943002f988a066206ebc1d38349f5b951c9c4b77adeb9e7fbc SHA512 679ed57ea6ae60b9190fc8c5e9363ca043f92a8ae44de43cf22a23e0dc81368bc64c4f9abd34cea55f93f6baa49f1acded12c62cd2bf15ca5bcf1bff226f60b1 WHIRLPOOL 83c6f1780b946cc5399ca433571abfb9fc8a44dc7b7a4b6fec2976423ded640a9fda1e477ef3b27bc0a0f99f6095ee50598034f2a18bb0b1abbc71c463b8abaf
+EBUILD icespider-0.1.ebuild 936 SHA256 b263522fa7713e260fc7000b82099cb5478b26deaa7218cb3f72d762b1fab07d SHA512 c2651c4ec4b965d111065651113ac642a2c72fdd921b3b1c26c3b2bcd7368e5dfae83ee1486c71bb823d8a6d85a615986c1b41141d813dda7fe6f97b715ba96e WHIRLPOOL 218ddfcb0e23ec22ded719358c2897d94021b8b9a24cb7708daeee2e2fe76571e271108e94ce6098b3eafb1e4ed0104982da1119f8406e12f9dacc6acd735539
+EBUILD icespider-0.2.ebuild 936 SHA256 b263522fa7713e260fc7000b82099cb5478b26deaa7218cb3f72d762b1fab07d SHA512 c2651c4ec4b965d111065651113ac642a2c72fdd921b3b1c26c3b2bcd7368e5dfae83ee1486c71bb823d8a6d85a615986c1b41141d813dda7fe6f97b715ba96e WHIRLPOOL 218ddfcb0e23ec22ded719358c2897d94021b8b9a24cb7708daeee2e2fe76571e271108e94ce6098b3eafb1e4ed0104982da1119f8406e12f9dacc6acd735539
diff --git a/www-misc/icespider/icespider-0.1_beta1.ebuild b/www-misc/icespider/icespider-0.1.ebuild
index d976ca2..ca66172 100644
--- a/www-misc/icespider/icespider-0.1_beta1.ebuild
+++ b/www-misc/icespider/icespider-0.1.ebuild
@@ -1,11 +1,11 @@
 EAPI="5"
 
-DESCRIPTION="ICE API and client for Gentoo Browse"
-HOMEPAGE="http://gentoobrowse.randomdan.homeip.net/"
+DESCRIPTION="Tools and libraries for building web services/sites that are clients of ICE services"
+HOMEPAGE="http://icespider.randomdan.homeip.net/"
 
-#SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
 LICENSE="GPL"
-SLOT="0"
+SLOT="0/0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
@@ -17,10 +17,6 @@ RDEPEND="dev-libs/Ice
 DEPEND="${DEPEND}
 	dev-util/boost-build"
 
-src_unpack() {
-	mkdir ${S}
-	rsync -a --exclude=bin /home/randomdan/dev/src/{icespider,*.jam} ${S}
-}
 src_prepare() {
 	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
 }
diff --git a/www-misc/icespider/icespider-0.2.ebuild b/www-misc/icespider/icespider-0.2.ebuild
new file mode 100644
index 0000000..ca66172
--- /dev/null
+++ b/www-misc/icespider/icespider-0.2.ebuild
@@ -0,0 +1,37 @@
+EAPI="5"
+
+DESCRIPTION="Tools and libraries for building web services/sites that are clients of ICE services"
+HOMEPAGE="http://icespider.randomdan.homeip.net/"
+
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
+LICENSE="GPL"
+SLOT="0/0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/Ice
+	dev-libs/libadhocutil
+	dev-cpp/slicer
+	dev-libs/fcgi
+	dev-libs/boost"
+DEPEND="${DEPEND}
+	dev-util/boost-build"
+
+src_prepare() {
+	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
+}
+
+src_compile() {
+	cd ${S}/icespider || die
+	setarch $(uname -m) -RL b2 -q ${BJAMOPTS} variant=release \
+		common core compile fcgi xslt fileSessions testing || die
+}
+
+src_install() {
+	cd ${S}/icespider || die
+	setarch $(uname -m) -RL b2 -q ${BJAMOPTS} variant=release --prefix=${D}/usr --includedir=/${D}/usr/include/icespider \
+		install \
+		install-ice \
+		install-tools || die
+}
+