commit: 559ec5bf5897e3c96f8fddc37e0c2bfd069cbeef Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Oct 20 10:58:34 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Oct 20 10:58:34 2020 +0000 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 <sam <AT> 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..00000000000 --- a/net-misc/unison/files/unison-2.48.4-ocaml-4.08.patch +++ /dev/null @@ -1,79 +0,0 @@ -From: Stephane Glondu <[email protected]> -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/unison-2.48.4-r1.ebuild b/net-misc/unison/unison-2.48.4-r1.ebuild deleted file mode 100644 index 11de4808528..00000000000 --- a/net-misc/unison/unison-2.48.4-r1.ebuild +++ /dev/null @@ -1,81 +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="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="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" - -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 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 -} diff --git a/net-misc/unison/unison-2.48.4-r2.ebuild b/net-misc/unison/unison-2.48.4-r2.ebuild deleted file mode 100644 index 99d421e0e95..00000000000 --- a/net-misc/unison/unison-2.48.4-r2.ebuild +++ /dev/null @@ -1,86 +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="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="<dev-lang/ocaml-4.10.0:=[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" - -S="${WORKDIR}"/src - -PATCHES=( - "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch - "${FILESDIR}"/${PN}-2.48.4-ocaml-4.08.patch # https://bugs.gentoo.org/709646 -) - -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 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 -}
