summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-06-30 20:25:34 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-06-30 20:25:34 +0000
commit90b6318e4ba332e137d7935c4a7adb3a0455019b (patch)
treefcc181ee2a2ff4f8f9190dc807440cca0b346b13 /dev-ml/extlib
parentbump; vdr-plugin-2.eclass; eapi=4 (diff)
downloadhistorical-90b6318e4ba332e137d7935c4a7adb3a0455019b.tar.gz
historical-90b6318e4ba332e137d7935c4a7adb3a0455019b.tar.bz2
historical-90b6318e4ba332e137d7935c4a7adb3a0455019b.zip
add patch from upstream for compatibility with ocaml 4.00
Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64
Diffstat (limited to 'dev-ml/extlib')
-rw-r--r--dev-ml/extlib/ChangeLog6
-rw-r--r--dev-ml/extlib/Manifest11
-rw-r--r--dev-ml/extlib/extlib-1.5.2.ebuild6
-rw-r--r--dev-ml/extlib/files/extlib-1.5.2-ocaml4.patch17
4 files changed, 33 insertions, 7 deletions
diff --git a/dev-ml/extlib/ChangeLog b/dev-ml/extlib/ChangeLog
index ad3d0cb9a109..5d4bab10cd44 100644
--- a/dev-ml/extlib/ChangeLog
+++ b/dev-ml/extlib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ml/extlib
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/ChangeLog,v 1.16 2012/05/05 14:20:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/ChangeLog,v 1.17 2012/06/30 20:25:34 aballier Exp $
+
+ 30 Jun 2012; Alexis Ballier <aballier@gentoo.org> extlib-1.5.2.ebuild,
+ +files/extlib-1.5.2-ocaml4.patch:
+ add patch from upstream for compatibility with ocaml 4.00
05 May 2012; Alexis Ballier <aballier@gentoo.org> -extlib-1.5.1.ebuild:
remove old
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 829f7ed5827f..a480415c2d30 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,14 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX extlib-1.5.2-ocaml4.patch 498 RMD160 5c256d2bcbbd0012443feb9c752f75c19b958778 SHA1 55ecc83555177d788e00fcf31443bd038eb7d6d9 SHA256 6e1528ac289ee85d10f8a06cad676586940f87d7548c0e9e26352903e51d7a6d
DIST extlib-1.5.2.tar.gz 70197 RMD160 ff554b614c099bce562f82b148067c731eddf059 SHA1 adce5398677a295ab3e6750525cc5dd49ccc80fb SHA256 ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa
-EBUILD extlib-1.5.2.ebuild 924 RMD160 4fea6d0ce0b55cd32a586ae97939c0d6e1b5377a SHA1 39c02ae555d9f91eb129104a89e08af4ce22f0df SHA256 c9bcf0e0fc828bdd0cd50f61e9bcbf360596e29d6b3656820c8944c845ca1a1d
-MISC ChangeLog 2361 RMD160 76d6d539f629bd47a81cef90853ab274c93f74d0 SHA1 e5a871596000b11424addf891d61bf9cad81d8a1 SHA256 befc9fe6eef0aa922a634bd31f1328ff6d91db49260826d1cf4ce7c29f4cf567
+EBUILD extlib-1.5.2.ebuild 981 RMD160 81ba19e74c27d19cf5cd45eb82c418a34b4ba723 SHA1 ec9d93115fcc27ac8fd875cec562ea2716bc10a4 SHA256 bfa1c3d2fa081217d91d2d68739cd16135008076fc2bfea0251ae30344079849
+MISC ChangeLog 2531 RMD160 281e121bf9abbb2c02563ddb16d4e947ca996e28 SHA1 824330c4fdfb41f1e7ccfcbd5724a14c2527e713 SHA256 f7c37f9714137c40976e461c8543d0600eff9f3c5760a9c3813680e38a04f2e9
MISC metadata.xml 238 RMD160 04d42364f6a2cfa9708f27a94c36dfb8e300273c SHA1 635f21599641d45e538a19848cf5c50d0d250058 SHA256 507218f0b2d1dbe6bb645dec6adb097dd2eb43f889c30bce760ce5f6bbe5651a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk+lNyIACgkQvFcC4BYPU0qC8wCfdgL4FzFW0jNUmmVPIJqv9s2E
-4IkAoJIomj64pYLbQNXTGXWZjgUsM6oY
-=oyr9
+iEYEARECAAYFAk/vYMQACgkQvFcC4BYPU0pQ2QCgrTdJs5CKWaaxQv7GtJvhhDxd
+HIoAoLWR+i+39VTjqVmchvc3X4+8Qokt
+=rWhe
-----END PGP SIGNATURE-----
diff --git a/dev-ml/extlib/extlib-1.5.2.ebuild b/dev-ml/extlib/extlib-1.5.2.ebuild
index 14f4b5bc7a46..16cc10d7a2f1 100644
--- a/dev-ml/extlib/extlib-1.5.2.ebuild
+++ b/dev-ml/extlib/extlib-1.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.5.2.ebuild,v 1.4 2012/03/08 11:46:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.5.2.ebuild,v 1.5 2012/06/30 20:25:34 aballier Exp $
EAPI="2"
@@ -16,6 +16,10 @@ SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc +ocamlopt"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-ocaml4.patch"
+}
+
src_compile() {
emake all || die "failed to build"
if use ocamlopt; then
diff --git a/dev-ml/extlib/files/extlib-1.5.2-ocaml4.patch b/dev-ml/extlib/files/extlib-1.5.2-ocaml4.patch
new file mode 100644
index 000000000000..81c519b7b10b
--- /dev/null
+++ b/dev-ml/extlib/files/extlib-1.5.2-ocaml4.patch
@@ -0,0 +1,17 @@
+Fixes ocaml 4 compatibility.
+
+From upstream:
+svn diff http://ocaml-extlib.googlecode.com/svn/trunk/ -c 396
+
+Index: extlib/extHashtbl.ml
+===================================================================
+--- extlib/extHashtbl.ml (revision 395)
++++ extlib/extHashtbl.ml (revision 396)
+@@ -32,6 +32,7 @@
+ }
+
+ include Hashtbl
++ let create n = Hashtbl.create (* no seed *) n
+
+ external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity"
+ external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity"