diff options
Diffstat (limited to 'net-misc/unison')
-rw-r--r-- | net-misc/unison/Manifest | 12 | ||||
-rw-r--r-- | net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch | 67 | ||||
-rw-r--r-- | net-misc/unison/unison-2.48.15_p4-r2.ebuild (renamed from net-misc/unison/unison-2.48.4-r1.ebuild) | 56 | ||||
-rw-r--r-- | net-misc/unison/unison-2.48.4.ebuild | 89 | ||||
-rw-r--r-- | net-misc/unison/unison-2.51.3_p20201024.ebuild (renamed from net-misc/unison/unison-2.51.2.ebuild) | 73 |
5 files changed, 162 insertions, 135 deletions
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index 8e565a3c75c7..be083cf7b175 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -1,11 +1,9 @@ +AUX unison-2.48.15_p4-ocaml-4.08.patch 1942 BLAKE2B 18cd8c18e0c30156fd3e36aaa987a9ad033ff321edd4f911006bfec958d70884f3575536cfe543e8da0fc10448193bb3514936bab95f3c71c96b75b4f4048c0e SHA512 802b333418513df59fbbf956620f1576141763a898d320a3be06d35d5ad8adf38c13e9bc9dd38cae05f2d7a25c07a3fcc709ace66c6a92d728c25a42688494e9 AUX unison-2.48.4-Makefile-dep.patch 542 BLAKE2B b32665bd2562c84aae1a801648c9324a0fafe39fb7d7d6be0b6bc52cdcd2f8282cfcde97fe2682b1d41656f65f1df9e32adc03660ef2c5c6a9394709c3d1e838 SHA512 e36704c7ac0fee66a308364ad72443a36ac14c1aacca0728b50f1770df91bf77347b58d218e93943a91cf2e99672840a6c322a5a4a5f238797d440ae16aa2394 +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 -EBUILD unison-2.48.4-r1.ebuild 2446 BLAKE2B 623ed9dac7a80c7ac9a7419f390f7248532b794d5a3f1e90cbaeafbd90ee98021654a9e690872ebd42bbd2822092ed594c6e50552f5560a542802c8852270b79 SHA512 ca69c3c15068aba7c52aa0822b8b88ee219fec46e2f23ea6bb6c0892c169ea7b099206b2181b30688e441460251a35d11d9e976468d2ac243bba690552d81c96 -EBUILD unison-2.48.4.ebuild 2351 BLAKE2B f9629d54a0a1c47dd448aeee7cd1bbda01253fa422fe37cda0cb4f5f9d1e2906d9cfaf24e23a4ee3222389918beb4059a4d086a47d781bae42fd71ccc50f18ac SHA512 988fc794d474ae672e46580e8f9dcf73a068e79f989baa09fabca37ab35a3279cbd29540925de952bc67bfdacfb0512dcf1d0fc2e1a03c975fb4f6232a938261 -EBUILD unison-2.51.2.ebuild 2161 BLAKE2B 74f35bf07cfa486f07742e421ed117a80735e172de8d601e1a9dd2b8998eb9bb1a9cad0299d622b27d7494d0a0bd5e90587f1eecd3b02bd0fcf6069375581078 SHA512 9b51aadb8cf2bc12ef6933fa22d483d18dd2ef3af934d8a41de1ab8a4fd0254824d1dd2b3fa9b5bdd6b317a356784ccba12095ce7f6cffba72c72616785d0e6d +DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61 +EBUILD unison-2.48.15_p4-r2.ebuild 3009 BLAKE2B c6d6f34bb42d24e4045040a02cf4e5f83e4fe803b1d68b539dce3b723d0ee7d45d14543657e9ded729eafda23bb02bfa347645d35384c511aa55ff8c2d1f0f8c SHA512 5debbdb871a92943168ee1d204518f69a0902be6d2f8f918533b492b8b3cd0e84e6409a7e6a7159e8b2843a10e2e1104ad3c38aa099fd7f2fefdcf39856b7307 +EBUILD unison-2.51.3_p20201024.ebuild 2786 BLAKE2B 9cda5f7c4a19868d445e3a7aba95b31fb41f7ed8605d81a12364503dd2250173a7814bafe01107d82fd2330078e52bafeb91d7d8e64897e2ae69c9615f19517d SHA512 ad00ac0fa08372a2b203c63514b8109e4f91c4c8b41ccf9f60cd8862a91f51e3d978228897b433ee5a1775d775d427e4c417d93747dc1fa4ff000de86303a7f8 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 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 000000000000..8a8205d3cfe3 --- /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 <steph@glondu.net> +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.4-r1.ebuild b/net-misc/unison/unison-2.48.15_p4-r2.ebuild index b76c12b42399..2b4efbfb62ce 100644 --- a/net-misc/unison/unison-2.48.4-r1.ebuild +++ b/net-misc/unison/unison-2.48.15_p4-r2.ebuild @@ -3,17 +3,22 @@ EAPI=7 -IUSE="gtk doc static debug threads +ocamlopt test" +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://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 )" +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 ~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 @@ -22,29 +27,29 @@ KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~spar RESTRICT="test !ocamlopt? ( strip )" # ocaml version so we are sure it has ocamlopt use flag -DEPEND="dev-lang/ocaml[ocamlopt?] - gtk? ( dev-ml/lablgtk )" +DEPEND="<dev-lang/ocaml-4.10.0:=[ocamlopt?] + 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" -S="${WORKDIR}"/src -PATCHES=( "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch ) +S="${WORKDIR}"/${P/_p/v}/src + +PATCHES=( + "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch + "${FILESDIR}"/${PN}-2.48.15_p4-ocaml-4.08.patch # https://bugs.gentoo.org/709646 +) 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" fi - if use static; then - myconf="$myconf STATIC=true" - fi - if use debug; then myconf="$myconf DEBUGGING=true" fi @@ -72,10 +77,17 @@ 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 unison-${SLOT} "${PN} (${SLOT})" "${EPREFIX}/usr/share/icons/hicolor/scalable/apps/${PN}-${SLOT}.svg" + fi + if use doc; then - DOCS+=( "${DISTDIR}/${P}-manual.pdf" ) - HTML_DOCS=( "${DISTDIR}/${P}-manual.html" ) + DOCS+=( "${DISTDIR}/${DOC_P}-manual.pdf" ) + HTML_DOCS=( "${DISTDIR}/${DOC_P}-manual.html" ) fi + einstalldocs } @@ -83,5 +95,15 @@ 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 +} + +pkg_postrm() { + if use gtk; then + xdg_icon_cache_update + fi } 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 56ef942628c9..000000000000 --- 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 ) - test? ( || ( dev-util/ctags >=app-editors/emacs-23.1:* ) )" - -RDEPEND="gtk? ( dev-ml/lablgtk - || ( 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 -} diff --git a/net-misc/unison/unison-2.51.2.ebuild b/net-misc/unison/unison-2.51.3_p20201024.ebuild index 3c6d4df6c2e3..f0744e723563 100644 --- a/net-misc/unison/unison-2.51.2.ebuild +++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild @@ -3,43 +3,53 @@ 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://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 - )" +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="gtk doc static debug threads +ocamlopt test" +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 -DEPEND="dev-lang/ocaml[ocamlopt?] - gtk? ( dev-ml/lablgtk )" - -RDEPEND="gtk? ( dev-ml/lablgtk +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" -RESTRICT="!ocamlopt? ( strip ) !test? ( test )" -S="${WORKDIR}"/src +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 + # 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 static; then - myconf="$myconf STATIC=true" - fi - if use debug; then myconf="$myconf DEBUGGING=true" fi @@ -53,24 +63,33 @@ src_compile() { use ocamlopt || myconf="$myconf NATIVE=false" # Discard cflags as it will try to pass them to ocamlc... - emake $myconf CFLAGS="" buildexecutable + emake $myconf CFLAGS="" } src_test() { - emake selftest CFLAGS="" + 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+=( "${DISTDIR}/${P}-manual.pdf" ) - HTML_DOCS=( "${DISTDIR}/${P}-manual.html" ) + DOCS+=( ../doc/unison-manual.pdf ) + # HTML_DOCS=( "${DISTDIR}/${P}-manual.html" ) fi + einstalldocs } @@ -78,5 +97,15 @@ 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 +} + +pkg_postrm() { + if use gtk; then + xdg_icon_cache_update + fi } |