Version bump, thanks to everyone in bug #183019, fix build with asneeded, thanks to Santiago M. Mola, bug #189238

Package-Manager: portage-2.1.4

5 files changed, 130 insertions, 6 deletions

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index bc0ce142e06e..82e84c73c774 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/unison
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.44 2007/07/22 08:10:38 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.45 2008/01/27 15:06:14 aballier Exp $
+
+*unison-2.27.57 (27 Jan 2008)
+
+  27 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/unison-2.27.57-as-needed.patch, +unison-2.27.57.ebuild:
+  Version bump, thanks to everyone in bug #183019, fix build with asneeded,
+  thanks to Santiago M. Mola, bug #189238
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   unison-2.13.16.ebuild, unison-2.17.1-r1.ebuild:
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index e3ff6b292a86..cd69d5a98c86 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ocaml-3.08-extnames.patch 748 RMD160 0b468d28c7531974b5db4450a90ce7fb684855f3 SHA1 92eb4e481ebc717a7b2cf87b6ef5620f7e719196 SHA256 0f81c08dd7a668614d9316a0b7a88cc791876e2727308b865a97adbd16e75bc5
 MD5 5abcf068ada1ab9eedbe3dfa16ad15fb files/ocaml-3.08-extnames.patch 748
 RMD160 0b468d28c7531974b5db4450a90ce7fb684855f3 files/ocaml-3.08-extnames.patch 748
@@ -10,6 +13,10 @@ AUX unison-2.17.1-io-error.patch 3077 RMD160 9e1c15556008e878f39cf337507d4bef4c3
 MD5 19d585242fe713e94253b12159f87c80 files/unison-2.17.1-io-error.patch 3077
 RMD160 9e1c15556008e878f39cf337507d4bef4c3e8d34 files/unison-2.17.1-io-error.patch 3077
 SHA256 45a921c7f38584da08169a5c19cad2bf231abc9d83a220dec657815c639ca6e3 files/unison-2.17.1-io-error.patch 3077
+AUX unison-2.27.57-as-needed.patch 432 RMD160 a6b5baf799f686764c7dc9285541cae9178c4fbd SHA1 f7566f358355b0ecb5e000101721d189363bbdc4 SHA256 0284d72f0d9de0a824c2bc2a2f78baced3b84eb15ea10e0e6576ff52cf57686d
+MD5 563b6be3c3abcf295a27da2f97557a3f files/unison-2.27.57-as-needed.patch 432
+RMD160 a6b5baf799f686764c7dc9285541cae9178c4fbd files/unison-2.27.57-as-needed.patch 432
+SHA256 0284d72f0d9de0a824c2bc2a2f78baced3b84eb15ea10e0e6576ff52cf57686d files/unison-2.27.57-as-needed.patch 432
 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
@@ -17,6 +24,9 @@ DIST unison-2.13.16.tar.gz 393266 RMD160 171d8bbc788be31227f6b09d1793a984d33bfdf
 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
 MD5 dc921f25945741ae308447b210b6d06f unison-2.12.0-r1.ebuild 1442
 RMD160 53a50858ed9e624103427290a2fe582384a18e2b unison-2.12.0-r1.ebuild 1442
@@ -29,10 +39,14 @@ EBUILD unison-2.17.1-r1.ebuild 1960 RMD160 7d41ea2878e072e0601e8317a6d7e5a199280
 MD5 fe86a78572776a740c24eff6d4861dc1 unison-2.17.1-r1.ebuild 1960
 RMD160 7d41ea2878e072e0601e8317a6d7e5a199280d6c unison-2.17.1-r1.ebuild 1960
 SHA256 e15caf6168b8e6654cb5e5c5306c9de4f44d230e2daeaf232d25cadf022ae877 unison-2.17.1-r1.ebuild 1960
