Release slicer 1.4 and related deps changes

4 files changed, 89 insertions, 2 deletions

diff --git a/net-misc/gentoobrowse-api/Manifest b/net-misc/gentoobrowse-api/Manifest
index dc38feb..54967e1 100644
--- a/net-misc/gentoobrowse-api/Manifest
+++ b/net-misc/gentoobrowse-api/Manifest
@@ -1,2 +1,4 @@
+AUX slicer.patch 1152 SHA256 3cac0f87ca1ec50a74d5716ade72e713cc3a353370366df2d9dcf77627e0123a SHA512 0fa7bc92c32a58e1a7a183ccca68aa45ff35eb3f9e27bce7533817ffc5ef9795a437b0487a2897139e410220bc60de21c6e1a918c5964bcd9cb6421a7b446d3f WHIRLPOOL 62fae342a98e4da58ef3ac2dc1db4502be21aa635150fe958d6053039ddba0bb77d911a427164ac3a4efee7383557eb634fcdaf77d204a189f7ee6987c60b913
 DIST gentoobrowse-api-0.4.5.1.tar.bz2 1571054 SHA256 794c070473567fbe56b48c224b92db5e0ef1eaebb4a9167026bbc0398e59c8ff SHA512 fbf629628eb3a17cb1cfd778189cd5714dd981e36e1eb9b6ee2065e0f169e683847d68be4d6d1dbe7b9d8dfee68fdbd88264db2a1b3302f8297505cf54fbfd4a WHIRLPOOL 48a27a4f40231fd2f414ca1f2f113257e7299effaf58a75a7819f84ee63550eedb763d476f7ac024a0c65185dd509dd804069854d61fd22640227ee0c7659992
