1 |
commit: 422480add31731ac3df1851b4ef6654e13a8bda9 |
2 |
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 2 02:58:45 2020 +0000 |
4 |
Commit: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 2 02:58:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422480ad |
7 |
|
8 |
dev-vcs/fossil: Fix Tcl dependency and search |
9 |
|
10 |
Bug: https://bugs.gentoo.org/690828 |
11 |
Bug: https://bugs.gentoo.org/675778 |
12 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
13 |
Signed-off-by: Aaron W. Swenson <titanofold <AT> gentoo.org> |
14 |
|
15 |
.../files/fossil-2.10-check-lib64-for-tcl.patch | 11 ++++ |
16 |
dev-vcs/fossil/fossil-2.10-r1.ebuild | 72 ++++++++++++++++++++++ |
17 |
2 files changed, 83 insertions(+) |
18 |
|
19 |
diff --git a/dev-vcs/fossil/files/fossil-2.10-check-lib64-for-tcl.patch b/dev-vcs/fossil/files/fossil-2.10-check-lib64-for-tcl.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..404c5d7d667 |
22 |
--- /dev/null |
23 |
+++ b/dev-vcs/fossil/files/fossil-2.10-check-lib64-for-tcl.patch |
24 |
@@ -0,0 +1,11 @@ |
25 |
+--- a/autosetup/local.tcl |
26 |
++++ b/autosetup/local.tcl |
27 |
+@@ -12,7 +12,7 @@ |
28 |
+ return [parse-tclconfig-sh-file $p/tclConfig.sh] |
29 |
+ } |
30 |
+ # Some systems allow for multiple versions |
31 |
+- foreach libpath {lib/tcl8.6 lib/tcl8.5 lib/tcl8.4 lib/tcl tcl lib} { |
32 |
++ foreach libpath {lib/tcl8.6 lib/tcl8.5 lib/tcl8.4 lib/tcl tcl lib lib64} { |
33 |
+ if {[file exists $p/$libpath/tclConfig.sh]} { |
34 |
+ return [parse-tclconfig-sh-file $p/$libpath/tclConfig.sh] |
35 |
+ } |
36 |
|
37 |
diff --git a/dev-vcs/fossil/fossil-2.10-r1.ebuild b/dev-vcs/fossil/fossil-2.10-r1.ebuild |
38 |
new file mode 100644 |
39 |
index 00000000000..ca988001b44 |
40 |
--- /dev/null |
41 |
+++ b/dev-vcs/fossil/fossil-2.10-r1.ebuild |
42 |
@@ -0,0 +1,72 @@ |
43 |
+# Copyright 1999-2020 Gentoo Authors |
44 |
+# Distributed under the terms of the GNU General Public License v2 |
45 |
+ |
46 |
+EAPI=7 |
47 |
+ |
48 |
+inherit toolchain-funcs |
49 |
+ |
50 |
+DESCRIPTION="Simple, high-reliability, source control management, and more" |
51 |
+HOMEPAGE="https://www.fossil-scm.org/" |
52 |
+SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz" |
53 |
+ |
54 |
+LICENSE="BSD-2" |
55 |
+SLOT="0" |
56 |
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
57 |
+IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static |
58 |
+ tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks" |
59 |
+ |
60 |
+REQUIRED_USE="ssl? ( !miniz )" |
61 |
+ |
62 |
+RDEPEND=" |
63 |
+ sys-libs/zlib |
64 |
+ || ( |
65 |
+ sys-libs/readline:0 |
66 |
+ dev-libs/libedit |
67 |
+ ) |
68 |
+ system-sqlite? ( >=dev-db/sqlite-3.28.0:3 ) |
69 |
+ ssl? ( dev-libs/openssl:0 ) |
70 |
+ tcl? ( dev-lang/tcl:0= ) |
71 |
+" |
72 |
+ |
73 |
+# Either tcl or jimtcl need to be present to build Fossil (Bug #675778) |
74 |
+DEPEND="${RDEPEND} |
75 |
+ !tcl? ( |
76 |
+ || ( |
77 |
+ dev-lang/tcl:* |
78 |
+ dev-lang/jimtcl:* |
79 |
+ ) |
80 |
+ ) |
81 |
+" |
82 |
+ |
83 |
+# Tests can't be run from the build directory |
84 |
+RESTRICT="test" |
85 |
+ |
86 |
+# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828 |
87 |
+PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch ) |
88 |
+ |
89 |
+src_configure() { |
90 |
+ # this is not an autotools situation so don't make it seem like one |
91 |
+ # --with-tcl: works |
92 |
+ # --without-tcl: dies |
93 |
+ local myconf="--with-openssl=$(usex ssl auto none)" |
94 |
+ use debug && myconf+=' --fossil-debug' |
95 |
+ use json && myconf+=' --json' |
96 |
+ use system-sqlite && myconf+=' --disable-internal-sqlite' |
97 |
+ use static && myconf+=' --static' |
98 |
+ use tcl && myconf+=' --with-tcl=1' |
99 |
+ use fusefs || myconf+=' --disable-fusefs' |
100 |
+ |
101 |
+ local u useflags |
102 |
+ useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs |
103 |
+ th1-docs th1-hooks ) |
104 |
+ for u in ${useflags[@]} ; do |
105 |
+ use ${u} && myconf+=" --with-${u}" |
106 |
+ done |
107 |
+ |
108 |
+ tc-export CC |
109 |
+ ./configure ${myconf} || die |
110 |
+} |
111 |
+ |
112 |
+src_install() { |
113 |
+ dobin fossil |
114 |
+} |