diff options
| -rw-r--r-- | dev-lang/ocaml/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-lang/ocaml/Manifest | 30 | ||||
| -rw-r--r-- | dev-lang/ocaml/files/digest-ocaml-3.08 | 1 | ||||
| -rw-r--r-- | dev-lang/ocaml/files/digest-ocaml-3.08.4 | 1 | ||||
| -rw-r--r-- | dev-lang/ocaml/ocaml-3.08.3.ebuild | 4 | ||||
| -rw-r--r-- | dev-lang/ocaml/ocaml-3.08.4.ebuild (renamed from dev-lang/ocaml/ocaml-3.08.ebuild) | 30 |
6 files changed, 40 insertions, 35 deletions
diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog index 878d957f9d9d..f757c738a251 100644 --- a/dev-lang/ocaml/ChangeLog +++ b/dev-lang/ocaml/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for dev-lang/ocaml # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.66 2005/09/17 20:05:57 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.67 2005/09/21 21:54:25 mattam Exp $ +*ocaml-3.08.4 (21 Sep 2005) + + 21 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.3.ebuild, + +ocaml-3.08.4.ebuild, -ocaml-3.08.ebuild: + Add latest version, remove unused one. Version .3 is stable on x86 and + amd64. + 17 Sep 2005; Aron Griffis <agriffis@gentoo.org> ocaml-3.08.3.ebuild: Mark 3.08.3 stable on ia64 diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index ce6dc9a0e372..fcf309fd13ce 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -1,27 +1,19 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155 +MD5 ede360aa66fcf54120c19798f0421e61 ocaml-3.08.ebuild 2209 +MD5 21c2231b75a3b65a0080959455c164b7 ocaml-3.08.4.ebuild 2495 +MD5 e3554fd0d2b4cbd09694d68ca3edb0d8 ocaml-3.08.1.ebuild 2149 MD5 d3e28c5c99b056007b6b5b0781a4e542 ocaml-3.06-r2.ebuild 1660 MD5 ef7cc12a4ff8aeec9ddb58ff65f7e3c0 ocaml-3.07-r1.ebuild 2910 -MD5 e3554fd0d2b4cbd09694d68ca3edb0d8 ocaml-3.08.1.ebuild 2149 -MD5 dc193a50e4ae4c9ddb5222354d7ed935 ocaml-3.08.3.ebuild 2295 -MD5 ede360aa66fcf54120c19798f0421e61 ocaml-3.08.ebuild 2209 +MD5 19a4bb277c2cebf2ad7f8378c6da1946 ocaml-3.08.3.ebuild 2293 MD5 2852db5cd542dd78e85d6da0f824f301 ChangeLog 10294 +MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155 +MD5 4df214d6cd74b3c5955d868879dd6cc7 files/ocaml-3.06-tcltk-8.4compat-patch.bz2 639 +MD5 3148840e70f4bb5263bdf7cd6c97e6d9 files/ocaml-rebuild.sh 1215 +MD5 c57fc46d92565b5d44c8c4f2a4a072d3 files/ocaml-3.08.3-gcc4.patch 710 MD5 13c4abf06e236e8835011a387f90ecc9 files/digest-ocaml-3.06-r2 63 MD5 c42de320103c2d3eb1aa4002e2e0716b files/digest-ocaml-3.07-r1 130 -MD5 77519cb4017543f060a963387b593299 files/digest-ocaml-3.08 65 +MD5 45ff13419dd955aa86d021abbf325fc2 files/ocaml-3.07-hppa.patch 15730 MD5 3854a7d6aaedc7d5fde7239776cec5cf files/digest-ocaml-3.08.1 66 MD5 d80f37fe859bc2ea8f71e13f02578275 files/digest-ocaml-3.08.3 66 +MD5 b15b12e756d7eb95981891617e694a7a files/digest-ocaml-3.08.4 66 +MD5 77519cb4017543f060a963387b593299 files/digest-ocaml-3.08 65 MD5 91579cecf8659312c2324d8d40709433 files/ocaml-3.06-sparc-configure.patch 1660 -MD5 4df214d6cd74b3c5955d868879dd6cc7 files/ocaml-3.06-tcltk-8.4compat-patch.bz2 639 -MD5 45ff13419dd955aa86d021abbf325fc2 files/ocaml-3.07-hppa.patch 15730 -MD5 c57fc46d92565b5d44c8c4f2a4a072d3 files/ocaml-3.08.3-gcc4.patch 710 -MD5 3148840e70f4bb5263bdf7cd6c97e6d9 files/ocaml-rebuild.sh 1215 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDLHdFKf2g/qXtneoRAgKlAJ935f96OZWHW1ttCbR26mcS4hoY+wCfV9V5 -srH0WxA5AVLEbd6URWLVneM= -=wMyd ------END PGP SIGNATURE----- diff --git a/dev-lang/ocaml/files/digest-ocaml-3.08 b/dev-lang/ocaml/files/digest-ocaml-3.08 deleted file mode 100644 index 6b524fc89bd8..000000000000 --- a/dev-lang/ocaml/files/digest-ocaml-3.08 +++ /dev/null @@ -1 +0,0 @@ -MD5 c6ef478362295c150101cdd2efcd38e0 ocaml-3.08.0.tar.gz 2458425 diff --git a/dev-lang/ocaml/files/digest-ocaml-3.08.4 b/dev-lang/ocaml/files/digest-ocaml-3.08.4 new file mode 100644 index 000000000000..877897aad938 --- /dev/null +++ b/dev-lang/ocaml/files/digest-ocaml-3.08.4 @@ -0,0 +1 @@ +MD5 96b8edeb6190d9f15c086c7decd277a9 ocaml-3.08.4.tar.bz2 2054019 diff --git a/dev-lang/ocaml/ocaml-3.08.3.ebuild b/dev-lang/ocaml/ocaml-3.08.3.ebuild index d9732e097212..f6b53d966263 100644 --- a/dev-lang/ocaml/ocaml-3.08.3.ebuild +++ b/dev-lang/ocaml/ocaml-3.08.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.3.ebuild,v 1.6 2005/09/17 00:35:27 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.3.ebuild,v 1.7 2005/09/21 21:54:25 mattam Exp $ inherit flag-o-matic eutils multilib @@ -11,7 +11,7 @@ SRC_URI="http://caml.inria.fr/distrib/ocaml-3.08/${P}.tar.bz2" LICENSE="QPL-1.0 LGPL-2" SLOT="0" -KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ~ppc-macos ~sparc ~x86" +KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ppc-macos ~sparc x86" IUSE="tcltk latex" DEPEND="virtual/libc diff --git a/dev-lang/ocaml/ocaml-3.08.ebuild b/dev-lang/ocaml/ocaml-3.08.4.ebuild index d5b5fdbf42dd..e5af01e9be92 100644 --- a/dev-lang/ocaml/ocaml-3.08.ebuild +++ b/dev-lang/ocaml/ocaml-3.08.4.ebuild @@ -1,28 +1,27 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.ebuild,v 1.12 2005/03/19 19:40:23 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.4.ebuild,v 1.1 2005/09/21 21:54:25 mattam Exp $ -inherit flag-o-matic eutils +inherit flag-o-matic eutils multilib DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family" HOMEPAGE="http://www.ocaml.org/" -SRC_URI="http://caml.inria.fr/distrib/ocaml-3.08/${P}.0.tar.gz" +SRC_URI="http://caml.inria.fr/distrib/ocaml-3.08/${P}.tar.bz2" LICENSE="QPL-1.0 LGPL-2" SLOT="0" -KEYWORDS="~x86 ~sparc ~ppc ~alpha ~ia64 amd64 hppa ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86" IUSE="tcltk latex" DEPEND="virtual/libc tcltk? ( >=dev-lang/tk-3.3.3 )" -S="${WORKDIR}/${P}.0" - pkg_setup() { ewarn ewarn "Building ocaml with unsafe CFLAGS can have unexpected results" ewarn "Please retry building with safer CFLAGS before reporting bugs" + ewarn "Likewise, building with a hardened gcc is not possible." ewarn } @@ -43,7 +42,7 @@ src_compile() { ./configure -prefix /usr \ -bindir /usr/bin \ - -libdir /usr/lib/ocaml \ + -libdir /usr/$(get_libdir)/ocaml \ -mandir /usr/share/man \ --with-pthread ${myconf} || die @@ -57,22 +56,29 @@ src_compile() { src_install() { make BINDIR=${D}/usr/bin \ - LIBDIR=${D}/usr/lib/ocaml \ + LIBDIR=${D}/usr/$(get_libdir)/ocaml \ MANDIR=${D}/usr/share/man \ install || die + # compiler libs + dodir /usr/lib/ocaml/compiler-libs + insinto /usr/lib/ocaml/compiler-libs + doins {utils,typing,parsing}/*.{mli,cmi,cmo,cmx,o} + + # headers + dodir /usr/include + dosym /usr/include/caml /usr/lib/ocaml/caml + # silly, silly makefiles - dosed "s:${D}::g" /usr/lib/ocaml/ld.conf + dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf # documentation dodoc Changes INSTALL LICENSE README Upgrading } pkg_postinst() { - ranlib /usr/lib/ocaml/*.a - if use latex; then - echo "TEXINPUTS=/usr/lib/ocaml/ocamldoc:" > /etc/env.d/99ocamldoc + echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > /etc/env.d/99ocamldoc fi echo |