subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-misc\/unison\/"

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2024-08-01 Thread Alfredo Tupone

commit: d7a1fee2e71ffdccc1956a996d24fc2675a926a5
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Thu Aug  1 18:26:58 2024 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Thu Aug  1 18:28:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a1fee2

net-misc/unison: ignore TextRel on 32 bits

Closes: https://bugs.gentoo.org/926546
Signed-off-by: Alfredo Tupone  gentoo.org>

 net-misc/unison/unison-2.53.5-r1.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/net-misc/unison/unison-2.53.5-r1.ebuild 
b/net-misc/unison/unison-2.53.5-r1.ebuild
index d1619282f060..2c3522204b35 100644
--- a/net-misc/unison/unison-2.53.5-r1.ebuild
+++ b/net-misc/unison/unison-2.53.5-r1.ebuild
@@ -86,6 +86,11 @@ src_test() {
 }
 
 src_install() {
+   # OCaml generates textrels on 32-bit arches
+   if use arm || use ppc || use x86 ; then
+   export QA_TEXTRELS='.*'
+   fi
+
# install manually, since it's just too much
# work to force the Makefile to do the right thing.
cd "${S}/src" || die

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2024-07-03 Thread Maciej Barć

commit: 401701337483aa607349711eac1e58ddb26d5e4a
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Jul  3 19:27:37 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Jul  4 02:39:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40170133

net-misc/unison: fix desktop file

Closes: https://bugs.gentoo.org/935398
Signed-off-by: Maciej Barć  gentoo.org>

 net-misc/unison/{unison-2.53.5.ebuild => unison-2.53.5-r1.ebuild} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-misc/unison/unison-2.53.5.ebuild 
b/net-misc/unison/unison-2.53.5-r1.ebuild
similarity index 96%
rename from net-misc/unison/unison-2.53.5.ebuild
rename to net-misc/unison/unison-2.53.5-r1.ebuild
index 95aaf5401b6c..d1619282f060 100644
--- a/net-misc/unison/unison-2.53.5.ebuild
+++ b/net-misc/unison/unison-2.53.5-r1.ebuild
@@ -107,17 +107,16 @@ src_install() {
 
cd "${S}" || die
 
-   doman "man/${PN}.1"
-
if use gui ; then
newicon -s scalable icons/U.svg "${PN}-${SLOT}.svg"
-   make_desktop_entry "${PN}-${SLOT}" "${PN^} GUI (${SLOT})" 
"${PN}-${SLOT}"
+   make_desktop_entry "${PN}-gui-${SLOT}" "${PN^} GUI (${SLOT})" 
"${PN}-${SLOT}"
fi
 
if use doc ; then
DOCS+=( doc/unison-manual.pdf )
fi
 
+   doman "man/${PN}.1"
einstalldocs
 }

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2024-06-21 Thread Maciej Barć

commit: 432e263820f632c52366c900519e793afe74e2be
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri Jun 21 12:28:35 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri Jun 21 12:28:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432e2638

net-misc/unison: drop old 2.51.5-r1

Closes: https://bugs.gentoo.org/850343
Closes: https://bugs.gentoo.org/769341
Signed-off-by: Maciej Barć  gentoo.org>

 net-misc/unison/Manifest|   1 -
 net-misc/unison/unison-2.51.5-r1.ebuild | 146 
 2 files changed, 147 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 3f10329b5846..612fd10bc02b 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1,2 @@
-DIST unison-2.51.5.tar.gz 1385407 BLAKE2B 
cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8
 SHA512 
4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440
 DIST unison-2.53.3.tar.gz 1415490 BLAKE2B 
1142419781f5084da7ae8d043897f2f80aa4c3770a1c5cb44f8d7f669f718c41dd7fa6d13069cd95c71842233309eb886f63ab525e5e446ff761ea970de0e794
 SHA512 
f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b
 DIST unison-2.53.5.tar.gz 1408926 BLAKE2B 
e7e3db458a485fca8820508a964df5877aed0a2d6a3ea8305298d0c6516591323f3cacdd86c4e057585c0f3b2da8a03a5a3653f543d6f1acb20701f23a81f470
 SHA512 
eabeed7b428f1985610b47ce8bc7faac515fd24937727612aa45435da3e38d40b6cd6d227eb3b65dc370d46458cecfca9d0e9e1712b2b7fa41b76675f8115c4c

diff --git a/net-misc/unison/unison-2.51.5-r1.ebuild 
b/net-misc/unison/unison-2.51.5-r1.ebuild
deleted file mode 100644
index 6c916a9fa788..
--- a/net-misc/unison/unison-2.51.5-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop xdg-utils
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/
-   https://github.com/bcpierce00/unison/";
-
-if [[ "${PV}" == ** ]] ; then
-   inherit git-r3
-
-   EGIT_REPO_URI="https://github.com/bcpierce00/${PN}.git";
-else
-   SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz
-   -> ${P}.tar.gz"
-
-   KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-IUSE="debug doc gui +ocamlopt +threads"
-RESTRICT="!ocamlopt? ( strip )"
-
-BDEPEND="
-   dev-lang/ocaml:=[ocamlopt?]
-   doc? (
-   app-text/dvipsk
-   app-text/ghostscript-gpl
-   dev-tex/hevea
-   dev-texlive/texlive-latex
-   www-client/lynx
-   )
-"
-DEPEND="
-   gui? (
-   dev-ml/lablgtk:2=[ocamlopt?]
-   )
-"
-RDEPEND="
-   gui? (
-   dev-ml/lablgtk:2=[ocamlopt?]
-   || (
-   net-misc/ssh-askpass-fullscreen
-   net-misc/x11-ssh-askpass
-   )
-   )
-"
-IDEPEND="
-   >=app-eselect/eselect-unison-0.4
-"
-
-DOCS=( CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
-
-QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}"
-
-gui_cache_update() {
-   if use gui ; then
-   xdg_icon_cache_update
-   xdg_desktop_database_update
-   fi
-}
-
-src_prepare() {
-   default
-
-   # https://github.com/bcpierce00/unison/issues/416
-   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
-   # https://github.com/bcpierce00/unison/pull/415
-   sed -e "/myName/d" -i doc/docs.ml || die
-}
-
-src_compile() {
-   local -a myconf=()
-
-   if use debug ; then
-   myconf+=( DEBUGGING=true )
-   fi
-
-   if use doc; then
-   VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" 
HEVEA=true docs
-   fi
-
-   if use gui ; then
-   myconf+=( UISTYLE=gtk2 )
-   else
-   myconf+=( UISTYLE=text )
-   fi
-
-   if ! use ocamlopt ; then
-   myconf+=( NATIVE=false )
-   fi
-
-   if use threads ; then
-   myconf+=( THREADS=true )
-   fi
-
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake "${myconf[@]}" CFLAGS="" src
-}
-
-src_test() {
-   emake test CFLAGS=""
-}
-
-src_install() {
-   # install manually, since it's just too much
-   # work to force the Makefile to do the right thing.
-   cd src || die
-   local binname
-   for binname in unison unison-fsmonitor ; do
-   exeinto /usr/bin
-   newexe "${binname}" "${binname}-${SLOT}"
-   done
-
-   if use gui ; then
-   newicon -s scalable ../icons/U.svg "${PN}-${SLOT

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2024-06-20 Thread Arthur Zamarin

commit: 664846a09d4cf4cc19a19d61fda902df7ba60fcd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun 21 04:23:39 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun 21 04:23:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664846a0

net-misc/unison: Stabilize 2.53.3-r1 amd64, #934634

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/unison/unison-2.53.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.53.3-r1.ebuild 
b/net-misc/unison/unison-2.53.3-r1.ebuild
index 50fa0b81c9bb..b74dc58452c9 100644
--- a/net-misc/unison/unison-2.53.3-r1.ebuild
+++ b/net-misc/unison/unison-2.53.3-r1.ebuild
@@ -17,7 +17,7 @@ else
SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
 
-   KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+   KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2024-06-20 Thread Arthur Zamarin

commit: e7314ce0f910f29e2e6d90944bb505c161949595
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun 21 04:23:38 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun 21 04:23:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7314ce0

net-misc/unison: Stabilize 2.53.3-r1 x86, #934634

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/unison/unison-2.53.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.53.3-r1.ebuild 
b/net-misc/unison/unison-2.53.3-r1.ebuild
index 1b149dccc0c0..50fa0b81c9bb 100644
--- a/net-misc/unison/unison-2.53.3-r1.ebuild
+++ b/net-misc/unison/unison-2.53.3-r1.ebuild
@@ -17,7 +17,7 @@ else
SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
 
-   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+   KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2024-06-20 Thread Maciej Barć

commit: f8251447a160931cbfcbb896fb0fa3e6ffe109f7
Author: Maciej Barć  gentoo  org>
AuthorDate: Thu Jun 20 20:19:26 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Jun 20 21:01:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8251447

net-misc/unison: misc fixes

Closes: https://bugs.gentoo.org/685776
Closes: https://bugs.gentoo.org/928589
Signed-off-by: Maciej Barć  gentoo.org>

 ...nison-2.51.5.ebuild => unison-2.51.5-r1.ebuild} | 109 ++--
 net-misc/unison/unison-2.53.3-r1.ebuild| 139 +
 net-misc/unison/unison-2.53.3.ebuild   |  99 ---
 3 files changed, 212 insertions(+), 135 deletions(-)

diff --git a/net-misc/unison/unison-2.51.5.ebuild 
b/net-misc/unison/unison-2.51.5-r1.ebuild
similarity index 53%
rename from net-misc/unison/unison-2.51.5.ebuild
rename to net-misc/unison/unison-2.51.5-r1.ebuild
index 914cd4876cd3..6c916a9fa788 100644
--- a/net-misc/unison/unison-2.51.5.ebuild
+++ b/net-misc/unison/unison-2.51.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,32 +6,67 @@ EAPI=8
 inherit desktop xdg-utils
 
 DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/ 
https://github.com/bcpierce00/unison";
-SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/
+   https://github.com/bcpierce00/unison/";
+
+if [[ "${PV}" == ** ]] ; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/bcpierce00/${PN}.git";
+else
+   SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+
+   KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug doc gtk +ocamlopt threads"
+IUSE="debug doc gui +ocamlopt +threads"
+RESTRICT="!ocamlopt? ( strip )"
 
-BDEPEND="dev-lang/ocaml:=[ocamlopt?]
-   doc? ( app-text/dvipsk
+BDEPEND="
+   dev-lang/ocaml:=[ocamlopt?]
+   doc? (
+   app-text/dvipsk
app-text/ghostscript-gpl
-   dev-texlive/texlive-latex
dev-tex/hevea
+   dev-texlive/texlive-latex
www-client/lynx
-   )"
-DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )"
-RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?]
-   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-   >=app-eselect/eselect-unison-0.4"
+   )
+"
+DEPEND="
+   gui? (
+   dev-ml/lablgtk:2=[ocamlopt?]
+   )
+"
+RDEPEND="
+   gui? (
+   dev-ml/lablgtk:2=[ocamlopt?]
+   || (
+   net-misc/ssh-askpass-fullscreen
+   net-misc/x11-ssh-askpass
+   )
+   )
+"
+IDEPEND="
+   >=app-eselect/eselect-unison-0.4
+"
 
 DOCS=( CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
 QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}"
 
