[gentoo-commits] repo/gentoo:master commit in: dev-vcs/fossil/

["Aaron Swenson" <titanofold@gentoo.org>]

commit:     676c2c8d269c12a54f8b1c26c3d46d6750c39363
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 11:24:58 2017 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 11:24:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676c2c8d

dev-vcs/fossil: Bump to 2.4, improve metadata

Improve some of the notes in metadata.xml to make it a bit clearer as
to what affect the use flag will have.

split up some of the use flags as one doesn’t necessitate the other
with tcl-stubs.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-vcs/fossil/Manifest          |  9 +++---
 dev-vcs/fossil/fossil-2.4.ebuild | 57 ++++++++++++++++++++++++++++++++++
 dev-vcs/fossil/metadata.xml      | 66 +++++++++++++++++++++-------------------
 3 files changed, 97 insertions(+), 35 deletions(-)

diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index dd58a323f65..72d233bd0b3 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,4 +1,5 @@
-DIST fossil-src-1.34.tar.gz 4449452 SHA256 53a6b83e878feced9ac7705f87e5b6ea82727314e3e19202ae1c46c7e4dba49f SHA512 7c2677566527466727e823e5bf59f636b5fd08dd1093a742c3f7f72d398d380288030c3a573ae3c66c60f1e8c194f36f5987fa835251d7ced10533b9779578d7 WHIRLPOOL cb00af705b1f4376e09129091154f847da62817548d1838c03c34422eb223704e8a92cee5038a5cf5f75c600d55ce23fd681ca82f1f0e854b42b23b7c82bc66e
-DIST fossil-src-1.35.tar.gz 4642421 SHA256 c1f92f925a87c9872cb40d166f56ba08b90edbab01a8546ff37025836136ba1d SHA512 2a31530d81a316b69daba446e91236fdb94ced17a7228c094fc6053f9d75e736b6a50a93d97b8e875a4750fa4ff868b0dc78b494131b8ed118d160fff8995905 WHIRLPOOL 83406c7010e462f3e9742e03a6eb7a64e5f31516a6d353e56d71a8e54aec2154cd38160e73800ee72d6a5a91a0954e9bb5628b75bf5fd582696507c67a5da803
-DIST fossil-src-2.2.tar.gz 4826890 SHA256 9b8f82196eb89e4a2e82b4bcc51e314ae509a22c37073a18a0b325f11c53cf71 SHA512 1a1aedf3f9883a64f9f98c9a01857f5fb69cff0be23817016a4bc405b2efc85f21ac86a771d5e7314128e3fabc21444ac717017cf0935241fd4af964b7c086e0 WHIRLPOOL 8298287694930286f159a59f14efa07f0d3bcdc2ba961c55f7da1faab804e1a5d27386237c6bfa125341bf76bb33e1c3b63e61417378128c7511c459ae6a4705
-DIST fossil-src-2.3.tar.gz 4898441 SHA256 f073abf455a38ea0a08c3926d7445ab8115b145457f36c763ad9b74cd6a64a5d SHA512 41f87a9f79b87895b1972d2866b27205da34076eb35200b60fd38f1921162bf9099a71caac4063c04b919484208b39c7184dff661dc0b5ca7716d8edd11462cc WHIRLPOOL 920144e9a9adf88e9669c0254e924cc6e240e443361638d757910ef198c09659c6e24497f2fae7646285ad6d493d59a09c65bde6523d2c3a9e3af14ff522e456
+DIST fossil-src-1.34.tar.gz 4449452 BLAKE2B cb31ac87a5b6ac21d8c7b0b07c605e38cde283d618a6543ec3e74f801a584815fc8ca0f01ba402ca3d358918fdf4e3fed4b409d3e34398e007cb9c5272417ef1 SHA512 7c2677566527466727e823e5bf59f636b5fd08dd1093a742c3f7f72d398d380288030c3a573ae3c66c60f1e8c194f36f5987fa835251d7ced10533b9779578d7
+DIST fossil-src-1.35.tar.gz 4642421 BLAKE2B 475b8d59876b824f2c2987c584aa9851b1d36ef7681a23bda904e5fcfe12861ca0f410bd5ad363d640c71aa54e2aeacec1a17169262b9ed17ee9e12e6c1aca7e SHA512 2a31530d81a316b69daba446e91236fdb94ced17a7228c094fc6053f9d75e736b6a50a93d97b8e875a4750fa4ff868b0dc78b494131b8ed118d160fff8995905
+DIST fossil-src-2.2.tar.gz 4826890 BLAKE2B aa35b20be5ec65df06e50c9218cf923ee4ba84dcb5fd3239987da82b63f1eac95578c230445c2255698fd49b8ff3d50e45b3a288c4dd92b34cd54d4c225b6511 SHA512 1a1aedf3f9883a64f9f98c9a01857f5fb69cff0be23817016a4bc405b2efc85f21ac86a771d5e7314128e3fabc21444ac717017cf0935241fd4af964b7c086e0
+DIST fossil-src-2.3.tar.gz 4898441 BLAKE2B b4b49113a24e4ebcce1c0c191b6b867b479561764c720af678d8871ed2d74aea0e061f61edd2e730986342ae8267d2f66e49565c98828460c490123d383e9779 SHA512 41f87a9f79b87895b1972d2866b27205da34076eb35200b60fd38f1921162bf9099a71caac4063c04b919484208b39c7184dff661dc0b5ca7716d8edd11462cc
+DIST fossil-src-2.4.tar.gz 4919205 BLAKE2B 35009cffc757b6ea153faf89525cae4463a2169dace090183b9dd6955a615a04363576295e4b24652ebec7f20772ef9d83c6b9af29f68bd5695c56b88cbf77cb SHA512 de7f2321677df7f6dc2a3a20e58f456602d938f40125ef33d401f28cdaa93e38d3db10e109547df269bc95a2ac8669ade05b6fd6fad39e6633f15ffdd91c499f

