also install zlib support, thanks to Pierre Clairambault <pclairam@gmail.com>, bug #198466

Package-Manager: portage-2.1.3.19

5 files changed, 102 insertions, 9 deletions

diff --git a/dev-ml/camlzip/ChangeLog b/dev-ml/camlzip/ChangeLog
index 25796618009d..ffba10ccd88e 100644
--- a/dev-ml/camlzip/ChangeLog
+++ b/dev-ml/camlzip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ml/camlzip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/ChangeLog,v 1.5 2007/05/26 20:34:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/ChangeLog,v 1.6 2007/11/10 14:18:20 aballier Exp $
+
+*camlzip-1.03-r1 (10 Nov 2007)
+
+  10 Nov 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/camlzip-1.03-Makefile-findlib.patch, +camlzip-1.03-r1.ebuild:
+  also install zlib support, thanks to Pierre Clairambault
+  <pclairam@gmail.com>, bug #198466
 
 *camlzip-1.03 (26 May 2007)
 
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index 0034c1a2aa04..4b9416be229b 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -9,20 +9,28 @@ AUX camlzip-1.01-Makefile-findlib.patch 801 RMD160 ef98778a4875ef6f0cdaa1a28886e
 MD5 34f19ca145eb89c455a8767467331619 files/camlzip-1.01-Makefile-findlib.patch 801
 RMD160 ef98778a4875ef6f0cdaa1a28886e25475ce6bb2 files/camlzip-1.01-Makefile-findlib.patch 801
 SHA256 bd81d28bdc8f242801bb1a9fff7c9e332f02f28e7bc20bcacc0a0938a021def9 files/camlzip-1.01-Makefile-findlib.patch 801
+AUX camlzip-1.03-Makefile-findlib.patch 1011 RMD160 40d6388356cd3dac257a396e0cb2c0369b98ba80 SHA1 fabcc8f38b634a332441254bb1f8ed5f141e8320 SHA256 7e9def0a74e5c28449257621fbbd59c5276aecba0a32af7400718fed8bd4f9b8
+MD5 beb48d656890cfd133274bb096798af9 files/camlzip-1.03-Makefile-findlib.patch 1011
+RMD160 40d6388356cd3dac257a396e0cb2c0369b98ba80 files/camlzip-1.03-Makefile-findlib.patch 1011
+SHA256 7e9def0a74e5c28449257621fbbd59c5276aecba0a32af7400718fed8bd4f9b8 files/camlzip-1.03-Makefile-findlib.patch 1011
 DIST camlzip-1.01.tar.gz 15113 RMD160 5c8cd63deb813cfd6ebe0f7dc5b29a10f87800e2 SHA1 83797b440ba1c1ce309b7e1e12609a9cc3e7b395 SHA256 4a47bbcaa6d5d0dda8bdd3bf1bad87c02e42a3808c79be3cc7db5750154eef24
 DIST camlzip-1.03.tar.gz 24562 RMD160 fc773c0e351863538817f5c803a1b1d6cf9bc6e5 SHA1 ecb4cbbdeb673d0aacdc961f38e4a14d5cf1627b SHA256 d45af5deee6126137eb1bd896373ceeabacb916e30b977122de2eb3134336f08
 EBUILD camlzip-1.01-r1.ebuild 877 RMD160 30a59847a908ae4424a495a264658b71a59ac375 SHA1 9b22db06c2a0b5dde4b4c0ac0280a4d2ab9c3fa4 SHA256 17f5238f44a8cf39cf68728bcd04114ce706da649d3d82133cf4b14a313844fd
 MD5 b58db0616b6259c2d7e6a0c74767b258 camlzip-1.01-r1.ebuild 877
 RMD160 30a59847a908ae4424a495a264658b71a59ac375 camlzip-1.01-r1.ebuild 877
 SHA256 17f5238f44a8cf39cf68728bcd04114ce706da649d3d82133cf4b14a313844fd camlzip-1.01-r1.ebuild 877
