1 |
commit: 1ac0b00a5363be3c04d568f35f4a44ef39572195 |
2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
3 |
AuthorDate: Fri Oct 23 08:15:21 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=1ac0b00a |
7 |
|
8 |
net-misc/unison: bump to 2.51.3_p20201024 |
9 |
|
10 |
has several fixes |
11 |
based on commit 73f1bfa from (Commits on Oct 24, 2020) |
12 |
https://github.com/bcpierce00/unison/commits/master |
13 |
|
14 |
shorten path in make_desktop_entry |
15 |
USE=doc to build unison-manual.pdf (no .html) |
16 |
|
17 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
18 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
20 |
|
21 |
net-misc/unison/Manifest | 1 + |
22 |
net-misc/unison/unison-2.51.3_p20201024.ebuild | 111 +++++++++++++++++++++++++ |
23 |
2 files changed, 112 insertions(+) |
24 |
|
25 |
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest |
26 |
index cfc94fa8ec5..a5277f2845b 100644 |
27 |
--- a/net-misc/unison/Manifest |
28 |
+++ b/net-misc/unison/Manifest |
29 |
@@ -5,3 +5,4 @@ DIST unison-2.51.2-manual.html 311981 BLAKE2B 1e1bc18d5bca5d50976b28c4e59cc27fcc |
30 |
DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0 SHA512 170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d |
31 |
DIST unison-2.51.2.tar.gz 691251 BLAKE2B 39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f SHA512 9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115 |
32 |
DIST unison-2.51.3.tar.gz 1370060 BLAKE2B 3e082c5de8c68d87fd4d061dbcf535b9001bd3bacd740fede4e94a239bc554e463c0493260748df61527304d2f874cb194f629fb1f066a47be5a5e54360f3cb7 SHA512 202bc592cf18d3ac76d7e29ec71add5d6e33a96b4b885e0e2add9a5a621db2290184f268c70e4f05e4884d6cdfed09f6fcd3dde85681c39628a10ea552917c8f |
33 |
+DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61 |
34 |
|
35 |
diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild b/net-misc/unison/unison-2.51.3_p20201024.ebuild |
36 |
new file mode 100644 |
37 |
index 00000000000..f0744e72356 |
38 |
--- /dev/null |
39 |
+++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild |
40 |
@@ -0,0 +1,111 @@ |
41 |
+# Copyright 1999-2020 Gentoo Authors |
42 |
+# Distributed under the terms of the GNU General Public License v2 |
43 |
+ |
44 |
+EAPI=7 |
45 |
+ |
46 |
+inherit desktop xdg-utils |
47 |
+ |
48 |
+MY_COMMIT="73f1bfa2476f907e2d781948ce9e764230bf8b27" |
49 |
+DESCRIPTION="Two-way cross-platform file synchronizer" |
50 |
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/" |
51 |
+SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" |
52 |
+ |
53 |
+LICENSE="GPL-2" |
54 |
+SLOT="$(ver_cut 1-2)" |
55 |
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" |
56 |
+IUSE="debug doc gtk +ocamlopt threads" |
57 |
+RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0 |
58 |
+ |
59 |
+# ocaml version so we are sure it has ocamlopt use flag |
60 |
+BDEPEND="dev-lang/ocaml:=[ocamlopt?] |
61 |
+ doc? ( app-text/dvipsk |
62 |
+ app-text/ghostscript-gpl |
63 |
+ dev-texlive/texlive-latex )" |
64 |
+DEPEND="gtk? ( dev-ml/lablgtk:2= )" |
65 |
+RDEPEND="gtk? ( dev-ml/lablgtk:2= |
66 |
+ || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) |
67 |
+ >=app-eselect/eselect-unison-0.4" |
68 |
+ |
69 |
+S="${WORKDIR}/${PN}-${MY_COMMIT}" |
70 |
+ |
71 |
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt ) |
72 |
+ |
73 |
+src_prepare() { |
74 |
+ # https://github.com/bcpierce00/unison/issues/416 |
75 |
+ sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die |
76 |
+ # https://github.com/bcpierce00/unison/pull/415 |
77 |
+ sed -e "/myName/d" -i doc/docs.ml || die |
78 |
+ default |
79 |
+} |
80 |
+ |
81 |
+src_compile() { |
82 |
+ # build unison-manual.pdf but not .html |
83 |
+ if use doc; then |
84 |
+ local myconf="all docs HEVEA=false" |
85 |
+ else |
86 |
+ local myconf="all" |
87 |
+ fi |
88 |
+ |
89 |
+ if use threads; then |
90 |
+ myconf="$myconf THREADS=true" |
91 |
+ fi |
92 |
+ |
93 |
+ if use debug; then |
94 |
+ myconf="$myconf DEBUGGING=true" |
95 |
+ fi |
96 |
+ |
97 |
+ if use gtk; then |
98 |
+ myconf="$myconf UISTYLE=gtk2" |
99 |
+ else |
100 |
+ myconf="$myconf UISTYLE=text" |
101 |
+ fi |
102 |
+ |
103 |
+ use ocamlopt || myconf="$myconf NATIVE=false" |
104 |
+ |
105 |
+ # Discard cflags as it will try to pass them to ocamlc... |
106 |
+ emake $myconf CFLAGS="" |
107 |
+} |
108 |
+ |
109 |
+src_test() { |
110 |
+ emake test CFLAGS="" |
111 |
+} |
112 |
+ |
113 |
+src_install() { |
114 |
+ # install manually, since it's just too much |
115 |
+ # work to force the Makefile to do the right thing. |
116 |
+ local binname |
117 |
+ cd src || die |
118 |
+ for binname in unison unison-fsmonitor; do |
119 |
+ newbin ${binname} ${binname}-${SLOT} |
120 |
+ done |
121 |
+ |
122 |
+ if use gtk; then |
123 |
+ newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg |
124 |
+ make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}" |
125 |
+ fi |
126 |
+ |
127 |
+ # Waiting for https://github.com/bcpierce00/unison/issues/411 |
128 |
+ if use doc; then |
129 |
+ DOCS+=( ../doc/unison-manual.pdf ) |
130 |
+ # HTML_DOCS=( "${DISTDIR}/${P}-manual.html" ) |
131 |
+ fi |
132 |
+ |
133 |
+ einstalldocs |
134 |
+} |
135 |
+ |
136 |
+pkg_postinst() { |
137 |
+ elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}" |
138 |
+ elog "in your profile files to access exactly this version over ssh." |
139 |
+ elog "Or you can use 'eselect unison' to set the version." |
140 |
+ eselect unison update || die |
141 |
+ |
142 |
+ if use gtk; then |
143 |
+ xdg_icon_cache_update |
144 |
+ fi |
145 |
+} |
146 |
+ |
147 |
+pkg_postrm() { |
148 |
+ if use gtk; then |
149 |
+ xdg_icon_cache_update |
150 |
+ fi |
151 |
+} |