diff --git a/dev-vcs/fossil/fossil-2.4.ebuild b/dev-vcs/fossil/fossil-2.4.ebuild
new file mode 100644
index 00000000000..234ccb888c9
--- /dev/null
+++ b/dev-vcs/fossil/fossil-2.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple, high-reliability, source control management, and more"
+HOMEPAGE="http://www.fossil-scm.org/"
+SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
+	  tcl tcl-stubs -tcl-private-stubs th1-docs th1-hooks"
+
+REQUIRED_USE="ssl? ( !miniz )"
+
+DEPEND="
+	sys-libs/zlib
+	|| ( sys-libs/readline:0 dev-libs/libedit )
+	system-sqlite? ( >=dev-db/sqlite-3.20.0:3 )
+	ssl? ( dev-libs/openssl:0 )
+	tcl? ( dev-lang/tcl:0= )
+"
+RDEPEND="${DEPEND}"
+
+# Tests can't be run from the build directory
+RESTRICT="test"
+
+src_configure() {
+	# this is not an autotools situation so don't make it seem like one
+	# --with-tcl: works
+	# --without-tcl: dies
+	local myconf="--with-openssl=$(usex ssl auto none)"
+	use debug         && myconf+=' --fossil-debug'
+	use json          && myconf+=' --json'
+	use system-sqlite && myconf+=' --disable-internal-sqlite'
+	use static        && myconf+=' --static'
+
+	use fusefs || myconf+=' --disable-fusefs'
+
+	local u useflags
+	useflags=( legacy-mv-rm miniz tcl tcl-stubs tcl-private-stubs
+			   th1-docs th1-hooks )
+	for u in ${useflags[@]} ; do
+		use ${u} &&  myconf+=" --with-${u}"
+	done
+
+	tc-export CC
+	./configure ${myconf} || die
+}
+
+src_install() {
+	dobin fossil
+}

diff --git a/dev-vcs/fossil/metadata.xml b/dev-vcs/fossil/metadata.xml
index 2017eefa292..2b1ade69604 100644
--- a/dev-vcs/fossil/metadata.xml
+++ b/dev-vcs/fossil/metadata.xml
@@ -1,35 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>rafaelmartins@gentoo.org</email>
-        <name>Rafael G. Martins</name>
-    </maintainer>
-    <maintainer type="person">
-        <email>titanofold@gentoo.org</email>
-        <name>Aaron W. Swenson</name>
-        <description>Co-Maintainer</description>
-    </maintainer>
-    <use>
-        <flag name="fusefs">Enable the Fuse Filesystem</flag>
-        <flag name="json">Enable the JSON API of Fossil's wiki</flag>
-        <flag name="legacy-mv-rm">
-	        Enable legacy behavior for mv/rm (skip checkout files)
-        </flag>
-        <flag name="miniz">
-	        Use the bundled miniz for compression instead of zlib
-        </flag>
-        <flag name="sqlite">
-            Use the system SQLite instead of the bundled one
-        </flag>
-        <flag name="system-sqlite">
-            Use the system SQLite instead of the bundled one
-        </flag>
-        <flag name="th1-docs">
-	        Enable TH1 for embedded documentation pages
-        </flag>
-        <flag name="th1-hooks">
-	        Enable TH1 hooks for commands and web pages
-        </flag>
-    </use>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+		<description>Co-Maintainer</description>
+	</maintainer>
+	<use>
+		<flag name="fusefs">Enable the Fuse Filesystem</flag>
+		<flag name="json">Enable the JSON API of Fossil's wiki</flag>
+		<flag name="legacy-mv-rm">
+			Enable legacy behavior for mv/rm (skip checkout files).
+		</flag>
+		<flag name="miniz">
+			Use the bundled miniz for compression instead of
+			zlib. Incompatible with ssl.
+		</flag>
+		<flag name="system-sqlite">
+			Use the system SQLite instead of the bundled one
+		</flag>
+		<flag name="tcl-stubs">
+			Enable Tcl integration via stubs library mechanism
+		</flag>
+		<flag name="tcl-private-stubs">
+			Enable Tcl integration via private stubs mechanism
+		</flag>
+		<flag name="th1-docs">
+			Enable TH1 for embedded documentation pages
+		</flag>
+		<flag name="th1-hooks">
+			Enable TH1 hooks for commands and web pages
+		</flag>
+	</use>
 </pkgmetadata>