* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/lex/
@ 2022-12-06 14:47 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2022-12-06 14:47 UTC (permalink / raw
To: gentoo-commits
commit: b3f723403f7162c68f9fdc67a760e84496c4b673
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 5 19:51:23 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 14:46:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f72340
app-alternatives/lex: Use app-alternatives.eclass
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-alternatives/lex/lex-0-r1.ebuild | 42 +++++++++++++-----------------------
1 file changed, 15 insertions(+), 27 deletions(-)
diff --git a/app-alternatives/lex/lex-0-r1.ebuild b/app-alternatives/lex/lex-0-r1.ebuild
index 5533e1623d7a..3dc442185fd9 100644
--- a/app-alternatives/lex/lex-0-r1.ebuild
+++ b/app-alternatives/lex/lex-0-r1.ebuild
@@ -3,39 +3,27 @@
EAPI=8
-DESCRIPTION="lex symlinks"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
-SRC_URI=""
-S=${WORKDIR}
+ALTERNATIVES=(
+ "flex:>=sys-devel/flex-2.6.4-r5"
+ reflex:sys-devel/reflex
+)
+
+inherit app-alternatives
-LICENSE="CC0-1.0"
-SLOT="0"
+DESCRIPTION="lex symlinks"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+flex reflex"
-REQUIRED_USE="^^ ( flex reflex )"
RDEPEND="
- flex? ( >=sys-devel/flex-2.6.4-r5 )
- reflex? ( sys-devel/reflex )
!<sys-devel/flex-2.6.4-r5
"
src_install() {
- if use flex; then
- dosym flex /usr/bin/lex
- newman - lex.1 <<<".so flex.1"
-
- newenvd - 90lex <<-EOF
- LEX=flex
- EOF
- elif use reflex; then
- dosym reflex /usr/bin/lex
- newman - lex.1 <<<".so reflex.1"
-
- newenvd - 90lex <<-EOF
- LEX=reflex
- EOF
- else
- die "Invalid USE flag combination (broken REQUIRED_USE?)"
- fi
+ local alt=$(get_alternative)
+
+ dosym "${alt}" /usr/bin/lex
+ newman - lex.1 <<<".so ${alt}.1"
+
+ newenvd - 90lex <<-EOF
+ LEX=${alt}
+ EOF
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/lex/
@ 2022-12-27 19:53 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-27 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 3a54dcaa7467beb24e340830f870062cd33fa939
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 19:47:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 19:53:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a54dcaa
app-alternatives/lex: Stabilize 0-r1 ppc64, #886017
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/lex/lex-0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-alternatives/lex/lex-0-r1.ebuild b/app-alternatives/lex/lex-0-r1.ebuild
index 516b402fa75d..74bc78455949 100644
--- a/app-alternatives/lex/lex-0-r1.ebuild
+++ b/app-alternatives/lex/lex-0-r1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
inherit app-alternatives
DESCRIPTION="lex symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
!<sys-devel/flex-2.6.4-r5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/lex/
@ 2022-12-27 19:45 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-27 19:45 UTC (permalink / raw
To: gentoo-commits
commit: 8330c19d0d3bc9c71a14d9c1965ebe15d8e1a06e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 19:37:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 19:45:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8330c19d
app-alternatives/lex: Stabilize 0-r1 hppa, #886017
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/lex/lex-0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-alternatives/lex/lex-0-r1.ebuild b/app-alternatives/lex/lex-0-r1.ebuild
index 34a36443fe88..e42fb68b7e06 100644
--- a/app-alternatives/lex/lex-0-r1.ebuild
+++ b/app-alternatives/lex/lex-0-r1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
inherit app-alternatives
DESCRIPTION="lex symlinks"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
!<sys-devel/flex-2.6.4-r5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/lex/
@ 2022-12-27 13:40 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-27 13:40 UTC (permalink / raw
To: gentoo-commits
commit: 6100654fe2990e0da50d7bb746bf2efbcaa8464c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 13:39:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 13:39:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6100654f
app-alternatives/lex: Stabilize 0-r1 arm64, #886017
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/lex/lex-0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-alternatives/lex/lex-0-r1.ebuild b/app-alternatives/lex/lex-0-r1.ebuild
index a9b76d579752..adc26f7ee445 100644
--- a/app-alternatives/lex/lex-0-r1.ebuild
+++ b/app-alternatives/lex/lex-0-r1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
inherit app-alternatives
DESCRIPTION="lex symlinks"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
!<sys-devel/flex-2.6.4-r5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/lex/
@ 2022-12-27 11:31 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-27 11:31 UTC (permalink / raw
To: gentoo-commits
commit: b4d0b3681e8a3bdf57666f8e5a2a9b1b450e44ff
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 11:31:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 11:31:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4d0b368
app-alternatives/lex: Stabilize 0-r1 amd64, #886017
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/lex/lex-0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-alternatives/lex/lex-0-r1.ebuild b/app-alternatives/lex/lex-0-r1.ebuild
index 3dc442185fd9..38b3c4d1375c 100644
--- a/app-alternatives/lex/lex-0-r1.ebuild
+++ b/app-alternatives/lex/lex-0-r1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
inherit app-alternatives
DESCRIPTION="lex symlinks"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
!<sys-devel/flex-2.6.4-r5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/lex/
@ 2022-12-03 0:54 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-03 0:54 UTC (permalink / raw
To: gentoo-commits
commit: 6e8855971f7a26e1fb5b051bae0346a22a4f83f9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 00:53:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 00:53:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e885597
app-alternatives/lex: fix lex symlink on non-merged-usr
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/lex/{lex-0.ebuild => lex-0-r1.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-alternatives/lex/lex-0.ebuild b/app-alternatives/lex/lex-0-r1.ebuild
similarity index 94%
rename from app-alternatives/lex/lex-0.ebuild
rename to app-alternatives/lex/lex-0-r1.ebuild
index eee421a1179c..5533e1623d7a 100644
--- a/app-alternatives/lex/lex-0.ebuild
+++ b/app-alternatives/lex/lex-0-r1.ebuild
@@ -22,14 +22,14 @@ RDEPEND="
src_install() {
if use flex; then
- dosym flex /bin/lex
+ dosym flex /usr/bin/lex
newman - lex.1 <<<".so flex.1"
newenvd - 90lex <<-EOF
LEX=flex
EOF
elif use reflex; then
- dosym reflex /bin/lex
+ dosym reflex /usr/bin/lex
newman - lex.1 <<<".so reflex.1"
newenvd - 90lex <<-EOF
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-alternatives/lex/
@ 2022-12-02 21:16 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-12-02 21:16 UTC (permalink / raw
To: gentoo-commits
commit: d05bcafc980182a12a9c8a86dd23fdc9bc7885d5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 2 06:18:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 2 21:09:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05bcafc
app-alternatives/lex: install env.d file for LEX
Without this, autotools will end up probing for flex even when
it's not specifically needed.
If packages really do need flex, it's not expected that
ebuild maintainers will fix the underlying problem, but
the ebuilds should then set LEX=flex and BDEPEND on it.
If upstream is active, they should consider reporting the problem
to them though.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/lex/lex-0.ebuild | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/app-alternatives/lex/lex-0.ebuild b/app-alternatives/lex/lex-0.ebuild
index 260f9d0ba5f2..88a00b0f7b8f 100644
--- a/app-alternatives/lex/lex-0.ebuild
+++ b/app-alternatives/lex/lex-0.ebuild
@@ -24,9 +24,17 @@ src_install() {
if use reflex; then
dosym reflex /bin/lex
newman - lex.1 <<<".so reflex.1"
+
+ newenvd - 90lex <<-EOF
+ LEX=reflex
+ EOF
elif use flex; then
dosym flex /bin/lex
newman - lex.1 <<<".so flex.1"
+
+ newenvd - 90lex <<-EOF
+ LEX=flex
+ EOF
else
die "Invalid USE flag combination (broken REQUIRED_USE?)"
fi
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-12-27 19:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-06 14:47 [gentoo-commits] repo/gentoo:master commit in: app-alternatives/lex/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-12-27 19:53 Sam James
2022-12-27 19:45 Sam James
2022-12-27 13:40 Sam James
2022-12-27 11:31 Sam James
2022-12-03 0:54 Sam James
2022-12-02 21:16 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox