version bump

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 89 insertions, 5 deletions

diff --git a/dev-ml/findlib/ChangeLog b/dev-ml/findlib/ChangeLog
index 72572311bc0a..31c611d70292 100644
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/findlib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.82 2012/05/08 12:15:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.83 2012/05/08 22:45:59 aballier Exp $
+
+*findlib-1.3.1 (08 May 2012)
+
+  08 May 2012; Alexis Ballier <aballier@gentoo.org> +findlib-1.3.1.ebuild:
+  version bump
 
 *findlib-1.3.0 (08 May 2012)
 
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 5fa7bf8708f4..1f04d4c68891 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -4,15 +4,17 @@ Hash: SHA1
 DIST findlib-1.2.7.tar.gz 163452 RMD160 d374a9dcfee69e2428e904a77882616dd4fe61e7 SHA1 bb99da86a454ec755c9c5e4a464013be5c766801 SHA256 c920b129e48b3b313e67b915a078ab06a9ddd2e072f3353edfa74144f256029b
 DIST findlib-1.2.8.tar.gz 163985 RMD160 8b8c22c27cbdfa0a324d44480671d36d3c6eb2a8 SHA1 85d28df1a5a5c72a7a1b1c40ff89ea592507e6bd SHA256 1b1d54932a8b09c221d92ee85953f2b612381e8fd48fdf3e7a96f88995544567
 DIST findlib-1.3.0.tar.gz 229667 RMD160 3db8c6ff52234208ea5308dac2358c7b2fdf6a90 SHA1 374def2ba1ad406d07bb7a85ce9b9cf64af4e428 SHA256 abb0a41ccf3e71460ac79ac4d8e914975ba400797d0260b2dc9fe3e7d30b456d
+DIST findlib-1.3.1.tar.gz 229719 RMD160 c8a609d74df7dd87850ae34c88307af3636b20bc SHA1 996d8ff4372e178a9fb18b690bb9746847763d82 SHA256 9e4b063c3b10f36006521fb4ef457d87c2a0684a55e76c1776fbce707422b978
 EBUILD findlib-1.2.7.ebuild 1750 RMD160 57d645ec0fd72ea7d35bbc0189ff91a565922f84 SHA1 f49fe75d4835dc1c589c2178ac619ce15017b0ed SHA256 82c503417402391ec953fa234591a7ceb999f9f57b5f6af154bba3b0a6f3e034
 EBUILD findlib-1.2.8.ebuild 1763 RMD160 0b58eeedf6f098d7c161483db3b5aa45816247e7 SHA1 0d1e6af008716ddd11d9f24b1ccc3323781c5a9d SHA256 144a4f29dee4fa6d5c7c897b344698985620edda4e4e7754c0f01ff6080b6d25
 EBUILD findlib-1.3.0.ebuild 1763 RMD160 c4e2fab82c7c483da38c794fe8894b1ab81de4c8 SHA1 6948457ae34ff97f1d11300068028fdc5748fd38 SHA256 88545276e35dd5d630739fe631567bb12570c90afb408224d6bb24ed529f6f0e
-MISC ChangeLog 9554 RMD160 c8457487cefd48da42e79fb7a51f534b7ee0904c SHA1 95c031a5d1525596795bbc36fb870979ce5657a9 SHA256 f31b31ad6ed28fc2e40a2a75119d7c00d3714d94c5e77b677a87b04b742bb0a2
+EBUILD findlib-1.3.1.ebuild 1763 RMD160 99b229750ecc2c661c7e8a151d51f0c74331007e SHA1 013b786cfaa0b58c50e41d5735fc9907aba308ab SHA256 2f8afbe42ad643d7242510d16f004f3de22e6d2c97b5c07b5ad369d5e38a9ef0
+MISC ChangeLog 9675 RMD160 a035f1abe24782733572bbc7eb48f528f084891f SHA1 b88d61c6e425e14fe2c31a61abe669dbf203c19b SHA256 d24a4064594725f15c431ef09f4aa75cbbbd4f696581fca4f7c01dfde8cccc0f
 MISC metadata.xml 156 RMD160 b85f5bc80861e3fb890d0c87457a549d5bdaa191 SHA1 3be740773dec616d1c3969afaf1571348e455fef SHA256 40d721e2107cc8aac043b574fdae94c9e31ae133bc8e275fbc0a56329b3f5cee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+pDmAACgkQvFcC4BYPU0r4ZQCgl3t90QbZBVRJbGeZqYJt/91X
-B6QAn0hDOtadJt8supTeLVOVKRjFUJ/z
-=KpYn
+iEYEARECAAYFAk+poi0ACgkQvFcC4BYPU0qeDQCbB8rUHVrHefeI/QRB9jAklIMi
+JNwAoI2fIEyJro4mTufMjeeYtE8a22u5
+=ESct
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/findlib/findlib-1.3.1.ebuild b/dev-ml/findlib/findlib-1.3.1.ebuild
new file mode 100644
index 000000000000..c9743922ac82
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.3.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.3.1.ebuild,v 1.1 2012/05/08 22:45:59 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"
+
+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
+}