From 8ddb6bf1d474f26f07f0b30fdff5516c0f8fd191 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 22 Aug 2020 14:56:49 +0100
Subject: Relax GBAPI slicer version limit

---
 net-misc/gentoobrowse-api/Manifest                 |  5 +-
 .../gentoobrowse-api-0.11.1-r1.ebuild              | 58 ++++++++++++++++++++++
 .../gentoobrowse-api-0.11.1.ebuild                 | 58 ----------------------
 3 files changed, 59 insertions(+), 62 deletions(-)
 create mode 100644 net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1-r1.ebuild
 delete mode 100644 net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1.ebuild

diff --git a/net-misc/gentoobrowse-api/Manifest b/net-misc/gentoobrowse-api/Manifest
index ce6c35d..04c9436 100644
--- a/net-misc/gentoobrowse-api/Manifest
+++ b/net-misc/gentoobrowse-api/Manifest
@@ -1,7 +1,4 @@
-<<<<<<< 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
+EBUILD gentoobrowse-api-0.11.1-r1.ebuild 1491 BLAKE2B 2f635d994416a9618cfa32dfbf86dd4053469e9e198da8ffc28842a507e60daaaac89f0580133c1c631cf8c2d0deed357e45334e40c6053e1d2ffefe511d56c9 SHA512 a7d81472a7dd2812f3a4b5598442e51e63fc171405850f2454194677598b8cee5a50bf85a1bb3b48b0295b3a6571583b7c01fa99449bd6359e1683787c85b577
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1-r1.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1-r1.ebuild
new file mode 100644
index 0000000..6ee6d89
--- /dev/null
+++ b/net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1-r1.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
+}
+
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1.ebuild
deleted file mode 100644
index 5e148fb..0000000
--- a/net-misc/gentoobrowse-api/gentoobrowse-api-0.11.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-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
-}
-
-- 
cgit v1.2.3