Remove old, bump latest, stablize, update pkgconfig dep

6 files changed, 52 insertions, 48 deletions

diff --git a/www-apps/gentoobrowse/Manifest b/www-apps/gentoobrowse/Manifest
index b62b450..71ce2af 100644
--- a/www-apps/gentoobrowse/Manifest
+++ b/www-apps/gentoobrowse/Manifest
@@ -1,4 +1,2 @@
-DIST gentoobrowse-2.1.4.tar.xz 61908 BLAKE2B 192f831b2a2fa611b4a06db98b3fda0db474d6496de6486438d0c50baa06cf2d31761e11ab73d1d1046db47cd526b3d6eccfe112af73b50e49004551e46768be SHA512 4ed947aa82e9da180b978cf10bf8a7a6186a962b888a77b8ad1df39962154f08176feb1cfab6f2ba05c4cc6bd77e3846fac0633ce38b45720033cc7b7dd6d86b
 DIST gentoobrowse-2.1.5.tar.xz 62196 BLAKE2B 0d6ca3fe154ba7f44a3eca64079ad111ac3ca84e296ff199fd70c478056527b6461a957592174856a23f089afe8f14c50f61a0ee0d80430872a2846ea5394624 SHA512 cd7b5e973d53312c0e0cb72bba039faaafdcf56ad65b9127129b04bdbc400c5567572be80c7611eb1f277861c2c93aeba3b86cab13f9294ed7677247267edb58
-EBUILD gentoobrowse-2.1.4-r1.ebuild 814 BLAKE2B 22b7ffcf6d749a7d2beb72959ef833f3d5da2b42e32661e1eb5a444859db584bdda4c41cbb7505b5406d01f3eb9a524323abbfcfc5aa5eaf997e3fef21441275 SHA512 350d3bdc0f293ba935d9ea924f629c61f6c61ad63221ab100e27c17b54152e370b84f254cbe90938513d6194d6690a93062a518dbeca2eefe979403730a54de2
-EBUILD gentoobrowse-2.1.5.ebuild 814 BLAKE2B 22b7ffcf6d749a7d2beb72959ef833f3d5da2b42e32661e1eb5a444859db584bdda4c41cbb7505b5406d01f3eb9a524323abbfcfc5aa5eaf997e3fef21441275 SHA512 350d3bdc0f293ba935d9ea924f629c61f6c61ad63221ab100e27c17b54152e370b84f254cbe90938513d6194d6690a93062a518dbeca2eefe979403730a54de2
+EBUILD gentoobrowse-2.1.5-r1.ebuild 811 BLAKE2B 18f7cf10162231f97c388d47e26507300d958d9c16fcb4425f20bbca15355927a88aaa21495cae58ba954d833d4f5054c20a2bb2f58df489229e83e1b012d374 SHA512 8a88720bb2c8ae3026de3666e78055751716d500a93f1ce3630772f1c3ba89656a150410e355f87dc8ea932f6b519c12ce4a5051052d2cb30a02ba14ebef50bb
diff --git a/www-apps/gentoobrowse/gentoobrowse-2.1.4-r1.ebuild b/www-apps/gentoobrowse/gentoobrowse-2.1.5-r1.ebuild
index 60ac743..7bdd099 100644
--- a/www-apps/gentoobrowse/gentoobrowse-2.1.4-r1.ebuild
+++ b/www-apps/gentoobrowse/gentoobrowse-2.1.5-r1.ebuild
@@ -7,12 +7,12 @@ SRC_URI="https://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz"
 HOMEPAGE="http://gentoobrowse.randomdan.homip.net/"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
 DEPEND="
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	>=www-misc/icespider-0.6:=
 	>=net-misc/gentoobrowse-api-0.10
 	dev-cpp/slicer:=
diff --git a/www-apps/gentoobrowse/gentoobrowse-2.1.5.ebuild b/www-apps/gentoobrowse/gentoobrowse-2.1.5.ebuild
deleted file mode 100644
index 60ac743..0000000
--- a/www-apps/gentoobrowse/gentoobrowse-2.1.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-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="
-	dev-util/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 1420f74..915a61b 100644
--- a/www-apps/mirrorsearch/Manifest
+++ b/www-apps/mirrorsearch/Manifest
@@ -1,2 +1,4 @@
 DIST mirrorsearch-0.2.1.2.tar.xz 14424 BLAKE2B 38b7cfa04259c6e0d5e8c306c3ef48175fa0c69aec0fa6739a04526748c8ac5198ae00a14f58afee885afe392740dd5bdf4a504ed63e86a2dc8cd4e258b3a4e7 SHA512 511be19d785e83296bdd0c1d992e6fa000c457cf7d58a4a3f5240b5665734629419c2ef43455902fb36a9d47208a42a03022fc71170e3532929329f0c2f745d0
-EBUILD mirrorsearch-0.2.1.2.ebuild 928 BLAKE2B e43fdf2137ed293a1899e0354d48a180af7bdcfb14dcd9fc028016a6441a2028618391ad8d3d28d0792407721b48d2fe4589b8fd15a0654e4257eec230e61dce SHA512 9d99382c416d45807c55ff15b6df9ddebda4940905d820081ec3e5524f689c9c5db95ba285c6ba6787737c72dbd10ff90104409741130491dd056bb80a9aec74
+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.ebuild 927 BLAKE2B 3bda05f00cb68cadfce7502740e1a452c91daf34aec9f12cf01dabe940b05f25a631bb28d7a0c8089e6f377ca4ae471b84a3ec87d7f5ba5d01185ae152df62b4 SHA512 6ec6136d8997fbfa4a8d9bf633ccc741316dbb5d167c39240a9c548d0569b1c57d6275f1bc143df2e4134aef98d4f1de3945c9c1f22a3f7f2dfd8a699c9a0015
diff --git a/www-apps/mirrorsearch/mirrorsearch-0.2.1.2.ebuild b/www-apps/mirrorsearch/mirrorsearch-0.2.1.2.ebuild
index 397216f..5a47e1a 100644
--- a/www-apps/mirrorsearch/mirrorsearch-0.2.1.2.ebuild
+++ b/www-apps/mirrorsearch/mirrorsearch-0.2.1.2.ebuild
@@ -6,7 +6,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
@@ -18,7 +18,7 @@ DEPEND="
 	=sys-apps/icebox-service-1.11
 "
 BDEPEND="${DEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	dev-util/boost-build
 "
 
diff --git a/www-apps/mirrorsearch/mirrorsearch-0.2.1.3.ebuild b/www-apps/mirrorsearch/mirrorsearch-0.2.1.3.ebuild
new file mode 100644
index 0000000..2cd3697
--- /dev/null
+++ b/www-apps/mirrorsearch/mirrorsearch-0.2.1.3.ebuild
@@ -0,0 +1,44 @@
+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
+}
+