1 |
commit: 27dfa0e4f1a7848454d19177bde693415a6d45e1 |
2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 27 18:44:31 2018 +0000 |
4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 27 18:45:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27dfa0e4 |
7 |
|
8 |
net-misc/unison: bump to 2.51.2 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/651972 |
11 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
12 |
|
13 |
net-misc/unison/Manifest | 3 ++ |
14 |
net-misc/unison/unison-2.48.4-r1.ebuild | 87 +++++++++++++++++++++++++++++++++ |
15 |
net-misc/unison/unison-2.51.2.ebuild | 82 +++++++++++++++++++++++++++++++ |
16 |
3 files changed, 172 insertions(+) |
17 |
|
18 |
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest |
19 |
index f1479c9334e..9ceab2eb127 100644 |
20 |
--- a/net-misc/unison/Manifest |
21 |
+++ b/net-misc/unison/Manifest |
22 |
@@ -1,3 +1,6 @@ |
23 |
DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68 |
24 |
DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9 |
25 |
DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024 |
26 |
+DIST unison-2.51.2-manual.html 311981 BLAKE2B 1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05 SHA512 2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997 |
27 |
+DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0 SHA512 170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d |
28 |
+DIST unison-2.51.2.tar.gz 691251 BLAKE2B 39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f SHA512 9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115 |
29 |
|
30 |
diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild b/net-misc/unison/unison-2.48.4-r1.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..55e5485844d |
33 |
--- /dev/null |
34 |
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild |
35 |
@@ -0,0 +1,87 @@ |
36 |
+# Copyright 1999-2018 Gentoo Foundation |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=7 |
40 |
+ |
41 |
+IUSE="gtk doc static debug threads +ocamlopt test" |
42 |
+ |
43 |
+DESCRIPTION="Two-way cross-platform file synchronizer" |
44 |
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/" |
45 |
+LICENSE="GPL-2" |
46 |
+SLOT="$(ver_cut 1-2)" |
47 |
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" |
48 |
+ |
49 |
+# Upstream, for this version, has explicitly disabled test with marker |
50 |
+# "Skipping some tests -- remove me!". Given the potentially destructive nature |
51 |
+# of those tests, let's not try to run them (they're re-enabled in subsequent |
52 |
+# releases). |
53 |
+RESTRICT="test" |
54 |
+ |
55 |
+# ocaml version so we are sure it has ocamlopt use flag |
56 |
+DEPEND="dev-lang/ocaml[ocamlopt?] |
57 |
+ gtk? ( dev-ml/lablgtk )" |
58 |
+ |
59 |
+RDEPEND="gtk? ( dev-ml/lablgtk |
60 |
+ || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) |
61 |
+ >=app-eselect/eselect-unison-0.4" |
62 |
+ |
63 |
+SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz |
64 |
+ doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf |
65 |
+ https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )" |
66 |
+S="${WORKDIR}"/src |
67 |
+PATCHES=( "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch ) |
68 |
+ |
69 |
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt ) |
70 |
+ |
71 |
+src_compile() { |
72 |
+ local myconf |
73 |
+ |
74 |
+ if use threads; then |
75 |
+ myconf="$myconf THREADS=true" |
76 |
+ fi |
77 |
+ |
78 |
+ if use static; then |
79 |
+ myconf="$myconf STATIC=true" |
80 |
+ fi |
81 |
+ |
82 |
+ if use debug; then |
83 |
+ myconf="$myconf DEBUGGING=true" |
84 |
+ fi |
85 |
+ |
86 |
+ if use gtk; then |
87 |
+ myconf="$myconf UISTYLE=gtk2" |
88 |
+ else |
89 |
+ myconf="$myconf UISTYLE=text" |
90 |
+ fi |
91 |
+ |
92 |
+ use ocamlopt || myconf="$myconf NATIVE=false" |
93 |
+ |
94 |
+ # Discard cflags as it will try to pass them to ocamlc... |
95 |
+ emake $myconf CFLAGS="" buildexecutable |
96 |
+} |
97 |
+ |
98 |
+src_test() { |
99 |
+ emake selftest CFLAGS="" |
100 |
+} |
101 |
+ |
102 |
+src_install () { |
103 |
+ # install manually, since it's just too much |
104 |
+ # work to force the Makefile to do the right thing. |
105 |
+ local binname |
106 |
+ for binname in unison unison-fsmonitor; do |
107 |
+ newbin ${binname} ${binname}-${SLOT} |
108 |
+ done |
109 |
+ if use doc; then |
110 |
+ DOCS+=( "${DISTDIR}/${P}-manual.pdf" ) |
111 |
+ HTML_DOCS=( "${DISTDIR}/${P}-manual.html" ) |
112 |
+ fi |
113 |
+ einstalldocs |
114 |
+ use ocamlopt || export STRIP_MASK="*/bin/*" |
115 |
+} |
116 |
+ |
117 |
+pkg_postinst() { |
118 |
+ elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}" |
119 |
+ elog "in your profile files to access exactly this version over ssh." |
120 |
+ elog "Or you can use 'eselect unison' to set the version." |
121 |
+ eselect unison update |
122 |
+} |
123 |
|
124 |
diff --git a/net-misc/unison/unison-2.51.2.ebuild b/net-misc/unison/unison-2.51.2.ebuild |
125 |
new file mode 100644 |
126 |
index 00000000000..25776c6fb51 |
127 |
--- /dev/null |
128 |
+++ b/net-misc/unison/unison-2.51.2.ebuild |
129 |
@@ -0,0 +1,82 @@ |
130 |
+# Copyright 1999-2018 Gentoo Foundation |
131 |
+# Distributed under the terms of the GNU General Public License v2 |
132 |
+ |
133 |
+EAPI=7 |
134 |
+ |
135 |
+DESCRIPTION="Two-way cross-platform file synchronizer" |
136 |
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/" |
137 |
+SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz |
138 |
+ doc? ( |
139 |
+ https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf |
140 |
+ https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html |
141 |
+ )" |
142 |
+ |
143 |
+LICENSE="GPL-2" |
144 |
+SLOT="$(ver_cut 1-2)" |
145 |
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" |
146 |
+IUSE="gtk doc static debug threads +ocamlopt test" |
147 |
+ |
148 |
+# ocaml version so we are sure it has ocamlopt use flag |
149 |
+DEPEND="dev-lang/ocaml[ocamlopt?] |
150 |
+ gtk? ( dev-ml/lablgtk )" |
151 |
+ |
152 |
+RDEPEND="gtk? ( dev-ml/lablgtk |
153 |
+ || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) |
154 |
+ >=app-eselect/eselect-unison-0.4" |
155 |
+ |
156 |
+S="${WORKDIR}"/src |
157 |
+ |
158 |
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt ) |
159 |
+ |
160 |
+src_compile() { |
161 |
+ local myconf |
162 |
+ |
163 |
+ if use threads; then |
164 |
+ myconf="$myconf THREADS=true" |
165 |
+ fi |
166 |
+ |
167 |
+ if use static; then |
168 |
+ myconf="$myconf STATIC=true" |
169 |
+ fi |
170 |
+ |
171 |
+ if use debug; then |
172 |
+ myconf="$myconf DEBUGGING=true" |
173 |
+ fi |
174 |
+ |
175 |
+ if use gtk; then |
176 |
+ myconf="$myconf UISTYLE=gtk2" |
177 |
+ else |
178 |
+ myconf="$myconf UISTYLE=text" |
179 |
+ fi |
180 |
+ |
181 |
+ use ocamlopt || myconf="$myconf NATIVE=false" |
182 |
+ |
183 |
+ # Discard cflags as it will try to pass them to ocamlc... |
184 |
+ emake $myconf CFLAGS="" buildexecutable |
185 |
+} |
186 |
+ |
187 |
+src_test() { |
188 |
+ emake selftest CFLAGS="" |
189 |
+} |
190 |
+ |
191 |
+src_install () { |
192 |
+ # install manually, since it's just too much |
193 |
+ # work to force the Makefile to do the right thing. |
194 |
+ local binname |
195 |
+ for binname in unison unison-fsmonitor; do |
196 |
+ newbin ${binname} ${binname}-${SLOT} |
197 |
+ done |
198 |
+ if use doc; then |
199 |
+ DOCS+=( "${DISTDIR}/${P}-manual.pdf" ) |
200 |
+ HTML_DOCS=( "${DISTDIR}/${P}-manual.html" ) |
201 |
+ fi |
202 |
+ einstalldocs |
203 |
+ use ocamlopt || export STRIP_MASK="*/bin/*" |
204 |
+} |
205 |
+ |
206 |
+pkg_postinst() { |
207 |
+ elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}" |
208 |
+ elog "in your profile files to access exactly this version over ssh." |
209 |
+ elog "Or you can use 'eselect unison' to set the version." |
210 |
+ eselect unison update |
211 |
+} |