New beta version, fixes bug #63107. Remove old version.

5 files changed, 31 insertions, 14 deletions

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index af47a7121a8d..a72063c645ed 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for net-misc/unison
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.18 2004/08/19 10:50:27 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.19 2004/09/25 21:05:24 mattam Exp $
 
+*unison-2.10.2 (25 Sep 2004)
+
+  25 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> +unison-2.10.2.ebuild,
+  -unison-2.9.1.ebuild:
+  New beta version of unison, with brand new lablgtk2 GUI. Thanks to Alan Shmitt
+  <alan.schmitt@polytechnique.org>, for the submission (bug #63107). Removed 
+  old, unused ebuild.
+  
   19 Aug 2004; Stuart Herbert <stuart@gentoo.org> unison-2.9.1-r1.ebuild,
   unison-2.9.1.ebuild:
   Fixed broken SRC_URI settings, requested by tigger@gentoo.org
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index ee9ac7285830..969e198c9eb6 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,7 +1,7 @@
-MD5 f3d0a948bb8214c28422538b6231fa2a unison-2.9.1.ebuild 1058
-MD5 93a1a2adab36bf79407518c6eee7fb24 ChangeLog 2247
-MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 9cbbda8086ce875c8613bcc6617f413c ChangeLog 2559
 MD5 adf97cf085cc519cd79d7d21c6e87ca6 unison-2.9.1-r1.ebuild 1218
-MD5 29b28492666138199820e9df8fcc6a47 files/digest-unison-2.9.1 64
+MD5 e254c8370319e10ba88fe358b266e764 unison-2.10.2.ebuild 1337
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 MD5 29b28492666138199820e9df8fcc6a47 files/digest-unison-2.9.1-r1 64
 MD5 5abcf068ada1ab9eedbe3dfa16ad15fb files/ocaml-3.08-extnames.patch 748
+MD5 d30eefbf86fd33cad44a672fc99cca5c files/digest-unison-2.10.2 65
diff --git a/net-misc/unison/files/digest-unison-2.10.2 b/net-misc/unison/files/digest-unison-2.10.2
new file mode 100644
index 000000000000..e8ae04bacf0c
--- /dev/null
+++ b/net-misc/unison/files/digest-unison-2.10.2
@@ -0,0 +1 @@
+MD5 a93cf03d4221ab6bab8b758b0325a9d5 unison-2.10.2.tar.gz 458032
diff --git a/net-misc/unison/files/digest-unison-2.9.1 b/net-misc/unison/files/digest-unison-2.9.1
deleted file mode 100644
index 0431bf98c368..000000000000
--- a/net-misc/unison/files/digest-unison-2.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8084fa87c13671de21ec1b701a4606c unison-2.9.1.tar.gz 319081
diff --git a/net-misc/unison/unison-2.9.1.ebuild b/net-misc/unison/unison-2.10.2.ebuild
index b96c9e4fb3fa..214c5962b9d4 100644
--- a/net-misc/unison/unison-2.9.1.ebuild
+++ b/net-misc/unison/unison-2.10.2.ebuild
@@ -1,20 +1,26 @@
 # Copyright 1999-2004 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.ebuild,v 1.19 2004/08/19 10:50:27 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.10.2.ebuild,v 1.1 2004/09/25 21:05:24 mattam Exp $
 
-IUSE="gtk"
+inherit eutils
+
+IUSE="gtk gtk2"
 
 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"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND=">=dev-lang/ocaml-3.04
-	gtk? ( =dev-ml/lablgtk-1.2* )"
-RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
+	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* ) )"
+
+SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${P}/${P}.tar.gz"
 
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+pkg_setup() {
+	ewarn "This is a beta release, use at your very own risk"
+}
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -25,11 +31,14 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
 
 	if use gtk; then
-		myconf="$myconf UISTYLE=gtk"
+		if use gtk2; then
+			myconf="$myconf UISTYLE=gtk2"
+		else
+			myconf="$myconf UISTYLE=gtk"
+		fi
 	else
 		myconf="$myconf UISTYLE=text"
 	fi