From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A780A139085 for ; Sat, 14 Jan 2017 15:41:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D7E122419F; Sat, 14 Jan 2017 15:41:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD27C22419F for ; Sat, 14 Jan 2017 15:41:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76FAC33FECD for ; Sat, 14 Jan 2017 15:41:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D0F126D2 for ; Sat, 14 Jan 2017 15:41:41 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1484408493.064c2fda859b78cc2f180010075dc0907a7ff563.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ocaml/Manifest dev-lang/ocaml/ocaml-3.12.1.ebuild X-VCS-Directories: dev-lang/ocaml/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 064c2fda859b78cc2f180010075dc0907a7ff563 X-VCS-Branch: master Date: Sat, 14 Jan 2017 15:41:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e7b60ab6-0c84-4b27-af42-4762b18dbc10 X-Archives-Hash: 1d927b49cb46a5c951ba7b34a1cab186 commit: 064c2fda859b78cc2f180010075dc0907a7ff563 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Jan 14 15:41:33 2017 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sat Jan 14 15:41:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064c2fda dev-lang/ocaml: last EAPI=1 ebuild is gone Package-Manager: portage-2.3.0 dev-lang/ocaml/Manifest | 2 - dev-lang/ocaml/ocaml-3.12.1.ebuild | 132 ------------------------------------- 2 files changed, 134 deletions(-) diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index 22ba2d7..c5f58f1 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -1,7 +1,5 @@ -DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0 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-3.tar.bz2 4101 SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658 SHA512 8be5c44de5a6b0b7c14723e41d92fe807b881b218cc5eee38ea7519c0f971415cb7fe30035303da275089dcb8a61c4f334c4a88e0bdbced3953503794b8308a7 WHIRLPOOL f1920606785702c44dead01b1426145653bc1931acba2d614c6818baddc051e4f74ca0322cae66ade63ba0cd0df5651cfd67f511fca5f12973b67a0c50ebab6d 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/ocaml-3.12.1.ebuild b/dev-lang/ocaml/ocaml-3.12.1.ebuild deleted file mode 100644 index a662590..00000000 --- a/dev-lang/ocaml/ocaml-3.12.1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="1" - -inherit flag-o-matic eutils multilib versionator toolchain-funcs - -PATCHLEVEL="3" -MY_P="${P/_/+}" -DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family" -HOMEPAGE="http://www.ocaml.org/" -SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.bz2 - mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" - -LICENSE="QPL-1.0 LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs" - -RDEPEND="tk? ( >=dev-lang/tk-3.3.3 ) - ncurses? ( sys-libs/ncurses ) - X? ( x11-libs/libX11 x11-proto/xproto ) - gdbm? ( sys-libs/gdbm )" -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_unpack() { - unpack ${A} - cd "${S}" - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - # Bug #459512 - epatch "${FILESDIR}/${PN}-4.01.0-pkg-config-ncurses.patch" -} - -src_compile() { - 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 tk || myconf="${myconf} -no-tk" - use ncurses || myconf="${myconf} -no-curses" - use X || myconf="${myconf} -no-graph" - use gdbm || myconf="${myconf} -no-dbm" - - # ocaml uses a home-brewn configure script, preventing it to use econf. - RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix /usr \ - --bindir /usr/bin \ - --libdir /usr/$(get_libdir)/ocaml \ - --mandir /usr/share/man \ - -host "${CHOST}" \ - -cc "$(tc-getCC)" \ - -as "$(tc-getAS)" \ - -aspp "$(tc-getCC) -c" \ - -partialld "$(tc-getLD) -r" \ - --with-pthread ${myconf} || die "configure failed!" - - emake -j1 world || die "make world failed!" - - # Native code generation can be disabled now - if use ocamlopt ; then - # bug #279968 - emake -j1 opt || die "make opt failed!" - emake -j1 opt.opt || die "make opt.opt failed!" - fi -} - -src_install() { - make BINDIR="${D}"/usr/bin \ - LIBDIR="${D}"/usr/$(get_libdir)/ocaml \ - MANDIR="${D}"/usr/share/man \ - install || die "make install failed!" - - # Install the compiler libs - dodir /usr/$(get_libdir)/ocaml/compiler-libs - insinto /usr/$(get_libdir)/ocaml/compiler-libs - doins {utils,typing,parsing}/*.{mli,cmi,cmo} - use ocamlopt && doins {utils,typing,parsing}/*.{cmx,o} - - # Symlink the headers to the right place - dodir /usr/include - dosym /usr/$(get_libdir)/ocaml/caml /usr/include/ - - # Remove ${D} from ld.conf, as the buildsystem isn't $(DESTDIR) aware - dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf - - dodoc Changes INSTALL README Upgrading - - # Create and envd entry for latex input files (this definitely belongs into - # CONTENT and not in pkg_postinst. - if use latex ; then - echo "TEXINPUTS=/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" || die -} - -pkg_postinst() { - echo - ewarn "OCaml is not binary compatible from version to version, so you" - ewarn "need to rebuild all packages depending on it, that are actually" - ewarn "installed on your system. To do so, you can run:" - ewarn "emerge @ocaml-rebuild" - ewarn "Or, (almost) equivalently: emerge -1 /usr/$(get_libdir)/ocaml" - echo -}