Gentoo Archives: gentoo-commits

From: "Aaron W. Swenson" <titanofold@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/fossil/
Date: Fri, 02 Oct 2020 03:40:12
Message-Id: 1601609842.f16b344c51b67da95e31e077c4b5a2092788ef0f.titanofold@gentoo
1 commit: f16b344c51b67da95e31e077c4b5a2092788ef0f
2 Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 2 03:37:22 2020 +0000
4 Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 2 03:37:22 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f16b344c
7
8 dev-vcs/fossil: Cleanup
9
10 Bug: https://bugs.gentoo.org/738220
11 Closes: https://bugs.gentoo.org/724272
12 Closes: https://bugs.gentoo.org/675778
13 Closes: https://bugs.gentoo.org/690828
14 Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org>
15
16 dev-vcs/fossil/Manifest | 1 -
17 dev-vcs/fossil/fossil-2.11.1.ebuild | 72 -------------------------------------
18 dev-vcs/fossil/metadata.xml | 3 --
19 3 files changed, 76 deletions(-)
20
21 diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
22 index bafd954b09d..90af46f42af 100644
23 --- a/dev-vcs/fossil/Manifest
24 +++ b/dev-vcs/fossil/Manifest
25 @@ -1,2 +1 @@
26 -DIST fossil-src-2.11.1.tar.gz 5850806 BLAKE2B 640807055100888d6bfea13539efb02190f07db5edcec58025952e464d50d4bd13992e5e8f5e515b01f52eaa3409d7a536bd4b48aecb5fdcf6214e47dc4963ed SHA512 055306c0d5c2f9b536ace6385ed79b5ced56d77dfc8e08b38f51075e97dfebfffca10aa7e17d2b22b9945c71b12eb131d49f3651e2890820dc9cb04719cd0265
27 DIST fossil-src-2.12.1.tar.gz 6011181 BLAKE2B f9437c4fb20314706bbbec70efbb6a53e2ac7760986baf88ea72505f03877a5d1069d0d2828aa2bfefac96c1358e4c8f824405d61fd24d490442fa8b768711e9 SHA512 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee
28
29 diff --git a/dev-vcs/fossil/fossil-2.11.1.ebuild b/dev-vcs/fossil/fossil-2.11.1.ebuild
30 deleted file mode 100644
31 index dc00229d55a..00000000000
32 --- a/dev-vcs/fossil/fossil-2.11.1.ebuild
33 +++ /dev/null
34 @@ -1,72 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -inherit toolchain-funcs
41 -
42 -DESCRIPTION="Simple, high-reliability, source control management, and more"
43 -HOMEPAGE="https://www.fossil-scm.org/"
44 -SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
45 -
46 -LICENSE="BSD-2"
47 -SLOT="0"
48 -KEYWORDS="amd64 arm ppc ppc64 x86"
49 -IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
50 - tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
51 -
52 -REQUIRED_USE="ssl? ( !miniz )"
53 -
54 -RDEPEND="
55 - sys-libs/zlib
56 - || (
57 - sys-libs/readline:0
58 - dev-libs/libedit
59 - )
60 - system-sqlite? ( >=dev-db/sqlite-3.28.0:3 )
61 - ssl? ( dev-libs/openssl:0 )
62 - tcl? ( dev-lang/tcl:0= )
63 -"
64 -
65 -# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
66 -DEPEND="${RDEPEND}
67 - !tcl? (
68 - || (
69 - dev-lang/tcl:*
70 - dev-lang/jimtcl:*
71 - )
72 - )
73 -"
74 -
75 -# Tests can't be run from the build directory
76 -RESTRICT="test"
77 -
78 -# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
79 -PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch )
80 -
81 -src_configure() {
82 - # this is not an autotools situation so don't make it seem like one
83 - # --with-tcl: works
84 - # --without-tcl: dies
85 - local myconf="--with-openssl=$(usex ssl auto none)"
86 - use debug && myconf+=' --fossil-debug'
87 - use json && myconf+=' --json'
88 - use system-sqlite && myconf+=' --disable-internal-sqlite'
89 - use static && myconf+=' --static'
90 - use tcl && myconf+=' --with-tcl=1'
91 - use fusefs || myconf+=' --disable-fusefs'
92 -
93 - local u useflags
94 - useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
95 - th1-docs th1-hooks )
96 - for u in ${useflags[@]} ; do
97 - use ${u} && myconf+=" --with-${u}"
98 - done
99 -
100 - tc-export CC CXX
101 - CC_FOR_BUILD=${CC} ./configure ${myconf} || die
102 -}
103 -
104 -src_install() {
105 - dobin fossil
106 -}
107
108 diff --git a/dev-vcs/fossil/metadata.xml b/dev-vcs/fossil/metadata.xml
109 index 5f61527e696..b96ecf35bd4 100644
110 --- a/dev-vcs/fossil/metadata.xml
111 +++ b/dev-vcs/fossil/metadata.xml
112 @@ -12,9 +12,6 @@
113 <use>
114 <flag name="fusefs">Enable the Fuse Filesystem</flag>
115 <flag name="json">Enable the JSON API of Fossil's wiki</flag>
116 - <flag name="legacy-mv-rm">
117 - Enable legacy behavior for mv/rm (skip checkout files).
118 - </flag>
119 <flag name="miniz">
120 Use the bundled miniz for compression instead of
121 zlib. Incompatible with ssl.