Bump for Nagios things

4 files changed, 107 insertions, 0 deletions

diff --git a/dev-libs/libadhocutil/Manifest b/dev-libs/libadhocutil/Manifest
index bea9c13..9d7b0ff 100644
--- a/dev-libs/libadhocutil/Manifest
+++ b/dev-libs/libadhocutil/Manifest
@@ -1,2 +1,7 @@
 DIST libadhocutil-0.7.6.tar.xz 44188 BLAKE2B b72dfd7436799c8f0e2905cf1f755a66de3abcdab6144da53c606a8f8e60b127a64cd4467cdef7e0024d1b0a3ab7f752f63fa39922d978cfc4b4610d305e0d41 SHA512 fd8b2ba0e52a9850fc151b8e02b653f6cac57c0724d298289abbc9ba9bfd8ee5287ba804c1b617bd70300cc154f1957ca6d87a6f1e84a3222907d2a31ac601e2
+<<<<<<< Updated upstream
+=======
+DIST libadhocutil-0.7.7.tar.xz 44816 BLAKE2B 6cf9fa49ae9ff0da2b1190d2bf43e72380f3681b9e503c9284317c3f565ef3c0472c1f152a532fe6c64cd7b8f3dab4d14a1425cf193f0211e68435d8aae6482c SHA512 5af9569c2218924b56de2de11ffcc720b74da27d5515686b959729adcdf12db0cd59c6b0a6d587b623867ad79b4acd6f7ff0923dd07120e41bc43c50e78b1402
+>>>>>>> Stashed changes
 EBUILD libadhocutil-0.7.6.ebuild 630 BLAKE2B 32cd5faf7f49a825230f334282ae3830f96fb8237a41444a2b7e9a541d59283cc4b4494e2b3f9355f31945a919ab82acd685a94bdc775d4021a3e6f7830847ff SHA512 1d4912886d8b3e3c8f8ba4b5aab08f7a58031bf4fa1ccd6f5d277e62eb8c222ea1d9a609110cad6b708ad70f383f4781ba890c25c7ab8e70b9327e7b032945b6
+EBUILD libadhocutil-0.7.7.ebuild 630 BLAKE2B 32cd5faf7f49a825230f334282ae3830f96fb8237a41444a2b7e9a541d59283cc4b4494e2b3f9355f31945a919ab82acd685a94bdc775d4021a3e6f7830847ff SHA512 1d4912886d8b3e3c8f8ba4b5aab08f7a58031bf4fa1ccd6f5d277e62eb8c222ea1d9a609110cad6b708ad70f383f4781ba890c25c7ab8e70b9327e7b032945b6
diff --git a/dev-libs/libadhocutil/libadhocutil-0.7.7.ebuild b/dev-libs/libadhocutil/libadhocutil-0.7.7.ebuild
new file mode 100644
index 0000000..321c3e0
--- /dev/null
+++ b/dev-libs/libadhocutil/libadhocutil-0.7.7.ebuild
@@ -0,0 +1,39 @@
+EAPI="7"
+
+inherit bjam
+
+DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers"
+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.7.2"
+KEYWORDS="x86 amd64"
+IUSE="man test"
+
+RDEPEND="
+	net-misc/curl
+	=dev-libs/Ice-3.7*
+	dev-cpp/glibmm
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	dev-util/boost-build
+	dev-util/pkgconfig
+	man? ( app-doc/doxygen )
+"
+
+src_compile() {
+	bjambuild libadhocutil//adhocutil
+}
+
+src_install() {
+	bjaminstall libadhocutil//install \
+		-i adhocutil
+
+	if use man ; then
+		doxygenbuild
+	fi
+}
+
diff --git a/net-misc/gentoobrowse-api/Manifest b/net-misc/gentoobrowse-api/Manifest
index 98f0b5f..ce6c35d 100644
--- a/net-misc/gentoobrowse-api/Manifest
+++ b/net-misc/gentoobrowse-api/Manifest
@@ -1,2 +1,7 @@
+<<<<<<< Updated upstream
+=======
+DIST gentoobrowse-api-0.11.1.tar.xz 889928 BLAKE2B 8638f8bc397d3868cc0c85ea2d433b76105df8a1cee301465a2d028c5d7551418754623109229419ff3bb6714ab864dcae3dab748787c779fc1671439ae85bf4 SHA512 836e063d2c09305c0eeff2972b7fd25ca26692ec7e878996ff162ddc3e654ff35cbeb482cfdbeddd12fbf2048796ddf76d36673fe27c25a6612bd01897be7f6d
+>>>>>>> Stashed changes
 DIST gentoobrowse-api-0.11.tar.xz 889728 BLAKE2B 7a9c3f00595edf8526eaa08581945402f029f581cb4b2603be4eb3c50354a378005d4fa5dac82b1eccc9d69dde71fc4ce3c275e52dde8fbdd3da481158d0e4b8 SHA512 c352d6d728601a9abeb1a8882ab9805a0af2ad6c74c9b256d25cd20d0235e66887d768f8e8d9cfddd5fe42769c0b0c2a72e3cff6ce6def7f3f2bd72927799609
 EBUILD gentoobrowse-api-0.11-r1.ebuild 1489 BLAKE2B e74e7d8e6415acda10cc6a3cc1b96219e02c6bcf7ea4c27bdaf018c32f69d25f2b63bb194ff63a8e66c1d9c56d6a173b230e833ee141d801631a020142df7802 SHA512 31290f079b4a707e0908e2c3bd07e31f564f1b071174bfff5a285abd911ec023fdafc2d69200b3c96039bed68977428a4a47049e43a48fdd595ee17f89bd9208
+EBUILD gentoobrowse-api-0.11.1.ebuild 1491 BLAKE2B d1de7e9ddc03af33f577a0d9bbcf9efd397985ea91331fb7f4fb4fa6b590dc0be468fc257892374896b1e416ec27e5df4af06c99e2e79db5b676c1e772cf18ab SHA512 8b6aa2bd7691ff7ca23585fca856661877932034e543b6faaf3e5562c63cc23a96e4ae78098a228936f235739788feca686063135202e4799306d48e29f06ef0
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1.ebuild
new file mode 100644
index 0000000..5e148fb
--- /dev/null
+++ b/net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1.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.4[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
+	dev-util/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
+}
+