commit:     4530442dc257bbc66a5b67b1846d16c7d2f0093f
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 16:56:07 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 16:56:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4530442d

dev-lang/ocaml: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-lang/ocaml/Manifest                            |   1 -
 .../files/ocaml-4.01.0-pkg-config-ncurses.patch    |  15 ---
 dev-lang/ocaml/ocaml-4.02.3-r1.ebuild              | 116 -------------------
 dev-lang/ocaml/ocaml-4.03.0-r1.ebuild              | 125 ---------------------
 4 files changed, 257 deletions(-)

diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index c5f58f1..321529f 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,5 +1,4 @@
 DIST ocaml-4.02.3.tar.xz 2058552 SHA256 
83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3 SHA512 
a815421f6a320b18e7f351bd66884024ad4a33525ba161a198ea356892ce331be6c1ddf4cd07d120ebe9a902bcf815ce1b17e45f405e4e0b2d55ce1b6d2adada
 WHIRLPOOL 
1104cdcf23b773ebf0c0ef8d8ee36b2b4b58b1fab10a41ff7f2d522c34ae6161bc6cba28b279eea03ac183a111fc332557084b017d0c2ad6f9c969204e309597
-DIST ocaml-4.03.0.tar.xz 2289296 SHA256 
695caf381105183f9d37bcfb63f863f782352b070e5d7ff3ca269712398fe326 SHA512 
9a7f4b17d459373334fb04f8a0d42732243245bf16bc35c935fb2119c7990d0c85549b2e11adea68a98a0a0171a461ccfbb2e249b59eedf90349f087a18ce243
 WHIRLPOOL 
9c822f7c66494a6e7fc30e565e7c8d120808a15b42cd64ccad0946f8413da44b50ec84dfd658e8f394dce4effe7eda380a0a203db14df9dfc24c7b54f7681cea
 DIST ocaml-4.04.0.tar.gz 4057711 SHA256 
03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 SHA512 
288c514e7ccfe29fe9a65239d04f000b3b05df71f15bc05b3e5af50cb233544b4fec22baad69f60de587e8f0f8f65ee023a5b709896a1a68f9fd6fe30b81344d
 WHIRLPOOL 
91fea4195ed84fb97f2ae68e30f47ce60a2404bc47ca809f6e0d182dd755833ea16a2e033ee0a02fab008f5905a2a9b6fa8dc2194c75b8d9daa353eb6b1d70e9
 DIST ocaml-patches-7.tar.bz2 2194 SHA256 
71e9496af89ded9852d8e1f32be18a5f0d7e11270958fb4bc8c588420b1e9156 SHA512 
63bca96f009e2de24ff6f7a4b37b97c5b7655d5ad6196f06cc2b18ca213e87878a310d169378c341c00aaac698530e458e301620bcc21284bc8b9ea143f642dd
 WHIRLPOOL 
02d17436f901c70b2fa8a104d8b7a6526c65ab9b40408b549c4f4dfe7a1eeae8213620d151fb181833782504e4d7cb6fa3ff7ddebe77efcb88d32fe057cbd8cc
 DIST ocaml-patches-8.tar.bz2 1803 SHA256 
bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512 
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
 WHIRLPOOL 
ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be

diff --git a/dev-lang/ocaml/files/ocaml-4.01.0-pkg-config-ncurses.patch 
b/dev-lang/ocaml/files/ocaml-4.01.0-pkg-config-ncurses.patch
deleted file mode 100644
index b9fa750..00000000
--- a/dev-lang/ocaml/files/ocaml-4.01.0-pkg-config-ncurses.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ocaml-4.01.0-orig/configure        2013-08-23 16:22:36.000000000 +1000
-+++ ocaml-4.01.0/configure     2014-01-18 20:06:50.669644267 +1100
-@@ -892,7 +892,11 @@
- # For the terminfo module
- 
- if test "$withcurses" = "yes"; then
--  for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do
-+  ncurseslibs=""
-+  if pkg-config --exists ncurses 2>/dev/null; then
-+    ncurseslibs=`pkg-config --libs ncurses`
-+  fi
-+  for libs in "${ncurseslibs}" "-lcurses" "-ltermcap" "-lcurses -ltermcap" 
"-lncurses"; do
-     if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then
-       echo "termcap functions found (with libraries '$libs')"
-       echo "#define HAS_TERMCAP" >> s.h

