diff options
| author |   Matthieu Sozeau <mattam@gentoo.org> | 2005-02-18 11:03:35 +0000 |
|---|---|---|
| committer | Matthieu Sozeau <mattam@gentoo.org> | 2005-02-18 11:03:35 +0000 |
| commit | 47e6850973f39fa9264d72c3de7f8629d82b2046 (patch) | |
| tree | 79da2ded68284327a28dba5fc11555d176488d47 /net-misc/unison | |
| parent | Removed the numeric patch, it causes more problems than advantages. (diff) | |
| download | gentoo-2-47e6850973f39fa9264d72c3de7f8629d82b2046.tar.gz gentoo-2-47e6850973f39fa9264d72c3de7f8629d82b2046.tar.bz2 gentoo-2-47e6850973f39fa9264d72c3de7f8629d82b2046.zip | |
Add ssh-askpass dependencies (fixes bug #68298).
Diffstat (limited to 'net-misc/unison')
| -rw-r--r-- | net-misc/unison/ChangeLog | 10 | ||||
| -rw-r--r-- | net-misc/unison/unison-2.10.2.ebuild | 8 | ||||
| -rw-r--r-- | net-misc/unison/unison-2.9.1-r1.ebuild | 9 |
3 files changed, 17 insertions, 10 deletions
diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog index be0d48279852..534add9edf67 100644 --- a/net-misc/unison/ChangeLog +++ b/net-misc/unison/ChangeLog @@ -1,6 +1,10 @@ # 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.22 2004/12/29 20:15:17 ciaranm Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.23 2005/02/18 11:03:35 mattam Exp $ + + 18 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> unison-2.10.2.ebuild, + unison-2.9.1-r1.ebuild: + Add ssh-askpass runtime dependencies (fixes bug #68298). 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : Change encoding to UTF-8 for GLEP 31 compliance @@ -41,7 +45,7 @@ 14 Jun 2004; Aron Griffis <agriffis@gentoo.org> unison-2.9.1.ebuild: Fix use invocation - 08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> unison-2.9.1.ebuild: + 08 Jun 2004; Bryan Ãstergaard <kloeri@gentoo.org> unison-2.9.1.ebuild: Stable on alpha. 28 May 2004; Danny van Dyk <kugelfang@gentoo.org> unison-2.9.1.ebuild: diff --git a/net-misc/unison/unison-2.10.2.ebuild b/net-misc/unison/unison-2.10.2.ebuild index 7317bbae4012..7ccab39378c0 100644 --- a/net-misc/unison/unison-2.10.2.ebuild +++ b/net-misc/unison/unison-2.10.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.2 2004/09/30 16:18:56 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.10.2.ebuild,v 1.3 2005/02/18 11:03:35 mattam Exp $ inherit eutils @@ -14,7 +14,9 @@ KEYWORDS="~x86 ~ppc ~amd64" DEPEND=">=dev-lang/ocaml-3.04 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* ) )" + +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" diff --git a/net-misc/unison/unison-2.9.1-r1.ebuild b/net-misc/unison/unison-2.9.1-r1.ebuild index 468e4ef9e8b0..eebcad4b124e 100644 --- a/net-misc/unison/unison-2.9.1-r1.ebuild +++ b/net-misc/unison/unison-2.9.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.2 2004/08/19 10:50:27 stuart Exp $ +# $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 @@ -10,11 +10,12 @@ 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 sparc ppc ~alpha ~amd64" DEPEND=">=dev-lang/ocaml-3.04 gtk? ( =dev-ml/lablgtk-1.2* )" -RDEPEND="gtk? ( =x11-libs/gtk+-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" |