From 5101c6a9783088eebeddb1b5b1534bd7e90050af Mon Sep 17 00:00:00 2001 From: Matthieu Sozeau Date: Sat, 21 Aug 2004 17:45:22 +0000 Subject: Findlib eclass introduction changes, remove old versions and add check for correct ld.conf on install. --- dev-ml/findlib/ChangeLog | 9 +++- dev-ml/findlib/Manifest | 8 ++-- dev-ml/findlib/files/digest-findlib-0.8 | 1 - dev-ml/findlib/files/digest-findlib-1.0.4 | 1 - dev-ml/findlib/files/digest-findlib-1.0.4-r1 | 1 + dev-ml/findlib/findlib-0.8.ebuild | 32 ------------- dev-ml/findlib/findlib-1.0.4-r1.ebuild | 72 ++++++++++++++++++++++++++++ dev-ml/findlib/findlib-1.0.4.ebuild | 45 ----------------- 8 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 dev-ml/findlib/files/digest-findlib-0.8 delete mode 100644 dev-ml/findlib/files/digest-findlib-1.0.4 create mode 100644 dev-ml/findlib/files/digest-findlib-1.0.4-r1 delete mode 100644 dev-ml/findlib/findlib-0.8.ebuild create mode 100644 dev-ml/findlib/findlib-1.0.4-r1.ebuild delete mode 100644 dev-ml/findlib/findlib-1.0.4.ebuild (limited to 'dev-ml') 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 -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 findlib-1.0.4.ebuild: header fix; tidy diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest index d2c4db6d8d87..e4b9719dc141 100644 --- a/dev-ml/findlib/Manifest +++ b/dev-ml/findlib/Manifest @@ -1,6 +1,4 @@ -MD5 6b1855cffaa264f2ca126e06eeb922ea ChangeLog 1370 -MD5 5fa8d041e432db07defddfd1bdd83e2a findlib-0.8.ebuild 863 +MD5 a47cb7196cf2aeda2ce29f396613d818 ChangeLog 1644 MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225 -MD5 4cca6c611cf7494486f696825c1b4730 findlib-1.0.4.ebuild 1211 -MD5 71c0cb8388ce98236cf5c6f38d6703c1 files/digest-findlib-0.8 63 -MD5 0f67e24c7ecc9bad9281ccdf7e20f49f files/digest-findlib-1.0.4 65 +MD5 81e2f6b03d8d6ce7f69899c21422651f findlib-1.0.4-r1.ebuild 1609 +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 deleted file mode 100644 index 4c253ad28aab..000000000000 --- a/dev-ml/findlib/files/digest-findlib-1.0.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 dbfabe1b3677a03bcf238ecccb36d84f findlib-1.0.4.tar.gz 148287 diff --git a/dev-ml/findlib/files/digest-findlib-1.0.4-r1 b/dev-ml/findlib/files/digest-findlib-1.0.4-r1 new file mode 100644 index 000000000000..4c253ad28aab --- /dev/null +++ b/dev-ml/findlib/files/digest-findlib-1.0.4-r1 @@ -0,0 +1 @@ +MD5 dbfabe1b3677a03bcf238ecccb36d84f findlib-1.0.4.tar.gz 148287 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-r1.ebuild b/dev-ml/findlib/findlib-1.0.4-r1.ebuild new file mode 100644 index 000000000000..ad4d401ec308 --- /dev/null +++ b/dev-ml/findlib/findlib-1.0.4-r1.ebuild @@ -0,0 +1,72 @@ +# 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-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 ~amd64" + +DEPEND=">=dev-lang/ocaml-3.07" + +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." + eerror "" + eerror "Please make sure that ocaml is installed with tk support or remove the USE flag" + + false; + fi +} + +src_compile() { + ./configure + + ./configure -bindir /usr/bin -mandir /usr/share/man \ + -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 diff --git a/dev-ml/findlib/findlib-1.0.4.ebuild b/dev-ml/findlib/findlib-1.0.4.ebuild deleted file mode 100644 index 10a689e336fa..000000000000 --- a/dev-ml/findlib/findlib-1.0.4.ebuild +++ /dev/null @@ -1,45 +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-1.0.4.ebuild,v 1.2 2004/08/09 18:46:24 mr_bones_ Exp $ - -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" - -DEPEND=">=dev-lang/ocaml-3.07" - -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." - eerror "" - eerror "Please make sure that ocaml is installed with tk support or remove the USE flag" - - false; - fi -} - -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" - - make all || die - make opt || die # optimized code -} - -src_install() { - make prefix=${D} install || die - - cd ${S}/doc - dodoc QUICKSTART README - dohtml html/* -} -- cgit v1.2.3-65-gdbad