-MISC ChangeLog 6465 RMD160 6000c9c8c93bf58a8c72d3d3388233e4f3de7150 SHA1 72890d4b1869402420ab94041a2b56fd01acd1b2 SHA256 4026b69b2a7ddd120b8fd994ff2798eff81c3d58232e826712c51c3107a7b8b2
-MD5 6c93a215855ad73d7c85cfc44568630a ChangeLog 6465
-RMD160 6000c9c8c93bf58a8c72d3d3388233e4f3de7150 ChangeLog 6465
-SHA256 4026b69b2a7ddd120b8fd994ff2798eff81c3d58232e826712c51c3107a7b8b2 ChangeLog 6465
+EBUILD unison-2.27.57.ebuild 1816 RMD160 7c3718a8141f14639a4c68f37972c9c095fffe5a SHA1 a64a0977591c0b8ff681f015349232a28f2d9efb SHA256 ad5d406fcd30ee90412a3574cce24b1a7dd12b5b4f820f24156f04a16142b916
+MD5 0fd5bce45b4f0ac14459918c99931826 unison-2.27.57.ebuild 1816
+RMD160 7c3718a8141f14639a4c68f37972c9c095fffe5a unison-2.27.57.ebuild 1816
+SHA256 ad5d406fcd30ee90412a3574cce24b1a7dd12b5b4f820f24156f04a16142b916 unison-2.27.57.ebuild 1816
+MISC ChangeLog 6731 RMD160 623b0ff39135bf1d1b79bcc7b03e45a00f53888f SHA1 4daa0c7b1bca640840f5555407f5b95926f76daf SHA256 43c88f18493f707491175cb994e77d1d9540c9edb5b027b094ccad61e2f37272
+MD5 eec3f394d94f81eff36b20e9cff2324c ChangeLog 6731
+RMD160 623b0ff39135bf1d1b79bcc7b03e45a00f53888f ChangeLog 6731
+SHA256 43c88f18493f707491175cb994e77d1d9540c9edb5b027b094ccad61e2f37272 ChangeLog 6731
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -46,3 +60,13 @@ SHA256 25689d7d5606ea2fa5f17e7cbb23a189801358ae5149db9c6a87b6e44dc63e59 files/di
 MD5 d8dec6448c5834378165dcc7e395b7ff files/digest-unison-2.17.1-r1 750
 RMD160 b3068d243fff51386adfbbec672461a0de0d6780 files/digest-unison-2.17.1-r1 750
 SHA256 36c86f6ff85ab0be2a303b0960b9a5a792836511790785c406ecddefcf52d277 files/digest-unison-2.17.1-r1 750
+MD5 e8faa83e51a64da3f917aa6efcf12f12 files/digest-unison-2.27.57 759
+RMD160 8484443b7e2a9373bc079013fdd6ab8cd3b328c9 files/digest-unison-2.27.57 759
+SHA256 3f49e07cd66c7e4ccfa02b5788d9858f6c7cdaa2dd063d33054552e058470f52 files/digest-unison-2.27.57 759
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHnJ3vvFcC4BYPU0oRAqTDAKDMBkWNktGgFdkr5xIqp3GsrouDWwCdH6rM
++8YX344xGAEpGCPbWVmFfu0=
+=sELr
+-----END PGP SIGNATURE-----
diff --git a/net-misc/unison/files/digest-unison-2.27.57 b/net-misc/unison/files/digest-unison-2.27.57
new file mode 100644
index 000000000000..dee8d8018fa3
--- /dev/null
+++ b/net-misc/unison/files/digest-unison-2.27.57
@@ -0,0 +1,9 @@
+MD5 0d15059f968d847ce75bafea34fe1c30 unison-2.27.57-manual.html 232117
+RMD160 705e5cf7f82cee9f23f0c3d3e091dd6bb228d28e unison-2.27.57-manual.html 232117
+SHA256 6916be92391aba8c9176d26d9e22805dc5c6978c12299b37d41a035f15adcf92 unison-2.27.57-manual.html 232117
+MD5 453659e6088617b850daefcbb37a98e7 unison-2.27.57-manual.pdf 453871
+RMD160 c4402abe5efe09ce5d0715d8e039898e73e9d42e unison-2.27.57-manual.pdf 453871
+SHA256 fabda0833b4c7c39080b00ad7e945872986246df243c728c586ed97e4110e308 unison-2.27.57-manual.pdf 453871
+MD5 4ba0a3e4bf4b4ad0c063f86391371f78 unison-2.27.57.tar.gz 617253
+RMD160 15388e3f2b9b593aba140416216837c49e4800c0 unison-2.27.57.tar.gz 617253
+SHA256 49299ec14216a8467b2c6ba148f8145bec31fa787433f9ce3851c2d62f0035ae unison-2.27.57.tar.gz 617253
diff --git a/net-misc/unison/files/unison-2.27.57-as-needed.patch b/net-misc/unison/files/unison-2.27.57-as-needed.patch
new file mode 100644
index 000000000000..ff5be04853ff
--- /dev/null
+++ b/net-misc/unison/files/unison-2.27.57-as-needed.patch
@@ -0,0 +1,11 @@
+--- unison-2.17.1/Makefile.OCaml
++++ unison-2.17.1/Makefile.OCaml
+@@ -330,7 +330,7 @@
+ 
+ $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS)
+ 	@echo Linking $@
+-	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $(CLIBS) $^
++	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $^ $(CLIBS)
+ 
+ # Unfortunately -output-obj does not put .o files into the output, only .cmx
+ # files, so we have to use $(LD) to take care of COBJS.
diff --git a/net-misc/unison/unison-2.27.57.ebuild b/net-misc/unison/unison-2.27.57.ebuild
new file mode 100644
index 000000000000..f497e1fbdbb6
--- /dev/null
+++ b/net-misc/unison/unison-2.27.57.ebuild
@@ -0,0 +1,73 @@
+# 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
+}