From 8d5cbeddea4da37f82c476d5821c460b6364b10a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Fri, 13 Dec 2019 16:00:32 +0100 Subject: [PATCH] dev-util/omake: Assign RESTRICT only once. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/699198 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Ulrich Müller --- dev-util/omake/omake-0.10.2.ebuild | 7 +++---- dev-util/omake/omake-0.10.3.ebuild | 7 +++---- dev-util/omake/omake-0.9.8.6.0_rc1.ebuild | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dev-util/omake/omake-0.10.2.ebuild b/dev-util/omake/omake-0.10.2.ebuild index d8f2abbc56cc..b6934c6a855a 100644 --- a/dev-util/omake/omake-0.10.2.ebuild +++ b/dev-util/omake/omake-0.10.2.ebuild @@ -5,23 +5,22 @@ EAPI=5 inherit toolchain-funcs multilib eutils -RESTRICT="installsources" DESCRIPTION="Make replacement" HOMEPAGE="http://projects.camlcity.org/projects/omake.html" SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="doc fam ncurses +ocamlopt readline" +RESTRICT="installsources !ocamlopt? ( strip )" + DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )" RDEPEND="${DEPEND}" -RESTRICT="!ocamlopt? ( strip )" - src_prepare() { epatch \ "${FILESDIR}/${P}-cflags.patch" diff --git a/dev-util/omake/omake-0.10.3.ebuild b/dev-util/omake/omake-0.10.3.ebuild index 430979c1cfbd..eda48ece533d 100644 --- a/dev-util/omake/omake-0.10.3.ebuild +++ b/dev-util/omake/omake-0.10.3.ebuild @@ -5,23 +5,22 @@ EAPI=5 inherit toolchain-funcs multilib eutils -RESTRICT="installsources" DESCRIPTION="Make replacement" HOMEPAGE="http://projects.camlcity.org/projects/omake.html" SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="doc fam ncurses +ocamlopt readline" +RESTRICT="installsources !ocamlopt? ( strip )" + DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )" RDEPEND="${DEPEND}" -RESTRICT="!ocamlopt? ( strip )" - src_prepare() { epatch \ "${FILESDIR}/${PN}-0.10.2-cflags.patch" diff --git a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild index 2ca918e00a10..b8d6d19812c9 100644 --- a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild +++ b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild @@ -6,23 +6,22 @@ EAPI=5 inherit toolchain-funcs multilib versionator eutils MY_PV=$(replace_version_separator 5 '.' "$(replace_version_separator 4 '-' )") -RESTRICT="installsources" DESCRIPTION="Make replacement" HOMEPAGE="http://omake.metaprl.org/" SRC_URI="http://omake.metaprl.org/downloads/${PN}-${MY_PV}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ppc x86" IUSE="doc fam ncurses +ocamlopt readline" +RESTRICT="installsources !ocamlopt? ( strip )" + DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )" RDEPEND="${DEPEND}" -RESTRICT="!ocamlopt? ( strip )" - S=${WORKDIR}/${PN}-${MY_PV%-*} use_boolean() { -- 2.26.2