Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-misc/unison/ChangeLog8
-rw-r--r--net-misc/unison/Manifest18
-rw-r--r--net-misc/unison/files/ocaml-3.08-extnames.patch14
-rw-r--r--net-misc/unison/files/unison-2.12.0-gtk2-bug.patch11
-rw-r--r--net-misc/unison/files/unison-2.17.1-io-error.patch66
-rw-r--r--net-misc/unison/unison-2.12.0-r1.ebuild63
-rw-r--r--net-misc/unison/unison-2.17.1-r1.ebuild77
-rw-r--r--net-misc/unison/unison-2.27.57.ebuild73
8 files changed, 11 insertions, 319 deletions
diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index 5235e33bf9f3..a221c0a388c0 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/unison
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.50 2008/06/16 20:20:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.51 2008/06/16 20:46:11 aballier Exp $
+
+ 16 Jun 2008; Alexis Ballier <aballier@gentoo.org>
+ -files/unison-2.12.0-gtk2-bug.patch, -files/unison-2.17.1-io-error.patch,
+ -files/ocaml-3.08-extnames.patch, -unison-2.12.0-r1.ebuild,
+ -unison-2.17.1-r1.ebuild, -unison-2.27.57.ebuild:
+ remove unused versions
*unison-2.13.16-r1 (16 Jun 2008)
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 2603f6c24b16..a2eef8a8dc4b 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,32 +1,22 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX ocaml-3.08-extnames.patch 748 RMD160 0b468d28c7531974b5db4450a90ce7fb684855f3 SHA1 92eb4e481ebc717a7b2cf87b6ef5620f7e719196 SHA256 0f81c08dd7a668614d9316a0b7a88cc791876e2727308b865a97adbd16e75bc5
-AUX unison-2.12.0-gtk2-bug.patch 490 RMD160 d9d49dfa0c8e2a144e5883384b321f58a409273c SHA1 000524de4c3eb577a2aa35c5ad78e5773978906b SHA256 b0edb4750f6025cc1f8f53ba09fe8285a56283c2a4fe3435e645aa656f2bf35f
-AUX unison-2.17.1-io-error.patch 3077 RMD160 9e1c15556008e878f39cf337507d4bef4c3e8d34 SHA1 19031bc6a9c510a0a5e2c7eb9358aaf1e02f2919 SHA256 45a921c7f38584da08169a5c19cad2bf231abc9d83a220dec657815c639ca6e3
AUX unison-2.27.57-as-needed.patch 432 RMD160 a6b5baf799f686764c7dc9285541cae9178c4fbd SHA1 f7566f358355b0ecb5e000101721d189363bbdc4 SHA256 0284d72f0d9de0a824c2bc2a2f78baced3b84eb15ea10e0e6576ff52cf57686d
-DIST unison-2.12.0.tar.gz 841717 RMD160 89f215787df9b8f1d0edb367559be5dce810c215 SHA1 71cc8abedf8e9434285a610c3f4090ddc05cdfa9 SHA256 b1caacff71f74671e81de949d402750d3791d0b4b2e764a3b3d46407d8fa32c3
DIST unison-2.13.16-manual.html 196162 RMD160 cf6a9077eaee5f58381e5197b8cc14ffeb1e93b7 SHA1 c7bb5b547830a318a5dbe800d34fefb07f6f460e SHA256 52fbb03925c44c46837d919a3baebceefc723c09458ec7e95d3993f2a98f0e20
DIST unison-2.13.16-manual.pdf 436229 RMD160 33e822129131a6da32099483a1767c4aaf615058 SHA1 0cf6d7873228c3b7dabb9419245ef05c36261028 SHA256 8f0851b5b34e2d85a6a02f5a374a7d743e5067a419fca689d14d278c951597df
DIST unison-2.13.16.tar.gz 393266 RMD160 171d8bbc788be31227f6b09d1793a984d33bfdfc SHA1 3f119f6a6e8bc5ade8933d4693075a768f0abf9a SHA256 808400a933aeb67654edc770822cd186d1b2adc92e7cb5836996c71c69ffe656
-DIST unison-2.17.1-manual.html 219449 RMD160 30139b6ec047cd00878741ace62c49b2c0421e2e SHA1 7f1d8e7af5c1d811e22216d577d243a919b572a5 SHA256 941078f73580d465fd91590dbaaf060489ae5a05d8db2359747134c0442e64ed
-DIST unison-2.17.1-manual.pdf 404886 RMD160 2936665534f9db0fa64c7686e8535bc09d9d6132 SHA1 94f5be7f4449468c3c5cd421747d6ca19322f9a1 SHA256 d0cd1a3bbc26a3c7acfa51144dd8212a76a856032c6b213a5aa74e40200f299f
-DIST unison-2.17.1.tar.gz 415057 RMD160 7b5143d160c09cefd6027807ca54c02e83265008 SHA1 03e02df5499b2c9db79ac895ca7c2d5d59b1f294 SHA256 7a1173921237dd3e0ca758f4ba902a3d54eb04385a4450459f349a8846b7052c
DIST unison-2.27.57-manual.html 232117 RMD160 705e5cf7f82cee9f23f0c3d3e091dd6bb228d28e SHA1 7b151af23a65f7b290a5da9c891363fc85b72f3e SHA256 6916be92391aba8c9176d26d9e22805dc5c6978c12299b37d41a035f15adcf92
DIST unison-2.27.57-manual.pdf 453871 RMD160 c4402abe5efe09ce5d0715d8e039898e73e9d42e SHA1 9a9565f682a38f264f5419e838f6563788d242d1 SHA256 fabda0833b4c7c39080b00ad7e945872986246df243c728c586ed97e4110e308
DIST unison-2.27.57.tar.gz 617253 RMD160 15388e3f2b9b593aba140416216837c49e4800c0 SHA1 9892680d8bd3e3c50031451cc6e77eb5431768ea SHA256 49299ec14216a8467b2c6ba148f8145bec31fa787433f9ce3851c2d62f0035ae
-EBUILD unison-2.12.0-r1.ebuild 1442 RMD160 53a50858ed9e624103427290a2fe582384a18e2b SHA1 ee30ffdc4dc7c5a34696be69f91660ab6aa71d2a SHA256 422c6774809470ee2c0f3721383ba942a5852980607fc174157d74416c3a3776
EBUILD unison-2.13.16-r1.ebuild 2227 RMD160 e4f1540fdf9249b75589b6d134b7a07ff129a1c1 SHA1 480e2c4a35648907cab0c2c1a9b5b7d9060c42dd SHA256 56a0385e894161ae9c23bbcb88e250df313e43377e5e96c8e70af45c05dc08e7
EBUILD unison-2.13.16.ebuild 1751 RMD160 5659a045f2ded2a106f8349692693fab01202601 SHA1 f1f3aba07f301f4a78485d26165f767037a12295 SHA256 b23db89e6fe55ca5622310f71bfed146f79480e5f5da313e5f2addb62230eab1
-EBUILD unison-2.17.1-r1.ebuild 1960 RMD160 7d41ea2878e072e0601e8317a6d7e5a199280d6c SHA1 588cae292d6d21928c57bcb7a33c2811dd029496 SHA256 e15caf6168b8e6654cb5e5c5306c9de4f44d230e2daeaf232d25cadf022ae877
EBUILD unison-2.27.57-r1.ebuild 2171 RMD160 4e1fd8ac5483c376e096504dfbda46330f2b0fed SHA1 510233f0add2b286298ccbcfff63f8c5a1c7310c SHA256 9eb6d2de6a7715e6225ca39be6e3de3c4d4ffa437c75805334c327872dd26c59
-EBUILD unison-2.27.57.ebuild 1816 RMD160 7c3718a8141f14639a4c68f37972c9c095fffe5a SHA1 a64a0977591c0b8ff681f015349232a28f2d9efb SHA256 ad5d406fcd30ee90412a3574cce24b1a7dd12b5b4f820f24156f04a16142b916
-MISC ChangeLog 7420 RMD160 312dfc97aecf9bc3d2b7316220bf1eafd9701d0a SHA1 a91d6c6831a7c0abfab06e7aad432f5bbfc15c39 SHA256 9c87b3e8b4f6bcb85b74a2472dc8737d319661a780dd076109a724a7e236fa21
+MISC ChangeLog 7688 RMD160 44f3be5af34f42e40adfc7c591658c1555dd0f5f SHA1 d5984287974f7c1181d2f5e45795a5c9c1985daa SHA256 cb0657033ad68e6265165390c974791704b50f0b5a08aeba07d618e32d5e6795
MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkhWy0EACgkQvFcC4BYPU0olCwCgs5mGADisVr8I9EfrGn7G5PSQ
-YLYAn1Ql1tmkV1WLNjqTanB9z49uVPPq
-=iQTQ
+iEYEARECAAYFAkhW0VwACgkQvFcC4BYPU0rWRQCgnmn6KlYzoYMY3QoFIvGKM0CY
+IqkAn3g8MoQgAE6GKDPWZ6NYpzDBa9BI
+=BS7e
-----END PGP SIGNATURE-----
diff --git a/net-misc/unison/files/ocaml-3.08-extnames.patch b/net-misc/unison/files/ocaml-3.08-extnames.patch
deleted file mode 100644
index e959be2f3991..000000000000
--- a/net-misc/unison/files/ocaml-3.08-extnames.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur unison-2.9.1/ubase/uprintf.ml unison-2.9.1.patched/ubase/uprintf.ml
---- unison-2.9.1/ubase/uprintf.ml 2002-04-11 07:13:23.000000000 +0200
-+++ unison-2.9.1.patched/ubase/uprintf.ml 2004-08-08 14:10:09.784776851 +0200
-@@ -10,8 +10,8 @@
- (* *)
- (***********************************************************************)
-
--external format_int: string -> int -> string = "format_int"
--external format_float: string -> float -> string = "format_float"
-+external format_int: string -> int -> string = "caml_format_int"
-+external format_float: string -> float -> string = "caml_format_float"
-
- let fprintf outchan doafter format =
- let format = (Obj.magic format : string) in
diff --git a/net-misc/unison/files/unison-2.12.0-gtk2-bug.patch b/net-misc/unison/files/unison-2.12.0-gtk2-bug.patch
deleted file mode 100644
index 637f19adcb28..000000000000
--- a/net-misc/unison/files/unison-2.12.0-gtk2-bug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uigtk2.ml.old 2005-03-12 17:17:59.000000000 +0100
-+++ uigtk2.ml 2005-07-13 19:55:34.856959280 +0200
-@@ -1314,7 +1314,7 @@
- mainWindow#scroll_vertical `JUMP (min p 1.) in
-
- ignore (mainWindow#connect#unselect_row ~callback:
-- (fun ~row ~column ~event -> current := None; updateDetails ()));
-+ (fun ~row ~column ~event -> current := None));
- ignore (mainWindow#connect#select_row ~callback:
- (fun ~row ~column ~event -> current := Some row; updateDetails ()));
-
diff --git a/net-misc/unison/files/unison-2.17.1-io-error.patch b/net-misc/unison/files/unison-2.17.1-io-error.patch
deleted file mode 100644
index eea448534504..000000000000
--- a/net-misc/unison/files/unison-2.17.1-io-error.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -uNr unison-2.17.1.orig/stasher.ml unison-2.17.1/stasher.ml
---- unison-2.17.1.orig/stasher.ml 2005-08-11 17:26:59.000000000 -0700
-+++ unison-2.17.1/stasher.ml 2006-09-13 12:04:18.000000000 -0700
-@@ -314,23 +314,36 @@
- (Path.toString backPath)
- (Fspath.toString backRoot));
- try Os.rename fspath path backRoot backPath
-- with
-- _ ->
-- ((let info = Fileinfo.get true fspath path in
-- match info.Fileinfo.typ with
-- `SYMLINK ->
-- Os.symlink
-- backRoot backPath
-- (Os.readLink fspath path)
-- | _ ->
-- Copy.localFile
-- fspath path
-- backRoot backPath backPath
-- `Copy
-- info.Fileinfo.desc
-- (Osx.ressLength info.Fileinfo.osX.Osx.ressInfo)
-- None);
-- Os.delete fspath path)
-+ with
-+ _ ->
-+ debug (fun () -> Util.msg "Rename failed -- copying instead\n");
-+ let rec copy p backp =
-+ let info = Fileinfo.get true fspath p in
-+ match info.Fileinfo.typ with
-+ | `SYMLINK ->
-+ debug (fun () -> Util.msg " Copying link %s / %s to %s / %s\n"
-+ (Fspath.toString fspath) (Path.toString p)
-+ (Fspath.toString backRoot) (Path.toString backp));
-+ Os.symlink backRoot backp (Os.readLink fspath p)
-+ | `FILE ->
-+ debug (fun () -> Util.msg " Copying file %s / %s to %s / %s\n"
-+ (Fspath.toString fspath) (Path.toString p)
-+ (Fspath.toString backRoot) (Path.toString backp));
-+ Copy.localFile fspath p backRoot backp backp
-+ `Copy info.Fileinfo.desc
-+ (Osx.ressLength info.Fileinfo.osX.Osx.ressInfo) None
-+ | `DIRECTORY ->
-+ debug (fun () -> Util.msg " Copying directory %s / %s to %s / %s\n"
-+ (Fspath.toString fspath) (Path.toString p)
-+ (Fspath.toString backRoot) (Path.toString backp));
-+ Os.createDir backRoot backp info.Fileinfo.desc;
-+ let ch = Os.childrenOf fspath p in
-+ Safelist.iter (fun n -> copy (Path.child p n) (Path.child backp n)) ch
-+ | `ABSENT -> assert false in
-+ copy path backPath;
-+ debug (fun () -> Util.msg " Finished copying; deleting %s / %s\n"
-+ (Fspath.toString fspath) (Path.toString path));
-+ Os.delete fspath path
- end else begin
- debug ( fun () -> Util.msg
- "File %s in %s will not be backed up.\n"
-diff -uNr unison-2.17.1.orig/uutil.ml unison-2.17.1/uutil.ml
---- unison-2.17.1.orig/uutil.ml 2005-08-11 17:26:59.000000000 -0700
-+++ unison-2.17.1/uutil.ml 2006-09-13 12:01:33.000000000 -0700
-@@ -123,4 +123,4 @@
- end else if !l > 0 then
- notify !l
- in
-- Util.convertUnixErrorsToTransient "readWrite" (fun () -> read len)
-+ Util.convertUnixErrorsToTransient "readWriteBounded" (fun () -> read len)
diff --git a/net-misc/unison/unison-2.12.0-r1.ebuild b/net-misc/unison/unison-2.12.0-r1.ebuild
deleted file mode 100644
index dab153b3044a..000000000000
--- a/net-misc/unison/unison-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.12.0-r1.ebuild,v 1.2 2005/09/21 21:35:41 mattam Exp $
-
-inherit eutils
-
-IUSE="gtk static debug threads"
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~amd64 sparc"
-
-DEPEND=">=dev-lang/ocaml-3.04
- gtk? ( >=dev-ml/lablgtk-2.2 )"
-
-RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
-|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
-
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-src_unpack() {
- unpack ${P}.tar.gz
-
- # Fix for coreutils change of tail syntax
- cd ${S}
- sed -i -e 's/tail -1/tail -n 1/' Makefile.OCaml
- # Fix for bad button behavior
- epatch ${FILESDIR}/unison-2.12.0-gtk2-bug.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
-
- make $myconf CFLAGS="" || die "error making unsion"
-}
-
-src_install () {
- # install manually, since it's just too much
- # work to force the Makefile to do the right thing.
- dobin unison || die
- dodoc BUGS.txt CONTRIB COPYING INSTALL NEWS \
- README ROADMAP.txt TODO.txt || die
-}
diff --git a/net-misc/unison/unison-2.17.1-r1.ebuild b/net-misc/unison/unison-2.17.1-r1.ebuild
deleted file mode 100644
index f82ee1d00b2e..000000000000
--- a/net-misc/unison/unison-2.17.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.17.1-r1.ebuild,v 1.4 2007/07/22 08:10:38 dberkholz Exp $
-
-inherit eutils
-
-IUSE="gtk doc static debug threads"
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-
-DEPEND=">=dev-lang/ocaml-3.04
- gtk? ( >=dev-ml/lablgtk-2.2 )"
-
-RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
-|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
-
-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 )"
-
-pkg_setup() {
- ewarn "This is a beta release, use at your very own risk"
-}
-
-src_unpack() {
- unpack ${P}.tar.gz
- # backport patch for file-io error (fixed in current trunk)
- EPATCH_OPTS="-d ${S} -p1"
- epatch ${FILESDIR}/${P}-io-error.patch
-
- # Fix for coreutils change of tail syntax
- cd ${S}
- sed -i -e 's/tail -1/tail -n 1/' Makefile.OCaml
-}
-
-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
-
- make $myconf CFLAGS="" || die "error making unsion"
-}
-
-src_install () {
- # install manually, since it's just too much
- # work to force the Makefile to do the right thing.
- dobin unison || die
- dodoc BUGS.txt CONTRIB COPYING 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
-}
diff --git a/net-misc/unison/unison-2.27.57.ebuild b/net-misc/unison/unison-2.27.57.ebuild
deleted file mode 100644
index f497e1fbdbb6..000000000000
--- a/net-misc/unison/unison-2.27.57.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.27.57.ebuild,v 1.1 2008/01/27 15:06:14 aballier Exp $
-
-inherit eutils
-
-IUSE="gtk doc static debug threads"
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-
-DEPEND=">=dev-lang/ocaml-3.04
- gtk? ( >=dev-ml/lablgtk-2.2 )"
-
-RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
-|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
-
-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_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-as-needed.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
-
- # 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.
- dobin unison || 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
-}