gentoo resync : 25.08.2020

6 files changed, 7 insertions, 183 deletions

diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 775dcbeaab2e..29f5fb6b0117 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,11 +1,6 @@
 AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f134553c5b6d7b3b685959baa531071923f0611fb22ce5945ab2ecbd4d1bae3c6234c557ac2edc872363cf05a3045bf70bebe1a1b SHA512 ccc3f6cf55902748bf8a27ea1c7c1733a2e33a45b297a7f9f732dc772e021e461052e30f841c7fa83c6303e6c7d8f8aac96f248c909d824237edb17335cb3e2f
-DIST fossil-src-2.10.tar.gz 5634327 BLAKE2B 1a02ef0d32b06dd09760d6a62450ad7bc15de97b5263d50ec776dbf0e2fff6b6fba4ec944eecffdaf31737f4a45e30aa898a728590a0c6e2ae171937a349e92b SHA512 aad54e3eaa2d647257c5c723fca4e55981aac0432d3d0b4deaa9651c7db7d27cb9f26f7ff40c31c452cb8dd54b0f0663c632183dc11982bc9cc24adf78b952e5
-DIST fossil-src-2.11.tar.gz 5850256 BLAKE2B af825ca9b79360149d53001b2952259bbad50fe05e77e84e54d58b11a66e612fd8c5f7bb3a8c36dd6f1b267ede3a1ed4c6b8229d10c6f25ff4de858842e100ce SHA512 0489b5b8595a0c50c8a7d787ff2d4a30980dce83b33052f7bf8f4630320fe8a0276bc73a00f3ced2962a474df1fddb2dd2e0d70f8854e1fc83e3746ea63b6ba1
-DIST fossil-src-2.8.tar.gz 5359975 BLAKE2B 6b63eadc8cd563d646698edc9972a52ec1feb868cb362449c232c99dcb81fea2fa227d631ebf8b695417c571933784dfffd5ecbec2a5027ac9901578a054c559 SHA512 5c6a8dc1545c43b3c95fbbec343db023e27a9db58f282a881bb7e488e3e26a0f7913a41f505dedf618b884507e48956780bd0e12482e184345d68edd1e79ff8e
-DIST fossil-src-2.9.tar.gz 5440118 BLAKE2B 2817e3c88073a26ef384d45271511eaacf5394a67ba6041ba0b37f321303abcba28655daf7963b8e51a8bc9bfeee681cea1f318f5ba66e93a5317b98771ad059 SHA512 c3786d4ae5517c88917819448863e9e1e37704a7073a1c87c042660313b77ce3a63f32e35e6a56af1c681e7b8a5acc652b4447d0387b8a8a5b3b5aa04dd9a9b5
-EBUILD fossil-2.10-r1.ebuild 1785 BLAKE2B c9b8d29a0da8dc51377f3e83238b031efc61d95f3211b467229754503f11340371ea865f98f7141fad1268f123e12bf3ee1a7e2bcc58ecc4f9b8ec068b63470f SHA512 ca346dd213a307865eb7b77ae6031de1b4a7415fb7b3195c8fd06b1941ed125d91d7e48b81e4466b22c711975ffc9e70259248620345bf49838e42dc0008bbdb
-EBUILD fossil-2.10.ebuild 1532 BLAKE2B ea4e60d58501a90082b16fa9f34a2e1f1288064be2e4f31f05359a83e5673475e368b8b533221771f07abb7758d46a361537d580b52c7346d8552249d8d25411 SHA512 f7707a36961431a90c6cb39623b6d3ac681ff9a2e06729e7c3de9b980cb9d564c4262b7952c0e534d9dfa014d3d73bb969d74015102a8009244f3886b25a6d1f
-EBUILD fossil-2.11.ebuild 1808 BLAKE2B 310f26c69a11c49587ff79db06f49a7c54a7501487c85c487df6f54da38404df2d4ceafee93a700e88166187793309571880f335c75a19b836b29fd2dca752d4 SHA512 a3b413d0d0232a8925881f54e8b33b3eb85774fc09fc5847b108ec153ce8626e2b92fb5a7115fd0b6596e32f12a6b914a44b0aec55ee56e37f2ba69c23ae449b
-EBUILD fossil-2.8.ebuild 1529 BLAKE2B 8bfc18c0e98ce9838faa1fe65484bac119ec242f8085c9eaf912a1d5b65ae19598924bd4445e7717895b6e4de9ae0e50f662fc4b16a63089911d5a97a7005cc2 SHA512 b6174bcb75f9e6395b71c8b82103104b97a065af34720bc4aed358f71ac34033624022b06dfcdb0d03d583ff9c8891d21ed1073d4c21872d6a07150b20bf6306
-EBUILD fossil-2.9.ebuild 1534 BLAKE2B b56c917b54b543bc6db8bd3bc4c91e5912e97a31a7785f29c4bf2eb29750f3735f589e657e5344fc7b1b2bdac5e7282b2d67ff5d0c9ef7a5401f525cfb2330e6 SHA512 3b4ab6992cbcb3e4ef43409b2d9bd077e38130f1f8c88830f11e57c185a362d676000891d4677a2d3f7c01d5ec167c07768bb6f688db6cffad00e515afd861e6
+DIST fossil-src-2.11.1.tar.gz 5850806 BLAKE2B 640807055100888d6bfea13539efb02190f07db5edcec58025952e464d50d4bd13992e5e8f5e515b01f52eaa3409d7a536bd4b48aecb5fdcf6214e47dc4963ed SHA512 055306c0d5c2f9b536ace6385ed79b5ced56d77dfc8e08b38f51075e97dfebfffca10aa7e17d2b22b9945c71b12eb131d49f3651e2890820dc9cb04719cd0265
+DIST fossil-src-2.12.1.tar.gz 6011181 BLAKE2B f9437c4fb20314706bbbec70efbb6a53e2ac7760986baf88ea72505f03877a5d1069d0d2828aa2bfefac96c1358e4c8f824405d61fd24d490442fa8b768711e9 SHA512 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee
+EBUILD fossil-2.11.1.ebuild 1803 BLAKE2B b54945558e0ea1c47fb53bba1791c336502b4313944f1e2b136233090de7fff386bbb34fd767fd4ebbae9dd8e1e7a9f82184772f06fb57d1a4f3fd8c26ce7c6e SHA512 904b64bcd8c4d6ea15133ada565655751388fefd455e795725f883707fb41e6d9db4237307c4d725b10a78a289e997c40dcca5970fa53219eddfb7f8629c7fdc
+EBUILD fossil-2.12.1.ebuild 1808 BLAKE2B 310f26c69a11c49587ff79db06f49a7c54a7501487c85c487df6f54da38404df2d4ceafee93a700e88166187793309571880f335c75a19b836b29fd2dca752d4 SHA512 a3b413d0d0232a8925881f54e8b33b3eb85774fc09fc5847b108ec153ce8626e2b92fb5a7115fd0b6596e32f12a6b914a44b0aec55ee56e37f2ba69c23ae449b
 MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.10.ebuild b/dev-vcs/fossil/fossil-2.10.ebuild