-EBUILD gentoobrowse-api-0.4.5.1.ebuild 1398 SHA256 a380ccd0e7d81978d7fa1372d6d4ad2af0adfc4beeb0edee273e758b1d6c6baf SHA512 d445943030de30678e2204f4b3c7df7f4e786b9f8467feec9b9c78b90f5f4688f5f0b29a4f4855f3e0d913ce1da6272c4b29bc03834bfbe0f83058b55eb06941 WHIRLPOOL 20058dd3204881e61694164e8d8b4f5724be3eb26baf0a150ecc2fb1663f87699bc421268a84dd30602f9ebebeb947fe5f07f650a9591ed38a12280b70fc8434
+EBUILD gentoobrowse-api-0.4.5.1-r1.ebuild 1444 SHA256 3054576d8b6954ceb9b86ba85e57217cd825cde834ee5682ddfca813f02c574a SHA512 d0e47d020497fac3746511dcdec69c1b36bbc95211163c8dd0cbee3176bf55feba34b4a5ce2b5fc5a837d8bc274022b3fd3581084491f8d2faa14df7847930fa WHIRLPOOL 30a0324a7d99bb911430fa24cca84be23c15d92663e6d9052fea8b49f8a4904963e97ccef667ed47f2aa712f5f43c1b9d93e3d97bf0714b4ada5f854e0e2807e
+EBUILD gentoobrowse-api-0.4.5.1.ebuild 1396 SHA256 f7ccb926fbca8d89b0fc4acbcf4f28dede857f9827cac34a97b82acf5f6ea4f2 SHA512 0e01ae02e9c7c61fde3bc14b464b847686075eaea84c4021b2280c40f701ae566b01204088bfe4b419e7c8cd1832066ed2d7d695c9ffde8bf76f6edec8b256ab WHIRLPOOL 620217eed380b6a26629a0f615c6efac7675f6cebc8a351c8b7e351d9c189631fb4a251d483889f59b6edc906479c1aef62f07c95d61531196fd9aef78011d7a
diff --git a/net-misc/gentoobrowse-api/files/slicer.patch b/net-misc/gentoobrowse-api/files/slicer.patch
new file mode 100644
index 0000000..583d8fe
--- /dev/null
+++ b/net-misc/gentoobrowse-api/files/slicer.patch
@@ -0,0 +1,29 @@
+diff --git a/slice.jam b/slice.jam
+index 0ea52ba..434e562 100644
+--- a/slice.jam
++++ b/slice.jam
+@@ -24,8 +24,8 @@ scanner.register slice-scanner : include ;
+ type.set-scanner SLICE : slice-scanner ;
+ 
+ generators.register-standard slice.slice2cpp : SLICE : CPP H : <slicer>no ;
+-generators.register-standard slice.slicer : SLICE : CPP H : <slicer>yes ;
+-generators.register-standard slice.slicer.pure : SLICE : CPP : <slicer>pure ;
++generators.register-standard slice.slicer : SLICE : CPP CPP(slicer-%) H : <slicer>yes ;
++generators.register-standard slice.slicer.pure : SLICE : CPP(slicer-%) : <slicer>pure ;
+ 
+ toolset.flags slice.slice2cpp INCLUDES <include> ;
+ toolset.flags slice.slice2cpp DLLEXPORT <ice-visibility>public : --dll-export JAM_DLL_PUBLIC ;
+@@ -44,12 +44,11 @@ actions slice.slice2cpp
+ actions slice.slicer
+ {
+   slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) $(DLLEXPORT) $(ALLOWICE[1])
+-	slicer -I"$(INCLUDES)" $(2) $(1[1]) $(ALLOWICE[1])
++	slicer -I"$(INCLUDES)" $(2) $(1[2]) $(ALLOWICE[1])
+ }
+ 
+ actions slice.slicer.pure
+ {
+-	truncate -c -s 0 $(1[1])
+ 	slicer -I"$(INCLUDES)" $(2) $(1[1]) $(ALLOWICE[1])
+ }
+ 
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.4.5.1-r1.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.4.5.1-r1.ebuild
new file mode 100644
index 0000000..6586fd6
--- /dev/null
+++ b/net-misc/gentoobrowse-api/gentoobrowse-api-0.4.5.1-r1.ebuild
@@ -0,0 +1,56 @@
+EAPI="5"
+inherit eutils
+
+DESCRIPTION="ICE API and client for Gentoo Browse"
+HOMEPAGE="http://gentoobrowse.randomdan.homeip.net/"
+
+SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
+LICENSE="GPL"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="client server"
+
+RDEPEND="dev-libs/Ice
+	server? (
+		=dev-cpp/slicer-1.4*:=[db]
+		sys-apps/icebox-service
+		>=dev-libs/libdbpp-postgresql-1.0.5
+		dev-libs/libadhocutil:=
+		>=dev-libs/icetray-0.1[tools]
+		>=dev-libs/boost-1.60
+		>=dev-libs/libgit2-0.24.0
+	)
+	>=dev-libs/libadhocutil-0.3
+	dev-libs/boost"
+DEPEND="${DEPEND}
+	sys-devel/flex
+	dev-util/boost-build"
+
+src_prepare() {
+	epatch ${FILESDIR}/slicer.patch
+	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
+}
+
+src_compile() {
+	cd ${S}/gentoobrowse-api || die
+	setarch $(uname -m) -RL b2 -q ${BJAMOPTS} variant=release \
+		api//gentoobrowse-api \
+		domain//gentoobrowse-domain \
+		$(use client && echo client//gbcli) \
+		$(use server && echo service//gentoobrowse-service util) || die
+}
+
+src_install() {
+	cd ${S}/gentoobrowse-api || die
+	setarch $(uname -m) -RL b2 -q ${BJAMOPTS} variant=release --prefix=${D}/usr \
+		--includedir=${D}/usr/include/${PN} \
+		install-libs \
+		install-slice \
+		$(use client && echo install-client) \
+		$(use server && echo install-service) || die
+	if use server ; then
+		insinto /etc/gentoobrowseapi || die
+		doins etc/icebox.config || die
+	fi
+}
+
diff --git a/net-misc/gentoobrowse-api/gentoobrowse-api-0.4.5.1.ebuild b/net-misc/gentoobrowse-api/gentoobrowse-api-0.4.5.1.ebuild
index 740c7b7..de762a0 100644
--- a/net-misc/gentoobrowse-api/gentoobrowse-api-0.4.5.1.ebuild
+++ b/net-misc/gentoobrowse-api/gentoobrowse-api-0.4.5.1.ebuild
@@ -11,7 +11,7 @@ IUSE="client server"
 
 RDEPEND="dev-libs/Ice
 	server? (
-		>=dev-cpp/slicer-1.2.1:=[db]
+		=dev-cpp/slicer-1.3*:=[db]
 		sys-apps/icebox-service
 		>=dev-libs/libdbpp-postgresql-1.0.5
 		dev-libs/libadhocutil:=