+EBUILD camlzip-1.03-r1.ebuild 894 RMD160 bbbe2b11c371eb0bfeb4c18b87c4cb6850a2ea5f SHA1 8b31aaf1f33bd9a6865db0f7a61a8c25b8cb386e SHA256 66721b93934d6d590301d70e4db92e7ed76d6260aee4e65b4150697f84fac5f1
+MD5 56606066e32c2e02ab79d6b93c710686 camlzip-1.03-r1.ebuild 894
+RMD160 bbbe2b11c371eb0bfeb4c18b87c4cb6850a2ea5f camlzip-1.03-r1.ebuild 894
+SHA256 66721b93934d6d590301d70e4db92e7ed76d6260aee4e65b4150697f84fac5f1 camlzip-1.03-r1.ebuild 894
 EBUILD camlzip-1.03.ebuild 893 RMD160 16d831ac9885fc0a20008443e1db6573a9ab3514 SHA1 73c92a3df4ce2a9cec44d2f12ba7c4d082a7c666 SHA256 3beee58ded5c78b76ac89bce4ba61c9fd6ead3292fa5bfd259252a430b95b77a
 MD5 649c05723d00dfcc9767b8921a24f76a camlzip-1.03.ebuild 893
 RMD160 16d831ac9885fc0a20008443e1db6573a9ab3514 camlzip-1.03.ebuild 893
 SHA256 3beee58ded5c78b76ac89bce4ba61c9fd6ead3292fa5bfd259252a430b95b77a camlzip-1.03.ebuild 893
-MISC ChangeLog 1105 RMD160 1b1a203e2fdc8cae890f571c6910b1d282d4c4b2 SHA1 06027b173752ff712e74c7b521254a014ecf348a SHA256 7f4809a614c8aaa63a948f634e3bcf2c76d534d7a6afa8746c75cbb5a4796a7c
-MD5 a68310a885207939b8460431d00c3e6c ChangeLog 1105
-RMD160 1b1a203e2fdc8cae890f571c6910b1d282d4c4b2 ChangeLog 1105
-SHA256 7f4809a614c8aaa63a948f634e3bcf2c76d534d7a6afa8746c75cbb5a4796a7c ChangeLog 1105
+MISC ChangeLog 1356 RMD160 d1d92acea72298dd3e0b43eb4c161d74f86624b1 SHA1 d4b4c4fef62d46a869f71002e656128d39ccc9cf SHA256 5d9f96e078b7b0ab28f6b2fa3a4230c51473986d4c1710fef3c27419eba8b4c7
+MD5 73ec854c9131f5fcdd601111f4530c97 ChangeLog 1356
+RMD160 d1d92acea72298dd3e0b43eb4c161d74f86624b1 ChangeLog 1356
+SHA256 5d9f96e078b7b0ab28f6b2fa3a4230c51473986d4c1710fef3c27419eba8b4c7 ChangeLog 1356
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -33,10 +41,13 @@ SHA256 70dbdc74bbb066af2596ccf9687f2a3d3b87dda47291cfab176c5286ad93b0f1 files/di
 MD5 907060b90504a47a42407b865c49e840 files/digest-camlzip-1.03 235
 RMD160 febd23f1420c182c8b55d29b019250461387416a files/digest-camlzip-1.03 235
 SHA256 4c3a12a27bdcdfd9e65fafb4a0ef13e86ffa27ea926ff78c49351b47d0bb9e6b files/digest-camlzip-1.03 235
