1 |
commit: 746f4841bb0a4d09794e40556b794ff41106cd5d |
2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
3 |
AuthorDate: Sat Oct 24 07:45:26 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 27 21:11:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746f4841 |
7 |
|
8 |
net-misc/unison: drop unison-2.51.2-r1 |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
11 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/17989 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
net-misc/unison/Manifest | 3 - |
16 |
.../unison/files/unison-2.51.2-ocaml-4.08.patch | 50 ------------- |
17 |
net-misc/unison/unison-2.51.2-r1.ebuild | 82 ---------------------- |
18 |
3 files changed, 135 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest |
21 |
index a5277f2845b..ad624096e76 100644 |
22 |
--- a/net-misc/unison/Manifest |
23 |
+++ b/net-misc/unison/Manifest |
24 |
@@ -1,8 +1,5 @@ |
25 |
DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec SHA512 658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78 |
26 |
DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68 |
27 |
DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9 |
28 |
-DIST unison-2.51.2-manual.html 311981 BLAKE2B 1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05 SHA512 2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997 |
29 |
-DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0 SHA512 170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d |
30 |
-DIST unison-2.51.2.tar.gz 691251 BLAKE2B 39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f SHA512 9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115 |
31 |
DIST unison-2.51.3.tar.gz 1370060 BLAKE2B 3e082c5de8c68d87fd4d061dbcf535b9001bd3bacd740fede4e94a239bc554e463c0493260748df61527304d2f874cb194f629fb1f066a47be5a5e54360f3cb7 SHA512 202bc592cf18d3ac76d7e29ec71add5d6e33a96b4b885e0e2add9a5a621db2290184f268c70e4f05e4884d6cdfed09f6fcd3dde85681c39628a10ea552917c8f |
32 |
DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61 |
33 |
|
34 |
diff --git a/net-misc/unison/files/unison-2.51.2-ocaml-4.08.patch b/net-misc/unison/files/unison-2.51.2-ocaml-4.08.patch |
35 |
deleted file mode 100644 |
36 |
index e3353e77e62..00000000000 |
37 |
--- a/net-misc/unison/files/unison-2.51.2-ocaml-4.08.patch |
38 |
+++ /dev/null |
39 |
@@ -1,50 +0,0 @@ |
40 |
-diff -ur src.orig/files.ml src/files.ml |
41 |
---- src.orig/files.ml 2018-01-27 21:53:44.000000000 +0100 |
42 |
-+++ src/files.ml 2019-12-11 16:12:40.005712137 +0100 |
43 |
-@@ -734,7 +734,7 @@ |
44 |
- with End_of_file -> |
45 |
- dirh.System.closedir () |
46 |
- end; |
47 |
-- Sort.list (<) !files |
48 |
-+ List.sort compare !files |
49 |
- |
50 |
- let ls dir pattern = |
51 |
- Util.convertUnixErrorsToTransient |
52 |
-diff -ur src.orig/recon.ml src/recon.ml |
53 |
---- src.orig/recon.ml 2018-01-27 21:53:44.000000000 +0100 |
54 |
-+++ src/recon.ml 2019-12-11 16:12:40.005712137 +0100 |
55 |
-@@ -661,8 +661,8 @@ |
56 |
- |
57 |
- (* Sorts the paths so that they will be displayed in order *) |
58 |
- let sortPaths pathUpdatesList = |
59 |
-- Sort.list |
60 |
-- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) |
61 |
-+ List.sort |
62 |
-+ (fun (p1, _) (p2, _) -> Path.compare p1 p2) |
63 |
- pathUpdatesList |
64 |
- |
65 |
- let rec enterPath p1 p2 t = |
66 |
-diff -ur src.orig/system/system_generic.ml src/system/system_generic.ml |
67 |
---- src.orig/system/system_generic.ml 2018-01-27 21:53:44.000000000 +0100 |
68 |
-+++ src/system/system_generic.ml 2019-12-11 16:12:40.005712137 +0100 |
69 |
-@@ -47,7 +47,7 @@ |
70 |
- let chmod = Unix.chmod |
71 |
- let chown = Unix.chown |
72 |
- let utimes = Unix.utimes |
73 |
--let link = Unix.link |
74 |
-+let link s1 s2 = Unix.link s1 s2 |
75 |
- let openfile = Unix.openfile |
76 |
- let opendir f = |
77 |
- let h = Unix.opendir f in |
78 |
-diff -ur src.orig/uigtk2.ml src/uigtk2.ml |
79 |
---- src.orig/uigtk2.ml 2018-01-27 21:53:44.000000000 +0100 |
80 |
-+++ src/uigtk2.ml 2019-12-11 16:12:40.005712137 +0100 |
81 |
-@@ -94,7 +94,7 @@ |
82 |
- let icon = |
83 |
- let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in |
84 |
- Gpointer.blit |
85 |
-- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); |
86 |
-+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); |
87 |
- p |
88 |
- |
89 |
- let leftPtrWatch = |
90 |
|
91 |
diff --git a/net-misc/unison/unison-2.51.2-r1.ebuild b/net-misc/unison/unison-2.51.2-r1.ebuild |
92 |
deleted file mode 100644 |
93 |
index 9b7c3a033ec..00000000000 |
94 |
--- a/net-misc/unison/unison-2.51.2-r1.ebuild |
95 |
+++ /dev/null |
96 |
@@ -1,82 +0,0 @@ |
97 |
-# Copyright 1999-2020 Gentoo Authors |
98 |
-# Distributed under the terms of the GNU General Public License v2 |
99 |
- |
100 |
-EAPI=7 |
101 |
- |
102 |
-DESCRIPTION="Two-way cross-platform file synchronizer" |
103 |
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/" |
104 |
-SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz |
105 |
- doc? ( |
106 |
- https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf |
107 |
- https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html |
108 |
- )" |
109 |
- |
110 |
-LICENSE="GPL-2" |
111 |
-SLOT="$(ver_cut 1-2)" |
112 |
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" |
113 |
-IUSE="debug doc gtk +ocamlopt threads" |
114 |
- |
115 |
-# ocaml version so we are sure it has ocamlopt use flag |
116 |
-DEPEND="<dev-lang/ocaml-4.10.0:=[ocamlopt?] |
117 |
- gtk? ( dev-ml/lablgtk:2= )" |
118 |
- |
119 |
-RDEPEND="gtk? ( dev-ml/lablgtk:2= |
120 |
- || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) |
121 |
- >=app-eselect/eselect-unison-0.4" |
122 |
- |
123 |
-RESTRICT="!ocamlopt? ( strip )" |
124 |
-S="${WORKDIR}"/src |
125 |
- |
126 |
-PATCHES=( |
127 |
- "${FILESDIR}"/${PN}-2.51.2-ocaml-4.08.patch # https://bugs.gentoo.org/709646 |
128 |
-) |
129 |
- |
130 |
-DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt ) |
131 |
- |
132 |
-src_compile() { |
133 |
- local myconf |
134 |
- |
135 |
- if use threads; then |
136 |
- myconf="$myconf THREADS=true" |
137 |
- fi |
138 |
- |
139 |
- if use debug; then |
140 |
- myconf="$myconf DEBUGGING=true" |
141 |
- fi |
142 |
- |
143 |
- if use gtk; then |
144 |
- myconf="$myconf UISTYLE=gtk2" |
145 |
- else |
146 |
- myconf="$myconf UISTYLE=text" |
147 |
- fi |
148 |
- |
149 |
- use ocamlopt || myconf="$myconf NATIVE=false" |
150 |
- |
151 |
- # Discard cflags as it will try to pass them to ocamlc... |
152 |
- emake $myconf CFLAGS="" buildexecutable |
153 |
-} |
154 |
- |
155 |
-src_test() { |
156 |
- emake selftest CFLAGS="" |
157 |
-} |
158 |
- |
159 |
-src_install() { |
160 |
- # install manually, since it's just too much |
161 |
- # work to force the Makefile to do the right thing. |
162 |
- local binname |
163 |
- for binname in unison unison-fsmonitor; do |
164 |
- newbin ${binname} ${binname}-${SLOT} |
165 |
- done |
166 |
- if use doc; then |
167 |
- DOCS+=( "${DISTDIR}/${P}-manual.pdf" ) |
168 |
- HTML_DOCS=( "${DISTDIR}/${P}-manual.html" ) |
169 |
- fi |
170 |
- einstalldocs |
171 |
-} |
172 |
- |
173 |
-pkg_postinst() { |
174 |
- elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}" |
175 |
- elog "in your profile files to access exactly this version over ssh." |
176 |
- elog "Or you can use 'eselect unison' to set the version." |
177 |
- eselect unison update |
178 |
-} |