* [gentoo-commits] repo/gentoo:master commit in: net-misc/unison/files/, net-misc/unison/
@ 2017-02-14 11:12 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-02-14 11:12 UTC (permalink / raw
To: gentoo-commits
commit: 19bb83e760d8b9130f614b15b66e0635dd79d2fc
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 11:11:47 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 11:12:23 2017 +0000
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 8cd3901dffab27203fab1702a7eb25555539f1b566ebe08036aef695f39e8593 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 f6488eae9fd1e5be405054d96df3aacd5b51c7ce64f615cfed7a43b516f0e839 SHA512 ce27591d77bbc09d41d02af15ae1618226fcb86833969cd3d199798252565f0b507bdb0d7ac3d0201c36a9a9138c89b3b0d2e3a08f28bd1d9cd1692c0d7dea18 WHIRLPOOL 49bd398fa04b9972044f9a6a164216d6032f785da2caedfc3c971f6a5f5d2f4a7d953841092ebe19ddc949a0f6a8082a7d43c8e1eea145a2fccbd943c2baf01f
-DIST unison-2.45.4.tar.gz 2716641 SHA256 f60a3327137129381b2028be43f84d79709ca5794d6394a6ca67a0f5f4d481c1 SHA512 f9ff18b6f2bd46fbb416a90b71e75c641e4c42bdd97f3f4bb13f47e3b629fa5f640ac9a2fca36322838c8ab790770ccaf47526260bdd655e65b1344b6eee02ef WHIRLPOOL a09d54da541866499b59675a2fd3ab998206c140b25df21e25dbb57788b75db11c3313eca613926d2c12b571422e1ef41ace691ee97322b750b8c65c026003b8
DIST unison-2.48.3-manual.html 278156 SHA256 500d8f83770fc3b07cf443dfb1579281d4379002d51523aa73451e03f6cdbe1a SHA512 50924c624abd86f231ad8cbcfd4e383322a55733108685255df21df6da26d9ad1ac7d4f7d7dcd82faf4696f3f0136c0ff3c8cf5ffda4042f63451f2b7c8e9502 WHIRLPOOL 9a48a23049cd8753ebfd71e2f396107039b1fdc76877a8dc4f229ef8dda6a9481b80156e66c27015c96e7a752dedb2ca7781f42c01a8839ec0361f150910dfcd
DIST unison-2.48.3-manual.pdf 516703 SHA256 cba2946656e04b856d98184b539e382ed85d987d24458a39e156946125f7b578 SHA512 3a16d6e0df6370784f960d37749f56a223c5eaab24ded299f6a61058f7692139239d0d64436d93268b4cbd8031de6139e187aca0beb54345a615e71253bce977 WHIRLPOOL fd57fec2e5a2605bca216bc4ae441ecd122faa26cd5abdfb39ea19ca4f44961691d266e86b702536dd7326b4072718d9c67739d7a264f9b4127330a41aff6823
DIST unison-2.48.3.tar.gz 1172646 SHA256 f40d3cfbe82078d79328b51acab3e5179f844135260c2f4710525b9b45b15483 SHA512 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d WHIRLPOOL a903f1f5e996655e3e001f33b959d839d2540d0a5c0584fded7aa483a774d8b07b3e7997357f03426f41ef6505cf3d40dec18616252c02add4a417dfef4c8df4
diff --git a/net-misc/unison/files/unison-2.27.57-as-needed.patch b/net-misc/unison/files/unison-2.27.57-as-needed.patch
deleted file mode 100644
index ff5be04853..0000000000
--- a/net-misc/unison/files/unison-2.27.57-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- unison-2.17.1/Makefile.OCaml
-+++ unison-2.17.1/Makefile.OCaml
-@@ -330,7 +330,7 @@
-
- $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS)
- @echo Linking $@
-- $(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $(CLIBS) $^
-+ $(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $^ $(CLIBS)
-
- # Unfortunately -output-obj does not put .o files into the output, only .cmx
- # files, so we have to use $(LD) to take care of COBJS.
diff --git a/net-misc/unison/files/unison-mymap.patch b/net-misc/unison/files/unison-mymap.patch
deleted file mode 100644
index 030eb0f017..0000000000
--- a/net-misc/unison/files/unison-mymap.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: unison-2.32.52/update.mli
-===================================================================
---- unison-2.32.52.orig/update.mli
-+++ unison-2.32.52/update.mli
-@@ -1,7 +1,7 @@
- (* Unison file synchronizer: src/update.mli *)
- (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
-
--module NameMap : Map.S with type key = Name.t
-+module NameMap : MyMap.S with type key = Name.t
-
- type archive =
- ArchiveDir of Props.t * archive NameMap.t
diff --git a/net-misc/unison/unison-2.27.157.ebuild b/net-misc/unison/unison-2.27.157.ebuild
deleted file mode 100644
index 7fdc84e465..0000000000
--- a/net-misc/unison/unison-2.27.157.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils versionator
-
-IUSE="gtk doc static debug threads +ocamlopt"
-
-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 ~ppc ~x86 ~amd64-linux"
-
-# 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 )"
-
-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_prepare() {
- epatch "${FILESDIR}/${PN}-2.27.57-as-needed.patch"
- epatch "${FILESDIR}/${PN}-mymap.patch"
-}
-
-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 -j1 $myconf CFLAGS="" || die "error making unsion"
-}
-
-src_test() {
- emake selftest || die "selftest failed"
-}
-
-src_install () {
- # install manually, since it's just too much
- # work to force the Makefile to do the right thing.
- newbin unison unison-${SLOT} || die
- dodoc BUGS.txt CONTRIB INSTALL NEWS \
- README ROADMAP.txt TODO.txt || die
-
- if use doc; then
- dohtml "${DISTDIR}/${P}-manual.html" || die
- dodoc "${DISTDIR}/${P}-manual.pdf" || die
- fi
- use ocamlopt || export STRIP_MASK="*/bin/*"
-}
-
-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."
-}
diff --git a/net-misc/unison/unison-2.32.52.ebuild b/net-misc/unison/unison-2.32.52.ebuild
deleted file mode 100644
index 6a3855ff11..0000000000
--- a/net-misc/unison/unison-2.32.52.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-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 ~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_prepare() {
- epatch "${FILESDIR}/${PN}-2.27.57-as-needed.patch"
- epatch "${FILESDIR}/${PN}-mymap.patch"
-}
-
-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 || die "error making unsion"
-}
-
-src_test() {
- emake selftest || die "selftest failed"
-}
-
-src_install () {
- # install manually, since it's just too much
- # work to force the Makefile to do the right thing.
- newbin unison unison-${SLOT} || die
- dodoc BUGS.txt CONTRIB INSTALL NEWS \
- README ROADMAP.txt TODO.txt || die
-
- if use doc; then
- dohtml "${DISTDIR}/${P}-manual.html" || die
- dodoc "${DISTDIR}/${P}-manual.pdf" || die
- fi
- use ocamlopt || export STRIP_MASK="*/bin/*"
-}
-
-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."
-}
diff --git a/net-misc/unison/unison-2.40.102.ebuild b/net-misc/unison/unison-2.40.102.ebuild
deleted file mode 100644
index 8392a648f9..0000000000
--- a/net-misc/unison/unison-2.40.102.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 TODO.txt
-
- if use doc; then
- dohtml "${DISTDIR}/${P}-manual.html"
- dodoc "${DISTDIR}/${P}-manual.pdf"
- fi
- use ocamlopt || export STRIP_MASK="*/bin/*"
-}
-
-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."
-}
diff --git a/net-misc/unison/unison-2.40.128.ebuild b/net-misc/unison/unison-2.40.128.ebuild
deleted file mode 100644
index 55f9393b99..0000000000
--- a/net-misc/unison/unison-2.40.128.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-4.03[ocamlopt?]
- gtk? ( dev-ml/lablgtk )
- test? ( || ( dev-util/ctags virtual/emacs ) )"
-
-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 )"
-
-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_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 TODO.txt
-
- if use doc; then
- dohtml "${DISTDIR}/${P}-manual.html"
- dodoc "${DISTDIR}/${P}-manual.pdf"
- fi
- use ocamlopt || export STRIP_MASK="*/bin/*"
-}
-
-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."
-}
diff --git a/net-misc/unison/unison-2.45.28.ebuild b/net-misc/unison/unison-2.45.28.ebuild
deleted file mode 100644
index 55f9393b99..0000000000
--- a/net-misc/unison/unison-2.45.28.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-4.03[ocamlopt?]
- gtk? ( dev-ml/lablgtk )
- test? ( || ( dev-util/ctags virtual/emacs ) )"
-
-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 )"
-
-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_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 TODO.txt
-
- if use doc; then
- dohtml "${DISTDIR}/${P}-manual.html"
- dodoc "${DISTDIR}/${P}-manual.pdf"
- fi
- use ocamlopt || export STRIP_MASK="*/bin/*"
-}
-
-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."
-}
diff --git a/net-misc/unison/unison-2.45.4.ebuild b/net-misc/unison/unison-2.45.4.ebuild
deleted file mode 100644
index 8392a648f9..0000000000
--- a/net-misc/unison/unison-2.45.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 TODO.txt
-
- if use doc; then
- dohtml "${DISTDIR}/${P}-manual.html"
- dodoc "${DISTDIR}/${P}-manual.pdf"
- fi
- use ocamlopt || export STRIP_MASK="*/bin/*"
-}
-
-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."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/unison/files/, net-misc/unison/
@ 2017-10-26 6:31 Benda XU
0 siblings, 0 replies; 4+ messages in thread
From: Benda XU @ 2017-10-26 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 837d78b9630309b99c65ef0d191676e1ebd8476a
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 26 06:28:06 2017 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 06:28:06 2017 +0000
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 00000000000..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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/unison/files/, net-misc/unison/
@ 2020-10-17 8:32 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2020-10-17 8:32 UTC (permalink / raw
To: gentoo-commits
commit: 71df67d36b63cbe65b3eb9a8b91c07ccb2ac9071
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Oct 14 14:43:39 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 08:32:04 2020 +0000
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 <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> 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 00000000000..8b0d89b335a
--- /dev/null
+++ b/net-misc/unison/files/unison-2.48.4-ocaml-4.08.patch
@@ -0,0 +1,79 @@
+From: Stephane Glondu <steph@glondu.net>
+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 00000000000..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.000000000 +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.000000000 +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.000000000 +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
+ let opendir f =
+ let h = Unix.opendir f in
+diff -ur src.orig/uigtk2.ml src/uigtk2.ml
+--- src.orig/uigtk2.ml 2018-01-27 21:53:44.000000000 +0100
++++ src/uigtk2.ml 2019-12-11 16:12:40.005712137 +0100
+@@ -94,7 +94,7 @@
+ 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-r2.ebuild b/net-misc/unison/unison-2.48.4-r2.ebuild
new file mode 100644
index 00000000000..da2e58c430d
--- /dev/null
+++ b/net-misc/unison/unison-2.48.4-r2.ebuild
@@ -0,0 +1,90 @@
+# 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"
+
+# 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 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
+}
diff --git a/net-misc/unison/unison-2.51.2-r1.ebuild b/net-misc/unison/unison-2.51.2-r1.ebuild
new file mode 100644
index 00000000000..c7b05df33aa
--- /dev/null
+++ b/net-misc/unison/unison-2.51.2-r1.ebuild
@@ -0,0 +1,86 @@
+# 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-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"
+
+RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
+S="${WORKDIR}"/src
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.51.2-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 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/unison/files/, net-misc/unison/
@ 2020-10-27 21:11 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2020-10-27 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 746f4841bb0a4d09794e40556b794ff41106cd5d
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Oct 24 07:45:26 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 21:11:35 2020 +0000
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 <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17989
Signed-off-by: Sam James <sam <AT> 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..00000000000
--- 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.000000000 +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.000000000 +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.000000000 +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
- let opendir f =
- let h = Unix.opendir f in
-diff -ur src.orig/uigtk2.ml src/uigtk2.ml
---- src.orig/uigtk2.ml 2018-01-27 21:53:44.000000000 +0100
-+++ src/uigtk2.ml 2019-12-11 16:12:40.005712137 +0100
-@@ -94,7 +94,7 @@
- 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.51.2-r1.ebuild b/net-misc/unison/unison-2.51.2-r1.ebuild
deleted file mode 100644
index 9b7c3a033ec..00000000000
--- a/net-misc/unison/unison-2.51.2-r1.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="debug doc gtk +ocamlopt threads"
-
-# 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"
-
-RESTRICT="!ocamlopt? ( strip )"
-S="${WORKDIR}"/src
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.51.2-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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-27 21:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-17 8:32 [gentoo-commits] repo/gentoo:master commit in: net-misc/unison/files/, net-misc/unison/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-10-27 21:11 Sam James
2017-10-26 6:31 Benda XU
2017-02-14 11:12 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox