From 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 Mar 2021 14:27:17 +0000 Subject: gentoo resync : 20.03.2021 --- net-misc/unison/Manifest | 4 +- net-misc/unison/unison-2.51.4_rc1.ebuild | 107 ------------------------------- net-misc/unison/unison-2.51.4_rc2.ebuild | 107 +++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 109 deletions(-) delete mode 100644 net-misc/unison/unison-2.51.4_rc1.ebuild create mode 100644 net-misc/unison/unison-2.51.4_rc2.ebuild (limited to 'net-misc/unison') diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index cbcc8b4307b0..fa2450f284ce 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -5,9 +5,9 @@ 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 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a -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 EBUILD unison-2.48.15_p4-r2.ebuild 2998 BLAKE2B 3477822b9772652c245d6047e29ecdf70522f7668e9fb2e29e9556afdaf26dd96635983bf182ea5b2b56a0cd56b4bdae06ac0f2be399d1dd616d0e936fd346e5 SHA512 a6d3fb96a29e5156e7519f3f62a07622e1333b530afbfa1fa5cbf11524f5e9e8aa7df63af589d949bb904d8ab1fd6840d970fc27496f72033da2e9291d89c6c7 EBUILD unison-2.51.3_p20201024.ebuild 2772 BLAKE2B 4e1973839a992c1af50332b8f84c6a7d5d03c1962af8f4a9c183551f1247bc1890d85aa7651d71a12f96134e63e367c00f79bd2917322c8cd278afbc852b4daa SHA512 086fd563d0f74661d710ab07ead1c73ea7702b4fe427336a5da39d8c4d3b4e2fcbf2f25fa7c65e0ddb895b13e0fca3dd381825b2fac41da8e32bf20c01569e2d EBUILD unison-2.51.3_p20201127.ebuild 2756 BLAKE2B 3699033422041cf1bf5e626637f9ede038f474884564b921269e6bb996d0b725a09c52ffee6f9246a29b11433b7ea16212f6559184f2da21c129f71f5759962e SHA512 8e0ff13147e90eb51a9c49ed3b6020a288838490c8e6ccc11b5f9a2e75511d872d1a5bd84bd4242a1e1a73fb0ed7e633bed149a4ad25e8d94cd0ee46e3f1dc61 -EBUILD unison-2.51.4_rc1.ebuild 2662 BLAKE2B 604940ff64c3da3eba3116f6ce593b50ed249280ad3a85ce6fa469e752277cd976b0e9ce584a7000cd6583f9c6425a666e9b37c627f581ffc2b7e94f483ee19a SHA512 22f11f7a31acef79d3dbe0e663f3178988faabcd23f83e0924a92d65f95ef60efe4a725283cbb819c9ffe0f674f53aff3bad1815148f140553197404d96e13e9 +EBUILD unison-2.51.4_rc2.ebuild 2651 BLAKE2B 15f2abf27b02e733927caa6730f7ab1d5bb5181bd5b43c6bda4adc883b6524b030b64be790578783d057c4c0e2840a5fc6683ee95c53fdb17efe6d217ffe0d58 SHA512 588a30ea2cb26ffcc14c4bc00aadafde4b3df7729518e98bb215c969519d5abb76ed1e0142fd9c9090f485b393cf162d46e7312b080b15d8840d357bdcf33345 MISC metadata.xml 450 BLAKE2B 55d917828a118580b283b301e205453121b52d46495f02f5f488f71b325b3d290ffb768c3c89b2fc685f6dd6e87e37dc91b387d8b9d0f872681f70c7afeafe57 SHA512 fcc876158d2c94e56aae6a3d78df3e3b13b0d0a5d100513fe5f980c11c06d1fb055d5b943fcd4b01063343c80d78c328f23a82d73cccd65159b5306b35dac502 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 7ce1abe5eaba..000000000000 --- 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-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/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 -} 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 000000000000..db9797ada80a --- /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() { + 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 + + # 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/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 +} -- cgit v1.2.3