diff --git a/dev-lang/ocaml/ocaml-4.02.3-r1.ebuild 
b/dev-lang/ocaml/ocaml-4.02.3-r1.ebuild
deleted file mode 100644
index 39bf504..00000000
--- a/dev-lang/ocaml/ocaml-4.02.3-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="7"
-MY_P="${P/_/+}"
-DESCRIPTION="Fast modern type-inferring functional programming language 
descended from the ML family"
-HOMEPAGE="http://www.ocaml.org/";
-SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 
1-2)/${MY_P}.tar.xz
-       mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be 
rebuilt,
-# so here we go with the subslot.
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="emacs latex ncurses +ocamlopt X xemacs"
-
-RDEPEND="
-       ncurses? ( sys-libs/ncurses:0= )
-       X? ( x11-libs/libX11 x11-proto/xproto )"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-       xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
-       # dev-lang/ocaml creates its own objects but calls gcc for linking, 
which will
-       # results in relocations if gcc wants to create a PIE executable
-       if gcc-specs-pie ; then
-               append-ldflags -nopie
-               ewarn "Ocaml generates its own native asm, you're using a PIE 
compiler"
-               ewarn "We have appended -nopie to ocaml build options"
-               ewarn "because linking an executable with pie while the objects 
are not pic will not work"
-       fi
-}
-
-src_prepare() {
-       EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-}
-
-src_configure() {
-       export LC_ALL=C
-       local myconf=""
-
-       # Causes build failures because it builds some programs with -pg,
-       # bug #270920
-       filter-flags -fomit-frame-pointer
-       # Bug #285993
-       filter-mfpmath sse
-
-       # It doesn't compile on alpha without this LDFLAGS
-       use alpha && append-ldflags "-Wl,--no-relax"
-
-       use ncurses || myconf="${myconf} -no-curses"
-       use X || myconf="${myconf} -no-graph"
-
-       # ocaml uses a home-brewn configure script, preventing it to use econf.
-       RAW_LDFLAGS="$(raw-ldflags)" ./configure \
-               --prefix "${EPREFIX}"/usr \
-               --bindir "${EPREFIX}"/usr/bin \
-               --target-bindir "${EPREFIX}"/usr/bin \
-               --libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
-               --mandir "${EPREFIX}"/usr/share/man \
-               --no-ocamlbuild \
-               -target "${CHOST}" \
-               -host "${CBUILD}" \
-               -cc "$(tc-getCC)" \
-               -as "$(tc-getAS)" \
-               -aspp "$(tc-getCC) -c" \
-               -partialld "$(tc-getLD) -r" \
-               --with-pthread ${myconf} || die "configure failed!"
-
-       # http://caml.inria.fr/mantis/view.php?id=4698
-       export CCLINKFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-       emake world
-
-       # Native code generation can be disabled now
-       if use ocamlopt ; then
-               # bug #279968
-               emake opt
-               emake opt.opt
-       fi
-}
-
-src_install() {
-       emake BINDIR="${ED}"/usr/bin \
-               LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
-               MANDIR="${ED}"/usr/share/man \
-               install
-
-       # Symlink the headers to the right place
-       dodir /usr/include
-       dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
-
-       dodoc Changes INSTALL README
-
-       # Create and envd entry for latex input files
-       if use latex ; then
-               echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > 
"${T}"/99ocamldoc
-               doenvd "${T}"/99ocamldoc
-       fi
-
-       # Install ocaml-rebuild portage set
-       insinto /usr/share/portage/config/sets
-       doins "${FILESDIR}/ocaml.conf"
-}