deleted file mode 100644
index af7391ebfacf..000000000000
--- a/dev-vcs/fossil/fossil-2.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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.28.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=1'
-	use fusefs        || myconf+=' --disable-fusefs'
-
-	local u useflags
-	useflags=( legacy-mv-rm miniz 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/fossil-2.10-r1.ebuild b/dev-vcs/fossil/fossil-2.11.1.ebuild
index ca988001b44d..dc00229d55ae 100644
--- a/dev-vcs/fossil/fossil-2.10-r1.ebuild
+++ b/dev-vcs/fossil/fossil-2.11.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fossil-scm.org/home/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"
 
@@ -63,8 +63,8 @@ src_configure() {
 		use ${u} &&  myconf+=" --with-${u}"
 	done
 
-	tc-export CC
-	./configure ${myconf} || die
+	tc-export CC CXX
+	CC_FOR_BUILD=${CC} ./configure ${myconf} || die
 }
 
 src_install() {
diff --git a/dev-vcs/fossil/fossil-2.11.ebuild b/dev-vcs/fossil/fossil-2.12.1.ebuild
index e75b80518477..e75b80518477 100644
--- a/dev-vcs/fossil/fossil-2.11.ebuild
+++ b/dev-vcs/fossil/fossil-2.12.1.ebuild
diff --git a/dev-vcs/fossil/fossil-2.8.ebuild b/dev-vcs/fossil/fossil-2.8.ebuild
deleted file mode 100644
index 644099632df9..000000000000
--- a/dev-vcs/fossil/fossil-2.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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.27.1: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=1'
-	use fusefs        || myconf+=' --disable-fusefs'
-
-	local u useflags
-	useflags=( legacy-mv-rm miniz 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/fossil-2.9.ebuild b/dev-vcs/fossil/fossil-2.9.ebuild
deleted file mode 100644
index 209a3c8a789c..000000000000
--- a/dev-vcs/fossil/fossil-2.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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.28.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=1'
-	use fusefs        || myconf+=' --disable-fusefs'
-
-	local u useflags
-	useflags=( legacy-mv-rm miniz 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
-}