gentoo resync : 25.01.2018

4 files changed, 3 insertions, 114 deletions

diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 9f6fa1a9f74c..1cad6bff9ce9 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,7 +1,3 @@
-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 1489 BLAKE2B 91c07f327105685a81a97210135adf120bf4573e05be9e81d2f866ffd6585d761edaa2353570503a702ae453e547e12b57bc038aaac0689c6969a89ba6bff773 SHA512 f2788d37292adcf3d0a908742055fef863d64af50d616956c64dbacbf98e0e888963e665881bb5664109aaea50755cdfc0425ba8468a5a1173196212392b9ce5
+EBUILD fossil-2.4.ebuild 1488 BLAKE2B 02539210e2eb47e7aecfd9aa0e46a9b9e6061501d3252e997f5ecef94a50fc54b9b8d2e4e96c33c464e92b419fec5bd07938329f044515cedcf4bfae5bc93d69 SHA512 fb5ec8634fc9e147d962840d8000871d42f93edc58a361253ec5e5d287ba2aa59e99d24cc1555f0eb090e02ee0626233a11b357b90c41ef2b8006d2038db88ef
 MISC metadata.xml 1208 BLAKE2B c1456c3215431a9e787c81a58aa07c60818be4ece4131effd64ee9321c9d6fff9489c29a60d9092a126f8cab37641125baf747befbf5bb0004c7425861eab78f SHA512 e7debd6c174169ff43fb94c5813c7b6713fd2417b25e435b2fa875d68a41bf1ae1e60033d3c026f817b70059b7975275563c43b94f3dde2ec844c7010c57c0ec
diff --git a/dev-vcs/fossil/fossil-1.35.ebuild b/dev-vcs/fossil/fossil-1.35.ebuild
deleted file mode 100644
index 9e81c0a7483e..000000000000
--- a/dev-vcs/fossil/fossil-1.35.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 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}"
-
-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.3.ebuild b/dev-vcs/fossil/fossil-2.3.ebuild
deleted file mode 100644
index ff869df46b88..000000000000
--- a/dev-vcs/fossil/fossil-2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 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 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.4.ebuild b/dev-vcs/fossil/fossil-2.4.ebuild
index e1925ab383a7..cd6f4caf4918 100644
--- a/dev-vcs/fossil/fossil-2.4.ebuild
+++ b/dev-vcs/fossil/fossil-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+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"