version bump

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

3 files changed, 89 insertions, 5 deletions

diff --git a/dev-ml/findlib/ChangeLog b/dev-ml/findlib/ChangeLog
index 28fa9346509a..a9325e4d32b5 100644
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/findlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.63 2010/11/05 18:23:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.64 2010/11/07 16:33:18 aballier Exp $
+
+*findlib-1.2.6 (07 Nov 2010)
+
+  07 Nov 2010; Alexis Ballier <aballier@gentoo.org> +findlib-1.2.6.ebuild:
+  version bump
 
   05 Nov 2010; Markos Chandras <hwoarang@gentoo.org> findlib-1.2.5.ebuild:
   Stable on amd64 wrt bug #343751
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 780a5d1c8e3e..e838b0c3a326 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 DIST findlib-1.2.3.tar.gz 161096 RMD160 108773da642e14c41dcd8a827f584e65b7478286 SHA1 f5709a18408e9468d9374288ebd2cace96355f7c SHA256 39106f15899b4fb4a8239da7b9843323658b00a1531d90978ca0aa7ee4573481
 DIST findlib-1.2.5.tar.gz 162164 RMD160 a122ce8ef60fce12c2b30f7275a4f1480d0833bc SHA1 e0c6da48f9ea40c67f1d4857b428d20335b0c847 SHA256 9e1cf8ca3aa82329e1004612dae3060b2e24d4610c439d23575f72c88ddea868
+DIST findlib-1.2.6.tar.gz 162458 RMD160 76ee6ba0cf5c4ec8693dec14fae8582ad6cd5de3 SHA1 50d2764025168a5f3cab7f559b8fdf3cb680e405 SHA256 badf1d81a96322491e7ffa144c22fe04b106340b8279c15d54bd4b4d3d2ddfac
 EBUILD findlib-1.2.3.ebuild 1744 RMD160 13f886db028e2ba01d2ebcc6f56bcc6836a192ac SHA1 8c7fbee2d90800312dbff1dfc1d6865205a7dff0 SHA256 460ba8eacae3a99cb9db6fbe4e2691d04fc2954bbac04c8c2107bd1c5208e809
 EBUILD findlib-1.2.5.ebuild 1761 RMD160 354a82f0021fc907ba583cba18b5a6b17386c107 SHA1 51055fb81b41fd634751757456ff1409f805bfb0 SHA256 10327f9c299d53f6074f3ae991c69a8eb6b48f0459374c7fce681af948ed6942
-MISC ChangeLog 7511 RMD160 b43648b14f541d7b615bf127259ef1af073fb6db SHA1 055ff073015a19599a4f21a31d49216b88c740b3 SHA256 094d0ce10385b29c979b7726b0b64fd77ae6373c46bed216642548849be535d0
+EBUILD findlib-1.2.6.ebuild 1763 RMD160 c56d5a8aa92c92a729ac9e0b470c8e0ec077b48d SHA1 7419ba5fe0f8908318747621c7952571b6d5d784 SHA256 ddd77760e33a51d81e73f5ef4c3bde7af363c9f7e5e2334e38b886ce2b074bfd
+MISC ChangeLog 7632 RMD160 504634025fdb3c29683925010073e794d9ddfa77 SHA1 b441b155176e0f66669df03bab057d899d7a094f SHA256 7a1d8e9fadb08d5059b482785aef6353d3d3d64ba973c255afefedea1075571f
 MISC metadata.xml 156 RMD160 b85f5bc80861e3fb890d0c87457a549d5bdaa191 SHA1 3be740773dec616d1c3969afaf1571348e455fef SHA256 40d721e2107cc8aac043b574fdae94c9e31ae133bc8e275fbc0a56329b3f5cee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEUEARECAAYFAkzUS7oACgkQ9/cejkQaxBDSOwCcCd4DjTHppuSxUXWVZ42mEwbt
-+gMAlRL09cQXNZIKXZWkTWiqDCqwwTs=
-=rWpA
+iEYEARECAAYFAkzW1NUACgkQvFcC4BYPU0p7ygCdHPHDKIv2I8UyhyJdPF7eHaRl
+K38An3ItH6ruJRvx4wVGnp0ty0yhpSk9
+=Q7Zc
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/findlib/findlib-1.2.6.ebuild b/dev-ml/findlib/findlib-1.2.6.ebuild
new file mode 100644
index 000000000000..c1a4f49efea1
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.2.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.2.6.ebuild,v 1.1 2010/11/07 16:33:18 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
+}