new revision to move findlib packages to ocaml stdlib dir

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 91 insertions, 7 deletions

diff --git a/dev-ml/findlib/ChangeLog b/dev-ml/findlib/ChangeLog
index 93ac89435fe5..62b85adf1f78 100644
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/findlib
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.55 2009/02/16 18:10:52 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.56 2009/09/18 22:37:37 aballier Exp $
+
+*findlib-1.2.4-r1 (18 Sep 2009)
+
+  18 Sep 2009; Alexis Ballier <aballier@gentoo.org>
+  +findlib-1.2.4-r1.ebuild:
+  new revision to move findlib packages to ocaml stdlib dir
 
 *findlib-1.2.4 (16 Feb 2009)
 
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 4eaad8b1d369..b2444557ee70 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -4,13 +4,14 @@ Hash: SHA1
 DIST findlib-1.2.3.tar.gz 161096 RMD160 108773da642e14c41dcd8a827f584e65b7478286 SHA1 f5709a18408e9468d9374288ebd2cace96355f7c SHA256 39106f15899b4fb4a8239da7b9843323658b00a1531d90978ca0aa7ee4573481
 DIST findlib-1.2.4.tar.gz 161667 RMD160 bafa1bbea71fb05ee2fd411dabe00ba34a25d506 SHA1 de73c1c4287263e986b4a4f56b029aadaffc2944 SHA256 1f78702b8a7e91b1760da5717092072ef4f97331294701c560fda650b9ba05de
 EBUILD findlib-1.2.3.ebuild 1748 RMD160 e288ddfb0807470aa02b7e228c7ecf69825cf7fe SHA1 93e9df0ea589b43a205086dc1d2825b868473bce SHA256 3a7c3ffdabda87dde1e3ba1eaf3a343bf0f537193e34b4726a94a04c3feb357d
+EBUILD findlib-1.2.4-r1.ebuild 1770 RMD160 339f2217e294c19a819e570cb10c05a78e0412bf SHA1 6aa26c5974de52ed1be56f4c1c1c4f77cf1358ba SHA256 21f9ee6f0fb683a102ee557574536d5e9769b15a6524d03e35cebe9cc42d03dd
 EBUILD findlib-1.2.4.ebuild 1781 RMD160 e1d9ed25e2b02acf80acee313fed7b88f4865506 SHA1 86306af061b721fcc64de4a99827b57b62dc5d49 SHA256 4f849d137b6ff9d98c3265f10191f1cc897b8904b4632b5443ec302b116ab0a1
-MISC ChangeLog 6486 RMD160 31b55de62849be01bc8fb25a9f8b251449160641 SHA1 e0ea03b0b58cf0f334aae7586554cf5c1e8b82d2 SHA256 1ce947fdb9c7f6e08e5102acf65905f36b13e282e2da90cb2448ad93663470df
+MISC ChangeLog 6660 RMD160 3d486aa1207e89d110561d433e80120a45c2ea0d SHA1 f657070341e90e777007f0bb903c1f8420e73851 SHA256 902948b73a3c1aca7a4c470d90de7753de5e3ab1d0a0067850b61d0c477a6f28
 MISC metadata.xml 156 RMD160 b85f5bc80861e3fb890d0c87457a549d5bdaa191 SHA1 3be740773dec616d1c3969afaf1571348e455fef SHA256 40d721e2107cc8aac043b574fdae94c9e31ae133bc8e275fbc0a56329b3f5cee
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmZrC0ACgkQvFcC4BYPU0ppAACfVsaoWsuRxZFOtcfFdHpm27s9
-y5wAoJJA5HB9J0LNMXjcm6Y0tKIPOGZz
-=5Dvu
+iEYEARECAAYFAkq0C7YACgkQvFcC4BYPU0oHwgCfTJr2mq0wvZjjo9SPvg4u4hoT
+9CgAn0+P9Aka9C4n3OuGNzkF1HuNGPso
+=YZ3C
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/findlib/findlib-1.2.4-r1.ebuild b/dev-ml/findlib/findlib-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..cade1351b061
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.2.4-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.2.4-r1.ebuild,v 1.1 2009/09/18 22:37:37 aballier Exp $
+
+EAPI=2
+
+inherit multilib
+
+RESTRICT="installsources"
+
+DESCRIPTION="OCaml tool to find/use non-standard packages."
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+IUSE="doc +ocamlopt tk"
+
+LICENSE="MIT X11"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?,tk?]"
+RDEPEND="${DEPEND}"
+
+ocamlfind_destdir="/usr/$(get_libdir)/ocaml"
+stublibs="${ocamlfind_destdir}/stublibs"
+
+src_configure() {
+	local myconf
+	use tk && myconf="-with-toolbox"
+	./configure -bindir /usr/bin -mandir /usr/share/man \
+		-sitelib ${ocamlfind_destdir} \
+		-config ${ocamlfind_destdir}/findlib/findlib.conf \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake all || die
+	if use ocamlopt; then
+		emake opt || die # optimized code
+	else
+		# If using bytecode we dont want to strip the binary as it would remove the
+		# bytecode and only leave ocamlrun...
+		export STRIP_MASK="*/bin/*"
+	fi
+}
+
+src_install() {
+	dodir `ocamlc -where`
+
+	emake prefix="${D}" install || die
+
+	dodir "${stublibs}"
+
+	cd "${S}/doc"
+	dodoc QUICKSTART README DOCINFO
+	use doc && dohtml -r ref-html guide-html
+}
+
+check_stublibs() {
+	local ocaml_stdlib=`ocamlc -where`
+	local ldconf="${ocaml_stdlib}/ld.conf"
+
+	if [ ! -e ${ldconf} ]
+	then
+		echo "${ocaml_stdlib}" > ${ldconf}
+		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+	fi
+
+	if [ -z `grep -e ${stublibs} ${ldconf}` ]
+	then
+		echo ${stublibs} >> ${ldconf}
+	fi
+}
+
+pkg_postinst() {
+	check_stublibs
+}