Update stable and beta versions.

(Portage version: 2.0.51.22-r1)

11 files changed, 66 insertions, 124 deletions

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index 42f694bd9f29..d0eabdb3fa40 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/unison
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.26 2005/03/15 14:21:49 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.27 2005/07/12 22:37:16 mattam Exp $
+
+*unison-2.13.0 (12 Jul 2005)
+
+  12 Jul 2005; Matthieu Sozeau <mattam@gentoo.org>
+  -files/ocaml-3.08-extnames.patch, -unison-2.10.2.ebuild,
+  +unison-2.12.0.ebuild, -unison-2.12.2.ebuild, +unison-2.13.0.ebuild,
+  -unison-2.9.1-r1.ebuild:
+  Removed old versions and added latest stable and beta versions. Reworked docs
+  flag (now downloads prebuilt docs). Added static and debug use flags with
+  their usual sense. Now use THREADS=true by default, maybe not good on some
+  arches.
 
   15 Mar 2005; Seemant Kulleen <seemant@gentoo.org> :
   Dependency update: net-www/lynx -> www-client/lynx.
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index db72b11968a9..6dc16919a018 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 93ae66d35aa33f12ce787930a451690f unison-2.9.1-r1.ebuild 1277
-MD5 b8c4de03dee045a9cbc497fe4c0e0cb7 unison-2.12.2.ebuild 1934
-MD5 dedd7285a2ca5700f81805ef70d6ecf1 unison-2.10.2.ebuild 1403
-MD5 debee8568efd8bd4adb708c4f7e5f441 ChangeLog 3526
+MD5 6d72f709ae6b9f19dda4db833d55db4f unison-2.12.0.ebuild 1801
+MD5 cd68540b22bd93b285f2fe9aecb3e491 unison-2.13.0.ebuild 1869
+MD5 daf1e28cb197e50d7888b794f890e303 ChangeLog 4008
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 d30eefbf86fd33cad44a672fc99cca5c files/digest-unison-2.10.2 65
-MD5 a1a3e8239f1e9a84b81be52d2729d5e0 files/digest-unison-2.12.2 66
-MD5 5abcf068ada1ab9eedbe3dfa16ad15fb files/ocaml-3.08-extnames.patch 748
-MD5 29b28492666138199820e9df8fcc6a47 files/digest-unison-2.9.1-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCNwxeI1lqEGTUzyQRAmGmAKDRef6iE128SJ2ZLpWy3cOO6jlL0ACdHd6C
-N4qq9cS8Pl81/+ugi624G2o=
-=5WOd
------END PGP SIGNATURE-----
+MD5 f2b7bb2888f634f6b2e887a7f6ceda64 files/digest-unison-2.12.0 204
+MD5 76c33afd24bb34b9dbe90989e3235e36 files/digest-unison-2.13.0 204
diff --git a/net-misc/unison/files/digest-unison-2.10.2 b/net-misc/unison/files/digest-unison-2.10.2
deleted file mode 100644
index e8ae04bacf0c..000000000000
--- a/net-misc/unison/files/digest-unison-2.10.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a93cf03d4221ab6bab8b758b0325a9d5 unison-2.10.2.tar.gz 458032
diff --git a/net-misc/unison/files/digest-unison-2.12.0 b/net-misc/unison/files/digest-unison-2.12.0
new file mode 100644
index 000000000000..51c6f67bc4e0
--- /dev/null
+++ b/net-misc/unison/files/digest-unison-2.12.0
@@ -0,0 +1,3 @@
+MD5 c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz 841717
+MD5 aa4fec97bfecf9de3303a6fbe927b4d9 unison-2.12.0-manual.pdf 355550
+MD5 60b691a71650f718e540879fc66c7ec5 unison-2.12.0-manual.html 191976
diff --git a/net-misc/unison/files/digest-unison-2.12.2 b/net-misc/unison/files/digest-unison-2.12.2
deleted file mode 100644
index e564dbb4535c..000000000000
--- a/net-misc/unison/files/digest-unison-2.12.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b4f6563c14caeefd0ac860ecac701685 unison-2.12.2.tar.gz 1526930
diff --git a/net-misc/unison/files/digest-unison-2.13.0 b/net-misc/unison/files/digest-unison-2.13.0
new file mode 100644
index 000000000000..d24041fbedd3
--- /dev/null
+++ b/net-misc/unison/files/digest-unison-2.13.0
@@ -0,0 +1,3 @@
+MD5 c1eaf07effa4141f10c71168222445fa unison-2.13.0.tar.gz 390341
+MD5 655066dfc00256d3a9817f5a510a99a3 unison-2.13.0-manual.pdf 436327
+MD5 a4f3d30350992804646fa3af1c2b6ba8 unison-2.13.0-manual.html 196158
diff --git a/net-misc/unison/files/digest-unison-2.9.1-r1 b/net-misc/unison/files/digest-unison-2.9.1-r1
deleted file mode 100644
index 0431bf98c368..000000000000
--- a/net-misc/unison/files/digest-unison-2.9.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8084fa87c13671de21ec1b701a4606c unison-2.9.1.tar.gz 319081
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/unison-2.10.2.ebuild b/net-misc/unison/unison-2.12.0.ebuild
index 7ccab39378c0..9accc6884f15 100644
--- a/net-misc/unison/unison-2.10.2.ebuild
+++ b/net-misc/unison/unison-2.12.0.ebuild
@@ -1,16 +1,16 @@
 # 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.10.2.ebuild,v 1.3 2005/02/18 11:03:35 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.12.0.ebuild,v 1.1 2005/07/12 22:37:16 mattam Exp $
 
 inherit eutils
 
