diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-06-21 00:11:18 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-21 00:11:18 +0100 |
commit | bed3b604e16fc6075e29f1af8d47507a07035bd3 (patch) | |
tree | 1f5d57fd86e90db37f62afb463f4b4c08a2b6eda /net-misc/unison | |
parent | d6ca4e4f90cb75c323b5988eefa96a04c0d36908 (diff) |
gentoo auto-resync : 21:06:2024 - 00:11:18
Diffstat (limited to 'net-misc/unison')
-rw-r--r-- | net-misc/unison/Manifest | 8 | ||||
-rw-r--r-- | net-misc/unison/metadata.xml | 18 | ||||
-rw-r--r-- | net-misc/unison/unison-2.51.5-r1.ebuild (renamed from net-misc/unison/unison-2.51.5.ebuild) | 109 | ||||
-rw-r--r-- | net-misc/unison/unison-2.53.3-r1.ebuild | 139 | ||||
-rw-r--r-- | net-misc/unison/unison-2.53.3.ebuild | 99 | ||||
-rw-r--r-- | net-misc/unison/unison-2.53.5.ebuild | 138 |
6 files changed, 366 insertions, 145 deletions
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index 476415a8d264..af7844ce32f7 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -1,5 +1,7 @@ DIST unison-2.51.5.tar.gz 1385407 BLAKE2B cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8 SHA512 4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440 DIST unison-2.53.3.tar.gz 1415490 BLAKE2B 1142419781f5084da7ae8d043897f2f80aa4c3770a1c5cb44f8d7f669f718c41dd7fa6d13069cd95c71842233309eb886f63ab525e5e446ff761ea970de0e794 SHA512 f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b -EBUILD unison-2.51.5.ebuild 2581 BLAKE2B 390079d02bc2ab9a312f03309ce0c051f6bd6e470f01ccb8462abc47c20e613b5946063d9c884ea198a140ba8ac3fc30beaa450fcec97f127097c22535919820 SHA512 551e0153b1e156557ff22b8f6807b51cccf163210a8454cceafc0746966252c72e8e50627d65d1f6dd8170dfe64559d7dd6225f25242a1be721c2624ec5abf61 -EBUILD unison-2.53.3.ebuild 2229 BLAKE2B 2490f9a9c31179c9c5bd00a657cecb767ccf2039c9eef6ef586740891fc4128948beb7b6be621acddcab8b67b25b3a1e8d2061b4ce72d41c603bdd2aafa67188 SHA512 8f673f62833f15a79af93c438e10d9129694c668e80160e0799c48d86eea940bef4b3ea7af1da28604d88ca3d0e28817c3c0d24404b8196642f71dcb89f95c21 -MISC metadata.xml 451 BLAKE2B e84c101fb93728a569747cfd4ba69e4e746bde0ec1154aa940dfb963fe4313f6e37a2725df55d7921139b52ea021d1196592d8323617f084f50c18e4cff7cc32 SHA512 708a52b7f47377099de539ee768951d67e98a8173c6b168547135cfa80fda37c8c26cf9dfee038c76bc5bdabc966652e686f818af35905e58bd17396181c02ea +DIST unison-2.53.5.tar.gz 1408926 BLAKE2B e7e3db458a485fca8820508a964df5877aed0a2d6a3ea8305298d0c6516591323f3cacdd86c4e057585c0f3b2da8a03a5a3653f543d6f1acb20701f23a81f470 SHA512 eabeed7b428f1985610b47ce8bc7faac515fd24937727612aa45435da3e38d40b6cd6d227eb3b65dc370d46458cecfca9d0e9e1712b2b7fa41b76675f8115c4c +EBUILD unison-2.51.5-r1.ebuild 2893 BLAKE2B 761794ffe658525bacdc8e749d46793c07a08321f1ef5d551d31f12f414b0deee3276c27ba3667ae896fb279b347df65fa19305714d54cee3229a8ab96db1b84 SHA512 66a5f028bb2fd1d211e5b1e98f9816def4feaf11a2cc1849717931f6e2b90f5d70f805b314cbf76c4b246f0fae5747585ea9d28754223e957762bf4931365986 +EBUILD unison-2.53.3-r1.ebuild 2642 BLAKE2B 64d338b29e990e18240ee0250485806413b54f25140823c79dd79de5749437d0b6e36505c6a7c501da55043b62cf9b71d926adb7eac00786996e67c611dea17e SHA512 489c261ef5d9ae1f11eb39ebdf4e4d565d96148a482eae978c5fc8dcbfaeb934ae154c1b291d87450d484f39df8295ae977e830ecd1e980308eaad1707731d49 +EBUILD unison-2.53.5.ebuild 2617 BLAKE2B 65a9fc7f413884058caae84a80daa74b70d27e97f337a849f6dcee46c3632d56f021e6d31633cfbb1c084bf83cd6b88931850a0c7139c772a4786602ac02c878 SHA512 578f80ecdbf73353f6af0ff66391781bba4afd518f44d3cdeb32b852658ad91dbfdc64b5a30cdc2b2bb71ccebf61c657f5a00ae74c761585111f8448ef54a067 +MISC metadata.xml 533 BLAKE2B b8ab17513b1bfdb3467fd5f728caa0e782c8092737577c7ba9fd38c064842cc06136a1e84fc76d90c9c52785d54cce6916f4930c4e582a0138ecc8bbf623bd70 SHA512 6fb4be0ee5c3750f73c080aef8724535a470607966c3b8086ae95e7e962666dabbffb2536f6859e4cfe4018c985903a78b759d3cde498b0f97ad060af3b6eead 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 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">bcpierce00/unison</remote-id> - <bugs-to>https://github.com/bcpierce00/unison/issues</bugs-to> - <doc>https://github.com/bcpierce00/unison/wiki</doc> - <changelog>https://www.cis.upenn.edu/~bcpierce/unison/changes.html</changelog> - </upstream> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> + <upstream> + <remote-id type="github">bcpierce00/unison</remote-id> + <bugs-to>https://github.com/bcpierce00/unison/issues</bugs-to> + <changelog>https://www.cis.upenn.edu/~bcpierce/unison/changes.html</changelog> + <doc>https://github.com/bcpierce00/unison/wiki</doc> + </upstream> </pkgmetadata> diff --git a/net-misc/unison/unison-2.51.5.ebuild b/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}" == *9999* ]] ; 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-fsmonitor ; do + exeinto /usr/bin + newexe "${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}" + if use gui ; then + newicon -s scalable ../icons/U.svg "${PN}-${SLOT}.svg" + make_desktop_entry "${PN}-${SLOT}" "${PN} (${SLOT})" "${PN}-${SLOT}" fi - if use doc; then + if use doc ; then DOCS+=( ../doc/unison-manual.pdf ) HTML_DOCS=( "../doc/unison-manual.html" ) fi @@ -95,15 +133,14 @@ 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 + eselect unison update + + gui_cache_update } pkg_postrm() { - if use gtk; then - xdg_icon_cache_update - fi + eselect unison update + + gui_cache_update } diff --git a/net-misc/unison/unison-2.53.3-r1.ebuild b/net-misc/unison/unison-2.53.3-r1.ebuild new file mode 100644 index 000000000000..1b149dccc0c0 --- /dev/null +++ b/net-misc/unison/unison-2.53.3-r1.ebuild @@ -0,0 +1,139 @@ +# 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}" == *9999* ]] ; 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" + +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=( src/CONTRIB src/README 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 debug ; then + myconf+=( DEBUGGING=true ) + fi + + if use doc ; then + VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs + fi + + if use gui ; then + myconf+=( UISTYLE=gtk3 ) + 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="" -j1 src 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. + cd "${S}/src" || die + + local binname + for binname in unison unison-fsmonitor ; 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} (${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 + + gui_cache_update +} + +pkg_postrm() { + eselect unison update + + gui_cache_update +} diff --git a/net-misc/unison/unison-2.53.3.ebuild b/net-misc/unison/unison-2.53.3.ebuild deleted file mode 100644 index 0de016690ac1..000000000000 --- a/net-misc/unison/unison-2.53.3.ebuild +++ /dev/null @@ -1,99 +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://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 -} 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 000000000000..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}" == *9999* ]] ; 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 exactly this version over ssh." + elog "Or you can use 'eselect unison' to set the version." + + eselect unison update + + gui_cache_update +} + +pkg_postrm() { + eselect unison update + + gui_cache_update +} |