+MD5 907060b90504a47a42407b865c49e840 files/digest-camlzip-1.03-r1 235
+RMD160 febd23f1420c182c8b55d29b019250461387416a files/digest-camlzip-1.03-r1 235
+SHA256 4c3a12a27bdcdfd9e65fafb4a0ef13e86ffa27ea926ff78c49351b47d0bb9e6b files/digest-camlzip-1.03-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGWJnFvFcC4BYPU0oRAk8XAKCu5zYkqqOeS/gmJoGu+E4J1CVrLACfYBTA
-Nv1DHLF5ES0dptCQQ4ubNx0=
-=z7qp
+iD8DBQFHNb29vFcC4BYPU0oRAvQbAKCdOphdHgmVDKT5BCQ1S4s/B8kSNQCghuHx
+Fv/fwP1lFtRoz3EQMH2s1/Y=
+=Y5Nd
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/camlzip/camlzip-1.03-r1.ebuild b/dev-ml/camlzip/camlzip-1.03-r1.ebuild
new file mode 100644
index 000000000000..645cebe040b6
--- /dev/null
+++ b/dev-ml/camlzip/camlzip-1.03-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/camlzip-1.03-r1.ebuild,v 1.1 2007/11/10 14:18:20 aballier Exp $
+
+inherit findlib eutils
+
+IUSE=""
+
+DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
+HOMEPAGE="http://cristal.inria.fr/~xleroy/software.html#camlzip"
+SRC_URI="http://caml.inria.fr/distrib/bazar-ocaml/${P}.tar.gz"
+
+SLOT="1"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-lang/ocaml-3.04 \
+		>=sys-libs/zlib-1.1.3"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-Makefile-findlib.patch"
+	sed -e "s/VERSION/${PV}/" "${FILESDIR}/META" >> META
+}
+
+src_compile() {
+	emake all || die "Failed at compilation step !!!"
+	emake allopt || die "Failed at ML compilation step !!!"
+}
+
+src_install() {
+	findlib_src_install
+
+	dodoc README
+}
diff --git a/dev-ml/camlzip/files/camlzip-1.03-Makefile-findlib.patch b/dev-ml/camlzip/files/camlzip-1.03-Makefile-findlib.patch
new file mode 100644
index 000000000000..6eefb5021f8a
--- /dev/null
+++ b/dev-ml/camlzip/files/camlzip-1.03-Makefile-findlib.patch
@@ -0,0 +1,36 @@
+--- Makefile.orig	2007-11-08 18:07:44.000000000 +0100
++++ Makefile	2007-11-08 18:09:35.000000000 +0100
+@@ -19,10 +19,13 @@
+ OCAMLOPT=ocamlopt
+ OCAMLDEP=ocamldep
+ OCAMLMKLIB=ocamlmklib
++OCAMLFIND=ocamlfind 
+ 
+ OBJS=zlib.cmo zip.cmo gzip.cmo
+ C_OBJS=zlibstubs.o
+ 
++LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.a *.so *.cmx)
++
+ all: libcamlzip.a zip.cma
+ 
+ allopt: libcamlzip.a zip.cmxa
+@@ -55,18 +58,7 @@
+ 	rm -f *.o *.a
+ 
+ install:
+-	mkdir -p $(INSTALLDIR)
+-	cp zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a $(INSTALLDIR)
+-	if test -f dllcamlzip.so; then \
+-	  cp dllcamlzip.so $(INSTALLDIR); \
+-          ldconf=`$(OCAMLC) -where`/ld.conf; \
+-          installdir=$(INSTALLDIR); \
+-          if test `grep -s -c $$installdir'$$' $$ldconf || :` = 0; \
+-          then echo $$installdir >> $$ldconf; fi \
+-        fi
+-
+-installopt:
+-	cp zip.cmxa zip.a zip.cmx gzip.cmx $(INSTALLDIR)
++	$(OCAMLFIND) install camlzip META $(LIBINSTALL_FILES)
+ 
+ depend:
+ 	gcc -MM -I$(ZLIB_INCLUDE) *.c > .depend
diff --git a/dev-ml/camlzip/files/digest-camlzip-1.03-r1 b/dev-ml/camlzip/files/digest-camlzip-1.03-r1
new file mode 100644
index 000000000000..f287fc345617
--- /dev/null
+++ b/dev-ml/camlzip/files/digest-camlzip-1.03-r1
@@ -0,0 +1,3 @@
+MD5 65cee9abf1df6544cae554b94128d441 camlzip-1.03.tar.gz 24562
+RMD160 fc773c0e351863538817f5c803a1b1d6cf9bc6e5 camlzip-1.03.tar.gz 24562
+SHA256 d45af5deee6126137eb1bd896373ceeabacb916e30b977122de2eb3134336f08 camlzip-1.03.tar.gz 24562