-IUSE="gtk gtk2"
+IUSE="gtk gtk2 static debug"
 
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc ~amd64"
 
 DEPEND=">=dev-lang/ocaml-3.04
 	gtk? ( gtk2? ( >=dev-ml/lablgtk-2.2 ) !gtk2? ( =dev-ml/lablgtk-1.2* ) )"
@@ -18,11 +18,9 @@ DEPEND=">=dev-lang/ocaml-3.04
 RDEPEND="gtk? ( gtk2? ( >=dev-ml/lablgtk-2.2 ) !gtk2? ( =dev-ml/lablgtk-1.2* )
 || ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
 
-SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${P}/${P}.tar.gz"
-
-pkg_setup() {
-	ewarn "This is a beta release, use at your very own risk"
-}
+SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/${P}.tar.gz
+doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/${P}-manual.pdf
+	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/${P}-manual.html )"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -33,7 +31,15 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
+	local myconf="THREADS=true"
+
+	if use static; then
+		myconf="$myconf STATIC=true"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
 
 	if use gtk; then
 		if use gtk2; then
@@ -45,13 +51,19 @@ src_compile() {
 		myconf="$myconf UISTYLE=text"
 	fi
 
-	make $myconf CFLAGS="" || die
+	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
+	cd src
+	dobin unison || die
 	dodoc BUGS.txt CONTRIB COPYING INSTALL NEWS \
-	      README ROADMAP.txt TODO.txt
+	      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.12.2.ebuild b/net-misc/unison/unison-2.13.0.ebuild
index df51db04f13d..25e9c9862a6b 100644
--- a/net-misc/unison/unison-2.12.2.ebuild
+++ b/net-misc/unison/unison-2.13.0.ebuild
@@ -1,10 +1,10 @@
 # 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.2.ebuild,v 1.2 2005/03/15 14:16:15 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.13.0.ebuild,v 1.1 2005/07/12 22:37:16 mattam Exp $
 
 inherit eutils
 
-IUSE="gtk gtk2 doc"
+IUSE="gtk gtk2 doc static debug"
 
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
@@ -13,14 +13,14 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND=">=dev-lang/ocaml-3.04
-	gtk? ( gtk2? ( >=dev-ml/lablgtk-2.2 ) !gtk2? ( =dev-ml/lablgtk-1.2* ) )
-	doc? ( www-client/lynx >=dev-tex/hevea-1.07 virtual/tetex virtual/ghostscript )"
+	gtk? ( gtk2? ( >=dev-ml/lablgtk-2.2 ) !gtk2? ( =dev-ml/lablgtk-1.2* ) )"
 
 RDEPEND="gtk? ( gtk2? ( >=dev-ml/lablgtk-2.2 ) !gtk2? ( =dev-ml/lablgtk-1.2* )
 || ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
 
-#SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${P}/${P}.tar.gz"
-SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/resources/developers-only/${P}.tar.gz"
+SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/beta/${P}.tar.gz
+doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/beta/${P}-manual.pdf
+	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/beta/${P}-manual.html )"
 
 pkg_setup() {
 	ewarn "This is a beta release, use at your very own risk"
@@ -31,11 +31,19 @@ src_unpack() {
 
 	# Fix for coreutils change of tail syntax
 	cd ${S}
-	sed -i -e 's/tail -1/tail -n 1/' src/Makefile.OCaml
+	sed -i -e 's/tail -1/tail -n 1/' Makefile.OCaml
 }
 
 src_compile() {
-	local myconf
+	local myconf="THREADS=true"
+
+	if use static; then
+		myconf="$myconf STATIC=true"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
 
 	if use gtk; then
 		if use gtk2; then
@@ -48,28 +56,17 @@ src_compile() {
 	fi
 
 	make $myconf CFLAGS="" || die "error making unsion"
-	if use doc; then
-		make -C doc || die "error making doc"
-	fi
 }
 
 src_install () {
 	# install manually, since it's just too much
 	# work to force the Makefile to do the right thing.
-	cd src
 	dobin unison || die
 	dodoc BUGS.txt CONTRIB COPYING INSTALL NEWS \
 	      README ROADMAP.txt TODO.txt || die
-	cd ..
+
 	if use doc; then
-		cd doc
-		dodoc unison-manual.ps || die
-		doinfo unison-manual.info* || die
-		dohtml *.html || die
-		insinto /usr/share/doc/${PF}
-		doins unison-manual.pdf || die
-		cd ../icons
-		dohtml Unison.gif
-		cd ..
+		dohtml ${DISTDIR}/${P}-manual.html || die
+		dodoc ${DISTDIR}/${P}-manual.pdf || die
 	fi
 }
diff --git a/net-misc/unison/unison-2.9.1-r1.ebuild b/net-misc/unison/unison-2.9.1-r1.ebuild
deleted file mode 100644
index eebcad4b124e..000000000000
--- a/net-misc/unison/unison-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,54 +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.9.1-r1.ebuild,v 1.3 2005/02/18 11:03:35 mattam Exp $
-
-inherit eutils
-
-IUSE="gtk"
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc ~alpha ~amd64"
-
-DEPEND=">=dev-lang/ocaml-3.04
-	gtk? ( =dev-ml/lablgtk-1.2* )"
-RDEPEND="gtk? ( =x11-libs/gtk+-1.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 ocaml-3.08 change in exported symbol names
-	if has_version '>=ocaml-3.08'; then
-		epatch ${FILESDIR}/ocaml-3.08-extnames.patch
-	fi
-
-	# 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 gtk; then
-		myconf="$myconf UISTYLE=gtk"
-	else
-		myconf="$myconf UISTYLE=text"
-	fi
-
-	make $myconf CFLAGS="" || die
-}
-
-src_install () {
-	# install manually, since it's just too much
-	# work to force the Makefile to do the right thing.
-	dobin unison
-	dodoc BUGS.txt CONTRIB COPYING INSTALL NEWS \
-	      README ROADMAP.txt TODO.txt
-}