Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
Date: Tue, 14 Feb 2017 09:31:56
Message-Id: 1487064705.2775476e43062e27f22f5b93cc98a0f83befd10f.aballier@gentoo
1 commit: 2775476e43062e27f22f5b93cc98a0f83befd10f
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 14 09:31:24 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 14 09:31:45 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2775476e
7
8 dev-lang/ocaml: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-lang/ocaml/Manifest | 2 -
13 dev-lang/ocaml/ocaml-4.02.3.ebuild | 115 -------------------------------------
14 2 files changed, 117 deletions(-)
15
16 diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
17 index 321529ff95..c0fed0c245 100644
18 --- a/dev-lang/ocaml/Manifest
19 +++ b/dev-lang/ocaml/Manifest
20 @@ -1,4 +1,2 @@
21 -DIST ocaml-4.02.3.tar.xz 2058552 SHA256 83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3 SHA512 a815421f6a320b18e7f351bd66884024ad4a33525ba161a198ea356892ce331be6c1ddf4cd07d120ebe9a902bcf815ce1b17e45f405e4e0b2d55ce1b6d2adada WHIRLPOOL 1104cdcf23b773ebf0c0ef8d8ee36b2b4b58b1fab10a41ff7f2d522c34ae6161bc6cba28b279eea03ac183a111fc332557084b017d0c2ad6f9c969204e309597
22 DIST ocaml-4.04.0.tar.gz 4057711 SHA256 03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 SHA512 288c514e7ccfe29fe9a65239d04f000b3b05df71f15bc05b3e5af50cb233544b4fec22baad69f60de587e8f0f8f65ee023a5b709896a1a68f9fd6fe30b81344d WHIRLPOOL 91fea4195ed84fb97f2ae68e30f47ce60a2404bc47ca809f6e0d182dd755833ea16a2e033ee0a02fab008f5905a2a9b6fa8dc2194c75b8d9daa353eb6b1d70e9
23 -DIST ocaml-patches-7.tar.bz2 2194 SHA256 71e9496af89ded9852d8e1f32be18a5f0d7e11270958fb4bc8c588420b1e9156 SHA512 63bca96f009e2de24ff6f7a4b37b97c5b7655d5ad6196f06cc2b18ca213e87878a310d169378c341c00aaac698530e458e301620bcc21284bc8b9ea143f642dd WHIRLPOOL 02d17436f901c70b2fa8a104d8b7a6526c65ab9b40408b549c4f4dfe7a1eeae8213620d151fb181833782504e4d7cb6fa3ff7ddebe77efcb88d32fe057cbd8cc
24 DIST ocaml-patches-8.tar.bz2 1803 SHA256 bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411 WHIRLPOOL ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
25
26 diff --git a/dev-lang/ocaml/ocaml-4.02.3.ebuild b/dev-lang/ocaml/ocaml-4.02.3.ebuild
27 deleted file mode 100644
28 index 092d73c582..0000000000
29 --- a/dev-lang/ocaml/ocaml-4.02.3.ebuild
30 +++ /dev/null
31 @@ -1,115 +0,0 @@
32 -# Copyright 1999-2017 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI="5"
37 -
38 -inherit flag-o-matic eutils multilib versionator toolchain-funcs
39 -
40 -PATCHLEVEL="7"
41 -MY_P="${P/_/+}"
42 -DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
43 -HOMEPAGE="http://www.ocaml.org/"
44 -SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.xz
45 - mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
46 -
47 -LICENSE="QPL-1.0 LGPL-2"
48 -# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
49 -# so here we go with the subslot.
50 -SLOT="0/${PV}"
51 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
52 -IUSE="emacs latex ncurses +ocamlopt X xemacs"
53 -
54 -RDEPEND="
55 - ncurses? ( sys-libs/ncurses )
56 - X? ( x11-libs/libX11 x11-proto/xproto )"
57 -DEPEND="${RDEPEND}
58 - virtual/pkgconfig"
59 -
60 -PDEPEND="emacs? ( app-emacs/ocaml-mode )
61 - xemacs? ( app-xemacs/ocaml )"
62 -
63 -S="${WORKDIR}/${MY_P}"
64 -pkg_setup() {
65 - # dev-lang/ocaml creates its own objects but calls gcc for linking, which will
66 - # results in relocations if gcc wants to create a PIE executable
67 - if gcc-specs-pie ; then
68 - append-ldflags -nopie
69 - ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
70 - ewarn "We have appended -nopie to ocaml build options"
71 - ewarn "because linking an executable with pie while the objects are not pic will not work"
72 - fi
73 -}
74 -
75 -src_prepare() {
76 - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
77 -}
78 -
79 -src_configure() {
80 - export LC_ALL=C
81 - local myconf=""
82 -
83 - # Causes build failures because it builds some programs with -pg,
84 - # bug #270920
85 - filter-flags -fomit-frame-pointer
86 - # Bug #285993
87 - filter-mfpmath sse
88 -
89 - # It doesn't compile on alpha without this LDFLAGS
90 - use alpha && append-ldflags "-Wl,--no-relax"
91 -
92 - use ncurses || myconf="${myconf} -no-curses"
93 - use X || myconf="${myconf} -no-graph"
94 -
95 - # ocaml uses a home-brewn configure script, preventing it to use econf.
96 - RAW_LDFLAGS="$(raw-ldflags)" ./configure \
97 - --prefix "${EPREFIX}"/usr \
98 - --bindir "${EPREFIX}"/usr/bin \
99 - --target-bindir "${EPREFIX}"/usr/bin \
100 - --libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
101 - --mandir "${EPREFIX}"/usr/share/man \
102 - -target "${CHOST}" \
103 - -host "${CBUILD}" \
104 - -cc "$(tc-getCC)" \
105 - -as "$(tc-getAS)" \
106 - -aspp "$(tc-getCC) -c" \
107 - -partialld "$(tc-getLD) -r" \
108 - --with-pthread ${myconf} || die "configure failed!"
109 -
110 - # http://caml.inria.fr/mantis/view.php?id=4698
111 - export CCLINKFLAGS="${LDFLAGS}"
112 -}
113 -
114 -src_compile() {
115 - emake world
116 -
117 - # Native code generation can be disabled now
118 - if use ocamlopt ; then
119 - # bug #279968
120 - emake opt
121 - emake opt.opt
122 - fi
123 -}
124 -
125 -src_install() {
126 - emake BINDIR="${ED}"/usr/bin \
127 - LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
128 - MANDIR="${ED}"/usr/share/man \
129 - install
130 -
131 - # Symlink the headers to the right place
132 - dodir /usr/include
133 - dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
134 -
135 - dodoc Changes INSTALL README
136 -
137 - # Create and envd entry for latex input files
138 - if use latex ; then
139 - echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
140 - doenvd "${T}"/99ocamldoc
141 - fi
142 -
143 - # Install ocaml-rebuild portage set
144 - insinto /usr/share/portage/config/sets
145 - doins "${FILESDIR}/ocaml.conf"
146 -}