gentoo auto-resync : 21:10:2022 - 20:03:11

3 files changed, 1 insertions, 82 deletions

diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 5120f9cc467c..cf4fcd841831 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,6 +1,4 @@
 AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f134553c5b6d7b3b685959baa531071923f0611fb22ce5945ab2ecbd4d1bae3c6234c557ac2edc872363cf05a3045bf70bebe1a1b SHA512 ccc3f6cf55902748bf8a27ea1c7c1733a2e33a45b297a7f9f732dc772e021e461052e30f841c7fa83c6303e6c7d8f8aac96f248c909d824237edb17335cb3e2f
-DIST fossil-src-2.16.tar.gz 6275775 BLAKE2B 504f828f121385ec73311b340e0abfdba7da6a8571adb390c55c75fea0ef027366fb914c12552e177988bedbb735a3148d87ebdb23ffc2ce4b7bef8ef603692a SHA512 0569640a3b509c592f812a42526eec88ead034ba0ba3de93da62cfb1caa751954ae185eaa3398d411a02ee2a858ecae6cdf4e47199847527f7524fc9798a4b12
 DIST fossil-src-2.19.tar.gz 6435868 BLAKE2B 414dd8b1630bb6a8bcc22f3528da60386663e7f31191e5134474e37211e55323af45947452a0f09e21964dd3cd94ca6cf6e34ecd74e0d3e4f0dce7a50146f0ff SHA512 fcd84df2d84c3a958bb19228de4320456382d3c925717c58bec42de86d96383a9208fb31ba6aaeccd9bc6bba949048d5c1ce3d2b3e8535951956ae18d9aa34e4
-EBUILD fossil-2.16-r1.ebuild 1891 BLAKE2B a14d37b8d26d8078112c7e60ecb7d6f3e45becfb5e0894e0955dfacc5281aba4ba480678d99bb6a57b356ca355f37f5d3e7e8ccca5a725915b08d2923b93a919 SHA512 96e2c2f724f6a4149c279f3caf61ba8defa4a56b6a8e471d9119a7ba46fcfa35c597fd58193af6cedbfad34ea676230650e77b977bcc268a9cc6d85cf4a924c4
 EBUILD fossil-2.19.ebuild 1990 BLAKE2B a88a68a17adc8cea8ae97dba8ff19c0472d8b189398b935368a64bdabc874cec60df7bb01369705235f6a261e603416739266942015f5e6b2cb0ca545abb4097 SHA512 ff564abb9425f7c15a0e3bdcde848e12ccdb1976ec9a2b75ed62c28422e637a7c57ab1e46176f24e153dee2dc940e1de947aa79c5843755e7f9eaa0a0e1eb5b8
-MISC metadata.xml 950 BLAKE2B 2c6fb55552dd44c01649e8f394bbd56c49b3e01857493de3ad907e1058ed9f25d7bcfbe9aea0da21a578090d5e8a2d75edcf9f25cf25f2b54ca909334a522289 SHA512 f8c769c99b4889ed79011f460e0dbf2dc7d9c6576256a5c7523abab868e2a5c4d61ca1719813584051b3a8e72051cc88b06a34316ba267415c0915f3fb30dcf4
+MISC metadata.xml 834 BLAKE2B 430f78ec0e62687ed2fc884034e8fd7d9221b093e2b8602f2b3b15332cb9aa6b9a28d30d5786fa9c1d01ef94d2b8ee76efd51236ee5b3571b4853745cbe9250e SHA512 6494820f1c7161ce6d2fe0ec559e8ac28e6637e60f46e4c47ce9d57ec63db082535bbbf98bba3ea9b9888fa4c515422172e2fa7f2c04590bf7af1a6abb2e13b5
diff --git a/dev-vcs/fossil/fossil-2.16-r1.ebuild b/dev-vcs/fossil/fossil-2.16-r1.ebuild
deleted file mode 100644
index a750a2526ae7..000000000000
--- a/dev-vcs/fossil/fossil-2.16-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_TAG=7aedd5675883d4412cf20917d340b6985e3ecb842e88a39f135df034b2d5f4d3
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="https://www.fossil-scm.org/"
-SRC_URI="https://fossil-scm.org/home/tarball/${MY_TAG}/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
-	  tcl-private-stubs th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-RDEPEND="
-	sys-libs/zlib
-	|| (
-		sys-libs/readline:0
-		dev-libs/libedit
-	)
-	system-sqlite? ( >=dev-db/sqlite-3.35.0:3 )
-	ssl? ( dev-libs/openssl:0= )
-	tcl? ( dev-lang/tcl:0= )
-"
-
-# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
-DEPEND="${RDEPEND}
-	!tcl? (
-		|| (
-			dev-lang/tcl:*
-			dev-lang/jimtcl:*
-		)
-	)
-"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
-PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch )
-
-S="${WORKDIR}/fossil-src-${PV}"
-
-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=( miniz tcl-stubs tcl-private-stubs th1-docs th1-hooks )
-	for u in ${useflags[@]} ; do
-		use ${u} &&  myconf+=" --with-${u}"
-	done
-
-	tc-export CC CXX
-	CC_FOR_BUILD=${CC} ./configure ${myconf} || die
-}
-
-src_install() {
-	dobin fossil
-}
diff --git a/dev-vcs/fossil/metadata.xml b/dev-vcs/fossil/metadata.xml
index 06d9dccc1fad..947d802f108f 100644
--- a/dev-vcs/fossil/metadata.xml
+++ b/dev-vcs/fossil/metadata.xml
@@ -8,10 +8,6 @@
 	<use>
 		<flag name="fusefs">Enable the Fuse Filesystem</flag>
 		<flag name="json">Enable the JSON API of Fossil's wiki</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>