diff --git a/dev-lang/ocaml/ocaml-4.03.0-r1.ebuild 
b/dev-lang/ocaml/ocaml-4.03.0-r1.ebuild
deleted file mode 100644
index d2df32d..00000000
--- a/dev-lang/ocaml/ocaml-4.03.0-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="8"
-MY_P="${P/_/+}"
-DESCRIPTION="Fast modern type-inferring functional programming language 
descended from the ML family"
-HOMEPAGE="http://www.ocaml.org/";
-SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 
1-2)/${MY_P}.tar.xz
-       mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be 
rebuilt,
-# so here we go with the subslot.
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
-
-RDEPEND="
-       sys-libs/binutils-libs:=
-       ncurses? ( sys-libs/ncurses:0= )
-       X? ( x11-libs/libX11 x11-proto/xproto )"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-       xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
-       # dev-lang/ocaml creates its own objects but calls gcc for linking, 
which will
-       # results in relocations if gcc wants to create a PIE executable
-       if gcc-specs-pie ; then
-               append-ldflags -nopie
-               ewarn "Ocaml generates its own native asm, you're using a PIE 
compiler"
-               ewarn "We have appended -nopie to ocaml build options"
-               ewarn "because linking an executable with pie while the objects 
are not pic will not work"
-       fi
-}
-
-src_prepare() {
-       EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-}
-
-src_configure() {
-       export LC_ALL=C
-       local myconf=""
-
-       # Causes build failures because it builds some programs with -pg,
-       # bug #270920
-       filter-flags -fomit-frame-pointer
-       # Bug #285993
-       filter-mfpmath sse
-
-       # It doesn't compile on alpha without this LDFLAGS
-       use alpha && append-ldflags "-Wl,--no-relax"
-
-       use ncurses || myconf="${myconf} -no-curses"
-       use X || myconf="${myconf} -no-graph"
-       use flambda && myconf="${myconf} -flambda"
-
-       # ocaml uses a home-brewn configure script, preventing it to use econf.
-       RAW_LDFLAGS="$(raw-ldflags)" ./configure \
-               --prefix "${EPREFIX}"/usr \
-               --bindir "${EPREFIX}"/usr/bin \
-               --target-bindir "${EPREFIX}"/usr/bin \
-               --libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
-               --mandir "${EPREFIX}"/usr/share/man \
-               -target "${CHOST}" \
-               -host "${CBUILD}" \
-               -cc "$(tc-getCC)" \
-               -as "$(tc-getAS)" \
-               -aspp "$(tc-getCC) -c" \
-               -partialld "$(tc-getLD) -r" \
-               --with-pthread ${myconf} || die "configure failed!"
-
-       # http://caml.inria.fr/mantis/view.php?id=4698
-       export CCLINKFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-       emake world
-
-       # Native code generation can be disabled now
-       if use ocamlopt ; then
-               # bug #279968
-               emake opt
-               emake opt.opt
-       fi
-}
-
-src_test() {
-       if use ocamlopt ; then
-               emake -j1 tests
-       else
-               ewarn "${PN} testsuite requires ocamlopt useflag"
-       fi
-}
-
-src_install() {
-       emake BINDIR="${ED}"/usr/bin \
-               LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
-               MANDIR="${ED}"/usr/share/man \
-               install
-
-       # Symlink the headers to the right place
-       dodir /usr/include
-       dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
-
-       dodoc Changes README.adoc
-
-       # Create and envd entry for latex input files
-       if use latex ; then
-               echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > 
"${T}"/99ocamldoc
-               doenvd "${T}"/99ocamldoc
-       fi
-
-       # Install ocaml-rebuild portage set
-       insinto /usr/share/portage/config/sets
-       doins "${FILESDIR}/ocaml.conf"
-}

Reply via email to