gentoo resync : 26.11.2017

4 files changed, 60 insertions, 109 deletions

diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index b778e801bcd6..a88c84a2b686 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,11 +1,7 @@
-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
-EBUILD fossil-1.34.ebuild 1302 SHA256 2a6b866c5cb85c4113313b534afdfa29d1974f1b1592f7b1fa105792789c18b0 SHA512 b124bf0f3047a20bd73797b3d0ba6720f17eeb24beff74bce70a002d7ab0ed43dee9982a261275e1c88c54469b05ef1c95ebd7afe5a8c1cb8e1e1eaf529ed608 WHIRLPOOL e8ef15a4bb95130520262237888a843b208631d1ba8c9ccc8a8ade246c5804d528509ea8b9240cbaadd4093f70ce45b5d0582f7e7effbbf3b46b2005276f167a
-EBUILD fossil-1.35.ebuild 1280 SHA256 f147b75638ec9a6579ad89e757ca8690e8ff611764d544b46fe968367f9e8187 SHA512 676cb1621623705b4af679afa003814518a62b303d51f8ec8dcb01b9e13a8d4a9a98921ec4352e6190551d0826a0f2a839048e275bb2d3ffcd08a2345122170d WHIRLPOOL 7a3d05b23bb521bfbba35de17ebfb152f9be6a6a651cbc3980833da4c32c3c10e400d29b5df4acb133c53969d8ac49f4718dd502d76a4d87d1abe58fe7480dc3
-EBUILD fossil-2.2.ebuild 1316 SHA256 0a4ce960c822909e0b220aea8802ffe58a5c6f383a9ec14ab8a5c3175410938b SHA512 618f31d1d54d4fa5e29dcc502ebddfbee877d1e99335112052d234a997175a50c2c63a4cd407d413be37e47b01f9b4c0115a1b4fa9deb8d4dd180fd934c7dce8 WHIRLPOOL 09354d573b3e6897ca13f550a6e8955297f696f667ede23d30bac915b8cbf823d5f9d3df6c001186df581b2353d435d1878d7ec75102ac5dd7f9a299ef432fc5
-EBUILD fossil-2.3.ebuild 1411 SHA256 2c7f77bd7d19d5e3cb0158e7ea48b647c0b0aee2e6aa157021c1c00872c620f7 SHA512 dfa53e88eab5f66b1a0ca804d4e5f01c1dded2df7f70168654e8610fc52516a2322d9e01aeec274ebb67080f99dd96705fe76b74ef85795052bb40ba8d51a7ad WHIRLPOOL 3105ab2d67b4df29044a30a748f23181a830cbaf616aadefc40cad755542fdfe70119908ab2b35744b1bf1db8231834a17638ef32bcd5e8d3211cc373e46ae66
-MISC ChangeLog 3494 SHA256 43b3d90ea4e74776b33f762d19bfccfd2f240ac7962ff1c95be4a4b475edcc6d SHA512 5fb3097a4b67e78ae1e8e122c4c4523731d12754af2139565445e5711fdedae4da808258ab1851c25a151d343521e102f90aaefff7ee3dbc732cb5a788d59c70 WHIRLPOOL e17b649c26634e81694f8d5ab2b638e4dd74b23cbe4aaa506284fc0a76315b053be223a6b90c0991a421f9b346dc935a35817b0d8b8c9c79606239f133508564
-MISC ChangeLog-2015 4690 SHA256 7733e3b40772982e51448329e0e3b94f7250e8868297c3c09d090a06e6051a70 SHA512 59003f1ff5273969aace16d3a92b4432356f4862b2df86a302fc92885029b3e105dffa25ad44365d9e2caeb813f16f152634fbf200ffb94052d8386dc41557c9 WHIRLPOOL 1077531d9ea072a7f2187782b9afc8cfc5fbceb317c0f76b329f97e9c97f63298ae75272f0929caac8cb2966e89cb855186177bc8f136eeec33275dc5b3c134a
-MISC metadata.xml 1251 SHA256 02a995dad789d4d9dcea032c87631cacf8c0bffa3b3689593080142d713f0502 SHA512 785dec7c66b06d2451287e1db951bd47f53ec2f0b9b736c897ec57342a465ab8dafcd8b643385ae06abfd92e6bf417b09d11dde54a04f05c74b8b751164d8201 WHIRLPOOL a04aa7f2f42c32b7e0fd4a3a01073dc5e301fb94bd8a38e75e6f0e8cf991df5be48010fa74bbbb825d4035bb60e13c4c7697a1233f3774efe64374d47673c670
+DIST fossil-src-1.35.tar.gz 4642421 BLAKE2B 475b8d59876b824f2c2987c584aa9851b1d36ef7681a23bda904e5fcfe12861ca0f410bd5ad363d640c71aa54e2aeacec1a17169262b9ed17ee9e12e6c1aca7e SHA512 2a31530d81a316b69daba446e91236fdb94ced17a7228c094fc6053f9d75e736b6a50a93d97b8e875a4750fa4ff868b0dc78b494131b8ed118d160fff8995905
+DIST fossil-src-2.3.tar.gz 4898441 BLAKE2B b4b49113a24e4ebcce1c0c191b6b867b479561764c720af678d8871ed2d74aea0e061f61edd2e730986342ae8267d2f66e49565c98828460c490123d383e9779 SHA512 41f87a9f79b87895b1972d2866b27205da34076eb35200b60fd38f1921162bf9099a71caac4063c04b919484208b39c7184dff661dc0b5ca7716d8edd11462cc
+DIST fossil-src-2.4.tar.gz 4919205 BLAKE2B 35009cffc757b6ea153faf89525cae4463a2169dace090183b9dd6955a615a04363576295e4b24652ebec7f20772ef9d83c6b9af29f68bd5695c56b88cbf77cb SHA512 de7f2321677df7f6dc2a3a20e58f456602d938f40125ef33d401f28cdaa93e38d3db10e109547df269bc95a2ac8669ade05b6fd6fad39e6633f15ffdd91c499f
+EBUILD fossil-1.35.ebuild 1280 BLAKE2B 52aac85acf13a09ebbf293d6cddc4d1815850c41e61716f331cc7033e1809a203ec3c30a134b9a90d397658716ca423b2346c07cb9ab316fa7a0bfb0a73217c6 SHA512 676cb1621623705b4af679afa003814518a62b303d51f8ec8dcb01b9e13a8d4a9a98921ec4352e6190551d0826a0f2a839048e275bb2d3ffcd08a2345122170d
+EBUILD fossil-2.3.ebuild 1411 BLAKE2B c052fc11027519bcd30b94aabfe2011fdfd0cddf9f61b0ce85d2018d776475b62c42c44ceabd3675028e43f2c2885e917d83cf84216eaba0b125d5338a037ec5 SHA512 dfa53e88eab5f66b1a0ca804d4e5f01c1dded2df7f70168654e8610fc52516a2322d9e01aeec274ebb67080f99dd96705fe76b74ef85795052bb40ba8d51a7ad
+EBUILD fossil-2.4.ebuild 1490 BLAKE2B e526d4edd164a187f52a19c0207171c6775b26a64b15e594e99967f09de7e4591f1be14acac8dde0da19aaabed0d14e615fcfae40aa1090fe4ba9582387e1498 SHA512 518c4b0466b5f45383ae49a9d1a4bcd0060081d9e5870c2aef2db7432d89134a938939b36c8957877ae1d7d5e81f5ed6e8cc3d8af1dfaf63f0be55b91fec5a2c
+MISC metadata.xml 1208 BLAKE2B c1456c3215431a9e787c81a58aa07c60818be4ece4131effd64ee9321c9d6fff9489c29a60d9092a126f8cab37641125baf747befbf5bb0004c7425861eab78f SHA512 e7debd6c174169ff43fb94c5813c7b6713fd2417b25e435b2fa875d68a41bf1ae1e60033d3c026f817b70059b7975275563c43b94f3dde2ec844c7010c57c0ec
diff --git a/dev-vcs/fossil/fossil-1.34.ebuild b/dev-vcs/fossil/fossil-1.34.ebuild
deleted file mode 100644
index 35ef4bb26e52..000000000000
--- a/dev-vcs/fossil/fossil-1.34.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-src-${PV}
-
-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/download/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug fusefs json legacy-mv-rm miniz sqlite +ssl static tcl th1-docs th1-hooks"
-
-DEPEND="
-	sys-libs/zlib
-	|| ( sys-libs/readline:0 dev-libs/libedit )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0 )
-	tcl? ( dev-lang/tcl:0= )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-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 sqlite && myconf+=' --disable-internal-sqlite'
-	use static && myconf+=' --static'
-	use tcl    && myconf+=' --with-tcl --with-tcl-stubs'
-
-	local u
-	for u in legacy-mv-rm miniz th1-docs th1-hooks; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	use fusefs || myconf+=' --disable-fusefs'
-
-	tc-export CC
-	./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.2.ebuild b/dev-vcs/fossil/fossil-2.4.ebuild
index 058c2fa4f815..234ccb888c9e 100644
--- a/dev-vcs/fossil/fossil-2.2.ebuild
+++ b/dev-vcs/fossil/fossil-2.4.ebuild
@@ -11,38 +11,43 @@ SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug fusefs json legacy-mv-rm -miniz sqlite +ssl static tcl th1-docs th1-hooks"
+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 )
-	sqlite? ( >=dev-db/sqlite-3.14.0:3 )
+	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 sqlite && myconf+=' --disable-internal-sqlite'
-	use static && myconf+=' --static'
-	use tcl    && myconf+=' --with-tcl --with-tcl-stubs'
-
-	local u
-	for u in legacy-mv-rm miniz th1-docs th1-hooks; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
+	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
 }
diff --git a/dev-vcs/fossil/metadata.xml b/dev-vcs/fossil/metadata.xml
index 2017eefa2923..2b1ade696048 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>