+gui_cache_update() {
+   if use gui ; then
+   xdg_icon_cache_update
+   xdg_desktop_database_update
+   fi
+}
+
 src_prepare() {
default
+
# https://github.com/bcpierce00/unison/issues/416
sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
# https://github.com/bcpierce00/unison/pull/415
@@ -39,26 +74,28 @@ src_prepare() {
 }
 
 src_compile() {
-   local myconf
+   local -a myconf=()
 
-   if use threads; then
-   myconf+=( THREADS=true )
+   if use debug ; then
+   myconf+=( DEBUGGING=true )
fi
 
-   if use debug; then
-   myconf+=( DEBUGGING=true )
+   if use doc; then
+   VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" 
HEVEA=true docs
fi
 
-   if use gtk; then
+   if use gui ; then
myconf+=( UISTYLE=gtk2 )
else
myconf+=( UISTYLE=text )
fi
 
-   use ocamlopt || myconf+=( NATIVE=false )
+   if ! use ocamlopt ; then
+   myconf+=( NATIVE=false )
+   fi
 
-   if use doc; then
-   VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" 
HEVEA=true docs
+   if use threads ; then
+   myconf+=( THREADS=true )
fi
 
# Discard cflags as it will try to pass them to ocamlc...
@@ -72,18 +109,19 @@ src_test() {
 src_install() {
# install manually, since it's just too much
# work to force the Makefile to do the right thing.
-   local binname
cd src || die
-   for binname in unison unison-fsmonitor; do
-   newbin ${binname} ${binname}-${SLOT}
+   local binname
+   for binname in unison unison-

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2024-06-20 Thread Maciej Barć

commit: b78b9808ad65b91102af98730e6cb6a2c4369e05
Author: Maciej Barć  gentoo  org>
AuthorDate: Thu Jun 20 20:44:18 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Jun 20 21:01:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b78b9808

net-misc/unison: bump to 2.53.5

Signed-off-by: Maciej Barć  gentoo.org>

 net-misc/unison/Manifest |   1 +
 net-misc/unison/unison-2.53.5.ebuild | 138 +++
 2 files changed, 139 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 120b6d85e835..3f10329b5846 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,2 +1,3 @@
 DIST unison-2.51.5.tar.gz 1385407 BLAKE2B 
cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8
 SHA512 
4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440
 DIST unison-2.53.3.tar.gz 1415490 BLAKE2B 
1142419781f5084da7ae8d043897f2f80aa4c3770a1c5cb44f8d7f669f718c41dd7fa6d13069cd95c71842233309eb886f63ab525e5e446ff761ea970de0e794
 SHA512 
f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b
+DIST unison-2.53.5.tar.gz 1408926 BLAKE2B 
e7e3db458a485fca8820508a964df5877aed0a2d6a3ea8305298d0c6516591323f3cacdd86c4e057585c0f3b2da8a03a5a3653f543d6f1acb20701f23a81f470
 SHA512 
eabeed7b428f1985610b47ce8bc7faac515fd24937727612aa45435da3e38d40b6cd6d227eb3b65dc370d46458cecfca9d0e9e1712b2b7fa41b76675f8115c4c

diff --git a/net-misc/unison/unison-2.53.5.ebuild 
b/net-misc/unison/unison-2.53.5.ebuild
new file mode 100644
index ..95aaf5401b6c
--- /dev/null
+++ b/net-misc/unison/unison-2.53.5.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/
+   https://github.com/bcpierce00/unison/";
+
+if [[ "${PV}" == ** ]] ; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/bcpierce00/${PN}.git";
+else
+   SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+
+   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+IUSE="doc gui +ocamlopt"
+
+BDEPEND="
+   dev-lang/ocaml:=[ocamlopt?]
+   doc? (
+   app-text/dvipsk
+   app-text/ghostscript-gpl
+   dev-texlive/texlive-latex
+   )
+"
+DEPEND="
+   gui? (
+   dev-ml/lablgtk:3=[ocamlopt?]
+   )
+"
+RDEPEND="
+   >=dev-lang/ocaml-4.08:=
+   gui? (
+   dev-ml/lablgtk:3=[ocamlopt?]
+   || (
+   net-misc/ssh-askpass-fullscreen
+   net-misc/x11-ssh-askpass
+   )
+   )
+"
+IDEPEND="
+   >=app-eselect/eselect-unison-0.4
+"
+
+DOCS=( CONTRIBUTING.md README.md src/FEATURES.md src/ROADMAP.txt src/TODO.txt )
+
+QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}"
+
+gui_cache_update() {
+   if use gui ; then
+   xdg_icon_cache_update
+   xdg_desktop_database_update
+   fi
+}
+
+src_compile() {
+   local -a myconf=()
+
+   if ! use ocamlopt ; then
+   myconf+=( NATIVE=false )
+   fi
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake "${myconf[@]}" CFLAGS="" -j1 tui fsmonitor manpage
+
+   if use gui ; then
+   emake "${myconf[@]}" CFLAGS="" -j1 gui
+   fi
+
+   if use doc ; then
+   VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" 
HEVEA=false docs
+   fi
+}
+
+src_test() {
+   emake test CFLAGS=""
+}
+
+src_install() {
+   # install manually, since it's just too much
+   # work to force the Makefile to do the right thing.
+   cd "${S}/src" || die
+
+   local -a bins=(
+   unison
+   unison-fsmonitor
+   )
+
+   if use gui ; then
+   bins+=( unison-gui )
+   fi
+
+   local binname
+   for binname in "${bins[@]}" ; do
+   exeinto /usr/bin
+   newexe "${binname}" "${binname}-${SLOT}"
+   done
+
+   cd "${S}" || die
+
+   doman "man/${PN}.1"
+
+   if use gui ; then
+   newicon -s scalable icons/U.svg "${PN}-${SLOT}.svg"
+   make_desktop_entry "${PN}-${SLOT}" "${PN^} GUI (${SLOT})" 
"${PN}-${SLOT}"
+   fi
+
+   if use doc ; then
+   DOCS+=( doc/unison-manual.pdf )
+   fi
+
+   einstalldocs
+}
+
+pkg_postinst() {
+   elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/unison-${SLOT}"
+   elog "in your profile files to access ex

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2024-06-20 Thread Maciej Barć

commit: d0874cc679f515df1c469e4b388d86beeadd8a8d
Author: Maciej Barć  gentoo  org>
AuthorDate: Thu Jun 20 20:48:33 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Jun 20 21:01:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0874cc6

net-misc/unison: add the Gentoo ML project as the maintainer

Signed-off-by: Maciej Barć  gentoo.org>

 net-misc/unison/metadata.xml | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
index ddea0b516f37..bb6a9ec8d72c 100644
--- a/net-misc/unison/metadata.xml
+++ b/net-misc/unison/metadata.xml
@@ -1,11 +1,15 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
+
 
-   
-   
-   bcpierce00/unison
-   https://github.com/bcpierce00/unison/issues
-   https://github.com/bcpierce00/unison/wiki
-   
https://www.cis.upenn.edu/~bcpierce/unison/changes.html
-   
+  
+m...@gentoo.org
+ML
+  
+  
+bcpierce00/unison
+https://github.com/bcpierce00/unison/issues
+
https://www.cis.upenn.edu/~bcpierce/unison/changes.html
+https://github.com/bcpierce00/unison/wiki
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2024-01-27 Thread Joonas Niilola

commit: 437509263eb4ac577eb618e8744a06d8ad7a3b5b
Author: Christopher Fore  posteo  net>
AuthorDate: Sat Nov 25 19:19:14 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan 27 09:16:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43750926

net-misc/unison: add 2.53.3

Tested on amd64 and builds successfully, tests pass.

Removed ~sparc-solaris from the original ebuild provided as
`pkgcheck scan` said it was unknown.

Bug: https://bugs.gentoo.org/769341
Closes: https://bugs.gentoo.org/887609
Signed-off-by: Christopher Fore  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/33986
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/unison/Manifest |  1 +
 net-misc/unison/unison-2.53.3.ebuild | 99 
 2 files changed, 100 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index a43b259cbb2b..120b6d85e835 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1 +1,2 @@
 DIST unison-2.51.5.tar.gz 1385407 BLAKE2B 
cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8
 SHA512 
4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440
+DIST unison-2.53.3.tar.gz 1415490 BLAKE2B 
1142419781f5084da7ae8d043897f2f80aa4c3770a1c5cb44f8d7f669f718c41dd7fa6d13069cd95c71842233309eb886f63ab525e5e446ff761ea970de0e794
 SHA512 
f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b

diff --git a/net-misc/unison/unison-2.53.3.ebuild 
b/net-misc/unison/unison-2.53.3.ebuild
new file mode 100644
index ..0de016690ac1
--- /dev/null
+++ b/net-misc/unison/unison-2.53.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://github.com/bcpierce00/unison";
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug doc gtk +ocamlopt threads"
+
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+   doc? ( app-text/dvipsk
+   app-text/ghostscript-gpl
+   dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:3=[ocamlopt?] )"
+RDEPEND="gtk? ( dev-ml/lablgtk:3=[ocamlopt?]
+   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+   >=app-eselect/eselect-unison-0.4
+   >=dev-lang/ocaml-4.08"
+
+DOCS=( CONTRIB README ROADMAP.txt TODO.txt )
+
+src_compile() {
+   local myconf
+
+   if use threads; then
+   myconf+=( THREADS=true )
+   fi
+
+   if use debug; then
+   myconf+=( DEBUGGING=true )
+   fi
+
+   if use gtk; then
+   myconf+=( UISTYLE=gtk3 )
+   else
+   myconf+=( UISTYLE=text )
+   fi
+
+   use ocamlopt || myconf+=( NATIVE=false )
+
+   if use doc; then
+   VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" 
HEVEA=false docs
+   fi
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake "${myconf[@]}" CFLAGS="" src
+
+   emake manpage
+}
+
+src_test() {
+   emake test CFLAGS=""
+}
+
+src_install() {
+   # install manually, since it's just too much
+   # work to force the Makefile to do the right thing.
+   local binname
+   cd src || die
+   for binname in unison unison-fsmonitor; do
+   newbin ${binname} ${binname}-${SLOT}
+   done
+   doman ../man/unison.1
+
+   if use gtk; then
+   newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+   make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" 
"${PN}-${SLOT}"
+   fi
+
+   if use doc; then
+   DOCS+=( ../doc/unison-manual.pdf )
+   fi
+
+   einstalldocs
+}
+
+pkg_postinst() {
+   elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/unison-${SLOT}"
+   elog "in your profile files to access exactly this version over ssh."
+   elog "Or you can use 'eselect unison' to set the version."
+   eselect unison update || die
+
+   if use gtk; then
+   xdg_icon_cache_update
+   fi
+}
+
+pkg_postrm() {
+   if use gtk; then
+   xdg_icon_cache_update
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2023-01-27 Thread Andreas Sturmlechner

commit: 3d347299cf83e628dd12a61573cdfdcfa73ecca7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan 27 20:19:18 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan 27 22:34:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d347299

net-misc/unison: drop 2.51.3_p20201127, 2.51.4_rc2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-misc/unison/Manifest   |   2 -
 net-misc/unison/unison-2.51.3_p20201127.ebuild | 110 -
 net-misc/unison/unison-2.51.4_rc2.ebuild   | 107 
 3 files changed, 219 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index e20b41c58602..a43b259cbb2b 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1 @@
-DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 
83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd
 SHA512 
4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c641ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
-DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B 
d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703
 SHA512 
c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6
 DIST unison-2.51.5.tar.gz 1385407 BLAKE2B 
cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8
 SHA512 
4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440

diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild 
b/net-misc/unison/unison-2.51.3_p20201127.ebuild
deleted file mode 100644
index 4c244d239442..
--- a/net-misc/unison/unison-2.51.3_p20201127.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-MY_COMMIT="4713e608d2f9c998ba4412fee53b94dc9bef98b9"
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
-SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
-IUSE="debug doc gtk +ocamlopt threads"
-RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
-
-# ocaml version so we are sure it has ocamlopt use flag
-BDEPEND="dev-lang/ocaml:=[ocamlopt?]
-   doc? ( app-text/dvipsk
-   app-text/ghostscript-gpl
-   dev-texlive/texlive-latex )"
-DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )"
-RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?]
-   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-   >=app-eselect/eselect-unison-0.4"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
-
-src_prepare() {
-   # https://github.com/bcpierce00/unison/issues/416
-   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
-   # https://github.com/bcpierce00/unison/pull/415
-   sed -e "/myName/d" -i doc/docs.ml || die
-   default
-}
-
-src_compile() {
-   local myconf
-
-   if use threads; then
-   myconf="$myconf THREADS=true"
-   fi
-
-   if use debug; then
-   myconf="$myconf DEBUGGING=true"
-   fi
-
-   if use gtk; then
-   myconf="$myconf UISTYLE=gtk2"
-   else
-   myconf="$myconf UISTYLE=text"
-   fi
-
-   use ocamlopt || myconf="$myconf NATIVE=false"
-
-   if use doc; then
-   VARTEXFONTS="${T}/fonts" emake $myconf CFLAGS="" HEVEA=false 
docs
-   fi
-
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS="" src
-}
-
-src_test() {
-   emake test CFLAGS=""
-}
-
-src_install() {
-   # install manually, since it's just too much
-   # work to force the Makefile to do the right thing.
-   local binname
-   cd src || die
-   for binname in unison unison-fsmonitor; do
-   newbin ${binname} ${binname}-${SLOT}
-   done
-
-   if use gtk; then
-   newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-   make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" 
"${PN}-${SLOT}"
-   fi
-
-   # Waiting for https://github.com/bcpierce00/unison/issues/411
-   if use doc; then
-   DOCS+=( ../doc/unison-manual.pdf )
-   #   HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
-   fi
-
-   einstalldocs
-}
-
-pkg_postinst() {
-   elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/uni

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2022-12-18 Thread Sam James

commit: dde21e140da7bf4033264f1b4c902dfc9bcc8829
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 19 00:58:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 19 00:58:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde21e14

net-misc/unison: Stabilize 2.51.5 amd64, #886783

Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.51.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.5.ebuild 
b/net-misc/unison/unison-2.51.5.ebuild
index 28e83456f8d5..238c1a6c9172 100644
--- a/net-misc/unison/unison-2.51.5.ebuild
+++ b/net-misc/unison/unison-2.51.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 
 BDEPEND="dev-lang/ocaml:=[ocamlopt?]

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2022-12-18 Thread Sam James

commit: f0bef1719edaaf93f85860e29e9a719f219ad88f
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 11:49:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 11:49:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0bef171

net-misc/unison: Stabilize 2.51.5 x86, #886783

Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.51.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.5.ebuild 
b/net-misc/unison/unison-2.51.5.ebuild
index b378e9c13a3c..28e83456f8d5 100644
--- a/net-misc/unison/unison-2.51.5.ebuild
+++ b/net-misc/unison/unison-2.51.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 
 BDEPEND="dev-lang/ocaml:=[ocamlopt?]

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2022-02-26 Thread Florian Schmaus

commit: e38c57c052e642b449c44e9cdbf66d6b333c0a4b
Author: Florian Schmaus  gentoo  org>
AuthorDate: Sat Feb 26 10:28:13 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sat Feb 26 10:29:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e38c57c0

net-misc/unison: update HOMEPAGE

Signed-off-by: Florian Schmaus  gentoo.org>

 net-misc/unison/unison-2.51.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.5.ebuild 
b/net-misc/unison/unison-2.51.5.ebuild
index 9390b830c005..d17c53a3490f 100644
--- a/net-misc/unison/unison-2.51.5.ebuild
+++ b/net-misc/unison/unison-2.51.5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit desktop xdg-utils
 
 DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/ 
https://github.com/bcpierce00/unison";
 SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2022-02-26 Thread Florian Schmaus

commit: e7c75e16a9933ec3350b59abbbdb8152ded05140
Author: Florian Schmaus  gentoo  org>
AuthorDate: Sat Feb 26 10:28:23 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sat Feb 26 10:30:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c75e16

net-misc/unison: suppress QA warning for unison-fsmonitor

Signed-off-by: Florian Schmaus  gentoo.org>

 net-misc/unison/unison-2.51.5.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-misc/unison/unison-2.51.5.ebuild 
b/net-misc/unison/unison-2.51.5.ebuild
index d17c53a3490f..b378e9c13a3c 100644
--- a/net-misc/unison/unison-2.51.5.ebuild
+++ b/net-misc/unison/unison-2.51.5.ebuild
@@ -28,6 +28,8 @@ RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?]
 
 DOCS=( CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
+QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}"
+
 src_prepare() {
default
# https://github.com/bcpierce00/unison/issues/416

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2022-02-26 Thread Florian Schmaus

commit: b9a7e336ed7c038767aaf206772ff5be5dec105e
Author: Dennis Eisele  dennis-eisele  de>
AuthorDate: Thu Feb 24 18:38:30 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sat Feb 26 10:29:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9a7e336

net-misc/unison: fix documentation building

Closes: https://bugs.gentoo.org/833870
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Dennis Eisele  dennis-eisele.de>
Closes: https://github.com/gentoo/gentoo/pull/24335
Signed-off-by: Florian Schmaus  gentoo.org>

 net-misc/unison/unison-2.51.5.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net-misc/unison/unison-2.51.5.ebuild 
b/net-misc/unison/unison-2.51.5.ebuild
index f68427249b70..9390b830c005 100644
--- a/net-misc/unison/unison-2.51.5.ebuild
+++ b/net-misc/unison/unison-2.51.5.ebuild
@@ -17,7 +17,10 @@ IUSE="debug doc gtk +ocamlopt threads"
 BDEPEND="dev-lang/ocaml:=[ocamlopt?]
doc? ( app-text/dvipsk
app-text/ghostscript-gpl
-   dev-texlive/texlive-latex )"
+   dev-texlive/texlive-latex
+   dev-tex/hevea
+   www-client/lynx
+   )"
 DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )"
 RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?]
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
@@ -53,7 +56,7 @@ src_compile() {
use ocamlopt || myconf+=( NATIVE=false )
 
if use doc; then
-   VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" 
HEVEA=false docs
+   VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" 
HEVEA=true docs
fi
 
# Discard cflags as it will try to pass them to ocamlc...
@@ -80,7 +83,7 @@ src_install() {
 
if use doc; then
DOCS+=( ../doc/unison-manual.pdf )
-   HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+   HTML_DOCS=( "../doc/unison-manual.html" )
fi
 
einstalldocs

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2022-02-21 Thread Sam James

commit: fcd98b3c64bf81b38c67391c945e6181c65c7648
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 22 01:43:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 22 01:43:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd98b3c

net-misc/unison: drop obsolete comment

Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.51.5.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.5.ebuild 
b/net-misc/unison/unison-2.51.5.ebuild
index 9e1573deb3a6..f68427249b70 100644
--- a/net-misc/unison/unison-2.51.5.ebuild
+++ b/net-misc/unison/unison-2.51.5.ebuild
@@ -14,7 +14,6 @@ SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 
-# ocaml version so we are sure it has ocamlopt use flag
 BDEPEND="dev-lang/ocaml:=[ocamlopt?]
doc? ( app-text/dvipsk
app-text/ghostscript-gpl

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2022-02-21 Thread Sam James

commit: 916d5d52de676833b5006e68a5d00b3dccb1f8c0
Author: Dennis Eisele  dennis-eisele  de>
AuthorDate: Tue Feb 22 00:09:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 22 01:40:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916d5d52

net-misc/unison: bump version to 2.51.5 and bump EAPI to 8

Closes: https://bugs.gentoo.org/818247
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Dennis Eisele  dennis-eisele.de>
Closes: https://github.com/gentoo/gentoo/pull/24294
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest |   1 +
 net-misc/unison/unison-2.51.5.ebuild | 105 +++
 2 files changed, 106 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 0e186b02e774..e20b41c58602 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,2 +1,3 @@
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 
83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd
 SHA512 
4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c641ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
 DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B 
d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703
 SHA512 
c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6
+DIST unison-2.51.5.tar.gz 1385407 BLAKE2B 
cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8
 SHA512 
4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440

diff --git a/net-misc/unison/unison-2.51.5.ebuild 
b/net-misc/unison/unison-2.51.5.ebuild
new file mode 100644
index ..9e1573deb3a6
--- /dev/null
+++ b/net-misc/unison/unison-2.51.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
+
+# ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+   doc? ( app-text/dvipsk
+   app-text/ghostscript-gpl
+   dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?]
+   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+   >=app-eselect/eselect-unison-0.4"
+
+DOCS=( CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_prepare() {
+   default
+   # https://github.com/bcpierce00/unison/issues/416
+   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
+   # https://github.com/bcpierce00/unison/pull/415
+   sed -e "/myName/d" -i doc/docs.ml || die
+}
+
+src_compile() {
+   local myconf
+
+   if use threads; then
+   myconf+=( THREADS=true )
+   fi
+
+   if use debug; then
+   myconf+=( DEBUGGING=true )
+   fi
+
+   if use gtk; then
+   myconf+=( UISTYLE=gtk2 )
+   else
+   myconf+=( UISTYLE=text )
+   fi
+
+   use ocamlopt || myconf+=( NATIVE=false )
+
+   if use doc; then
+   VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" 
HEVEA=false docs
+   fi
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake "${myconf[@]}" CFLAGS="" src
+}
+
+src_test() {
+   emake test CFLAGS=""
+}
+
+src_install() {
+   # install manually, since it's just too much
+   # work to force the Makefile to do the right thing.
+   local binname
+   cd src || die
+   for binname in unison unison-fsmonitor; do
+   newbin ${binname} ${binname}-${SLOT}
+   done
+
+   if use gtk; then
+   newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+   make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" 
"${PN}-${SLOT}"
+   fi
+
+   if use doc; then
+   DOCS+=( ../doc/unison-manual.pdf )
+   HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+   fi
+
+   einstalldocs
+}
+
+pkg_postinst() {
+   elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/unison-${SLOT}"
+   elog "in your profile files to access exactly this version over ssh."
+   elog "Or you can use 'eselect unison' to set the version."
+   eselect unison update || die
+
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/files/

2021-05-18 Thread Joonas Niilola

commit: 3a6f7403466720c09da8ccd940baeb391d6a6a8f
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat May  1 17:57:32 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May 18 10:34:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a6f7403

net-misc/unison: remove unused patch(es)

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20636
Signed-off-by: Joonas Niilola  gentoo.org>

 .../files/unison-2.48.15_p4-ocaml-4.08.patch   | 67 --
 .../unison/files/unison-2.48.4-Makefile-dep.patch  | 20 ---
 2 files changed, 87 deletions(-)

diff --git a/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch 
b/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch
deleted file mode 100644
index 8a8205d3cfe..000
--- a/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Reworked for v2.48.15v4 ( https://github.com/bcpierce00/unison/commit/29fa058 )
-
-From: Stephane Glondu 
-Date: Mon, 25 Nov 2019 10:52:48 +0100
-Subject: Fix compilation with OCaml 4.08.1
-

- files.ml | 2 +-
- recon.ml | 4 ++--
- system/system_generic.ml | 2 +-
- uigtk2.ml| 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.OCaml b/Makefile.OCaml
-index 21610ce..7549907 100644
 a/files.ml
-+++ b/files.ml
-@@ -722,7 +722,7 @@ let get_files_in_directory dir =
-   with End_of_file ->
- dirh.System.closedir ()
-   end;
--  Sort.list (<) !files
-+  List.sort String.compare !files
- 
- let ls dir pattern =
-   Util.convertUnixErrorsToTransient
-diff --git a/recon.ml b/recon.ml
-index 5ed358d..a8719c4 100644
 a/recon.ml
-+++ b/recon.ml
-@@ -651,8 +651,8 @@ let rec reconcile
- 
- (* Sorts the paths so that they will be displayed in order   
*)
- let sortPaths pathUpdatesList =
--  Sort.list
--(fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
-+  List.sort
-+Path.compare
- pathUpdatesList
- 
- let rec enterPath p1 p2 t =
-diff --git a/system/system_generic.ml b/system/system_generic.ml
-index 9230cdc..ee457c5 100755
 a/system/system_generic.ml
-+++ b/system/system_generic.ml
-@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
- let chmod = Unix.chmod
- let chown = Unix.chown
- let utimes = Unix.utimes
--let link = Unix.link
-+let link s d = Unix.link s d
- let openfile = Unix.openfile
- let opendir f =
-   let h = Unix.opendir f in
-diff --git a/uigtk2.ml b/uigtk2.ml
-index 206d8ad..b2a17e2 100644
 a/uigtk2.ml
-+++ b/uigtk2.ml
-@@ -94,7 +94,7 @@ let icon =
- let icon =
-   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
-   Gpointer.blit
--(Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
-+(Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
-   p
-
- let leftPtrWatch =

diff --git a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch 
b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
deleted file mode 100644
index f65959dfb4a..000
--- a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Makefile.OCaml: fswatch.cmi depends on ubase/prefs.cmi.
-
-  The dependency is needed to compile unison
-  in parallel.
-
-Reference: https://github.com/bcpierce00/unison/pull/100
-
-diff --git a/Makefile.OCaml b/Makefile.OCaml
-index 21610ce..84fe7ad 100644
 a/Makefile.OCaml
-+++ b/Makefile.OCaml
-@@ -426,6 +426,8 @@ win32rc/unison.res.lib: win32rc/unison.res
-   @echo "$(CAMLC): $< ---> $@"
-   $(CAMLC) $(CAMLFLAGS) -c $(CWD)/$<
- 
-+fswatch.cmi : ubase/prefs.cmi
-+
- %.cmo: %.ml
-   @echo "$(OCAMLC): $< ---> $@"
-   $(OCAMLC) $(CAMLFLAGS) -c $(CWD)/$<

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-05-02 Thread Alfredo Tupone

commit: 921a68af015d95b880642ac291df6a2335fc47e6
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Mon May  3 06:10:35 2021 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Mon May  3 06:10:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=921a68af

net-misc/unison: require ocamlopt on lablgtk when needed

Closes: https://bugs.gentoo.org/782109
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone  gentoo.org>

 net-misc/unison/unison-2.51.3_p20201127.ebuild | 4 ++--
 net-misc/unison/unison-2.51.4_rc2.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild 
b/net-misc/unison/unison-2.51.3_p20201127.ebuild
index 0d813590718..484fcb308f3 100644
--- a/net-misc/unison/unison-2.51.3_p20201127.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -21,8 +21,8 @@ BDEPEND="dev-lang/ocaml:=[ocamlopt?]
doc? ( app-text/dvipsk
app-text/ghostscript-gpl
dev-texlive/texlive-latex )"
-DEPEND="gtk? ( dev-ml/lablgtk:2= )"
-RDEPEND="gtk? ( dev-ml/lablgtk:2=
+DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?]
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
>=app-eselect/eselect-unison-0.4"
 

diff --git a/net-misc/unison/unison-2.51.4_rc2.ebuild 
b/net-misc/unison/unison-2.51.4_rc2.ebuild
index db9797ada80..2a61c1d85d3 100644
--- a/net-misc/unison/unison-2.51.4_rc2.ebuild
+++ b/net-misc/unison/unison-2.51.4_rc2.ebuild
@@ -20,8 +20,8 @@ BDEPEND="dev-lang/ocaml:=[ocamlopt?]
doc? ( app-text/dvipsk
app-text/ghostscript-gpl
dev-texlive/texlive-latex )"
-DEPEND="gtk? ( dev-ml/lablgtk:2= )"
-RDEPEND="gtk? ( dev-ml/lablgtk:2=
+DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?]
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
>=app-eselect/eselect-unison-0.4"

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-04-27 Thread Joonas Niilola

commit: d1e10fb820af15afd24852cab8041a5b9ef6ae35
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Apr 16 06:46:28 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr 28 06:42:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e10fb8

net-misc/unison: remove :2.48

Closes: https://bugs.gentoo.org/749744
Closes: https://bugs.gentoo.org/770361
Closes: https://bugs.gentoo.org/569502
Closes: https://bugs.gentoo.org/639444
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20402
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/unison/Manifest|   3 -
 net-misc/unison/unison-2.48.15_p4-r2.ebuild | 109 
 2 files changed, 112 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 41d484b0b4f..0e186b02e77 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,5 +1,2 @@
-DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B 
d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec
 SHA512 
658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
-DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
-DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 
83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd
 SHA512 
4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c641ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
 DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B 
d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703
 SHA512 
c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6

diff --git a/net-misc/unison/unison-2.48.15_p4-r2.ebuild 
b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
deleted file mode 100644
index 1f9bb1d55d0..000
--- a/net-misc/unison/unison-2.48.15_p4-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-# Use the docs for the last 'normal' release
-DOC_P="${PN}-2.48.4"
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
-SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV/_p/v}.tar.gz -> 
${P/_p/v}.tar.gz"
-# No manual.pdf or manual.html available for this version
-SRC_URI+=" doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DOC_VER}/${DOC_P}-manual.pdf
-   
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DOC_VER}/${DOC_P}-manual.html
 )
-"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="debug doc gtk +ocamlopt threads"
-
-# Upstream, for this version, has explicitly disabled test with marker
-# "Skipping some tests -- remove me!". Given the potentially destructive nature
-# of those tests, let's not try to run them (they're re-enabled in subsequent
-# releases).
-RESTRICT="test !ocamlopt? ( strip )"
-
-# ocaml version so we are sure it has ocamlopt use flag
-DEPEND="https://bugs.gentoo.org/709646
-)
-
-DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
-
-src_compile() {
-   local myconf="all"
-
-   if use threads; then
-   myconf="$myconf THREADS=true"
-   fi
-
-   if use debug; then
-   myconf="$myconf DEBUGGING=true"
-   fi
-
-   if use gtk; then
-   myconf="$myconf UISTYLE=gtk2"
-   else
-   myconf="$myconf UISTYLE=text"
-   fi
-
-   use ocamlopt || myconf="$myconf NATIVE=false"
-
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS="" buildexecutable
-}
-
-src_test() {
-   emake selftest CFLAGS=""
-}
-
-src_install() {
-   # install manually, since it's just too much
-   # work to force the Makefile to do the right thing.
-   local binname
-   for binname in unison unison-fsmonitor; do
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-04-27 Thread Joonas Niilola

commit: 9fa89b44b31641ab9274770a583a0b0cb2f973d1
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Apr 16 06:37:29 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr 28 06:42:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa89b44

net-misc/unison: remove old

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/unison/Manifest   |   1 -
 net-misc/unison/unison-2.51.3_p20201024.ebuild | 111 -
 2 files changed, 112 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 6c8e996aba1..41d484b0b4f 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,6 +1,5 @@
 DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B 
d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec
 SHA512 
658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
-DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 
780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e
 SHA512 
87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 
83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd
 SHA512 
4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c641ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
 DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B 
d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703
 SHA512 
c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6

diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild 
b/net-misc/unison/unison-2.51.3_p20201024.ebuild
deleted file mode 100644
index 7f864d5d40b..000
--- a/net-misc/unison/unison-2.51.3_p20201024.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-MY_COMMIT="73f1bfa2476f907e2d781948ce9e764230bf8b27"
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
-SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="debug doc gtk +ocamlopt threads"
-RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
-
-# ocaml version so we are sure it has ocamlopt use flag
-BDEPEND="dev-lang/ocaml:=[ocamlopt?]
-   doc? ( app-text/dvipsk
-   app-text/ghostscript-gpl
-   dev-texlive/texlive-latex )"
-DEPEND="gtk? ( dev-ml/lablgtk:2= )"
-RDEPEND="gtk? ( dev-ml/lablgtk:2=
-   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-   >=app-eselect/eselect-unison-0.4"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
-
-src_prepare() {
-   # https://github.com/bcpierce00/unison/issues/416
-   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
-   # https://github.com/bcpierce00/unison/pull/415
-   sed -e "/myName/d" -i doc/docs.ml || die
-   default
-}
-
-src_compile() {
-   # build unison-manual.pdf but not .html
-   if use doc; then
-   local myconf="all docs HEVEA=false"
-   else
-   local myconf="all"
-   fi
-
-   if use threads; then
-   myconf="$myconf THREADS=true"
-   fi
-
-   if use debug; then
-   myconf="$myconf DEBUGGING=true"
-   fi
-
-   if use gtk; then
-   myconf="$myconf UISTYLE=gtk2"
-   else
-   myconf="$myconf UISTYLE=text"
-   fi
-
-   use ocamlopt || myconf="$myconf NATIVE=false"
-
-   # Discard cflags as

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-04-11 Thread Sam James

commit: 2f6559acc37befdd0c3955806cac768da537b97e
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 11 11:04:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 11 11:04:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f6559ac

net-misc/unison: Stabilize 2.51.3_p20201127 x86, #780852

Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.51.3_p20201127.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild 
b/net-misc/unison/unison-2.51.3_p20201127.ebuild
index f63e304f3ab..481da49fe67 100644
--- a/net-misc/unison/unison-2.51.3_p20201127.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-03-19 Thread Joonas Niilola

commit: de98d84f3e38bfaee359cbf6bb9d2e6c4814c52b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Mar 16 20:25:37 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Mar 19 07:24:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de98d84f

net-misc/unison: Release candidate 2.51.4_rc2

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/unison/Manifest |   1 +
 net-misc/unison/unison-2.51.4_rc2.ebuild | 107 +++
 2 files changed, 108 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 0a56449311a..148332b235c 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -4,3 +4,4 @@ DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda9
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 
780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e
 SHA512 
87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 
83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd
 SHA512 
4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c641ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
 DIST unison-2.51.4_rc1.tar.gz 1374314 BLAKE2B 
8b0218fa903ed8f1ceb3b489df8fbda5ba9fddfbe4b9440098d16dd298e15666bfc3722d1735069843511b7b39e8b49463c5b26b940ff770c7fcdfbd63eed1c2
 SHA512 
7b3fe2d09ff35ccdd68306d8fce6edd947489554c54afebe44d096210d2d8e58c6947386c2795c668070f5ba14a28547cee31d947d54ec90ed63927ad766c0bb
+DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B 
d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703
 SHA512 
c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6

diff --git a/net-misc/unison/unison-2.51.4_rc2.ebuild 
b/net-misc/unison/unison-2.51.4_rc2.ebuild
new file mode 100644
index 000..02f43dee92d
--- /dev/null
+++ b/net-misc/unison/unison-2.51.4_rc2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
+RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
+
+# ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+   doc? ( app-text/dvipsk
+   app-text/ghostscript-gpl
+   dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
+   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+   >=app-eselect/eselect-unison-0.4"
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_prepare() {
+   # https://github.com/bcpierce00/unison/issues/416
+   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
+   # https://github.com/bcpierce00/unison/pull/415
+   sed -e "/myName/d" -i doc/docs.ml || die
+   default
+}
+
+src_compile() {
+   local myconf
+
+   if use threads; then
+   myconf+=( THREADS=true )
+   fi
+
+   if use debug; then
+   myconf+=( DEBUGGING=true )
+   fi
+
+   if use gtk; then
+   myconf+=( UISTYLE=gtk2 )
+   else
+   myconf+=( UISTYLE=text )
+   fi
+
+   use ocamlopt || myconf+=( NATIVE=false )
+
+   if use doc; then
+   VARTEXFONTS="${T}/fonts" emake $myconf CFLAGS="" HEVEA=false 
docs
+   fi
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake $myconf CFLAGS="" src
+}
+
+src_test() {
+   emake test CFLAGS=""
+}
+
+src_install() {
+   # install manually, since it's just too much
+   # work to force the Makefile to do the right thing.
+   local binname
+   cd src || die
+   for binname in unison unison-fsmonitor; do
+   newbin ${binname} ${binname}-${SLOT}
+   done
+
+   if use gtk; then
+   newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+   make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" 
"${PN}-${SLOT}"
+   fi
+
+   # Waiting for https://github.com/bcpierce00/unison/issues/411
+   if use doc; then
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-03-19 Thread Joonas Niilola

commit: f702a91a757296ee0f47828d1f22030fa1c9a2f6
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Mar 17 09:16:55 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Mar 19 07:24:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f702a91a

net-misc/unison: drop rc1

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19963
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/unison/Manifest |   1 -
 net-misc/unison/unison-2.51.4_rc1.ebuild | 107 ---
 2 files changed, 108 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 148332b235c..6c8e996aba1 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -3,5 +3,4 @@ DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 
780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e
 SHA512 
87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 
83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd
 SHA512 
4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c641ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
-DIST unison-2.51.4_rc1.tar.gz 1374314 BLAKE2B 
8b0218fa903ed8f1ceb3b489df8fbda5ba9fddfbe4b9440098d16dd298e15666bfc3722d1735069843511b7b39e8b49463c5b26b940ff770c7fcdfbd63eed1c2
 SHA512 
7b3fe2d09ff35ccdd68306d8fce6edd947489554c54afebe44d096210d2d8e58c6947386c2795c668070f5ba14a28547cee31d947d54ec90ed63927ad766c0bb
 DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B 
d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703
 SHA512 
c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6

diff --git a/net-misc/unison/unison-2.51.4_rc1.ebuild 
b/net-misc/unison/unison-2.51.4_rc1.ebuild
deleted file mode 100644
index 7ce1abe5eab..000
--- a/net-misc/unison/unison-2.51.4_rc1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
-SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
-IUSE="debug doc gtk +ocamlopt threads"
-RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
-
-# ocaml version so we are sure it has ocamlopt use flag
-BDEPEND="dev-lang/ocaml:=[ocamlopt?]
-   doc? ( app-text/dvipsk
-   app-text/ghostscript-gpl
-   dev-texlive/texlive-latex )"
-DEPEND="gtk? ( dev-ml/lablgtk:2= )"
-RDEPEND="gtk? ( dev-ml/lablgtk:2=
-   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-   >=app-eselect/eselect-unison-0.4"
-
-DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
-
-src_prepare() {
-   # https://github.com/bcpierce00/unison/issues/416
-   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
-   # https://github.com/bcpierce00/unison/pull/415
-   sed -e "/myName/d" -i doc/docs.ml || die
-   default
-}
-
-src_compile() {
-   local myconf
-
-   if use threads; then
-   myconf="$myconf THREADS=true"
-   fi
-
-   if use debug; then
-   myconf="$myconf DEBUGGING=true"
-   fi
-
-   if use gtk; then
-   myconf="$myconf UISTYLE=gtk2"
-   else
-   myconf="$myconf UISTYLE=text"
-   fi
-
-   use ocamlopt || myconf="$myconf NATIVE=false"
-
-   if use doc; then
-   VARTEXFONTS="${T}/fonts" emake $myconf CFLAGS="" HEVEA=false 
docs
-   fi
-
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS="" src
-}
-
-src_test() {
-   emake test CFLAGS=""
-}
-
-src_install() {
-   # install manually, since it's just too much
-   # work to force the Makefile to do the right thing.
-   local binname
-   cd src || die
-   for binname in unison unison-fsm

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-03-19 Thread Joonas Niilola

commit: bed3fd174252742cd692bf871b8e30c4435560fe
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Mar 19 07:25:45 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Mar 19 07:25:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bed3fd17

net-misc/unison: handle arrays better in 2.51.4_rc2

Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/unison/unison-2.51.4_rc2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/unison/unison-2.51.4_rc2.ebuild 
b/net-misc/unison/unison-2.51.4_rc2.ebuild
index 02f43dee92d..db9797ada80 100644
--- a/net-misc/unison/unison-2.51.4_rc2.ebuild
+++ b/net-misc/unison/unison-2.51.4_rc2.ebuild
@@ -28,11 +28,11 @@ RDEPEND="gtk? ( dev-ml/lablgtk:2=
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
 src_prepare() {
+   default
# https://github.com/bcpierce00/unison/issues/416
sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
# https://github.com/bcpierce00/unison/pull/415
sed -e "/myName/d" -i doc/docs.ml || die
-   default
 }
 
 src_compile() {
@@ -55,11 +55,11 @@ src_compile() {
use ocamlopt || myconf+=( NATIVE=false )
 
if use doc; then
-   VARTEXFONTS="${T}/fonts" emake $myconf CFLAGS="" HEVEA=false 
docs
+   VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" 
HEVEA=false docs
fi
 
# Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS="" src
+   emake "${myconf[@]}" CFLAGS="" src
 }
 
 src_test() {

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-03-09 Thread Sam James

commit: 5ae9f04be315de9bb4080de1d102105020705e93
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Mar  8 14:09:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  9 09:44:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae9f04b

net-misc/unison: export VARTEXFONTS

Closes: https://github.com/gentoo/gentoo/pull/19830
Closes: https://bugs.gentoo.org/773487
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.51.3_p20201127.ebuild | 2 +-
 net-misc/unison/unison-2.51.4_rc1.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild 
b/net-misc/unison/unison-2.51.3_p20201127.ebuild
index a0420d55da8..f63e304f3ab 100644
--- a/net-misc/unison/unison-2.51.3_p20201127.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -58,7 +58,7 @@ src_compile() {
use ocamlopt || myconf="$myconf NATIVE=false"
 
if use doc; then
-   emake $myconf CFLAGS="" HEVEA=false docs
+   VARTEXFONTS="${T}/fonts" emake $myconf CFLAGS="" HEVEA=false 
docs
fi
 
# Discard cflags as it will try to pass them to ocamlc...

diff --git a/net-misc/unison/unison-2.51.4_rc1.ebuild 
b/net-misc/unison/unison-2.51.4_rc1.ebuild
index f3d1aab98d7..7ce1abe5eab 100644
--- a/net-misc/unison/unison-2.51.4_rc1.ebuild
+++ b/net-misc/unison/unison-2.51.4_rc1.ebuild
@@ -55,7 +55,7 @@ src_compile() {
use ocamlopt || myconf="$myconf NATIVE=false"
 
if use doc; then
-   emake $myconf CFLAGS="" HEVEA=false docs
+   VARTEXFONTS="${T}/fonts" emake $myconf CFLAGS="" HEVEA=false 
docs
fi
 
# Discard cflags as it will try to pass them to ocamlc...

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-03-05 Thread Sam James

commit: c5025b3c305fa1e60bda760e3cb68e7047473df6
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Jan 12 10:47:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar  5 19:56:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5025b3c

net-misc/unison: bump to 2.51.4_rc1

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest |   1 +
 net-misc/unison/unison-2.51.4_rc1.ebuild | 107 +++
 2 files changed, 108 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 6621fe5cba8..0a56449311a 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -3,3 +3,4 @@ DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 
780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e
 SHA512 
87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 
83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd
 SHA512 
4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c641ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
+DIST unison-2.51.4_rc1.tar.gz 1374314 BLAKE2B 
8b0218fa903ed8f1ceb3b489df8fbda5ba9fddfbe4b9440098d16dd298e15666bfc3722d1735069843511b7b39e8b49463c5b26b940ff770c7fcdfbd63eed1c2
 SHA512 
7b3fe2d09ff35ccdd68306d8fce6edd947489554c54afebe44d096210d2d8e58c6947386c2795c668070f5ba14a28547cee31d947d54ec90ed63927ad766c0bb

diff --git a/net-misc/unison/unison-2.51.4_rc1.ebuild 
b/net-misc/unison/unison-2.51.4_rc1.ebuild
new file mode 100644
index 000..f3d1aab98d7
--- /dev/null
+++ b/net-misc/unison/unison-2.51.4_rc1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
+RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
+
+# ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+   doc? ( app-text/dvipsk
+   app-text/ghostscript-gpl
+   dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
+   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+   >=app-eselect/eselect-unison-0.4"
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_prepare() {
+   # https://github.com/bcpierce00/unison/issues/416
+   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
+   # https://github.com/bcpierce00/unison/pull/415
+   sed -e "/myName/d" -i doc/docs.ml || die
+   default
+}
+
+src_compile() {
+   local myconf
+
+   if use threads; then
+   myconf="$myconf THREADS=true"
+   fi
+
+   if use debug; then
+   myconf="$myconf DEBUGGING=true"
+   fi
+
+   if use gtk; then
+   myconf="$myconf UISTYLE=gtk2"
+   else
+   myconf="$myconf UISTYLE=text"
+   fi
+
+   use ocamlopt || myconf="$myconf NATIVE=false"
+
+   if use doc; then
+   emake $myconf CFLAGS="" HEVEA=false docs
+   fi
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake $myconf CFLAGS="" src
+}
+
+src_test() {
+   emake test CFLAGS=""
+}
+
+src_install() {
+   # install manually, since it's just too much
+   # work to force the Makefile to do the right thing.
+   local binname
+   cd src || die
+   for binname in unison unison-fsmonitor; do
+   newbin ${binname} ${binname}-${SLOT}
+   done
+
+   if use gtk; then
+   newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+   make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" 
"${PN}-${SLOT}"
+   fi
+
+   # Waiting for https://github.com/bcpierce00/unison/issues/411
+   if use doc; then
+   DOCS+=( ../doc/

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-03-05 Thread Sam James

commit: 193dfb05dd5d2b884574f78a6f5972bf2781d6f6
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jan 27 11:57:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar  5 19:56:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=193dfb05

net-misc/unison: fix graphical UI logic in 2.51.3_p20201127

Use same logic as 2.51.4_rc1.

Bug: https://bugs.gentoo.org/758386
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19043
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.51.3_p20201127.ebuild | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild 
b/net-misc/unison/unison-2.51.3_p20201127.ebuild
index a035fe9b721..a0420d55da8 100644
--- a/net-misc/unison/unison-2.51.3_p20201127.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 }
 
 src_compile() {
-   local myconf="all"
+   local myconf
 
if use threads; then
myconf="$myconf THREADS=true"
@@ -57,13 +57,12 @@ src_compile() {
 
use ocamlopt || myconf="$myconf NATIVE=false"
 
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS=""
-
if use doc; then
-   myconf="$myconf docs HEVEA=false"
-   emake $myconf CFLAGS=""
+   emake $myconf CFLAGS="" HEVEA=false docs
fi
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake $myconf CFLAGS="" src
 }
 
 src_test() {

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2021-01-06 Thread Fabian Groffen

commit: 783ce7fa3a5eb2197d00694516f644dd0b7c238b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 14:50:19 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:06:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783ce7fa

net-misc/unison: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 net-misc/unison/unison-2.48.15_p4-r2.ebuild| 4 ++--
 net-misc/unison/unison-2.51.3_p20201024.ebuild | 4 ++--
 net-misc/unison/unison-2.51.3_p20201127.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-misc/unison/unison-2.48.15_p4-r2.ebuild 
b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
index 2b4efbfb62c..1f9bb1d55d0 100644
--- a/net-misc/unison/unison-2.48.15_p4-r2.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI+=" doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 
 # Upstream, for this version, has explicitly disabled test with marker

diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild 
b/net-misc/unison/unison-2.51.3_p20201024.ebuild
index 36616120b23..7f864d5d40b 100644
--- a/net-misc/unison/unison-2.51.3_p20201024.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
 

diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild 
b/net-misc/unison/unison-2.51.3_p20201127.ebuild
index f1758eeb555..a035fe9b721 100644
--- a/net-misc/unison/unison-2.51.3_p20201127.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-12-15 Thread Sam James

commit: 26ce9b92e1ae5b53aa98226624a91effe44238ae
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 15 10:10:40 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 15 10:10:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ce9b92

Revert "net-misc/unison: remove old"

This reverts commit e0ee85de3d5d468dfd65d9d20934395cc1bb1770.
Accidentally dropped stable in a slot.

Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest   |   1 +
 net-misc/unison/unison-2.51.3_p20201024.ebuild | 111 +
 2 files changed, 112 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 78be0b0a168..6621fe5cba8 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,4 +1,5 @@
 DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B 
d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec
 SHA512 
658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
+DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 
780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e
 SHA512 
87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 
83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd
 SHA512 
4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c641ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a

diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild 
b/net-misc/unison/unison-2.51.3_p20201024.ebuild
new file mode 100644
index 000..36616120b23
--- /dev/null
+++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+MY_COMMIT="73f1bfa2476f907e2d781948ce9e764230bf8b27"
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
+RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
+
+# ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+   doc? ( app-text/dvipsk
+   app-text/ghostscript-gpl
+   dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
+   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+   >=app-eselect/eselect-unison-0.4"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_prepare() {
+   # https://github.com/bcpierce00/unison/issues/416
+   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
+   # https://github.com/bcpierce00/unison/pull/415
+   sed -e "/myName/d" -i doc/docs.ml || die
+   default
+}
+
+src_compile() {
+   # build unison-manual.pdf but not .html
+   if use doc; then
+   local myconf="all docs HEVEA=false"
+   else
+   local myconf="all"
+   fi
+
+   if use threads; then
+   myconf="$myconf THREADS=true"
+   fi
+
+   if use debug; then
+   myconf="$myconf DEBUGGING=true"
+   fi
+
+   if use gtk; then
+   myconf="$myconf UISTYLE=gtk2"
+   else
+   myconf="$myconf UISTYLE=text"
+   fi
+
+   use ocamlopt || myconf="$myconf NATIVE=false"
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake $myconf CFLAGS=""
+}
+
+src_test() {
+   emake test CFLAGS=""
+}
+
+src_install() {
+   # install manually, since it's just too much
+   # work to force the Makefile to do the right thing.
+   local binname
+   cd src || die
+   for binna

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-12-14 Thread Sam James

commit: e0ee85de3d5d468dfd65d9d20934395cc1bb1770
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Dec  8 08:16:54 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 15 04:00:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0ee85de

net-misc/unison: remove old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/18433
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest   |   1 -
 net-misc/unison/unison-2.51.3_p20201024.ebuild | 111 -
 2 files changed, 112 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 6621fe5cba8..78be0b0a168 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,5 +1,4 @@
 DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B 
d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec
 SHA512 
658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
-DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 
780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e
 SHA512 
87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 
83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd
 SHA512 
4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c641ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a

diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild 
b/net-misc/unison/unison-2.51.3_p20201024.ebuild
deleted file mode 100644
index 36616120b23..000
--- a/net-misc/unison/unison-2.51.3_p20201024.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-MY_COMMIT="73f1bfa2476f907e2d781948ce9e764230bf8b27"
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
-SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-IUSE="debug doc gtk +ocamlopt threads"
-RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
-
-# ocaml version so we are sure it has ocamlopt use flag
-BDEPEND="dev-lang/ocaml:=[ocamlopt?]
-   doc? ( app-text/dvipsk
-   app-text/ghostscript-gpl
-   dev-texlive/texlive-latex )"
-DEPEND="gtk? ( dev-ml/lablgtk:2= )"
-RDEPEND="gtk? ( dev-ml/lablgtk:2=
-   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-   >=app-eselect/eselect-unison-0.4"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
-
-src_prepare() {
-   # https://github.com/bcpierce00/unison/issues/416
-   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
-   # https://github.com/bcpierce00/unison/pull/415
-   sed -e "/myName/d" -i doc/docs.ml || die
-   default
-}
-
-src_compile() {
-   # build unison-manual.pdf but not .html
-   if use doc; then
-   local myconf="all docs HEVEA=false"
-   else
-   local myconf="all"
-   fi
-
-   if use threads; then
-   myconf="$myconf THREADS=true"
-   fi
-
-   if use debug; then
-   myconf="$myconf DEBUGGING=true"
-   fi
-
-   if use gtk; then
-   myconf="$myconf UISTYLE=gtk2"
-   else
-   myconf="$myconf UISTYLE=text"
-   fi
-
-   use ocamlopt || myconf="$myconf NATIVE=false"
-
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS=""
-}
-
-src_test() {
-   emake test CFLAGS=""
-}
-
-src_install() {
-   # install manually, since it's just too much
-   # work to force the Makefile to do the right thing.
-   l

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-12-14 Thread Sam James

commit: 43f5f02c5f036d7a9d73f0a621d81b734e74913a
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Nov 27 18:13:30 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 15 04:00:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43f5f02c

net-misc/unison: bump to 2.51.3_p20201127

Closes: https://bugs.gentoo.org/758386

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest   |   1 +
 net-misc/unison/metadata.xml   |   8 +-
 net-misc/unison/unison-2.51.3_p20201127.ebuild | 111 +
 3 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 3a032f49316..6621fe5cba8 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -2,3 +2,4 @@ DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B 
d3dabea1b8b0d2a8c64716144d33265ba90
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 
780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e
 SHA512 
87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
+DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 
83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd
 SHA512 
4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c641ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a

diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
index 6f49eba8f49..5d879286e9f 100644
--- a/net-misc/unison/metadata.xml
+++ b/net-misc/unison/metadata.xml
@@ -1,5 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
+   
+   
+   bcpierce00/unison
+   https://github.com/bcpierce00/unison/issues
+   https://github.com/bcpierce00/unison/wiki
+   
https://www.cis.upenn.edu/~bcpierce/unison/changes.html
+   
 

diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild 
b/net-misc/unison/unison-2.51.3_p20201127.ebuild
new file mode 100644
index 000..f1758eeb555
--- /dev/null
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+MY_COMMIT="4713e608d2f9c998ba4412fee53b94dc9bef98b9"
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
+RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
+
+# ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+   doc? ( app-text/dvipsk
+   app-text/ghostscript-gpl
+   dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
+   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+   >=app-eselect/eselect-unison-0.4"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_prepare() {
+   # https://github.com/bcpierce00/unison/issues/416
+   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
+   # https://github.com/bcpierce00/unison/pull/415
+   sed -e "/myName/d" -i doc/docs.ml || die
+   default
+}
+
+src_compile() {
+   local myconf="all"
+
+   if use threads; then
+   myconf="$myconf THREADS=true"
+   fi
+
+   if use debug; then
+   myconf="$myconf DEBUGGING=true"
+   fi
+
+   if use gtk; then
+   myconf="$myconf UISTYLE=gtk2"
+   else
+   myconf="$myconf UISTYLE=text"
+   fi
+
+   use ocamlopt || myconf="$myconf NATIVE=false"
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake $myconf CFLAGS=""
+
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-11-27 Thread Agostino Sarubbo

commit: 394fe3f2e039d580eeab6e56838e3af325df0eb3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov 27 16:08:20 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov 27 16:08:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394fe3f2

net-misc/unison: ppc stable wrt bug #756811

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/unison/unison-2.51.3_p20201024.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild 
b/net-misc/unison/unison-2.51.3_p20201024.ebuild
index f3e2e3755dc..36616120b23 100644
--- a/net-misc/unison/unison-2.51.3_p20201024.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-11-27 Thread Agostino Sarubbo

commit: 0bf6b27110f9fccb9a922798ff3f3f12ea2e71ae
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov 27 16:02:42 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov 27 16:04:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf6b271

net-misc/unison: amd64 stable wrt bug #756811

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/unison/unison-2.51.3_p20201024.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild 
b/net-misc/unison/unison-2.51.3_p20201024.ebuild
index 995eed6c2c2..f3e2e3755dc 100644
--- a/net-misc/unison/unison-2.51.3_p20201024.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-11-26 Thread Thomas Deutschmann

commit: a9c6dd32a97de7080dc162da7159107082f5bdcf
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Nov 26 23:30:26 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Nov 26 23:31:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c6dd32

net-misc/unison: x86 stable (bug #756811)

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-misc/unison/unison-2.51.3_p20201024.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild 
b/net-misc/unison/unison-2.51.3_p20201024.ebuild
index f0744e72356..995eed6c2c2 100644
--- a/net-misc/unison/unison-2.51.3_p20201024.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-28 Thread Sam James

commit: 85553f7e2a333c9b7ca839563f8cd9c6060ab9f4
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Oct 28 11:34:10 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 29 01:26:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85553f7e

net-misc/unison: remove old

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/18056
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest |  1 -
 net-misc/unison/unison-2.51.3.ebuild | 97 
 2 files changed, 98 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index ad624096e76..3a032f49316 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,5 +1,4 @@
 DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B 
d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec
 SHA512 
658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
-DIST unison-2.51.3.tar.gz 1370060 BLAKE2B 
3e082c5de8c68d87fd4d061dbcf535b9001bd3bacd740fede4e94a239bc554e463c0493260748df61527304d2f874cb194f629fb1f066a47be5a5e54360f3cb7
 SHA512 
202bc592cf18d3ac76d7e29ec71add5d6e33a96b4b885e0e2add9a5a621db2290184f268c70e4f05e4884d6cdfed09f6fcd3dde85681c39628a10ea552917c8f
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 
780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e
 SHA512 
87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61

diff --git a/net-misc/unison/unison-2.51.3.ebuild 
b/net-misc/unison/unison-2.51.3.ebuild
deleted file mode 100644
index 8abdd80a5ad..000
--- a/net-misc/unison/unison-2.51.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
-SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-# Not available for the rcs
-#SRC_URI+=" doc? (
-#  
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-#  
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
-#  )"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-IUSE="debug gtk +ocamlopt threads"
-RESTRICT="!ocamlopt? ( strip )"
-
-# ocaml version so we are sure it has ocamlopt use flag
-BDEPEND="dev-lang/ocaml:=[ocamlopt?]"
-DEPEND="gtk? ( dev-ml/lablgtk:2= )"
-RDEPEND="gtk? ( dev-ml/lablgtk:2=
-   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-   >=app-eselect/eselect-unison-0.4"
-
-DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
-
-src_compile() {
-   local myconf="all"
-
-   if use threads; then
-   myconf="$myconf THREADS=true"
-   fi
-
-   if use debug; then
-   myconf="$myconf DEBUGGING=true"
-   fi
-
-   if use gtk; then
-   myconf="$myconf UISTYLE=gtk2"
-   else
-   myconf="$myconf UISTYLE=text"
-   fi
-
-   use ocamlopt || myconf="$myconf NATIVE=false"
-
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS=""
-}
-
-src_test() {
-   emake test CFLAGS=""
-}
-
-src_install() {
-   # install manually, since it's just too much
-   # work to force the Makefile to do the right thing.
-   local binname
-   cd src || die
-   for binname in unison unison-fsmonitor; do
-   newbin ${binname} ${binname}-${SLOT}
-   done
-
-   if use gtk; then
-   newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-   make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/icons/hicolor/scalable/apps/${PN}-${SLOT}.svg"
-   fi
-
-   # No docs for release candidates
-   #if use doc; the

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-27 Thread Sam James

commit: 1ac0b00a5363be3c04d568f35f4a44ef39572195
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Oct 23 08:15:21 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 27 21:11:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac0b00a

net-misc/unison: bump to 2.51.3_p20201024

has several fixes
based on commit 73f1bfa from (Commits on Oct 24, 2020)
https://github.com/bcpierce00/unison/commits/master

shorten path in make_desktop_entry
USE=doc to build unison-manual.pdf (no .html)

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest   |   1 +
 net-misc/unison/unison-2.51.3_p20201024.ebuild | 111 +
 2 files changed, 112 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index cfc94fa8ec5..a5277f2845b 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,3 +5,4 @@ DIST unison-2.51.2-manual.html 311981 BLAKE2B 
1e1bc18d5bca5d50976b28c4e59cc27fcc
 DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 
30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0
 SHA512 
170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
 DIST unison-2.51.2.tar.gz 691251 BLAKE2B 
39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f
 SHA512 
9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115
 DIST unison-2.51.3.tar.gz 1370060 BLAKE2B 
3e082c5de8c68d87fd4d061dbcf535b9001bd3bacd740fede4e94a239bc554e463c0493260748df61527304d2f874cb194f629fb1f066a47be5a5e54360f3cb7
 SHA512 
202bc592cf18d3ac76d7e29ec71add5d6e33a96b4b885e0e2add9a5a621db2290184f268c70e4f05e4884d6cdfed09f6fcd3dde85681c39628a10ea552917c8f
+DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 
780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e
 SHA512 
87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61

diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild 
b/net-misc/unison/unison-2.51.3_p20201024.ebuild
new file mode 100644
index 000..f0744e72356
--- /dev/null
+++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+MY_COMMIT="73f1bfa2476f907e2d781948ce9e764230bf8b27"
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
+RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
+
+# ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+   doc? ( app-text/dvipsk
+   app-text/ghostscript-gpl
+   dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
+   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+   >=app-eselect/eselect-unison-0.4"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_prepare() {
+   # https://github.com/bcpierce00/unison/issues/416
+   sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
+   # https://github.com/bcpierce00/unison/pull/415
+   sed -e "/myName/d" -i doc/docs.ml || die
+   default
+}
+
+src_compile() {
+   # build unison-manual.pdf but not .html
+   if use doc; then
+   local myconf="all docs HEVEA=false"
+   else
+   local myconf="all"
+   fi
+
+   if use threads; then
+   myconf="$myconf THREADS=true"
+   fi
+
+   if use debug; then
+   myconf="$myconf DEBUGGING=true"
+   fi
+
+   if use gtk; then
+   myconf="$myconf UISTYLE=gtk2"
+   else
+   myconf="$myconf UISTYLE=text"
+   fi
+
+   use ocamlopt || myconf="$myconf NATIVE=false"
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake $myconf CFLAGS=""
+}
+
+src_test() {
+   emake test CFLAGS=""
+}
+
+src_install() {
+   # install manually, since it's just too much
+   # work to force the Makefile to do the right thing.
+   local binname
+   cd src || die
+   for binname in unison unison-fsmon

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/files/, net-misc/unison/

2020-10-27 Thread Sam James

commit: 746f4841bb0a4d09794e40556b794ff41106cd5d
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Oct 24 07:45:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 27 21:11:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746f4841

net-misc/unison: drop unison-2.51.2-r1

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17989
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest   |  3 -
 .../unison/files/unison-2.51.2-ocaml-4.08.patch| 50 -
 net-misc/unison/unison-2.51.2-r1.ebuild| 82 --
 3 files changed, 135 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index a5277f2845b..ad624096e76 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,8 +1,5 @@
 DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B 
d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec
 SHA512 
658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
-DIST unison-2.51.2-manual.html 311981 BLAKE2B 
1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05
 SHA512 
2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
-DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 
30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0
 SHA512 
170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
-DIST unison-2.51.2.tar.gz 691251 BLAKE2B 
39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f
 SHA512 
9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115
 DIST unison-2.51.3.tar.gz 1370060 BLAKE2B 
3e082c5de8c68d87fd4d061dbcf535b9001bd3bacd740fede4e94a239bc554e463c0493260748df61527304d2f874cb194f629fb1f066a47be5a5e54360f3cb7
 SHA512 
202bc592cf18d3ac76d7e29ec71add5d6e33a96b4b885e0e2add9a5a621db2290184f268c70e4f05e4884d6cdfed09f6fcd3dde85681c39628a10ea552917c8f
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 
780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e
 SHA512 
87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61

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
deleted file mode 100644
index e3353e77e62..000
--- a/net-misc/unison/files/unison-2.51.2-ocaml-4.08.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur src.orig/files.ml src/files.ml
 src.orig/files.ml  2018-01-27 21:53:44.0 +0100
-+++ src/files.ml   2019-12-11 16:12:40.005712137 +0100
-@@ -734,7 +734,7 @@
-   with End_of_file ->
- dirh.System.closedir ()
-   end;
--  Sort.list (<) !files
-+  List.sort compare !files
- 
- let ls dir pattern =
-   Util.convertUnixErrorsToTransient
-diff -ur src.orig/recon.ml src/recon.ml
 src.orig/recon.ml  2018-01-27 21:53:44.0 +0100
-+++ src/recon.ml   2019-12-11 16:12:40.005712137 +0100
-@@ -661,8 +661,8 @@
- 
- (* Sorts the paths so that they will be displayed in order   
*)
- let sortPaths pathUpdatesList =
--  Sort.list
--(fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
-+  List.sort
-+(fun (p1, _) (p2, _) -> Path.compare p1 p2)
- pathUpdatesList
- 
- let rec enterPath p1 p2 t =
-diff -ur src.orig/system/system_generic.ml src/system/system_generic.ml
 src.orig/system/system_generic.ml  2018-01-27 21:53:44.0 +0100
-+++ src/system/system_generic.ml   2019-12-11 16:12:40.005712137 +0100
-@@ -47,7 +47,7 @@
- let chmod = Unix.chmod
- let chown = Unix.chown
- let utimes = Unix.utimes
--let link = Unix.link
-+let link s1 s2 = Unix.link s1 s2
- let openfile = Unix.openfile
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-22 Thread Sam James

commit: 115044510a34dbe0dc9b4ea1ec1e75083e4a8f5e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Oct 22 08:45:02 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 22 11:38:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11504451

net-misc/unison: bump to 2.51.3

Closes: https://bugs.gentoo.org/750449
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest |  1 +
 net-misc/unison/unison-2.51.3.ebuild | 97 
 2 files changed, 98 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index e2922b5d259..4afe614f459 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -4,4 +4,5 @@ DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda9
 DIST unison-2.51.2-manual.html 311981 BLAKE2B 
1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05
 SHA512 
2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
 DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 
30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0
 SHA512 
170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
 DIST unison-2.51.2.tar.gz 691251 BLAKE2B 
39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f
 SHA512 
9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115
+DIST unison-2.51.3.tar.gz 1370060 BLAKE2B 
3e082c5de8c68d87fd4d061dbcf535b9001bd3bacd740fede4e94a239bc554e463c0493260748df61527304d2f874cb194f629fb1f066a47be5a5e54360f3cb7
 SHA512 
202bc592cf18d3ac76d7e29ec71add5d6e33a96b4b885e0e2add9a5a621db2290184f268c70e4f05e4884d6cdfed09f6fcd3dde85681c39628a10ea552917c8f
 DIST unison-2.51.3_rc3.tar.gz 1370077 BLAKE2B 
4a894c8837112986b6bad20b0f3db7459fc861d90c094408b20ad70a2726ea0c7882e81126f939982b46625684c59233b55f6f6c30ca8724b8a421b9250fc904
 SHA512 
988fa67fcbf46832e46295c12e3faeade6b6785f64b9ca55e7e2d877bccee0585b3b7865c61b4abbbd06100b2850ec3460d3016d2faa4dffd9c54383179709dc

diff --git a/net-misc/unison/unison-2.51.3.ebuild 
b/net-misc/unison/unison-2.51.3.ebuild
new file mode 100644
index 000..8abdd80a5ad
--- /dev/null
+++ b/net-misc/unison/unison-2.51.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+# Not available for the rcs
+#SRC_URI+=" doc? (
+#  
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+#  
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
+#  )"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+IUSE="debug gtk +ocamlopt threads"
+RESTRICT="!ocamlopt? ( strip )"
+
+# ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
+   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+   >=app-eselect/eselect-unison-0.4"
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_compile() {
+   local myconf="all"
+
+   if use threads; then
+   myconf="$myconf THREADS=true"
+   fi
+
+   if use debug; then
+   myconf="$myconf DEBUGGING=true"
+   fi
+
+   if use gtk; then
+   myconf="$myconf UISTYLE=gtk2"
+   else
+   myconf="$myconf UISTYLE=text"
+   fi
+
+   use ocamlopt || myconf="$myconf NATIVE=false"
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake $myconf CFLAGS=""
+}
+
+src_test() {
+   emake test CFLAGS=""
+}
+
+src_install() {
+   # install manually, since it's just too much
+   # work to force the Makefile to do the right thing.
+   local binname
+   cd src || die
+   for binname in unison unison-fsmonitor; do
+   newbin ${binname} ${binname}-${SLOT}
+   done
+
+   if use gtk; then
+   newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+   make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/icons/hicolor/scalable/apps/${PN}-${SLOT}.svg"
+   fi
+
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-22 Thread Sam James

commit: e416ea07920d1515b6cfc94046bfe678b9822733
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Oct 22 08:46:39 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 22 11:38:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e416ea07

net-misc/unison: remove old

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest|  1 -
 net-misc/unison/unison-2.51.3_rc3-r1.ebuild | 99 -
 2 files changed, 100 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 4afe614f459..cfc94fa8ec5 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,4 +5,3 @@ DIST unison-2.51.2-manual.html 311981 BLAKE2B 
1e1bc18d5bca5d50976b28c4e59cc27fcc
 DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 
30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0
 SHA512 
170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
 DIST unison-2.51.2.tar.gz 691251 BLAKE2B 
39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f
 SHA512 
9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115
 DIST unison-2.51.3.tar.gz 1370060 BLAKE2B 
3e082c5de8c68d87fd4d061dbcf535b9001bd3bacd740fede4e94a239bc554e463c0493260748df61527304d2f874cb194f629fb1f066a47be5a5e54360f3cb7
 SHA512 
202bc592cf18d3ac76d7e29ec71add5d6e33a96b4b885e0e2add9a5a621db2290184f268c70e4f05e4884d6cdfed09f6fcd3dde85681c39628a10ea552917c8f
-DIST unison-2.51.3_rc3.tar.gz 1370077 BLAKE2B 
4a894c8837112986b6bad20b0f3db7459fc861d90c094408b20ad70a2726ea0c7882e81126f939982b46625684c59233b55f6f6c30ca8724b8a421b9250fc904
 SHA512 
988fa67fcbf46832e46295c12e3faeade6b6785f64b9ca55e7e2d877bccee0585b3b7865c61b4abbbd06100b2850ec3460d3016d2faa4dffd9c54383179709dc

diff --git a/net-misc/unison/unison-2.51.3_rc3-r1.ebuild 
b/net-misc/unison/unison-2.51.3_rc3-r1.ebuild
deleted file mode 100644
index 7349fcf36f9..000
--- a/net-misc/unison/unison-2.51.3_rc3-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
-SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-# Not available for the rcs
-#SRC_URI+=" doc? (
-#  
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-#  
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
-#  )"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-IUSE="debug gtk +ocamlopt threads"
-RESTRICT="!ocamlopt? ( strip )"
-
-# ocaml version so we are sure it has ocamlopt use flag
-BDEPEND="dev-lang/ocaml:=[ocamlopt?]"
-DEPEND="gtk? ( dev-ml/lablgtk:2= )"
-RDEPEND="
-   ${DEPEND}
-   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen )
-   >=app-eselect/eselect-unison-0.4
-"
-
-DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
-
-src_compile() {
-   local myconf="all"
-
-   if use threads; then
-   myconf="$myconf THREADS=true"
-   fi
-
-   if use debug; then
-   myconf="$myconf DEBUGGING=true"
-   fi
-
-   if use gtk; then
-   myconf="$myconf UISTYLE=gtk2"
-   else
-   myconf="$myconf UISTYLE=text"
-   fi
-
-   use ocamlopt || myconf="$myconf NATIVE=false"
-
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS=""
-}
-
-src_test() {
-   emake test CFLAGS=""
-}
-
-src_install() {
-   # install manually, since it's just too much
-   # work to force the Makefile to do the right thing.
-   local binname
-   cd src || die
-   for binname in unison unison-fsmonitor; do
-   newbin ${binname} ${binname}-${SLOT}
-   done
-
-   if use gtk; then
-   newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-   make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/icons/hicolor/scalable/apps/${PN}-${SLOT}.svg"
-   fi
-
-   # No docs for release candidates
-   #if use doc; then
-   #   DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
-   #   HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
-   #fi
-
-   einstalldocs
-}
-
-pkg_postinst() {
-   elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/unison-${SLOT}"
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/, net-misc/unison/files/

2020-10-20 Thread Sam James

commit: 559ec5bf5897e3c96f8fddc37e0c2bfd069cbeef
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 10:58:34 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 10:58:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=559ec5bf

net-misc/unison: cleanup old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest   |  1 -
 .../unison/files/unison-2.48.4-ocaml-4.08.patch| 79 
 net-misc/unison/unison-2.48.4-r1.ebuild| 81 
 net-misc/unison/unison-2.48.4-r2.ebuild| 86 --
 4 files changed, 247 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index c25524c6393..e2922b5d259 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,7 +1,6 @@
 DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B 
d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec
 SHA512 
658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
-DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 
8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f
 SHA512 
c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
 DIST unison-2.51.2-manual.html 311981 BLAKE2B 
1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05
 SHA512 
2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
 DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 
30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0
 SHA512 
170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
 DIST unison-2.51.2.tar.gz 691251 BLAKE2B 
39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f
 SHA512 
9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115

diff --git a/net-misc/unison/files/unison-2.48.4-ocaml-4.08.patch 
b/net-misc/unison/files/unison-2.48.4-ocaml-4.08.patch
deleted file mode 100644
index 8b0d89b335a..000
--- a/net-misc/unison/files/unison-2.48.4-ocaml-4.08.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Stephane Glondu 
-Date: Mon, 25 Nov 2019 10:52:48 +0100
-Subject: Fix compilation with OCaml 4.08.1
-

- Makefile.OCaml   | 2 +-
- files.ml | 2 +-
- recon.ml | 4 ++--
- system/system_generic.ml | 2 +-
- uigtk2.ml| 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.OCaml b/Makefile.OCaml
-index 21610ce..7549907 100644
 a/Makefile.OCaml
-+++ b/Makefile.OCaml
-@@ -95,7 +95,7 @@ buildexecutable::
- ### Default parameters
- 
- # Generate backtrace information for exceptions
--CAMLFLAGS+=-g
-+CAMLFLAGS+=-g -unsafe-string
- 
- INCLFLAGS=-I lwt -I ubase -I system
- CAMLFLAGS+=$(INCLFLAGS)
-diff --git a/files.ml b/files.ml
-index ba42ad5..02d52f3 100644
 a/files.ml
-+++ b/files.ml
-@@ -722,7 +722,7 @@ let get_files_in_directory dir =
-   with End_of_file ->
- dirh.System.closedir ()
-   end;
--  Sort.list (<) !files
-+  List.sort compare !files
- 
- let ls dir pattern =
-   Util.convertUnixErrorsToTransient
-diff --git a/recon.ml b/recon.ml
-index 5ed358d..a8719c4 100644
 a/recon.ml
-+++ b/recon.ml
-@@ -651,8 +651,8 @@ let rec reconcile
- 
- (* Sorts the paths so that they will be displayed in order   
*)
- let sortPaths pathUpdatesList =
--  Sort.list
--(fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
-+  List.sort
-+(fun (p1, _) (p2, _) -> Path.compare p1 p2)
- pathUpdatesList
- 
- let rec enterPath p1 p2 t =
-diff --git a/system/system_generic.ml b/system/system_generic.ml
-index 9230cdc..ee457c5 100755
 a/system/system_generic.ml
-+++ b/system/system_generic.m

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-20 Thread Sam James

commit: c267206121e75b6b07cd33fd6d7b326cd3dc5538
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 10:37:02 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 10:37:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2672061

net-misc/unison: ppc stable (bug #750335)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.48.15_p4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.15_p4-r2.ebuild 
b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
index c81fc2fcaf2..2b4efbfb62c 100644
--- a/net-misc/unison/unison-2.48.15_p4-r2.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 
 # Upstream, for this version, has explicitly disabled test with marker

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-20 Thread Joonas Niilola

commit: 90b27a694b353d8658dedad6fd41930ad1fce3de
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Oct 20 09:11:34 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Oct 20 09:11:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b27a69

net-misc/unison: stabilize 2.48.15_p4-r2 on x86

Bug: https://bugs.gentoo.org/750335
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/unison/unison-2.48.15_p4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.15_p4-r2.ebuild 
b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
index 17bbdc2c4a4..7322daf5c6e 100644
--- a/net-misc/unison/unison-2.48.15_p4-r2.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 
 # Upstream, for this version, has explicitly disabled test with marker

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-20 Thread Joonas Niilola

commit: ec79deae9731371e7a699a3c68dde2537dba7edf
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Oct 20 09:12:11 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Oct 20 09:12:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec79deae

net-misc/unison: stabilize 2.48.15_p4-r2 on amd64

Bug: https://bugs.gentoo.org/750335
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/unison/unison-2.48.15_p4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.15_p4-r2.ebuild 
b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
index 7322daf5c6e..c81fc2fcaf2 100644
--- a/net-misc/unison/unison-2.48.15_p4-r2.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 
 # Upstream, for this version, has explicitly disabled test with marker

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-20 Thread Sam James

commit: b35c26653aeefaba178031b6eb75fc6c5bdda44a
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 08:18:57 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 08:18:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b35c2665

net-misc/unison: Keyword 2.51.3_rc3-r1 arm, #749654

Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.51.3_rc3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.3_rc3-r1.ebuild 
b/net-misc/unison/unison-2.51.3_rc3-r1.ebuild
index 92975232568..7349fcf36f9 100644
--- a/net-misc/unison/unison-2.51.3_rc3-r1.ebuild
+++ b/net-misc/unison/unison-2.51.3_rc3-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 IUSE="debug gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )"

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-19 Thread Sam James

commit: 5c8fccbbeebf1d85a671f4f326bba232d4b9c855
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 06:53:22 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 06:53:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c8fccbb

net-misc/unison: fix icon path in 2.51.3_rc3

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 .../unison/{unison-2.51.3_rc3.ebuild => unison-2.51.3_rc3-r1.ebuild}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.3_rc3.ebuild 
b/net-misc/unison/unison-2.51.3_rc3-r1.ebuild
similarity index 97%
rename from net-misc/unison/unison-2.51.3_rc3.ebuild
rename to net-misc/unison/unison-2.51.3_rc3-r1.ebuild
index 314ce0d4d1c..92975232568 100644
--- a/net-misc/unison/unison-2.51.3_rc3.ebuild
+++ b/net-misc/unison/unison-2.51.3_rc3-r1.ebuild
@@ -69,7 +69,7 @@ src_install() {
 
if use gtk; then
newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-   make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
+   make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/icons/hicolor/scalable/apps/${PN}-${SLOT}.svg"
fi
 
# No docs for release candidates

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-19 Thread Sam James

commit: 23501d1efa116037dedb3ab3f5e184bae0c9c6cf
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 06:52:35 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 06:53:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23501d1e

net-misc/unison: install docs for unison-2.48.15_p4

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 15_p4-r1.ebuild => unison-2.48.15_p4-r2.ebuild} | 21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/net-misc/unison/unison-2.48.15_p4-r1.ebuild 
b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
similarity index 83%
rename from net-misc/unison/unison-2.48.15_p4-r1.ebuild
rename to net-misc/unison/unison-2.48.15_p4-r2.ebuild
index d8102533b70..17bbdc2c4a4 100644
--- a/net-misc/unison/unison-2.48.15_p4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
@@ -5,17 +5,20 @@ EAPI=7
 
 inherit desktop xdg-utils
 
+# Use the docs for the last 'normal' release
+DOC_P="${PN}-2.48.4"
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
 SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV/_p/v}.tar.gz -> 
${P/_p/v}.tar.gz"
 # No manual.pdf or manual.html available for this version
-#  doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-#  
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"
+SRC_URI+=" doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DOC_VER}/${DOC_P}-manual.pdf
+   
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DOC_VER}/${DOC_P}-manual.html
 )
+"
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-IUSE="debug gtk +ocamlopt threads"
+IUSE="debug doc gtk +ocamlopt threads"
 
 # Upstream, for this version, has explicitly disabled test with marker
 # "Skipping some tests -- remove me!". Given the potentially destructive nature
@@ -77,14 +80,14 @@ src_install() {
 
if use gtk; then
newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-   make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
+   make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/icons/hicolor/scalable/apps/${PN}-${SLOT}.svg"
+   fi
+
+   if use doc; then
+   DOCS+=( "${DISTDIR}/${DOC_P}-manual.pdf" )
+   HTML_DOCS=( "${DISTDIR}/${DOC_P}-manual.html" )
fi
 
-# No manual.pdf or manual.html available for this version
-#  if use doc; then
-#  DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
-#  HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
-#  fi
einstalldocs
 }

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-19 Thread Sam James

commit: dfcfaa586a6aee2b81100c59995480f632f669dc
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 03:08:18 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 03:09:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfcfaa58

net-misc/unison: fix .desktop and GUI build

Closes: https://bugs.gentoo.org/360161
Closes: https://bugs.gentoo.org/750125
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 .../unison/{unison-2.48.15_p4.ebuild => unison-2.48.15_p4-r1.ebuild}  | 4 ++--
 net-misc/unison/unison-2.51.3_rc3.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/unison/unison-2.48.15_p4.ebuild 
b/net-misc/unison/unison-2.48.15_p4-r1.ebuild
similarity index 95%
rename from net-misc/unison/unison-2.48.15_p4.ebuild
rename to net-misc/unison/unison-2.48.15_p4-r1.ebuild
index e32810067cd..d8102533b70 100644
--- a/net-misc/unison/unison-2.48.15_p4.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4-r1.ebuild
@@ -41,7 +41,7 @@ PATCHES=(
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
 src_compile() {
-   local myconf
+   local myconf="all"
 
if use threads; then
myconf="$myconf THREADS=true"
@@ -77,7 +77,7 @@ src_install() {
 
if use gtk; then
newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-   make_desktop_entry Unison "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
+   make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
fi
 
 # No manual.pdf or manual.html available for this version

diff --git a/net-misc/unison/unison-2.51.3_rc3.ebuild 
b/net-misc/unison/unison-2.51.3_rc3.ebuild
index 8b324830c1e..314ce0d4d1c 100644
--- a/net-misc/unison/unison-2.51.3_rc3.ebuild
+++ b/net-misc/unison/unison-2.51.3_rc3.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
 src_compile() {
-   local myconf
+   local myconf="all"
 
if use threads; then
myconf="$myconf THREADS=true"
@@ -69,7 +69,7 @@ src_install() {
 
if use gtk; then
newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-   make_desktop_entry Unison "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
+   make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
fi
 
# No docs for release candidates

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-19 Thread Sam James

commit: 09263804041305d2045fe52b0a6f9a987f9142f8
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Oct 19 11:50:43 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 03:09:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09263804

net-misc/unison: bump to 2.51.3_rc3

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17972
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest   | 2 +-
 net-misc/unison/{unison-2.51.3_rc2.ebuild => unison-2.51.3_rc3.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index bf262184879..c25524c6393 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,4 +5,4 @@ DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 
8e262e3e28b9f4cbe3925340aa3b08e99f1c30
 DIST unison-2.51.2-manual.html 311981 BLAKE2B 
1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05
 SHA512 
2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
 DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 
30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0
 SHA512 
170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
 DIST unison-2.51.2.tar.gz 691251 BLAKE2B 
39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f
 SHA512 
9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115
-DIST unison-2.51.3_rc2.tar.gz 1370090 BLAKE2B 
dd4657000a771a22f8e61af25d34334872595c53fa24d863e67f52fd0accd3406ac61fff61d01b1977ae3d6f2eaa50aedb2b31dd47abc6d08bd3d240786dab8b
 SHA512 
0acadad426370305093854953f7fc1a720a2be67a4d8327a54822bb94c7292136cc7d7980fb80291125a2f0280180443913bfd49c428ed5a27e3537ef4713153
+DIST unison-2.51.3_rc3.tar.gz 1370077 BLAKE2B 
4a894c8837112986b6bad20b0f3db7459fc861d90c094408b20ad70a2726ea0c7882e81126f939982b46625684c59233b55f6f6c30ca8724b8a421b9250fc904
 SHA512 
988fa67fcbf46832e46295c12e3faeade6b6785f64b9ca55e7e2d877bccee0585b3b7865c61b4abbbd06100b2850ec3460d3016d2faa4dffd9c54383179709dc

diff --git a/net-misc/unison/unison-2.51.3_rc2.ebuild 
b/net-misc/unison/unison-2.51.3_rc3.ebuild
similarity index 100%
rename from net-misc/unison/unison-2.51.3_rc2.ebuild
rename to net-misc/unison/unison-2.51.3_rc3.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-18 Thread Sam James

commit: 1f30b3d872ddc9b335377eb547b1c4f8636c4c10
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 19 02:54:32 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 19 02:54:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f30b3d8

net-misc/unison: don't double-name the desktop file

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.48.15_p4.ebuild | 7 +--
 net-misc/unison/unison-2.51.3_rc2.ebuild | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/net-misc/unison/unison-2.48.15_p4.ebuild 
b/net-misc/unison/unison-2.48.15_p4.ebuild
index 93297eaf827..e32810067cd 100644
--- a/net-misc/unison/unison-2.48.15_p4.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4.ebuild
@@ -74,10 +74,12 @@ src_install() {
for binname in unison unison-fsmonitor; do
newbin ${binname} ${binname}-${SLOT}
done
+
if use gtk; then
newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-   make_desktop_entry ${PN}-${SLOT} ${PN}-${SLOT} ${PN}-${SLOT}
+   make_desktop_entry Unison "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
fi
+
 # No manual.pdf or manual.html available for this version
 #  if use doc; then
 #  DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
@@ -90,7 +92,8 @@ pkg_postinst() {
elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/unison-${SLOT}"
elog "in your profile files to access exactly this version over ssh."
elog "Or you can use 'eselect unison' to set the version."
-   eselect unison update
+   eselect unison update || die
+
if use gtk; then
xdg_icon_cache_update
fi

diff --git a/net-misc/unison/unison-2.51.3_rc2.ebuild 
b/net-misc/unison/unison-2.51.3_rc2.ebuild
index 5fe71cf739a..8b324830c1e 100644
--- a/net-misc/unison/unison-2.51.3_rc2.ebuild
+++ b/net-misc/unison/unison-2.51.3_rc2.ebuild
@@ -66,10 +66,12 @@ src_install() {
for binname in unison unison-fsmonitor; do
newbin ${binname} ${binname}-${SLOT}
done
+
if use gtk; then
newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
-   make_desktop_entry ${PN}-${SLOT} ${PN}-${SLOT} ${PN}-${SLOT}
+   make_desktop_entry Unison "${PN} (${SLOT})" 
"${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg"
fi
+
# No docs for release candidates
#if use doc; then
#   DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
@@ -83,7 +85,8 @@ pkg_postinst() {
elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/unison-${SLOT}"
elog "in your profile files to access exactly this version over ssh."
elog "Or you can use 'eselect unison' to set the version."
-   eselect unison update
+   eselect unison update || die
+
if use gtk; then
xdg_icon_cache_update
fi

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-18 Thread Sam James

commit: 208a9be49ea4a768e4f513db32f19417086d5664
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Oct 17 12:09:51 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 19 02:54:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=208a9be4

net-misc/unison: .desktop file, menu icon

Closes: https://bugs.gentoo.org/360161

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17962
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.48.15_p4.ebuild | 15 +++
 net-misc/unison/unison-2.51.3_rc2.ebuild | 16 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.15_p4.ebuild 
b/net-misc/unison/unison-2.48.15_p4.ebuild
index a1fb30478f4..93297eaf827 100644
--- a/net-misc/unison/unison-2.48.15_p4.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit desktop xdg-utils
+
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
 SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV/_p/v}.tar.gz -> 
${P/_p/v}.tar.gz"
@@ -72,6 +74,10 @@ src_install() {
for binname in unison unison-fsmonitor; do
newbin ${binname} ${binname}-${SLOT}
done
+   if use gtk; then
+   newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+   make_desktop_entry ${PN}-${SLOT} ${PN}-${SLOT} ${PN}-${SLOT}
+   fi
 # No manual.pdf or manual.html available for this version
 #  if use doc; then
 #  DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
@@ -85,4 +91,13 @@ pkg_postinst() {
elog "in your profile files to access exactly this version over ssh."
elog "Or you can use 'eselect unison' to set the version."
eselect unison update
+   if use gtk; then
+   xdg_icon_cache_update
+   fi
+}
+
+pkg_postrm() {
+   if use gtk; then
+   xdg_icon_cache_update
+   fi
 }

diff --git a/net-misc/unison/unison-2.51.3_rc2.ebuild 
b/net-misc/unison/unison-2.51.3_rc2.ebuild
index 900baadd148..5fe71cf739a 100644
--- a/net-misc/unison/unison-2.51.3_rc2.ebuild
+++ b/net-misc/unison/unison-2.51.3_rc2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit desktop xdg-utils
+
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
 SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
@@ -64,7 +66,10 @@ src_install() {
for binname in unison unison-fsmonitor; do
newbin ${binname} ${binname}-${SLOT}
done
-
+   if use gtk; then
+   newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+   make_desktop_entry ${PN}-${SLOT} ${PN}-${SLOT} ${PN}-${SLOT}
+   fi
# No docs for release candidates
#if use doc; then
#   DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
@@ -79,4 +84,13 @@ pkg_postinst() {
elog "in your profile files to access exactly this version over ssh."
elog "Or you can use 'eselect unison' to set the version."
eselect unison update
+   if use gtk; then
+   xdg_icon_cache_update
+   fi
+}
+
+pkg_postrm() {
+   if use gtk; then
+   xdg_icon_cache_update
+   fi
 }

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-17 Thread Sam James

commit: 4b3ab9374d35d9971a12648c7b080ab3c72e7c58
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 17 08:52:02 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 17 08:52:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3ab937

net-misc/unison: apply 'tidying' changes to old

See also: 8d942e2283a9cab3747101e8771816dab1d7fe37

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.48.15_p4.ebuild | 6 +-
 net-misc/unison/unison-2.48.4-r1.ebuild  | 8 +---
 net-misc/unison/unison-2.48.4-r2.ebuild  | 6 +-
 net-misc/unison/unison-2.51.2-r1.ebuild  | 8 ++--
 net-misc/unison/unison-2.51.3_rc2.ebuild | 3 +--
 5 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/net-misc/unison/unison-2.48.15_p4.ebuild 
b/net-misc/unison/unison-2.48.15_p4.ebuild
index 771b3e609dd..a1fb30478f4 100644
--- a/net-misc/unison/unison-2.48.15_p4.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV/_p/v}.tar.gz -> ${P/
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-IUSE="gtk static debug threads +ocamlopt test"
+IUSE="debug gtk +ocamlopt threads"
 
 # Upstream, for this version, has explicitly disabled test with marker
 # "Skipping some tests -- remove me!". Given the potentially destructive nature
@@ -45,10 +45,6 @@ src_compile() {
myconf="$myconf THREADS=true"
fi
 
-   if use static; then
-   myconf="$myconf STATIC=true"
-   fi
-
if use debug; then
myconf="$myconf DEBUGGING=true"
fi

diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild 
b/net-misc/unison/unison-2.48.4-r1.ebuild
index c8cdf88bf1f..11de4808528 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-IUSE="gtk doc static debug threads +ocamlopt test"
-
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
 
SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
@@ -14,7 +12,7 @@ 
SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-
+IUSE="debug doc gtk +ocamlopt threads"
 # Upstream, for this version, has explicitly disabled test with marker
 # "Skipping some tests -- remove me!". Given the potentially destructive nature
 # of those tests, let's not try to run them (they're re-enabled in subsequent
@@ -41,10 +39,6 @@ src_compile() {
myconf="$myconf THREADS=true"
fi
 
-   if use static; then
-   myconf="$myconf STATIC=true"
-   fi
-
if use debug; then
myconf="$myconf DEBUGGING=true"
fi

diff --git a/net-misc/unison/unison-2.48.4-r2.ebuild 
b/net-misc/unison/unison-2.48.4-r2.ebuild
index da2e58c430d..99d421e0e95 100644
--- a/net-misc/unison/unison-2.48.4-r2.ebuild
+++ b/net-misc/unison/unison-2.48.4-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-IUSE="gtk doc static debug threads +ocamlopt test"
+IUSE="debug doc gtk +ocamlopt threads"
 
 # Upstream, for this version, has explicitly disabled test with marker
 # "Skipping some tests -- remove me!". Given the potentially destructive nature
@@ -44,10 +44,6 @@ src_compile() {
myconf="$myconf THREADS=true"
fi
 
-   if use static; then
-   myconf="$myconf STATIC=true"
-   fi
-
if use debug; then
myconf="$myconf DEBUGGING=true"
fi

diff --git a/net-misc/unison/unison-2.51.2-r1.ebuild 
b/net-misc/unison/unison-2.51.2-r1.ebuild
index c7b05df33aa..9b7c3a033ec 100644
--- a/net-misc/unison/unison-2.51.2-r1.ebuild
+++ b/net-misc/unison/unison-2.51.2-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-IUSE="gtk doc static debug threads +ocamlopt test"
+IUSE="debug doc gtk +ocamlopt threads"
 
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-IUSE="debug gtk threads +ocamlopt test"
+IUSE="debug gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )"
-RESTRICT+=" !test? ( test )"
 
 # ocaml

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-17 Thread Sam James

commit: a61319695615391310a9e3e5a3214fead3af76be
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 17 08:44:35 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 17 08:44:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6131969

net-misc/unison: restore ~ppc to 2.51.3_rc2

No longer needed sans-Dune.

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.51.3_rc2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.51.3_rc2.ebuild 
b/net-misc/unison/unison-2.51.3_rc2.ebuild
index 2f2b082f0f1..dbcefecfbbf 100644
--- a/net-misc/unison/unison-2.51.3_rc2.ebuild
+++ b/net-misc/unison/unison-2.51.3_rc2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 IUSE="debug gtk threads +ocamlopt test"
 RESTRICT="!ocamlopt? ( strip )"
 RESTRICT+=" !test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-17 Thread Sam James

commit: 8d942e2283a9cab3747101e8771816dab1d7fe37
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 17 08:43:20 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 17 08:43:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d942e22

net-misc/unison: tidying

* Don't install static libs
* Drop dune.eclass (the support upstream is experimental)
* ... so specify the OCaml dependency manually
* Sort IUSE
* Remove USE=doc for now (because no docs for the release candidate)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.51.3_rc2.ebuild | 23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/net-misc/unison/unison-2.51.3_rc2.ebuild 
b/net-misc/unison/unison-2.51.3_rc2.ebuild
index 8b53a7db107..2f2b082f0f1 100644
--- a/net-misc/unison/unison-2.51.3_rc2.ebuild
+++ b/net-misc/unison/unison-2.51.3_rc2.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit dune
-
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
 SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
@@ -17,10 +15,12 @@ 
SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-IUSE="gtk doc static debug threads +ocamlopt test"
-RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
+IUSE="debug gtk threads +ocamlopt test"
+RESTRICT="!ocamlopt? ( strip )"
+RESTRICT+=" !test? ( test )"
 
 # ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]"
 DEPEND="gtk? ( dev-ml/lablgtk:2= )"
 RDEPEND="
${DEPEND}
@@ -37,10 +37,6 @@ src_compile() {
myconf="$myconf THREADS=true"
fi
 
-   if use static; then
-   myconf="$myconf STATIC=true"
-   fi
-
if use debug; then
myconf="$myconf DEBUGGING=true"
fi
@@ -69,10 +65,13 @@ src_install() {
for binname in unison unison-fsmonitor; do
newbin ${binname} ${binname}-${SLOT}
done
-   if use doc; then
-   DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
-   HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
-   fi
+
+   # No docs for release candidates
+   #if use doc; then
+   #   DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
+   #   HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+   #fi
+
einstalldocs
 }

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-17 Thread Sam James

commit: fd56d246a51eded5955d96e85ca80c13e15ccde5
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 17 08:33:36 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 17 08:33:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd56d246

net-misc/unison: cleanup redundant

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.51.2.ebuild | 82 
 1 file changed, 82 deletions(-)

diff --git a/net-misc/unison/unison-2.51.2.ebuild 
b/net-misc/unison/unison-2.51.2.ebuild
deleted file mode 100644
index 916558d756a..000
--- a/net-misc/unison/unison-2.51.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
-SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-   doc? (
-   
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-   
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
-   )"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-IUSE="gtk doc static debug threads +ocamlopt test"
-
-# ocaml version so we are sure it has ocamlopt use flag
-DEPEND="dev-lang/ocaml[ocamlopt?]
-   gtk? ( dev-ml/lablgtk:2= )"
-
-RDEPEND="gtk? ( dev-ml/lablgtk:2=
-   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-   >=app-eselect/eselect-unison-0.4"
-
-RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
-S="${WORKDIR}"/src
-
-DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
-
-src_compile() {
-   local myconf
-
-   if use threads; then
-   myconf="$myconf THREADS=true"
-   fi
-
-   if use static; then
-   myconf="$myconf STATIC=true"
-   fi
-
-   if use debug; then
-   myconf="$myconf DEBUGGING=true"
-   fi
-
-   if use gtk; then
-   myconf="$myconf UISTYLE=gtk2"
-   else
-   myconf="$myconf UISTYLE=text"
-   fi
-
-   use ocamlopt || myconf="$myconf NATIVE=false"
-
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS="" buildexecutable
-}
-
-src_test() {
-   emake selftest CFLAGS=""
-}
-
-src_install() {
-   # install manually, since it's just too much
-   # work to force the Makefile to do the right thing.
-   local binname
-   for binname in unison unison-fsmonitor; do
-   newbin ${binname} ${binname}-${SLOT}
-   done
-   if use doc; then
-   DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
-   HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
-   fi
-   einstalldocs
-}
-
-pkg_postinst() {
-   elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/unison-${SLOT}"
-   elog "in your profile files to access exactly this version over ssh."
-   elog "Or you can use 'eselect unison' to set the version."
-   eselect unison update
-}

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/files/, net-misc/unison/

2020-10-17 Thread Sam James

commit: 71df67d36b63cbe65b3eb9a8b91c07ccb2ac9071
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Oct 14 14:43:39 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 17 08:32:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71df67d3

net-misc/unison: build with ocaml-4.09.0

Patches from https://bugs.gentoo.org/709646 applied
Restricting to <=dev-lang/ocaml-4.09:=
Does not build with ocaml-4.10.0

Closes: https://bugs.gentoo.org/709646
Bug: https://bugs.gentoo.org/739426
Bug: https://bugs.gentoo.org/733720

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 .../unison/files/unison-2.48.4-ocaml-4.08.patch| 79 +++
 .../unison/files/unison-2.51.2-ocaml-4.08.patch| 50 
 net-misc/unison/unison-2.48.4-r2.ebuild| 90 ++
 net-misc/unison/unison-2.51.2-r1.ebuild| 86 +
 4 files changed, 305 insertions(+)

diff --git a/net-misc/unison/files/unison-2.48.4-ocaml-4.08.patch 
b/net-misc/unison/files/unison-2.48.4-ocaml-4.08.patch
new file mode 100644
index 000..8b0d89b335a
--- /dev/null
+++ b/net-misc/unison/files/unison-2.48.4-ocaml-4.08.patch
@@ -0,0 +1,79 @@
+From: Stephane Glondu 
+Date: Mon, 25 Nov 2019 10:52:48 +0100
+Subject: Fix compilation with OCaml 4.08.1
+
+---
+ Makefile.OCaml   | 2 +-
+ files.ml | 2 +-
+ recon.ml | 4 ++--
+ system/system_generic.ml | 2 +-
+ uigtk2.ml| 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.OCaml b/Makefile.OCaml
+index 21610ce..7549907 100644
+--- a/Makefile.OCaml
 b/Makefile.OCaml
+@@ -95,7 +95,7 @@ buildexecutable::
+ ### Default parameters
+ 
+ # Generate backtrace information for exceptions
+-CAMLFLAGS+=-g
++CAMLFLAGS+=-g -unsafe-string
+ 
+ INCLFLAGS=-I lwt -I ubase -I system
+ CAMLFLAGS+=$(INCLFLAGS)
+diff --git a/files.ml b/files.ml
+index ba42ad5..02d52f3 100644
+--- a/files.ml
 b/files.ml
+@@ -722,7 +722,7 @@ let get_files_in_directory dir =
+   with End_of_file ->
+ dirh.System.closedir ()
+   end;
+-  Sort.list (<) !files
++  List.sort compare !files
+ 
+ let ls dir pattern =
+   Util.convertUnixErrorsToTransient
+diff --git a/recon.ml b/recon.ml
+index 5ed358d..a8719c4 100644
+--- a/recon.ml
 b/recon.ml
+@@ -651,8 +651,8 @@ let rec reconcile
+ 
+ (* Sorts the paths so that they will be displayed in order   
*)
+ let sortPaths pathUpdatesList =
+-  Sort.list
+-(fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
++  List.sort
++(fun (p1, _) (p2, _) -> Path.compare p1 p2)
+ pathUpdatesList
+ 
+ let rec enterPath p1 p2 t =
+diff --git a/system/system_generic.ml b/system/system_generic.ml
+index 9230cdc..ee457c5 100755
+--- a/system/system_generic.ml
 b/system/system_generic.ml
+@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
+ let chmod = Unix.chmod
+ let chown = Unix.chown
+ let utimes = Unix.utimes
+-let link = Unix.link
++let link s1 s2 = Unix.link s1 s2
+ let openfile = Unix.openfile
+ let opendir f =
+   let h = Unix.opendir f in
+diff --git a/uigtk2.ml b/uigtk2.ml
+index 206d8ad..b2a17e2 100644
+--- a/uigtk2.ml
 b/uigtk2.ml
+@@ -94,7 +94,7 @@ let icon =
+ let icon =
+   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
+   Gpointer.blit
+-(Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
++(Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
+   p
+ 
+ let leftPtrWatch =

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
new file mode 100644
index 000..e3353e77e62
--- /dev/null
+++ b/net-misc/unison/files/unison-2.51.2-ocaml-4.08.patch
@@ -0,0 +1,50 @@
+diff -ur src.orig/files.ml src/files.ml
+--- src.orig/files.ml  2018-01-27 21:53:44.0 +0100
 src/files.ml   2019-12-11 16:12:40.005712137 +0100
+@@ -734,7 +734,7 @@
+   with End_of_file ->
+ dirh.System.closedir ()
+   end;
+-  Sort.list (<) !files
++  List.sort compare !files
+ 
+ let ls dir pattern =
+   Util.convertUnixErrorsToTransient
+diff -ur src.orig/recon.ml src/recon.ml
+--- src.orig/recon.ml  2018-01-27 21:53:44.0 +0100
 src/recon.ml   2019-12-11 16:12:40.005712137 +0100
+@@ -661,8 +661,8 @@
+ 
+ (* Sorts the paths so that they will be displayed in order   
*)
+ let sortPaths pathUpdatesList =
+-  Sort.list
+-(fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
++  List.sort
++(fun (p1, _) (p2, _) -> Path.compare p1 p2)
+ pathUpdatesList
+ 
+ let rec enterPath p1 p2 t =
+diff -ur src.orig/system/system_generic.ml src/system/system_generic.ml
+--- src.orig/system/system_generic.ml  2018-01-27 21:53:44.0 +0100
 src/system/system_generic.ml   2019-12-11 16:12:40.005712137 +0100
+@@ -47,7 +47,7 @@
+ let ch

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/, net-misc/unison/files/

2020-10-17 Thread Sam James

commit: e547a74e68a1cd8047d3aaaf480acb3c94425a40
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Oct 16 22:07:53 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 17 08:32:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e547a74e

net-misc/unison: bump to 2.48.15_p4

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17927
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest   |  1 +
 .../files/unison-2.48.15_p4-ocaml-4.08.patch   | 67 
 net-misc/unison/unison-2.48.15_p4.ebuild   | 92 ++
 3 files changed, 160 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 9ceab2eb127..100bc6830fc 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1,4 @@
+DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B 
d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec
 SHA512 
658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 
8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f
 SHA512 
c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024

diff --git a/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch 
b/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch
new file mode 100644
index 000..8a8205d3cfe
--- /dev/null
+++ b/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch
@@ -0,0 +1,67 @@
+Reworked for v2.48.15v4 ( https://github.com/bcpierce00/unison/commit/29fa058 )
+
+From: Stephane Glondu 
+Date: Mon, 25 Nov 2019 10:52:48 +0100
+Subject: Fix compilation with OCaml 4.08.1
+
+---
+ files.ml | 2 +-
+ recon.ml | 4 ++--
+ system/system_generic.ml | 2 +-
+ uigtk2.ml| 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.OCaml b/Makefile.OCaml
+index 21610ce..7549907 100644
+--- a/files.ml
 b/files.ml
+@@ -722,7 +722,7 @@ let get_files_in_directory dir =
+   with End_of_file ->
+ dirh.System.closedir ()
+   end;
+-  Sort.list (<) !files
++  List.sort String.compare !files
+ 
+ let ls dir pattern =
+   Util.convertUnixErrorsToTransient
+diff --git a/recon.ml b/recon.ml
+index 5ed358d..a8719c4 100644
+--- a/recon.ml
 b/recon.ml
+@@ -651,8 +651,8 @@ let rec reconcile
+ 
+ (* Sorts the paths so that they will be displayed in order   
*)
+ let sortPaths pathUpdatesList =
+-  Sort.list
+-(fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
++  List.sort
++Path.compare
+ pathUpdatesList
+ 
+ let rec enterPath p1 p2 t =
+diff --git a/system/system_generic.ml b/system/system_generic.ml
+index 9230cdc..ee457c5 100755
+--- a/system/system_generic.ml
 b/system/system_generic.ml
+@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
+ let chmod = Unix.chmod
+ let chown = Unix.chown
+ let utimes = Unix.utimes
+-let link = Unix.link
++let link s d = Unix.link s d
+ let openfile = Unix.openfile
+ let opendir f =
+   let h = Unix.opendir f in
+diff --git a/uigtk2.ml b/uigtk2.ml
+index 206d8ad..b2a17e2 100644
+--- a/uigtk2.ml
 b/uigtk2.ml
+@@ -94,7 +94,7 @@ let icon =
+ let icon =
+   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
+   Gpointer.blit
+-(Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
++(Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
+   p
+
+ let leftPtrWatch =

diff --git a/net-misc/unison/unison-2.48.15_p4.ebuild 
b/net-misc/unison/unison-2.48.15_p4.ebuild
new file mode 100644
index 000..771b3e609dd
--- /dev/null
+++ b/net-misc/unison/unison-2.48.15_p4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV/_

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-17 Thread Sam James

commit: 7aaa57f489d464c17f6d641146ac56c5a50cde2a
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Oct 15 07:29:04 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 17 08:32:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aaa57f4

net-misc/unison: remove old (EAPI=5)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.48.4.ebuild | 89 
 1 file changed, 89 deletions(-)

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
deleted file mode 100644
index 1ecc2d6a3fd..000
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator
-
-IUSE="gtk doc static debug threads +ocamlopt test"
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
-LICENSE="GPL-2"
-SLOT="$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-
-# ocaml version so we are sure it has ocamlopt use flag
-DEPEND="dev-lang/ocaml[ocamlopt?]
-   gtk? ( dev-ml/lablgtk:2= )
-   test? ( || ( dev-util/ctags >=app-editors/emacs-23.1:* ) )"
-
-RDEPEND="gtk? ( dev-ml/lablgtk:2=
-   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-   !net-misc/unison:0
-   app-eselect/eselect-unison"
-
-#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
-
-RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
-SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-   doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-   
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"
-S="${WORKDIR}"/src
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch
-   default
-}
-
-src_compile() {
-   local myconf
-
-   if use threads; then
-   myconf="$myconf THREADS=true"
-   fi
-
-   if use static; then
-   myconf="$myconf STATIC=true"
-   fi
-
-   if use debug; then
-   myconf="$myconf DEBUGGING=true"
-   fi
-
-   if use gtk; then
-   myconf="$myconf UISTYLE=gtk2"
-   else
-   myconf="$myconf UISTYLE=text"
-   fi
-
-   use ocamlopt || myconf="$myconf NATIVE=false"
-
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS="" buildexecutable
-}
-
-src_test() {
-   emake selftest CFLAGS=""
-}
-
-src_install() {
-   # install manually, since it's just too much
-   # work to force the Makefile to do the right thing.
-   newbin unison unison-${SLOT}
-   dobin unison-fsmonitor
-   dodoc BUGS.txt CONTRIB INSTALL NEWS \
- README ROADMAP.txt TODO.txt
-
-   if use doc; then
-   dohtml "${DISTDIR}/${P}-manual.html"
-   dodoc "${DISTDIR}/${P}-manual.pdf"
-   fi
-}
-
-pkg_postinst() {
-   elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/unison-${SLOT}"
-   elog "in your profile files to access exactly this version over ssh."
-   elog "Or you can use 'eselect unison' to set the version."
-   eselect unison update
-}

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-17 Thread Sam James

commit: d66c5d6d20c41ca1c29ea0c02492b9c4c456db13
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Oct 15 07:25:47 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 17 08:32:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66c5d6d

net-misc/unison: fix MissingSlotDep

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/unison-2.48.4-r1.ebuild | 4 ++--
 net-misc/unison/unison-2.48.4.ebuild| 4 ++--
 net-misc/unison/unison-2.51.2.ebuild| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild 
b/net-misc/unison/unison-2.48.4-r1.ebuild
index b76c12b4239..c8cdf88bf1f 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -23,9 +23,9 @@ RESTRICT="test !ocamlopt? ( strip )"
 
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="dev-lang/ocaml[ocamlopt?]
-   gtk? ( dev-ml/lablgtk )"
+   gtk? ( dev-ml/lablgtk:2= )"
 
-RDEPEND="gtk? ( dev-ml/lablgtk
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
>=app-eselect/eselect-unison-0.4"
 

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
index 56ef942628c..1ecc2d6a3fd 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -15,10 +15,10 @@ KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos ~spa
 
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="dev-lang/ocaml[ocamlopt?]
-   gtk? ( dev-ml/lablgtk )
+   gtk? ( dev-ml/lablgtk:2= )
test? ( || ( dev-util/ctags >=app-editors/emacs-23.1:* ) )"
 
-RDEPEND="gtk? ( dev-ml/lablgtk
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
!net-misc/unison:0
app-eselect/eselect-unison"

diff --git a/net-misc/unison/unison-2.51.2.ebuild 
b/net-misc/unison/unison-2.51.2.ebuild
index 3c6d4df6c2e..916558d756a 100644
--- a/net-misc/unison/unison-2.51.2.ebuild
+++ b/net-misc/unison/unison-2.51.2.ebuild
@@ -18,9 +18,9 @@ IUSE="gtk doc static debug threads +ocamlopt test"
 
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="dev-lang/ocaml[ocamlopt?]
-   gtk? ( dev-ml/lablgtk )"
+   gtk? ( dev-ml/lablgtk:2= )"
 
-RDEPEND="gtk? ( dev-ml/lablgtk
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
>=app-eselect/eselect-unison-0.4"

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2020-10-17 Thread Sam James

commit: 2759ca74611a5aebdc14a873670a26f66a899107
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 17 08:31:56 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 17 08:32:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2759ca74

net-misc/unison: bump to 2.51.3_rc2

Bug: https://bugs.gentoo.org/709646
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 net-misc/unison/Manifest |  1 +
 net-misc/unison/unison-2.51.3_rc2.ebuild | 84 
 2 files changed, 85 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 100bc6830fc..bf262184879 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,3 +5,4 @@ DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 
8e262e3e28b9f4cbe3925340aa3b08e99f1c30
 DIST unison-2.51.2-manual.html 311981 BLAKE2B 
1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05
 SHA512 
2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
 DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 
30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0
 SHA512 
170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
 DIST unison-2.51.2.tar.gz 691251 BLAKE2B 
39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f
 SHA512 
9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115
+DIST unison-2.51.3_rc2.tar.gz 1370090 BLAKE2B 
dd4657000a771a22f8e61af25d34334872595c53fa24d863e67f52fd0accd3406ac61fff61d01b1977ae3d6f2eaa50aedb2b31dd47abc6d08bd3d240786dab8b
 SHA512 
0acadad426370305093854953f7fc1a720a2be67a4d8327a54822bb94c7292136cc7d7980fb80291125a2f0280180443913bfd49c428ed5a27e3537ef4713153

diff --git a/net-misc/unison/unison-2.51.3_rc2.ebuild 
b/net-misc/unison/unison-2.51.3_rc2.ebuild
new file mode 100644
index 000..8b53a7db107
--- /dev/null
+++ b/net-misc/unison/unison-2.51.3_rc2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+# Not available for the rcs
+#SRC_URI+=" doc? (
+#  
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+#  
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
+#  )"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+IUSE="gtk doc static debug threads +ocamlopt test"
+RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="
+   ${DEPEND}
+   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen )
+   >=app-eselect/eselect-unison-0.4
+"
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_compile() {
+   local myconf
+
+   if use threads; then
+   myconf="$myconf THREADS=true"
+   fi
+
+   if use static; then
+   myconf="$myconf STATIC=true"
+   fi
+
+   if use debug; then
+   myconf="$myconf DEBUGGING=true"
+   fi
+
+   if use gtk; then
+   myconf="$myconf UISTYLE=gtk2"
+   else
+   myconf="$myconf UISTYLE=text"
+   fi
+
+   use ocamlopt || myconf="$myconf NATIVE=false"
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake $myconf CFLAGS=""
+}
+
+src_test() {
+   emake test CFLAGS=""
+}
+
+src_install() {
+   # install manually, since it's just too much
+   # work to force the Makefile to do the right thing.
+   local binname
+   cd src || die
+   for binname in unison unison-fsmonitor; do
+   newbin ${binname} ${binname}-${SLOT}
+   done
+   if use doc; then
+   DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
+   HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+   fi
+   einstalldocs
+}
+
+pkg_postinst() {
+   elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/unison-${SLOT}"
+   elog "in your profile files to access exactly this version over ssh."
+   elog "Or you can use 'eselect unison' to set the version."
+   eselect unison update
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2019-12-20 Thread Ulrich Müller

commit: 19b9cb36d743b3c4a1d7f95e4722cd8666e1e9f1
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Dec 20 16:27:37 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Dec 20 22:48:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b9cb36

net-misc/unison: Update virtual/emacs dependency.

The virtual is deprecated, depend on app-editors/emacs instead.

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Ulrich Müller  gentoo.org>

 net-misc/unison/unison-2.48.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
index fb513a40f2e..e2ba50d54f2 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos ~spa
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="dev-lang/ocaml[ocamlopt?]
gtk? ( dev-ml/lablgtk )
-   test? ( || ( dev-util/ctags virtual/emacs ) )"
+   test? ( || ( dev-util/ctags >=app-editors/emacs-23.1:* ) )"
 
 RDEPEND="gtk? ( dev-ml/lablgtk
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2019-12-13 Thread Ulrich Müller

commit: b9881de4b9f796f2ab7c6723607b6b775de3caf5
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Dec 13 15:05:47 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Dec 13 15:05:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9881de4

net-misc/unison: Assign RESTRICT only once.

Closes: https://bugs.gentoo.org/699200
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Ulrich Müller  gentoo.org>

 net-misc/unison/unison-2.48.4-r1.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild 
b/net-misc/unison/unison-2.48.4-r1.ebuild
index a66ce281330..3cbf95371a2 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -7,6 +7,10 @@ IUSE="gtk doc static debug threads +ocamlopt test"
 
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+   doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+   
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"
+
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
@@ -15,7 +19,7 @@ KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos ~spar
 # "Skipping some tests -- remove me!". Given the potentially destructive nature
 # of those tests, let's not try to run them (they're re-enabled in subsequent
 # releases).
-RESTRICT="test"
+RESTRICT="test !ocamlopt? ( strip )"
 
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="dev-lang/ocaml[ocamlopt?]
@@ -25,10 +29,6 @@ RDEPEND="gtk? ( dev-ml/lablgtk
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
>=app-eselect/eselect-unison-0.4"
 
-RESTRICT+=" !ocamlopt? ( strip )"
-SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-   doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-   
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"
 S="${WORKDIR}"/src
 PATCHES=( "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch )

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2019-12-12 Thread Michał Górny

commit: 82503f13f216b9d0f9a68745685a46e8642922b9
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Dec 12 15:33:22 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Dec 12 16:34:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82503f13

net-misc/unison: [QA] Fix MissingTestRestrict

Signed-off-by: Michał Górny  gentoo.org>

 net-misc/unison/unison-2.48.4-r1.ebuild | 2 +-
 net-misc/unison/unison-2.48.4.ebuild| 2 +-
 net-misc/unison/unison-2.51.2.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild 
b/net-misc/unison/unison-2.48.4-r1.ebuild
index 005fa17a2e5..a66ce281330 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
>=app-eselect/eselect-unison-0.4"
 
-RESTRICT="!ocamlopt? ( strip )"
+RESTRICT+=" !ocamlopt? ( strip )"
 
SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf

https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
index 1cbadbf207a..fb513a40f2e 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -25,7 +25,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 
 #PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
 
-RESTRICT="!ocamlopt? ( strip )"
+RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
 
SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf

https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"

diff --git a/net-misc/unison/unison-2.51.2.ebuild 
b/net-misc/unison/unison-2.51.2.ebuild
index af6cf20473a..3be608825bf 100644
--- a/net-misc/unison/unison-2.51.2.ebuild
+++ b/net-misc/unison/unison-2.51.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
>=app-eselect/eselect-unison-0.4"
 
-RESTRICT="!ocamlopt? ( strip )"
+RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
 S="${WORKDIR}"/src
 
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2019-11-20 Thread Agostino Sarubbo

commit: 819270bf356662035b20f1146f24d4f6d9d5c4c1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 20 15:40:35 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 20 15:40:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=819270bf

net-misc/unison: x86 stable wrt bug #700694

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/unison/unison-2.48.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild 
b/net-misc/unison/unison-2.48.4-r1.ebuild
index 70639cd396a..005fa17a2e5 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 
 # Upstream, for this version, has explicitly disabled test with marker
 # "Skipping some tests -- remove me!". Given the potentially destructive nature

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2019-11-20 Thread Agostino Sarubbo

commit: 918db5f4cdbadcb0900eb41aaab7a1b21eedd3cb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 20 13:21:35 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 20 13:21:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=918db5f4

net-misc/unison: amd64 stable wrt bug #700694

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/unison/unison-2.48.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild 
b/net-misc/unison/unison-2.48.4-r1.ebuild
index 6b407095a3a..70639cd396a 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 
 # Upstream, for this version, has explicitly disabled test with marker
 # "Skipping some tests -- remove me!". Given the potentially destructive nature

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2019-11-20 Thread Agostino Sarubbo

commit: 13ace6913bb7ed5a2fada7878f67551ffad81229
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 20 11:27:17 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 20 11:27:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ace691

net-misc/unison: ppc stable wrt bug #700694

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/unison/unison-2.48.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild 
b/net-misc/unison/unison-2.48.4-r1.ebuild
index 01f53f133df..6b407095a3a 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 
 # Upstream, for this version, has explicitly disabled test with marker
 # "Skipping some tests -- remove me!". Given the potentially destructive nature

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2019-07-05 Thread Michał Górny

commit: 6f4a834809ccb8c64c75426424224876a6765ae8
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Apr 14 08:12:00 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jul  5 20:17:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4a8348

net-misc/unison: Replace STRIP_MASK with RESTRICT=strip

Closes: https://bugs.gentoo.org/651454
Signed-off-by: Michał Górny  gentoo.org>

 net-misc/unison/unison-2.48.4-r1.ebuild | 4 ++--
 net-misc/unison/unison-2.48.4.ebuild| 4 ++--
 net-misc/unison/unison-2.51.2.ebuild| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild 
b/net-misc/unison/unison-2.48.4-r1.ebuild
index 55e5485844d..01f53f133df 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
>=app-eselect/eselect-unison-0.4"
 
+RESTRICT="!ocamlopt? ( strip )"
 
SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf

https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"
@@ -76,7 +77,6 @@ src_install () {
HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
fi
einstalldocs
-   use ocamlopt || export STRIP_MASK="*/bin/*"
 }
 
 pkg_postinst() {

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
index 1fec2677b4e..1cbadbf207a 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,6 +25,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 
 #PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
 
+RESTRICT="!ocamlopt? ( strip )"
 
SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf

https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"
@@ -78,7 +79,6 @@ src_install () {
dohtml "${DISTDIR}/${P}-manual.html"
dodoc "${DISTDIR}/${P}-manual.pdf"
fi
-   use ocamlopt || export STRIP_MASK="*/bin/*"
 }
 
 pkg_postinst() {

diff --git a/net-misc/unison/unison-2.51.2.ebuild 
b/net-misc/unison/unison-2.51.2.ebuild
index 25776c6fb51..af6cf20473a 100644
--- a/net-misc/unison/unison-2.51.2.ebuild
+++ b/net-misc/unison/unison-2.51.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
>=app-eselect/eselect-unison-0.4"
 
+RESTRICT="!ocamlopt? ( strip )"
 S="${WORKDIR}"/src
 
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
@@ -71,7 +72,6 @@ src_install () {
HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
fi
einstalldocs
-   use ocamlopt || export STRIP_MASK="*/bin/*"
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2018-08-27 Thread Virgil Dupras

commit: 27dfa0e4f1a7848454d19177bde693415a6d45e1
Author: Virgil Dupras  gentoo  org>
AuthorDate: Mon Aug 27 18:44:31 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Mon Aug 27 18:45:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27dfa0e4

net-misc/unison: bump to 2.51.2

Closes: https://bugs.gentoo.org/651972
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-misc/unison/Manifest|  3 ++
 net-misc/unison/unison-2.48.4-r1.ebuild | 87 +
 net-misc/unison/unison-2.51.2.ebuild| 82 +++
 3 files changed, 172 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index f1479c9334e..9ceab2eb127 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1,6 @@
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 
8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f
 SHA512 
c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
+DIST unison-2.51.2-manual.html 311981 BLAKE2B 
1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05
 SHA512 
2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
+DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 
30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0
 SHA512 
170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
+DIST unison-2.51.2.tar.gz 691251 BLAKE2B 
39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f
 SHA512 
9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115

diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild 
b/net-misc/unison/unison-2.48.4-r1.ebuild
new file mode 100644
index 000..55e5485844d
--- /dev/null
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+
+# Upstream, for this version, has explicitly disabled test with marker
+# "Skipping some tests -- remove me!". Given the potentially destructive nature
+# of those tests, let's not try to run them (they're re-enabled in subsequent
+# releases).
+RESTRICT="test"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND="dev-lang/ocaml[ocamlopt?]
+   gtk? ( dev-ml/lablgtk )"
+
+RDEPEND="gtk? ( dev-ml/lablgtk
+   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+   >=app-eselect/eselect-unison-0.4"
+
+SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+   doc? ( 
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+   
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"
+S="${WORKDIR}"/src
+PATCHES=( "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch )
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_compile() {
+   local myconf
+
+   if use threads; then
+   myconf="$myconf THREADS=true"
+   fi
+
+   if use static; then
+   myconf="$myconf STATIC=true"
+   fi
+
+   if use debug; then
+   myconf="$myconf DEBUGGING=true"
+   fi
+
+   if use gtk; then
+   myconf="$myconf UISTYLE=gtk2"
+   else
+   myconf="$myconf UISTYLE=text"
+   fi
+
+   use ocamlopt || myconf="$myconf NATIVE=false"
+
+   # Discard cflags as it will try to pass them to ocamlc...
+   emake $myconf CFLAGS="" buildexecutable
+}
+
+src_test() {
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2018-01-12 Thread Benda XU

commit: de52dea2022217c2886dc131851fc3a514883346
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Jan 13 03:41:54 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Jan 13 03:42:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de52dea2

net-misc/unison: remove old versions that do not build.

Closes: https://bugs.gentoo.org/show_bug.cgi?id=592020
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-misc/unison/Manifest |  3 --
 net-misc/unison/unison-2.48.3.ebuild | 81 
 2 files changed, 84 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 4be55f3d42e..f1479c9334e 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,6 +1,3 @@
-DIST unison-2.48.3-manual.html 278156 BLAKE2B 
3534d497f2813b70644c1c6d9d24310dee5101c31f3066e9c51e9ac16dd9f2b4651d6bf07f13490534f5243ee4ff54549be668be22f9dc0d8fa7d48feee7844e
 SHA512 
50924c624abd86f231ad8cbcfd4e383322a55733108685255df21df6da26d9ad1ac7d4f7d7dcd82faf4696f3f0136c0ff3c8cf5ffda4042f63451f2b7c8e9502
-DIST unison-2.48.3-manual.pdf 516703 BLAKE2B 
79a502c2b6897c39600c73e172a9405027449f3bf1d89b34f31ba2df0271add2075296634fec1b2137ab4c4e27653b707f6f68c5130e4cc61d29370de06e4292
 SHA512 
3a16d6e0df6370784f960d37749f56a223c5eaab24ded299f6a61058f7692139239d0d64436d93268b4cbd8031de6139e187aca0beb54345a615e71253bce977
-DIST unison-2.48.3.tar.gz 1172646 BLAKE2B 
5f44154920395ef0458972ccd85a4831f2cd491ba6853c081ede6b849922cbd15c1d02ea289d48fb9777eaec451919b090d734c7b7b262a18efec2828b182275
 SHA512 
169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 
8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c
 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 
8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e
 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 
8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f
 SHA512 
c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024

diff --git a/net-misc/unison/unison-2.48.3.ebuild 
b/net-misc/unison/unison-2.48.3.ebuild
deleted file mode 100644
index 19d3bb695fb..000
--- a/net-misc/unison/unison-2.48.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator
-
-IUSE="gtk doc static debug threads +ocamlopt test"
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/";
-LICENSE="GPL-2"
-SLOT="$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
-
-# ocaml version so we are sure it has ocamlopt use flag
-DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
-   gtk? ( >=dev-ml/lablgtk-2.2 )
-   test? ( || ( dev-util/ctags virtual/emacs ) )"
-
-RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
-   || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-   !net-misc/unison:0
-   app-eselect/eselect-unison"
-
-#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
-
-SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-   doc? ( 
http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-   
http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"
-
-src_compile() {
-   local myconf
-
-   if use threads; then
-   myconf="$myconf THREADS=true"
-   fi
-
-   if use static; then
-   myconf="$myconf STATIC=true"
-   fi
-
-   if use debug; then
-   myconf="$myconf DEBUGGING=true"
-   fi
-
-   if use gtk; then
-   myconf="$myconf UISTYLE=gtk2"
-   else
-   myconf="$myconf UISTYLE=text"
-   fi
-
-   use ocamlopt || myconf="$myconf NATIVE=false"
-
-   # Discard cflags as it will try to pass them to ocamlc...
-   emake $myconf CFLAGS="" buildexecutable
-}
-
-src_test() {
-   emake selftest
-}
-
-src_install () {
-   # install manually, since it's just too much
-   # work to force the Makefile to do the right thing.
-   newbin unison unison-${SLOT}
-   dodoc BUGS.txt CONTRIB INSTALL NEWS \
- README ROADMAP.txt

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2017-12-14 Thread Jason Zaman

commit: f043f9359a949090a7496fe85685ed870480f9bb
Author: Jason Zaman  gentoo  org>
AuthorDate: Thu Dec 14 09:53:47 2017 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Thu Dec 14 09:54:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f043f935

net-misc/unison: amd64 stable

Gentoo-bug: 626304
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 net-misc/unison/unison-2.48.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
index 869fd068845..1fec2677b4e 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
 LICENSE="GPL-2"
 SLOT="$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="dev-lang/ocaml[ocamlopt?]

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2017-12-01 Thread Benda XU

commit: b86e5b9a765eb173f1b03763ff63774bfe9e0871
Author: Benda Xu  gentoo  org>
AuthorDate: Fri Dec  1 12:26:26 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Fri Dec  1 12:27:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86e5b9a

net-misc/unison: strip CFLAGS in src_test.

Credit: ernsteiswuerfel
Closes: https://bugs.gentoo.org/638766
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-misc/unison/Manifest | 2 +-
 net-misc/unison/unison-2.48.4.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index bc1319c1ba5..f7cf533e571 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -3,4 +3,4 @@ DIST unison-2.48.3-manual.pdf 516703 SHA256 
cba2946656e04b856d98184b539e382ed85d
 DIST unison-2.48.3.tar.gz 1172646 SHA256 
f40d3cfbe82078d79328b51acab3e5179f844135260c2f4710525b9b45b15483 SHA512 
169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d
 WHIRLPOOL 
a903f1f5e996655e3e001f33b959d839d2540d0a5c0584fded7aa483a774d8b07b3e7997357f03426f41ef6505cf3d40dec18616252c02add4a417dfef4c8df4
 DIST unison-2.48.4-manual.html 278110 SHA256 
2b5674e2fd7751148784a716ce5a03f8cd0a321c8a3bd4343832ed9b83d2d404 SHA512 
b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 WHIRLPOOL 
c843519b90faf440e1ef6c2a5cd2e4a64fe7044e76f55be26ca61ff54d8ca0ee5f4c2e9e827df27a2af03351d1532ccb22a36010f0420cd7ee476dc451650e6f
 DIST unison-2.48.4-manual.pdf 516093 SHA256 
eaf9bf89967eb17c59b98f0a7ba6b6ff260b6c6de73277a633d954ceb42f5f93 SHA512 
514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 WHIRLPOOL 
a2fd465e13c7d5832684e2ddf194c24d5e4e278ed5c8b53f2e7acac8f4ae2810bf74a3db0674ef73e2a686cf3a66db5b28dbf1320f78b8dc7568ee3cec4cd152
-DIST unison-2.48.4.tar.gz 1200861 SHA256 
30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8 SHA512 
c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
 WHIRLPOOL 
73d8637106cf43ab945a026310276f3636867f609e7d4491a80ff4b7dc98d5d737ee56d00987253e98200e13d971d09e41164b40283530df19f681000bf4733e
+DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 
8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f
 SHA512 
c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
index 951e84771c9..869fd068845 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -63,7 +63,7 @@ src_compile() {
 }
 
 src_test() {
-   emake selftest
+   emake selftest CFLAGS=""
 }
 
 src_install () {

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/files/, net-misc/unison/

2017-10-25 Thread Benda XU

commit: 837d78b9630309b99c65ef0d191676e1ebd8476a
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Oct 26 06:28:06 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Oct 26 06:28:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=837d78b9

net-misc/unison: fix parallel build bug.

Reference: https://github.com/bcpierce00/unison/pull/100
Credit: Robert Forsman, Coacher, José María Fernández González
Credit: Frank Steinmetzger, WGH
Closes: https://bugs.gentoo.org/582666

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../unison/files/unison-2.48.4-Makefile-dep.patch| 20 
 net-misc/unison/unison-2.48.4.ebuild |  5 +
 2 files changed, 25 insertions(+)

diff --git a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch 
b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
new file mode 100644
index 000..f65959dfb4a
--- /dev/null
+++ b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
@@ -0,0 +1,20 @@
+Makefile.OCaml: fswatch.cmi depends on ubase/prefs.cmi.
+
+  The dependency is needed to compile unison
+  in parallel.
+
+Reference: https://github.com/bcpierce00/unison/pull/100
+
+diff --git a/Makefile.OCaml b/Makefile.OCaml
+index 21610ce..84fe7ad 100644
+--- a/Makefile.OCaml
 b/Makefile.OCaml
+@@ -426,6 +426,8 @@ win32rc/unison.res.lib: win32rc/unison.res
+   @echo "$(CAMLC): $< ---> $@"
+   $(CAMLC) $(CAMLFLAGS) -c $(CWD)/$<
+ 
++fswatch.cmi : ubase/prefs.cmi
++
+ %.cmo: %.ml
+   @echo "$(OCAMLC): $< ---> $@"
+   $(OCAMLC) $(CAMLFLAGS) -c $(CWD)/$<

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
index a1f428de517..951e84771c9 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -30,6 +30,11 @@ 
SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}

https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
 )"
 S="${WORKDIR}"/src
 
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch
+   default
+}
+
 src_compile() {
local myconf

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2017-10-09 Thread Thomas Deutschmann

commit: 053edb5d3d3d49cf4fd1ee5b686888c4be0cc855
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Oct  9 23:22:49 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Oct  9 23:28:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=053edb5d

net-misc/unison: x86 stable (bug #626304)

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 net-misc/unison/unison-2.48.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
index 3a685747ee2..a1f428de517 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/";
 LICENSE="GPL-2"
 SLOT="$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris"
 
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="dev-lang/ocaml[ocamlopt?]

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2017-04-11 Thread Benda XU

commit: 42f6fec3b640ae4be96960c39c5c27e0c42b0671
Author: Benda Xu  gentoo  org>
AuthorDate: Wed Apr 12 02:13:50 2017 +
Commit: Benda XU  gentoo  org>
CommitDate: Wed Apr 12 02:15:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f6fec3

net-misc/unison: install unison-fsmonitor.

Bug: 572148
Credit: Phil Tooley

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-misc/unison/unison-2.48.4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
index 449d386b46f..3a685747ee2 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -65,6 +65,7 @@ src_install () {
# install manually, since it's just too much
# work to force the Makefile to do the right thing.
newbin unison unison-${SLOT}
+   dobin unison-fsmonitor
dodoc BUGS.txt CONTRIB INSTALL NEWS \
  README ROADMAP.txt TODO.txt

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/files/, net-misc/unison/

2017-02-14 Thread Alexis Ballier

commit: 19bb83e760d8b9130f614b15b66e0635dd79d2fc
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Feb 14 11:11:47 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Feb 14 11:12:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19bb83e7

net-misc/unison: Remove old slots that do not build with stable dev-lang/ocaml.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-misc/unison/Manifest   | 18 -
 .../unison/files/unison-2.27.57-as-needed.patch| 11 ---
 net-misc/unison/files/unison-mymap.patch   | 13 
 net-misc/unison/unison-2.27.157.ebuild | 86 -
 net-misc/unison/unison-2.32.52.ebuild  | 87 --
 net-misc/unison/unison-2.40.102.ebuild | 82 
 net-misc/unison/unison-2.40.128.ebuild | 82 
 net-misc/unison/unison-2.45.28.ebuild  | 82 
 net-misc/unison/unison-2.45.4.ebuild   | 82 
 9 files changed, 543 deletions(-)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index ddc8ce73ba..bc1319c1ba 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,21 +1,3 @@
-DIST unison-2.27.157-manual.html 235599 SHA256 
58f514c4c0818ebed6b2afa8e3dbf84871e240ddb6819d91e1b7c93be36c3f50 SHA512 
6e00b597a62b7874f3459bbe150ee948125c0b06faf1ec4e90ddb3ac52e3684f6c4ce57dd599904d6cf53919904a08b30cbae84daf28eb6f2079c7c6bda48892
 WHIRLPOOL 
8d3f99038ff33c52980637299d782bde192ce3863d01a4dea91e12c36e70ddc5e8ea235d0c108b4b86113e2ed9d326c45fa675cc0da932089f6c37c95b7a0801
-DIST unison-2.27.157-manual.pdf 453255 SHA256 
6af0f5242a08056d7dbcfce171083a577ed9748d13d1f9bc5d7050f224ec0162 SHA512 
c5a9a7a0a30219fdcdd9c5bbef5245c718bad4f4e2e844d75b5a44b986b6e7c0fe37acfe95676f8e72530bc8a58e62f469f16eef5f0f0d45bed239e37eb634c2
 WHIRLPOOL 
c54f0273a7c9993adeed001d93e2491772b796b2a02f75b4b56d42dfa7eaaea811b1ea2d07ead9245b7d7504e0944257c7d9f6b945834728418378674a83aba8
-DIST unison-2.27.157.tar.gz 674332 SHA256 
ec04069e95249a5b4e212ab48ec03820b1e1f707fb4c607e7f98851e98735adc SHA512 
5be96462d1e23164c173b1ad6088832d5a0dfeb8a2d3f6f4b197f8fdef5216d1fdb0b43fdf2d95dfe58c4a857089e1bd3ca3fbf7406019ba3a7837326bb2c554
 WHIRLPOOL 
f05d39b16e3da9ac6c8511e0201b1c170bd98a66ffa21483eff3bc22af226bed4104423f9b08bdb72fb2d83c027586b374239bf5f0bf4930ed2e37b08897370c
-DIST unison-2.32.52-manual.html 249124 SHA256 
c898239d8139d8405b96d87e12c06c7f41fd3629cac0c83bc338aad50fed7f81 SHA512 
2c10dbecc9089e53ad31d0c625e2e7c1ac0473d8f2706b9f4c9f3fe2569d02c8b54947c1cab1cf3433b45a877ed0f951ebfa9966b65ab91467e0794eb929f085
 WHIRLPOOL 
bba2626784f2999afa2067e87ad38d507b90d6abc2865682c9eb48a51c7e05e87c383fd5cc358ed07fc7ca4f82b3e59e559ee941af6cc92bc9866ae0918984c2
-DIST unison-2.32.52-manual.pdf 478388 SHA256 
b3fee7ac99907f3b1ed02c6ac901678e82ea1eed936acb45e9735b95d55cc4eb SHA512 
7fb643434b8aacbc2d8cfaf8bcc0b399106bfdccadc2484da12095f161a6cb99097241d8f17025984456e4ce25e8d007d7f33a6797467e42a6584e4070a2db42
 WHIRLPOOL 
53f6bc37657a550860f00cfe596636e0134dbab011dba3c7656ed90ddcb10f381fd513aff5da236916113f62b0e6f03a489d3c57303cc5ca8d37f486fec9f0b6
-DIST unison-2.32.52.tar.gz 697866 SHA256 
1542e5d4ad03e928260e061a8ff9d5e0bca3282481ed8bec5552de17a0270485 SHA512 
a97ab23ca8b87575653f6fea4f7eba7fb5aacb8cfa0195ebfff70ecc38f88f26677b26d76c8ba68bd2dac24bdabfabc2f7334ab94bd4b4c0eeb94303438dbda1
 WHIRLPOOL 
0608afb822c01b90318be3532dd313469950165ab820c3f8134393e5ef97852b2dfd683125b9ad0c599f2ebcd0b42478dbc3a92f7afc46ebc4dbd664c752a674
-DIST unison-2.40.102-manual.html 267095 SHA256 
d45cf43bff8805143c53b9f58c4250b781dae04caa0f8f30048c32eb8cf8bf75 SHA512 
08e6f446cc1d905f2bb82b05560c9c8f432e1357a7077a472eb9188ab5b3ef5f687f25d9f9c27a8e091d7fb76057dc9bd3eee50c3718e6f306f77ea5e75a1aad
 WHIRLPOOL 
0d2bac765e0234535df239d14c42db1283a32aeba2074290e0aff407c79d9c469d957437328ea47ccd561ffd718e2639a1abea6aaba6f4764e33fa627efe20de
-DIST unison-2.40.102-manual.pdf 496539 SHA256 
145b427a32cc4e295b128238cf2106853906f3e31b0b06d6757c000fd1e3c56b SHA512 
dc0ddb3158ee12f5d25bda690c67b8631df2aee07bb1b3f8077dacf5ac9fab2fcd7587a78136972e805e907fcea5991d2655aca50a0e3dfc2156ae1bb5e55896
 WHIRLPOOL 
ca0e4ac796df48a53c33dda68c93150597a0fe420985bc36c4bb90d9f24636e7a88335092094c7756a8ddf308cdb7cc3c2e8e06a862881f4e05e63c4bfaae44a
-DIST unison-2.40.102.tar.gz 2717566 SHA256 
4a63395e45bf6b93d5fee5cacbf686c3d9fe43dd7e6fc75ec6fe1a85cf1285ef SHA512 
813b5fcad43a3472d0eac38977a6268463db71f133b5f9b08c4357774f8f46ae234f9ffc42dfa3fe960588c61607a5f7dd37ab6553045668fcf53dce59aeec22
 WHIRLPOOL 
e5e81539c9ddb4da5817740d95607ffde0b6543dbed13ca476300138056d7c486e1b8a1493b3f28b0b42b0d932fcc68ca8e65a48a6525d009a033ba8e5f6111c
-DIST unison-2.40.128-manual.html 267099 SHA256 
8cd3901dffab27203fab1702a7eb2539f1b566ebe08036aef695f39e8593 SHA512 
037959c50c61cfda45963765901e34ec96a76bcbaa5d77c614c481e2d97ec94b1aa235b8

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2016-10-08 Thread Benda XU

commit: 8e3c8304f9d7ec99c42eb4049a09a753ee3ca179
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Oct  9 03:36:00 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Oct  9 03:36:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e3c8304

net-misc/unison: use eselect update to set a default.

Package-Manager: portage-2.3.0

 net-misc/unison/unison-2.48.4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-misc/unison/unison-2.48.4.ebuild 
b/net-misc/unison/unison-2.48.4.ebuild
index 7d93a41..db3ab88 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -80,4 +80,5 @@ pkg_postinst() {
elog "Unison now uses SLOTs, so you can specify 
servercmd=/usr/bin/unison-${SLOT}"
elog "in your profile files to access exactly this version over ssh."
elog "Or you can use 'eselect unison' to set the version."
+   eselect unison update
 }

[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

2016-10-01 Thread Benda XU

commit: 39dee860712a8140d00ce145e1d6998e06b9e9a3
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Oct  2 02:12:10 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Oct  2 02:14:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39dee860

net-misc/unison: version bumps, remove outdated changelogs.

  Deal with issues of ocaml-4.03.

Bug: 592020 594088 594104 594108 594110

Package-Manager: portage-2.3.0

 net-misc/unison/Manifest   |  9 
 net-misc/unison/unison-2.40.128.ebuild | 82 +
 net-misc/unison/unison-2.45.28.ebuild  | 82 +
 net-misc/unison/unison-2.48.4.ebuild   | 83 ++
 4 files changed, 256 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 93252de..ddc8ce7 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -7,9 +7,18 @@ DIST unison-2.32.52.tar.gz 697866 SHA256 
1542e5d4ad03e928260e061a8ff9d5e0bca3282
 DIST unison-2.40.102-manual.html 267095 SHA256 
d45cf43bff8805143c53b9f58c4250b781dae04caa0f8f30048c32eb8cf8bf75 SHA512 
08e6f446cc1d905f2bb82b05560c9c8f432e1357a7077a472eb9188ab5b3ef5f687f25d9f9c27a8e091d7fb76057dc9bd3eee50c3718e6f306f77ea5e75a1aad
 WHIRLPOOL 
0d2bac765e0234535df239d14c42db1283a32aeba2074290e0aff407c79d9c469d957437328ea47ccd561ffd718e2639a1abea6aaba6f4764e33fa627efe20de
 DIST unison-2.40.102-manual.pdf 496539 SHA256 
145b427a32cc4e295b128238cf2106853906f3e31b0b06d6757c000fd1e3c56b SHA512 
dc0ddb3158ee12f5d25bda690c67b8631df2aee07bb1b3f8077dacf5ac9fab2fcd7587a78136972e805e907fcea5991d2655aca50a0e3dfc2156ae1bb5e55896
 WHIRLPOOL 
ca0e4ac796df48a53c33dda68c93150597a0fe420985bc36c4bb90d9f24636e7a88335092094c7756a8ddf308cdb7cc3c2e8e06a862881f4e05e63c4bfaae44a
 DIST unison-2.40.102.tar.gz 2717566 SHA256 
4a63395e45bf6b93d5fee5cacbf686c3d9fe43dd7e6fc75ec6fe1a85cf1285ef SHA512 
813b5fcad43a3472d0eac38977a6268463db71f133b5f9b08c4357774f8f46ae234f9ffc42dfa3fe960588c61607a5f7dd37ab6553045668fcf53dce59aeec22
 WHIRLPOOL 
e5e81539c9ddb4da5817740d95607ffde0b6543dbed13ca476300138056d7c486e1b8a1493b3f28b0b42b0d932fcc68ca8e65a48a6525d009a033ba8e5f6111c
+DIST unison-2.40.128-manual.html 267099 SHA256 
8cd3901dffab27203fab1702a7eb2539f1b566ebe08036aef695f39e8593 SHA512 
037959c50c61cfda45963765901e34ec96a76bcbaa5d77c614c481e2d97ec94b1aa235b8316b69ac181ce251cf8f14ce0ff517e252a669c09502cc84cf313a0c
 WHIRLPOOL 
e245bd7575b25ca1e2a9ad52166dd585c688e0e671bbcd969a62c55335ea93526ea64c8508ec416cb2661f5fa7f0a22bbd7cbfd52482487f404bc3dcd636940e
+DIST unison-2.40.128-manual.pdf 496593 SHA256 
346f8d027adfafc9b042c8d4a144b6f0619cce43fa551dc3d4318a15464cd86a SHA512 
eda0c31a1836a64e2069eb8ec30c98f52ac51b818693b79b86adb484dd91aba96c88579b4cb3c15ae16a1e669ed3dd83bc25e7cea28f80debabd83d2d553d353
 WHIRLPOOL 
d509d3c87eb6667a646e2a49e72c5335050067063da78b1f89dd99e8cfd49bf68ba3ab9688fbe22ade60e00084f83733efc8583b0fc4c20cb58b9e92496021b6
+DIST unison-2.40.128.tar.gz 2717593 SHA256 
5a1ea828786b9602f2a42c2167c9e7643aba2c1e20066be7ce46de4779a5ca54 SHA512 
f33450445e2a83c5b62696b8b0aaa7d9fcbdd02cccda8e4bce4a9efe1e2b4a32d38c49a4716315e7b4bec6e21e4eb8efac529a31f45062765a6e53e02c600d11
 WHIRLPOOL 
0990ed4ac5bd85341a6bd52ae9150624515b08c30862076c554e6429ada82bc1d468fd993a219e3655cbc8c1185b2737ebb7a2b3954bde6693ae380acf27e486
+DIST unison-2.45.28-manual.html 272770 SHA256 
2fb3181008923683ca05fb8d4ceedffe41d4334fc39ab3df627f5b2f027bd553 SHA512 
aaed892f5108eefd57f172c72198ccb1b6e83456d75779238bfca0ee39d14dc0f60fc884d807c954bbfa2263f0b9ece9dd1f7f142832ea90778df7efe636be10
 WHIRLPOOL 
abee2b0901c1c6f045bb3829d4e694db733856f4882b6c1b72ab6b66f2c86a0f21140191becb53ac8148e4a725c44edfccd85c06dfa2bee1e2fadff54f091715
+DIST unison-2.45.28-manual.pdf 507997 SHA256 
27abb31912527f65dc6d57d348dbe787df3ead1532d0242f17da6d29776289d2 SHA512 
94c40ab1b4d9b48ca12e67d0e43aa169ace81143becd186a8f851bfd5762b553ce178e1a604f28b6e7d926af901ee100ab019f3b14c03e59778a08a56e8ffa02
 WHIRLPOOL 
68f789c2fb2be7caa24401fe3f21afdeef4d9faf89db7e92c95e35dc46a90ae7449644572e56d4f61ecaf74fdf24c71e44d175157a24a491518480b418ba79c3
+DIST unison-2.45.28.tar.gz 2701909 SHA256 
00ebb62767b1a438ecef2b16f999109ad4d2dbc0595d837b148461e8ca9774ee SHA512 
4adfdf28c1bc7baaf9f6e23c13bb39966f1288a603352c4064da985638abbebd5d3092726bcc8991e3eb027202654c10baeb57241530e68398076e8e5d912b8a
 WHIRLPOOL 
cff8e25d2dc8e27d8330d6b0fc00521d05f6d302f0c26f6e80fbae6dbf4b686478772c6bd7fb975c87ff8a726e5ab780cd3b8ae8ef496f2d5710f1023ab3b5bf
 DIST unison-2.45.4-manual.html 270543 SHA256 
472598d57ef74972a6488f412ba29200f66c809c165b224aef0458708d00a93b SHA512 
4faa79620bdf78fd84635f9595ec1048f3a5782e6284d26f26dcaea9193e9199d4be7d4f800900ce01890333af250857763678d271d623346650676ddc5eda3c
 WHIRLPOOL 
271142522f732bae204989ac4022b36cfdf3b4e688d4cf0ee2f271fb09b8a31af952f5d94b8f3d6c7a38859fb5fcc690fa280fa1db87d377e5ab66803609f59b
 DIST unison-2.45.4-manual.pdf 513121 SHA256 
f6488eae9fd1e5be405

77 matches

Mail list logo