public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/omake/
@ 2019-07-05 20:17 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-07-05 20:17 UTC (permalink / raw
  To: gentoo-commits

commit:     85f00aa1698d24bef393b6dfeb3c5a5c8b1a26d9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 08:08:48 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 20:17:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f00aa1

dev-util/omake: Replace STRIP_MASK with RESTRICT=strip

Closes: https://bugs.gentoo.org/651452
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/omake/omake-0.10.2.ebuild        | 5 +++--
 dev-util/omake/omake-0.10.3.ebuild        | 5 +++--
 dev-util/omake/omake-0.9.8.6.0_rc1.ebuild | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-util/omake/omake-0.10.2.ebuild b/dev-util/omake/omake-0.10.2.ebuild
index 46e34cdb6a5..d8f2abbc56c 100644
--- a/dev-util/omake/omake-0.10.2.ebuild
+++ b/dev-util/omake/omake-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,8 @@ DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
+RESTRICT="!ocamlopt? ( strip )"
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${P}-cflags.patch"
@@ -45,5 +47,4 @@ src_install() {
 		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
 		dohtml -r doc/html/*
 	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 }

diff --git a/dev-util/omake/omake-0.10.3.ebuild b/dev-util/omake/omake-0.10.3.ebuild
index 019e3e3775e..430979c1cfb 100644
--- a/dev-util/omake/omake-0.10.3.ebuild
+++ b/dev-util/omake/omake-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,8 @@ DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
+RESTRICT="!ocamlopt? ( strip )"
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-0.10.2-cflags.patch"
@@ -45,5 +47,4 @@ src_install() {
 		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
 		dohtml -r doc/html/*
 	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 }

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 daa7fd04918..2ca918e00a1 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,6 +21,8 @@ DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
+RESTRICT="!ocamlopt? ( strip )"
+
 S=${WORKDIR}/${PN}-${MY_PV%-*}
 
 use_boolean() {
@@ -77,5 +79,4 @@ src_install() {
 		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
 		dohtml -r doc/html/*
 	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/omake/
@ 2021-11-24 23:47 Marek Szuba
  0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2021-11-24 23:47 UTC (permalink / raw
  To: gentoo-commits

commit:     762175133d09f52ca1cd8e1726a6b6cae3104303
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 23:45:52 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 23:47:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76217513

dev-util/omake: update EAPI 5 -> 8, fix USE=doc

Closes: https://bugs.gentoo.org/819501
Closes: https://bugs.gentoo.org/826486
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../omake/{omake-0.10.3.ebuild => omake-0.10.3-r1.ebuild} | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dev-util/omake/omake-0.10.3.ebuild b/dev-util/omake/omake-0.10.3-r1.ebuild
similarity index 84%
rename from dev-util/omake/omake-0.10.3.ebuild
rename to dev-util/omake/omake-0.10.3-r1.ebuild
index 56f5309054d2..fdebd689cc2c 100644
--- a/dev-util/omake/omake-0.10.3.ebuild
+++ b/dev-util/omake/omake-0.10.3-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit epatch
+EAPI=8
 
 DESCRIPTION="Make replacement"
 HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
@@ -21,10 +19,9 @@ DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-0.10.2-cflags.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.2-cflags.patch"
+)
 
 src_configure() {
 	./configure \
@@ -43,7 +40,7 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 	dodoc ChangeLog CONTRIBUTORS.org README.md
 	if use doc; then
-		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
-		dohtml -r doc/html/*
+		dodoc doc/ps/omake-doc.pdf doc/txt/omake-doc.txt
+		dodoc -r doc/html
 	fi
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/omake/
@ 2019-12-13 15:06 Ulrich Müller
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2019-12-13 15:06 UTC (permalink / raw
  To: gentoo-commits

commit:     8d5cbeddea4da37f82c476d5821c460b6364b10a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 15:00:32 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 15:00:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5cbedd

dev-util/omake: Assign RESTRICT only once.

Closes: https://bugs.gentoo.org/699198
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 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 d8f2abbc56c..b6934c6a855 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 430979c1cfb..eda48ece533 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 2ca918e00a1..b8d6d19812c 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() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/omake/
@ 2017-11-05 18:05 Alexis Ballier
  0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2017-11-05 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     11c74cdbb2139de40ce04510797d586c385ef66c
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  5 17:58:58 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Nov  5 18:05:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c74cdb

dev-util/omake: bump to 0.10.3

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-util/omake/Manifest            |  1 +
 dev-util/omake/omake-0.10.3.ebuild | 49 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
index cd394e4db3c..4fe1096835c 100644
--- a/dev-util/omake/Manifest
+++ b/dev-util/omake/Manifest
@@ -1,2 +1,3 @@
 DIST omake-0.10.2.tar.gz 2434316 SHA256 c454f20535d91082294b150beebde3d0542f52be81daed17211326f4efa4d6fe SHA512 22c454825287dd54272874ec3aa7c5a79f7eac79e18a3eefd4b2e90a08f9767307b0f627d71049a4c08776c85318ce096e89fcc5619d3ec78cc073744efd0fbd WHIRLPOOL 86078e22c975b03f48968e02722374be61f24f1df9b402eeac87d0305c73e1558f2d9b6e74e419a911f797e74dd330fee192591f695ff2bdfbcfa56a90372a4c
+DIST omake-0.10.3.tar.gz 2438877 SHA256 ff3107e9459615ea6526309c533b04815eef60692a20dcd3a6169f5860786d1d SHA512 77eb87b819048d7d9cb9b89a73c5f922ba3adc93f0d58536b3cfa20abdbf1d2a4c576b77921c52e8ea5f80171e8a503b573bf2a92b65fa0579f6492574079733 WHIRLPOOL 959b7f7285bcbd45670b478b092fc520c90bf151f25fa8785e114b74f4cecfc382921d7207b46ae384e93f001f28b6b75b8c3ddd72d7117aa65ca5f393927358
 DIST omake-0.9.8.6-0.rc1.tar.gz 3254283 SHA256 23c498f071723621dd5e1e29c1abefd6937c73c67bb85d223fd514b9ae005ae9 SHA512 10a7ef6746c656d25852d408fafdd67a95acc59b73c892f0dbc316f2a01949b5349d5203c9fe2400cc7c05e14a7b1bc075603bd462ab74b60427d944f8e177d0 WHIRLPOOL d7da243aff8b6ff12f943db997bb644cfb88117b4deadb8ebea698537d864ede4084acc4afe7314a93eb24fa3a4092dbb24ecfb28cabff85c0214a03d89b44c6

diff --git a/dev-util/omake/omake-0.10.3.ebuild b/dev-util/omake/omake-0.10.3.ebuild
new file mode 100644
index 00000000000..019e3e3775e
--- /dev/null
+++ b/dev-util/omake/omake-0.10.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc fam ncurses +ocamlopt readline"
+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}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-0.10.2-cflags.patch"
+}
+
+src_configure() {
+	./configure \
+		-prefix "${EPREFIX}/usr" \
+		$(use readline || echo '-disable-readline') \
+		$(use ncurses  || echo '-disable-ncurses' ) \
+		$(use fam      || echo '-disable-fam'     ) \
+		|| die
+}
+
+src_compile() {
+	emake all
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc ChangeLog CONTRIBUTORS.org README.md
+	if use doc; then
+		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
+		dohtml -r doc/html/*
+	fi
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/omake/
@ 2016-09-27 14:13 Alexis Ballier
  0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2016-09-27 14:13 UTC (permalink / raw
  To: gentoo-commits

commit:     0c32447794e37e7b8486ebc0f4d561d35d471d52
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 14:07:35 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 14:07:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c324477

dev-util/omake: add :0= dep on readline

Package-Manager: portage-2.3.1

 dev-util/omake/omake-0.9.8.6.0_rc1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 b39cf8b..a6c3539 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ IUSE="doc fam ncurses +ocamlopt readline"
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	ncurses? ( >=sys-libs/ncurses-5.3 )
 	fam? ( virtual/fam )
-	readline? ( >=sys-libs/readline-4.3 )"
+	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}-${MY_PV%-*}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/omake/
@ 2016-09-27 14:13 Alexis Ballier
  0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2016-09-27 14:13 UTC (permalink / raw
  To: gentoo-commits

commit:     b6a913de1fc79b7fc50fcb79e38dafcafcf8d2de
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 14:08:15 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 14:08:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a913de

dev-util/omake: add :0= dep on ncurses

Package-Manager: portage-2.3.1

 dev-util/omake/omake-0.9.8.6.0_rc1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a6c3539..e364d1f 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
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE="doc fam ncurses +ocamlopt readline"
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	ncurses? ( >=sys-libs/ncurses-5.3 )
+	ncurses? ( >=sys-libs/ncurses-5.3:0= )
 	fam? ( virtual/fam )
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-11-24 23:47 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-05 20:17 [gentoo-commits] repo/gentoo:master commit in: dev-util/omake/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2021-11-24 23:47 Marek Szuba
2019-12-13 15:06 Ulrich Müller
2017-11-05 18:05 Alexis Ballier
2016-09-27 14:13 Alexis Ballier
2016-09-27 14:13 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox