Fix for gtk2 deprecation, update latest stable and unstable versions.

Package-Manager: portage-2.0.51.22-r1

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index 86e74d61b04732f6afd6d3be0775f8a764428854..5918d088979aa05d62989d3234ff11823786326c 100644 (file)
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,14 @@
 # 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.34 2005/09/17 12:20:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.35 2005/09/21 16:32:39 mattam Exp $
+
+*unison-2.12.0-r1 (21 Sep 2005)
+
+  21 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> +unison-2.12.0-r1.ebuild,
+  -unison-2.12.0.ebuild, -unison-2.13.0.ebuild, +unison-2.13.16.ebuild,
+  +unison-2.17.1.ebuild:
+  Fix for deprecated gtk2 USE flag (bug #106560). Add latest stable and update
+  to latest unstable version.
 
   01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> unison-2.12.0.ebuild:
   Stable on sparc
@@ -92,7 +100,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 Ã\83Â\98stergaard <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/Manifest b/net-misc/unison/Manifest
index e9cbb10b263e71de4ddfb65741853b283f89aa0a..777d1cfe7d5c96d8713648684143ece1d676a2f5 100644 (file)
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 53bf2c5e8536959706dc6456df858b00 unison-2.12.0.ebuild 1637
-MD5 a4757ad39d6014ba1a3db3e3d6292457 unison-2.13.0.ebuild 1927
 MD5 bfd01cd66f086cc9ca50321067cb43c1 unison-2.9.1-r1.ebuild 1276
-MD5 638b40b0aa46090ca68941f72ef3742b ChangeLog 4869
-MD5 38eaac5e705cb7500f081bb5fc220273 files/digest-unison-2.12.0 65
-MD5 76c33afd24bb34b9dbe90989e3235e36 files/digest-unison-2.13.0 204
-MD5 29b28492666138199820e9df8fcc6a47 files/digest-unison-2.9.1-r1 64
+MD5 6bb195dada52ef3a89cfce725153d743 unison-2.12.0-r1.ebuild 1442
+MD5 895352e780be1770c0ca73c7a694c4ec unison-2.13.16.ebuild 1696
+MD5 8b6f14fa98998bc5019f4006af2e5dff ChangeLog 5188
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 a5c77f41a817220743b90f1e530c0739 unison-2.17.1.ebuild 1773
+MD5 38eaac5e705cb7500f081bb5fc220273 files/digest-unison-2.12.0-r1 65
+MD5 613c9eae8429f41c8218d4967501b0ef files/digest-unison-2.17.1 204
 MD5 5abcf068ada1ab9eedbe3dfa16ad15fb files/ocaml-3.08-extnames.patch 748
 MD5 402b704e5c7c71a69fd6400c395834ec files/unison-2.12.0-gtk2-bug.patch 490
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLAoPKf2g/qXtneoRAmClAJ4sf3h8ShHLPiRNTXN68QpwLfLztACghUvr
-7w740uxt5YC8ksWJmlry5+Q=
-=uiGy
------END PGP SIGNATURE-----
+MD5 29b28492666138199820e9df8fcc6a47 files/digest-unison-2.9.1-r1 64
+MD5 3e50ed2240ee231bdb6079e1289eb97b files/digest-unison-2.13.16 207

diff --git a/net-misc/unison/files/digest-unison-2.12.0 b/net-misc/unison/files/digest-unison-2.12.0-r1
similarity index 100%
rename from net-misc/unison/files/digest-unison-2.12.0
rename to net-misc/unison/files/digest-unison-2.12.0-r1

diff --git a/net-misc/unison/files/digest-unison-2.13.0 b/net-misc/unison/files/digest-unison-2.13.0
deleted file mode 100644 (file)
index d24041f..0000000
--- a/net-misc/unison/files/digest-unison-2.13.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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.13.16 b/net-misc/unison/files/digest-unison-2.13.16
new file mode 100644 (file)
index 0000000..ce45050
--- /dev/null
+++ b/net-misc/unison/files/digest-unison-2.13.16
@@ -0,0 +1,3 @@
+MD5 a79bf5f4ebf2a1eaf15b1ac97f827374 unison-2.13.16.tar.gz 393266
+MD5 e7684d401d6f5ee194b9e631cc022dd6 unison-2.13.16-manual.pdf 436229
+MD5 2b39e52ec3893a112b28b7b0a294d941 unison-2.13.16-manual.html 196162

diff --git a/net-misc/unison/files/digest-unison-2.17.1 b/net-misc/unison/files/digest-unison-2.17.1
new file mode 100644 (file)
index 0000000..a4ca629
--- /dev/null
+++ b/net-misc/unison/files/digest-unison-2.17.1
@@ -0,0 +1,3 @@
+MD5 c62611dda096da360ad645fad8e8ce3e unison-2.17.1.tar.gz 415057
+MD5 e619b39db27ec8dbc36db35e808dd3bb unison-2.17.1-manual.pdf 404886
+MD5 6c782837db28944b6083adc37eff2b28 unison-2.17.1-manual.html 219449

diff --git a/net-misc/unison/unison-2.12.0.ebuild b/net-misc/unison/unison-2.12.0-r1.ebuild
similarity index 67%
rename from net-misc/unison/unison-2.12.0.ebuild
rename to net-misc/unison/unison-2.12.0-r1.ebuild
index 7ca8c9a5e79cf6ee3356162f8a4e0baf4e784e22..e2244d5ed0c4da1a84960d2da722e677876f3225 100644 (file)
--- a/net-misc/unison/unison-2.12.0.ebuild
+++ b/net-misc/unison/unison-2.12.0-r1.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.0.ebuild,v 1.6 2005/09/01 13:54:44 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.12.0-r1.ebuild,v 1.1 2005/09/21 16:32:39 mattam Exp $
 
 inherit eutils
 
-IUSE="gtk gtk2 static debug threads"
+IUSE="gtk static debug threads"
 
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
@@ -13,12 +13,12 @@ SLOT="0"
 KEYWORDS="x86 ppc ~amd64 sparc"
 
 DEPEND=">=dev-lang/ocaml-3.04
-       gtk? ( gtk2? ( >=dev-ml/lablgtk-2.2 ) !gtk2? ( =dev-ml/lablgtk-1.2* ) )"
+       gtk? ( >=dev-ml/lablgtk-2.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 ) )"
+RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2 )
+|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass )"
 
-SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 src_unpack() {
        unpack ${P}.tar.gz
@@ -27,7 +27,7 @@ src_unpack() {
        cd ${S}
        sed -i -e 's/tail -1/tail -n 1/' Makefile.OCaml
        # Fix for bad button behavior
-       epatch ${FILESDIR}/${P}-gtk2-bug.patch
+       epatch ${FILESDIR}/unison-2.12.0-gtk2-bug.patch
 }
 
 src_compile() {
@@ -46,11 +46,7 @@ src_compile() {
        fi
 
        if use gtk; then
-               if use gtk2; then
-                       myconf="$myconf UISTYLE=gtk2"
-               else
-                       myconf="$myconf UISTYLE=gtk"
-               fi
+               myconf="$myconf UISTYLE=gtk2"
        else
                myconf="$myconf UISTYLE=text"
        fi

diff --git a/net-misc/unison/unison-2.13.16.ebuild b/net-misc/unison/unison-2.13.16.ebuild
new file mode 100644 (file)
index 0000000..49ecd05
--- /dev/null
+++ b/net-misc/unison/unison-2.13.16.ebuild
@@ -0,0 +1,68 @@
+# 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.13.16.ebuild,v 1.1 2005/09/21 16:32:39 mattam 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 )"
+
+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 ${P}.tar.gz
+
+       # 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.13.0.ebuild b/net-misc/unison/unison-2.17.1.ebuild
similarity index 75%
rename from net-misc/unison/unison-2.13.0.ebuild
rename to net-misc/unison/unison-2.17.1.ebuild
index b1a483c6d313a76df1566fd01c294e6baadad07c..f33ae0d5f5637e1bb478ecf456b488ae50bbc438 100644 (file)
--- a/net-misc/unison/unison-2.13.0.ebuild
+++ b/net-misc/unison/unison-2.17.1.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.13.0.ebuild,v 1.4 2005/08/13 20:04:00 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.17.1.ebuild,v 1.1 2005/09/21 16:32:39 mattam Exp $
 
 inherit eutils
 
-IUSE="gtk gtk2 doc static debug threads"
+IUSE="gtk doc static debug threads"
 
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
@@ -13,10 +13,10 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 
 DEPEND=">=dev-lang/ocaml-3.04
-       gtk? ( gtk2? ( >=dev-ml/lablgtk-2.2 ) !gtk2? ( =dev-ml/lablgtk-1.2* ) )"
+       gtk? ( >=dev-ml/lablgtk-2.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 ) )"
+RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2 )
+|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass )"
 
 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
@@ -50,11 +50,7 @@ src_compile() {
        fi
 
        if use gtk; then
-               if use gtk2; then
-                       myconf="$myconf UISTYLE=gtk2"
-               else
-                       myconf="$myconf UISTYLE=gtk"
-               fi
+               myconf="$myconf UISTYLE=gtk2"
        else
                myconf="$myconf UISTYLE=text"
        fi