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: Thu, 29 Jun 2017 20:28:23
Message-Id: 1498768080.a2d28e3858a9279f1803bc0975600a45ea38eec5.aballier@gentoo
1 commit: a2d28e3858a9279f1803bc0975600a45ea38eec5
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 29 07:17:06 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 29 20:28:00 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2d28e38
7
8 dev-lang/ocaml: Remove old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 dev-lang/ocaml/Manifest | 1 -
13 dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild | 129 -------------------------------
14 2 files changed, 130 deletions(-)
15
16 diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
17 index 77f547ba084..06f7a2b7e13 100644
18 --- a/dev-lang/ocaml/Manifest
19 +++ b/dev-lang/ocaml/Manifest
20 @@ -1,7 +1,6 @@
21 DIST ocaml-4.04.0.tar.gz 4057711 SHA256 03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 SHA512 288c514e7ccfe29fe9a65239d04f000b3b05df71f15bc05b3e5af50cb233544b4fec22baad69f60de587e8f0f8f65ee023a5b709896a1a68f9fd6fe30b81344d WHIRLPOOL 91fea4195ed84fb97f2ae68e30f47ce60a2404bc47ca809f6e0d182dd755833ea16a2e033ee0a02fab008f5905a2a9b6fa8dc2194c75b8d9daa353eb6b1d70e9
22 DIST ocaml-4.04.1.tar.gz 4061830 SHA256 9aea1867848e370ae79f9aea4d48b04daf416478b0f43dfcb3a0f4d3ecf5f8e4 SHA512 d1bb536cd4c596752fb9e508f6b37b2d23a41350ecda866b8a890e15e5248b16e08bb99c9d02ed6cab8eed73162ae555cf6ef250f498e27f7463e6a724a5c103 WHIRLPOOL 56d16ba29596fb3952580643b5103415a46231af30cb0e86a9c8d3d200aa689d1cdeeda260494435ee958abbc3caab70b34a42622e9e9a61f3ad8d3c4e146a7d
23 DIST ocaml-4.04.2.tar.gz 4061873 SHA256 6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512 8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb WHIRLPOOL b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
24 -DIST ocaml-4.05.0-beta3.tar.gz 4424084 SHA256 3d82d5b32310d1c010981c12508e0ff63fb71b0c89457bcac813b7c291d4b61c SHA512 4c31f2b1f43d2c81ea9e8a6b86439806ab3b4b1ab6c6ae35bc98bbd2a993d94b9e26744febebe1d2424c5ee2deb8b5c9c45ff6fbf96bc629758dec86877fff80 WHIRLPOOL c2ecf0f8d4a9ee9fe92d1a0cbd3c16a4a341d6b8c1acd7077f8602aa730c88f7d58cf15f867da5f93c54de8c9f4984f5f12ae27ce3accedc0e4eeb0e0d73fc77
25 DIST ocaml-4.05.0-rc1.tar.gz 4431747 SHA256 11fbf2eb1939d8352cee4f48b9621e95c10ca124a99b2403f92b6228f6b5c3dd SHA512 0ff2e2d3e27ad10b047dba43c11761ab0b834c245ffef83530db50fde8f0c5c50b6e17f4ff44c5fcfc60b9f6105bd2dd9c387cb36e10ede1331cd5379e3be14b WHIRLPOOL 05059c0062076d714684840a08190ed7c77bf6683a2010553873d2f1e08e114cefc694c90713de659d48e425d09084c192b4a495f8e18e37c68603c8064d711a
26 DIST ocaml-patches-8.tar.bz2 1803 SHA256 bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411 WHIRLPOOL ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
27 DIST ocaml-patches-9.tar.bz2 1700 SHA256 1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0 WHIRLPOOL 185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
28
29 diff --git a/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild b/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
30 deleted file mode 100644
31 index 32d26aa50e0..00000000000
32 --- a/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
33 +++ /dev/null
34 @@ -1,129 +0,0 @@
35 -# Copyright 1999-2017 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI="5"
39 -
40 -inherit flag-o-matic eutils multilib versionator toolchain-funcs
41 -
42 -PATCHLEVEL="9"
43 -MY_P="${P/_/-}"
44 -DESCRIPTION="Type-inferring functional programming language descended from the ML family"
45 -HOMEPAGE="http://www.ocaml.org/"
46 -SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.gz
47 - mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
48 -
49 -LICENSE="QPL-1.0 LGPL-2"
50 -# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
51 -# so here we go with the subslot.
52 -SLOT="0/${PV}"
53 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
54 -IUSE="emacs +flambda latex ncurses +ocamlopt spacetime X xemacs"
55 -
56 -RDEPEND="
57 - sys-libs/binutils-libs:=
58 - ncurses? ( sys-libs/ncurses:0= )
59 - spacetime? ( sys-libs/libunwind:= )
60 - X? ( x11-libs/libX11 x11-proto/xproto )"
61 -DEPEND="${RDEPEND}
62 - virtual/pkgconfig"
63 -
64 -PDEPEND="emacs? ( app-emacs/ocaml-mode )
65 - xemacs? ( app-xemacs/ocaml )"
66 -
67 -S="${WORKDIR}/${MY_P}"
68 -pkg_setup() {
69 - # dev-lang/ocaml creates its own objects but calls gcc for linking, which will
70 - # results in relocations if gcc wants to create a PIE executable
71 - if gcc-specs-pie ; then
72 - append-ldflags -nopie
73 - ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
74 - ewarn "We have appended -nopie to ocaml build options"
75 - ewarn "because linking an executable with pie while the objects are not pic will not work"
76 - fi
77 -}
78 -
79 -src_prepare() {
80 - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
81 -}
82 -
83 -src_configure() {
84 - export LC_ALL=C
85 - local myconf=""
86 -
87 - # Causes build failures because it builds some programs with -pg,
88 - # bug #270920
89 - filter-flags -fomit-frame-pointer
90 - # Bug #285993
91 - filter-mfpmath sse
92 -
93 - # -ggdb3 & co makes it behave weirdly, breaks sexplib
94 - replace-flags -ggdb* -ggdb
95 -
96 - # It doesn't compile on alpha without this LDFLAGS
97 - use alpha && append-ldflags "-Wl,--no-relax"
98 -
99 - use ncurses || myconf="${myconf} -no-curses"
100 - use X || myconf="${myconf} -no-graph"
101 - use flambda && myconf="${myconf} -flambda"
102 - use spacetime && myconf="${myconf} -spacetime"
103 -
104 - # ocaml uses a home-brewn configure script, preventing it to use econf.
105 - RAW_LDFLAGS="$(raw-ldflags)" ./configure \
106 - --prefix "${EPREFIX}"/usr \
107 - --bindir "${EPREFIX}"/usr/bin \
108 - --target-bindir "${EPREFIX}"/usr/bin \
109 - --libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
110 - --mandir "${EPREFIX}"/usr/share/man \
111 - -target "${CHOST}" \
112 - -host "${CBUILD}" \
113 - -cc "$(tc-getCC)" \
114 - -as "$(tc-getAS)" \
115 - -aspp "$(tc-getCC) -c" \
116 - -partialld "$(tc-getLD) -r" \
117 - --with-pthread ${myconf} || die "configure failed!"
118 -
119 - # http://caml.inria.fr/mantis/view.php?id=4698
120 - export CCLINKFLAGS="${LDFLAGS}"
121 -}
122 -
123 -src_compile() {
124 - emake world
125 -
126 - # Native code generation can be disabled now
127 - if use ocamlopt ; then
128 - # bug #279968
129 - emake opt
130 - emake opt.opt
131 - fi
132 -}
133 -
134 -src_test() {
135 - if use ocamlopt ; then
136 - emake -j1 tests
137 - else
138 - ewarn "${PN} testsuite requires ocamlopt useflag"
139 - fi
140 -}
141 -
142 -src_install() {
143 - emake BINDIR="${ED}"/usr/bin \
144 - LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
145 - MANDIR="${ED}"/usr/share/man \
146 - install
147 -
148 - # Symlink the headers to the right place
149 - dodir /usr/include
150 - dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
151 -
152 - dodoc Changes README.adoc
153 -
154 - # Create and envd entry for latex input files
155 - if use latex ; then
156 - echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
157 - doenvd "${T}"/99ocamldoc
158 - fi
159 -
160 - # Install ocaml-rebuild portage set
161 - insinto /usr/share/portage/config/sets
162 - doins "${FILESDIR}/ocaml.conf"
163 -}