version bump

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.25.7 x86_64

3 files changed, 104 insertions, 5 deletions

diff --git a/dev-ml/findlib/ChangeLog b/dev-ml/findlib/ChangeLog
index bb983ada2a48..4815bba841c0 100644
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/findlib
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.38 2008/06/07 16:31:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.39 2008/08/05 09:25:15 aballier Exp $
+
+*findlib-1.2.2 (05 Aug 2008)
+
+  05 Aug 2008; Alexis Ballier <aballier@gentoo.org> +findlib-1.2.2.ebuild:
+  version bump
 
   07 Jun 2008; Alexis Ballier <aballier@gentoo.org> findlib-1.2.1.ebuild:
   Update homepage and SRC_URI
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 639eeef062ef..299a483da8c6 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA1
 
 DIST findlib-1.2.1.tar.gz 158480 RMD160 c91939b94508764605a957852e5074f11895f2be SHA1 04af3e36ccaa4a5ba41773ee6118b825fd1dff90 SHA256 fe3db7c9f9707eb589e8f194ac4364f854e8a57aace826d59ee52cf9fa2a2a4e
+DIST findlib-1.2.2.tar.gz 160979 RMD160 107ea66833b57f45f3b1c82f5c908f667f8d272d SHA1 362b4e5d4ab8c3d40d2951af27c283bc80b705ad SHA256 1b1ca52e1f680af9921d31826a0da557e7a76da2ee9d7586df5ecada31bde5b6
 EBUILD findlib-1.2.1.ebuild 2393 RMD160 337464ac7132b211750179125b7a2ef2d59b6f9e SHA1 71e5f69f309f46c1c976baa5a4a4562fa1f61247 SHA256 0c47d08ce882fef62f912560a1a625b2dc6f06df83899c18b7622994f096f260
-MISC ChangeLog 4684 RMD160 0a5e83504ea070e5a91d0544f1bee09aa84889b4 SHA1 9586eb8ec03085fba9c295773741455af7e3d6ec SHA256 88c103fccfd0c696e5a6c47e16db22c17f3f4bb8bfb3c3e740e1ee21779f7465
+EBUILD findlib-1.2.2.ebuild 2400 RMD160 4aa374569710fb9926c4499556cb67fc2f42dfd1 SHA1 8203e3c6750582eee3c7bdb7171bf3a6ec967202 SHA256 f75f0c4c4f67e1a64444e341d8b70ab93e3ede2e024bcfd28a9ef25c35b5d660
+MISC ChangeLog 4805 RMD160 482e6b7f5a962a049af08b4322e42e0619ab4a68 SHA1 a7db3aaf4b4c0e6ce0a9d8d79193e4857b51c9c0 SHA256 5ea2652006f8d27b4b576a60577d572dac002d875fc2cdfc2eb3d625d43f03d1
 MISC metadata.xml 156 RMD160 b85f5bc80861e3fb890d0c87457a549d5bdaa191 SHA1 3be740773dec616d1c3969afaf1571348e455fef SHA256 40d721e2107cc8aac043b574fdae94c9e31ae133bc8e275fbc0a56329b3f5cee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhKuAwACgkQvFcC4BYPU0qD5gCdG/+Fg2y847EVfzGsxBC2khGc
-VsIAnjsW8+CqVN++Ph87WLyFd3UbroOT
-=IaSv
+iEYEARECAAYFAkiYHIgACgkQvFcC4BYPU0q8+wCgk3c+Y60ejz9bsPr9q57xASo5
+etAAoKEwNe/1xrkLv0l/pVRoarLXE3sr
+=5TJA
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/findlib/findlib-1.2.2.ebuild b/dev-ml/findlib/findlib-1.2.2.ebuild
new file mode 100644
index 000000000000..8df16eafbe7f
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.2.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.2.2.ebuild,v 1.1 2008/08/05 09:25:15 aballier Exp $
+
+inherit multilib eutils
+
+EAPI="1"
+
+IUSE="doc +ocamlopt tk"
+
+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"
+
+LICENSE="MIT X11"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/ocaml-3.07"
+
+ocamlfind_destdir="/usr/$(get_libdir)/ocaml/site-packages"
+stublibs="${ocamlfind_destdir}/stublibs"
+
+pkg_setup()
+{
+	if ( use tk && ! built_with_use dev-lang/ocaml tk ); then
+		eerror "It seems you don't have ocaml compiled with tk support"
+		eerror ""
+		eerror "The findlib toolbox requires ocaml be built with tk support."
+		eerror ""
+		die "Please make sure that ocaml is installed with tk support or remove the USE flag"
+	fi
+	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "In order to build ${PN} with native code support from ocaml"
+		eerror "You first need to have a native code ocaml compiler."
+		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
+		die "Please install ocaml with ocamlopt useflag"
+	fi
+}
+
+src_compile() {
+	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"
+
+	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
+}