From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1248011-garchives=archives.gentoo.org@lists.gentoo.org>
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 C78A31382C5
for <garchives@archives.gentoo.org>; Thu, 4 Feb 2021 12:58:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C0B2FE08AD;
Thu, 4 Feb 2021 12:58:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A37D6E08AD
for <gentoo-commits@lists.gentoo.org>; Thu, 4 Feb 2021 12:58:55 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2BA06342577
for <gentoo-commits@lists.gentoo.org>; Thu, 4 Feb 2021 12:58:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 814E4476
for <gentoo-commits@lists.gentoo.org>; Thu, 4 Feb 2021 12:58:52 +0000 (UTC)
From: "Alfredo Tupone" <tupone@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" <tupone@gentoo.org>
Message-ID: <1612443519.85bf3c32b253356b73883f1f4ffecf60ab0ab251.tupone@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlbuild/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
X-VCS-Directories: dev-ml/ocamlbuild/
X-VCS-Committer: tupone
X-VCS-Committer-Name: Alfredo Tupone
X-VCS-Revision: 85bf3c32b253356b73883f1f4ffecf60ab0ab251
X-VCS-Branch: master
Date: Thu, 4 Feb 2021 12:58:52 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b308c328-90d4-4df3-990a-4ea044660aae
X-Archives-Hash: 6f1e4ea2478e325727e08a8679831e9c
commit: 85bf3c32b253356b73883f1f4ffecf60ab0ab251
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 4 12:58:39 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Feb 4 12:58:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bf3c32
dev-ml/ocamlbuild: merge 0.14.0 and 0.14.0-r1
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild | 2 +-
dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild | 40 ---------------------------
2 files changed, 1 insertion(+), 41 deletions(-)
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
index bf4f3bb4acf..8ec83d02e23 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
deleted file mode 100644
index fc4760420dd..00000000000
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
-HOMEPAGE="https://github.com/ocaml/ocamlbuild"
-SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
-RDEPEND="${DEPEND}
- !<dev-ml/findlib-1.6.1-r1
-"
-DEPEND="${DEPEND}
- test? ( dev-ml/findlib )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
-)
-
-src_configure() {
- emake -f configure.make Makefile.config \
- PREFIX="${EPREFIX}/usr" \
- BINDIR="${EPREFIX}/usr/bin" \
- LIBDIR="$(ocamlc -where)" \
- OCAML_NATIVE=$(usex ocamlopt true false) \
- OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \
- NATDYNLINK=$(usex ocamlopt true false)
-}
-
-src_install() {
- emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
- dodoc Changes
-}