Findlib eclass introduction changes, remove old versions and add check for correct ld.conf on install.

6 files changed, 48 insertions, 42 deletions

diff --git a/dev-ml/findlib/ChangeLog b/dev-ml/findlib/ChangeLog
index 17b4446094b4..4b134fb0ae69 100644
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ml/findlib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.11 2004/08/09 18:46:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.12 2004/08/21 17:45:22 mattam Exp $
+
+*findlib-1.0.4-r1 (21 Aug 2004)
+
+  21 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -findlib-0.8.ebuild,
+  +findlib-1.0.4-r1.ebuild, -findlib-1.0.4.ebuild:
+  New revision for introduction of the findlib eclass (just checks that stublibs
+  is in ld.conf). Remove old versions.
 
   09 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> findlib-1.0.4.ebuild:
   header fix; tidy
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index d2c4db6d8d87..0d44b389de57 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,6 +1,11 @@
-MD5 6b1855cffaa264f2ca126e06eeb922ea ChangeLog 1370
+MD5 33340ad48ee40fb8a5ef6a2b180b72bc ChangeLog 1580
 MD5 5fa8d041e432db07defddfd1bdd83e2a findlib-0.8.ebuild 863
 MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
 MD5 4cca6c611cf7494486f696825c1b4730 findlib-1.0.4.ebuild 1211
+MD5 2c283e18fb6d3cfdbf8c20628eef1814 .#ChangeLog.1.10 1480
+MD5 0148be537eae83f937d4bb3181e75679 findlib-1.0.4-r1.ebuild 1599
+MD5 8fa0d5cd981b90aa6db1dcd89401c919 .#Manifest.1.12 567
+MD5 20294c35597128b1f774541b55f50aa6 .#findlib-1.0.4.ebuild.1.1 1213
 MD5 71c0cb8388ce98236cf5c6f38d6703c1 files/digest-findlib-0.8 63
 MD5 0f67e24c7ecc9bad9281ccdf7e20f49f files/digest-findlib-1.0.4 65
+MD5 0f67e24c7ecc9bad9281ccdf7e20f49f files/digest-findlib-1.0.4-r1 65
diff --git a/dev-ml/findlib/files/digest-findlib-0.8 b/dev-ml/findlib/files/digest-findlib-0.8
deleted file mode 100644
index b7732f7bd4f1..000000000000
--- a/dev-ml/findlib/files/digest-findlib-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6fd9506464198c8f543b0f5ec8d44d55 findlib-0.8.tar.gz 158006
diff --git a/dev-ml/findlib/files/digest-findlib-1.0.4 b/dev-ml/findlib/files/digest-findlib-1.0.4-r1
index 4c253ad28aab..4c253ad28aab 100644
--- a/dev-ml/findlib/files/digest-findlib-1.0.4
+++ b/dev-ml/findlib/files/digest-findlib-1.0.4-r1
diff --git a/dev-ml/findlib/findlib-0.8.ebuild b/dev-ml/findlib/findlib-0.8.ebuild
deleted file mode 100644
index bfb7e1625cf2..000000000000
--- a/dev-ml/findlib/findlib-0.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-0.8.ebuild,v 1.9 2004/07/14 01:38:58 lv Exp $
-
-IUSE=""
-
-DESCRIPTION="OCaml tool to find/use non-standard packages."
-HOMEPAGE="http://www.ocaml-programming.de/programming/download-caml.html"
-SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~amd64"
-
-DEPEND="dev-lang/ocaml"
-
-src_compile() {
-	./configure -bindir /usr/bin -mandir /usr/share/man \
-		-sitelib /usr/lib/ocaml/site-packages/ \
-		-config /usr/lib/ocaml/site-packages/findlib/findlib.conf || die "configure failed"
-
-	make all || die
-	make opt || die # optimized code
-}
-
-src_install() {
-	make PREFIX=${D} install || die
-
-	cd ${S}/doc
-	dodoc QUICKSTART README
-	dohtml html/*
-}
diff --git a/dev-ml/findlib/findlib-1.0.4.ebuild b/dev-ml/findlib/findlib-1.0.4-r1.ebuild
index 10a689e336fa..ad4d401ec308 100644
--- a/dev-ml/findlib/findlib-1.0.4.ebuild
+++ b/dev-ml/findlib/findlib-1.0.4-r1.ebuild
@@ -1,20 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.0.4.ebuild,v 1.2 2004/08/09 18:46:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.0.4-r1.ebuild,v 1.1 2004/08/21 17:45:22 mattam Exp $
+
+IUSE="tcltk"
 
 DESCRIPTION="OCaml tool to find/use non-standard packages."
 HOMEPAGE="http://www.ocaml-programming.de/packages/"
 SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz"
 
 LICENSE="MIT X11"
+
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE="tcltk"
+KEYWORDS="x86 ppc sparc ~amd64"
 
 DEPEND=">=dev-lang/ocaml-3.07"
 
-pkg_setup() {
-	if use tcltk && which ocaml && ! which labltk ; then
+ocamlfind_destdir="/usr/lib/ocaml/site-packages"
+
+pkg_setup()
+{
+	if ( use tcltk && which ocaml && ! which labltk ); 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."
@@ -29,17 +34,39 @@ src_compile() {
 	./configure
 
 	./configure -bindir /usr/bin -mandir /usr/share/man \
-		-sitelib /usr/lib/ocaml/site-packages/ \
-		-config /usr/lib/ocaml/site-packages/findlib/findlib.conf || die "configure failed"
+		-sitelib ${ocamlfind_destdir} \
+		-config ${ocamlfind_destdir}/findlib/findlib.conf || die "configure failed"
 
 	make all || die
 	make opt || die # optimized code
 }
 
 src_install() {
+	dodir `ocamlc -where`
+
 	make prefix=${D} install || die
 
 	cd ${S}/doc
 	dodoc QUICKSTART README
 	dohtml html/*
 }
+
+check_stublibs() {
+	local stublibs=${ocamlfind_destdir}/stublibs
+	local ocaml_stdlib=`ocamlc -where`
+	local ldconf=${ocaml_stdlib}/ld.conf
+
+	if [ ! -e ${ldconf} ]
+	then
+		echo ${ocaml_stdlib} > ${ldconf}
+	fi
+
+	if [ -z `grep -e ${stublibs} ${ldconf}` ]
+	then
+		echo ${stublibs} >> ${ldconf}
+	fi
+}
+
+pkg_postinst() {
+	check_stublibs
+}
\ No newline at end of file