[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[Sam James]

commit:     0651969b55abf2bce481cb8d48a983463ddcc5cf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 06:13:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 21:09:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0651969b

app-alternatives/yacc: install env.d file for YACC

Without this, autotools will end up probing for bison even when
it's not specifically needed.

If packages really do need bison, it's not expected that
ebuild maintainers will fix the underlying problem, but
the ebuilds should then set YACC=bison 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/yacc/yacc-1.ebuild | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app-alternatives/yacc/yacc-1.ebuild b/app-alternatives/yacc/yacc-1.ebuild
index 93e55d2d17fd..d5508b6ebb90 100644
--- a/app-alternatives/yacc/yacc-1.ebuild
+++ b/app-alternatives/yacc/yacc-1.ebuild
@@ -28,12 +28,24 @@ src_install() {
 		# around bison(1).
 		dosym yacc.bison /usr/bin/yacc
 		newman - yacc.1 <<<".so yacc.bison.1"
+
+		newenvd - 90yacc <<-EOF
+			YACC=bison
+		EOF
 	elif use byacc; then
 		dosym byacc /usr/bin/yacc
 		newman - yacc.1 <<<".so byacc.1"
+
+		newenvd - 90yacc <<-EOF
+			YACC=byacc
+		EOF
 	elif use reference; then
 		dosym yacc-reference /usr/bin/yacc
 		newman - yacc.1 <<<".so yacc-reference.1"
+
+		newenvd - 90yacc <<-EOF
+			YACC=yacc
+		EOF
 	else
 		die "Invalid USE flag combination (broken REQUIRED_USE?)"
 	fi

[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[Sam James]

commit:     6d63f0d9bc87db15226c96e25ff2e42087143978
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 04:22:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 21:09:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d63f0d9

app-alternatives/yacc: define LICENSE and HOMEPAGE for the virtual

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/yacc/yacc-0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-alternatives/yacc/yacc-0.ebuild b/app-alternatives/yacc/yacc-0.ebuild
index d6275036abe8..40f51b6795ac 100644
--- a/app-alternatives/yacc/yacc-0.ebuild
+++ b/app-alternatives/yacc/yacc-0.ebuild
@@ -4,7 +4,9 @@
 EAPI=7
 
 DESCRIPTION="Virtual for yacc (yet another compiler compiler)"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
+LICENSE="metapackage"
 SLOT="0"
 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"
 

[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[Sam James]

commit:     8d975a71210fb429ace5a8fd5e2d8dcbd52b4339
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 03:42:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 03:42:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d975a71

app-alternatives/yacc: use YACC=yacc.bison, not YACC=bison

Thanks to Ionen for reporting.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/yacc/{yacc-1.ebuild => yacc-1-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-alternatives/yacc/yacc-1.ebuild b/app-alternatives/yacc/yacc-1-r1.ebuild
similarity index 98%
rename from app-alternatives/yacc/yacc-1.ebuild
rename to app-alternatives/yacc/yacc-1-r1.ebuild
index d5508b6ebb90..0d4632e1a05a 100644
--- a/app-alternatives/yacc/yacc-1.ebuild
+++ b/app-alternatives/yacc/yacc-1-r1.ebuild
@@ -30,7 +30,7 @@ src_install() {
 		newman - yacc.1 <<<".so yacc.bison.1"
 
 		newenvd - 90yacc <<-EOF
-			YACC=bison
+			YACC=yacc.bison
 		EOF
 	elif use byacc; then
 		dosym byacc /usr/bin/yacc

[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[Sam James]

commit:     3465091539af22c037e3c910c3acf84d889e49fd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 03:52:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 03:53:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34650915

app-alternatives/yacc: don't set YACC for Bison for now

Leaving this for now to be safe, as it's closer to pre-alternatives
status quo to leave it unset and let autoconf probe for Bison by itself
as it prefers it anyway, and might be a CPP-like situation wrt
calling bison or bison -y if YACC is set.

Thanks to Ionen again.

See: 8d975a71210fb429ace5a8fd5e2d8dcbd52b4339
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/yacc/{yacc-1-r1.ebuild => yacc-1-r2.ebuild} | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app-alternatives/yacc/yacc-1-r1.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
similarity index 80%
rename from app-alternatives/yacc/yacc-1-r1.ebuild
rename to app-alternatives/yacc/yacc-1-r2.ebuild
index 0d4632e1a05a..e748c4e0ab73 100644
--- a/app-alternatives/yacc/yacc-1-r1.ebuild
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -29,9 +29,13 @@ src_install() {
 		dosym yacc.bison /usr/bin/yacc
 		newman - yacc.1 <<<".so yacc.bison.1"
 
-		newenvd - 90yacc <<-EOF
-			YACC=yacc.bison
-		EOF
+		# Leaving this for now to be safe, as it's closer to pre-alternatives
+		# status quo to leave it unset and let autoconf probe for Bison by itself
+		# as it prefers it anyway, and might be a CPP-like situation wrt
+		# calling bison or bison -y if YACC is set.
+		#newenvd - 90yacc <<-EOF
+		#	YACC=yacc.bison
+		#EOF
 	elif use byacc; then
 		dosym byacc /usr/bin/yacc
 		newman - yacc.1 <<<".so byacc.1"

[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[Michał Górny]

commit:     e773377026c28a1324d074e8af1039cc8c432eb4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 19:55:32 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 14:46:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7733770

app-alternatives/yacc: Use app-alternatives.eclass

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-alternatives/yacc/yacc-1-r2.ebuild | 60 ++++++++++++++--------------------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/app-alternatives/yacc/yacc-1-r2.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
index e748c4e0ab73..2a3e288c2f8b 100644
--- a/app-alternatives/yacc/yacc-1-r2.ebuild
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -3,54 +3,42 @@
 
 EAPI=8
 
-DESCRIPTION="yacc symlinks"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
-SRC_URI=""
-S=${WORKDIR}
+ALTERNATIVES=(
+	"bison:>=sys-devel/bison-3.8.2-r1"
+	byacc:dev-util/byacc
+	"reference:>=dev-util/yacc-1.9.1-r7"
+)
+
+inherit app-alternatives
 
-LICENSE="CC0-1.0"
-SLOT="0"
+DESCRIPTION="yacc 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="+bison byacc reference"
-REQUIRED_USE="^^ ( bison byacc reference )"
 
 RDEPEND="
-	bison? ( >=sys-devel/bison-3.8.2-r1 )
-	byacc? ( dev-util/byacc )
-	reference? ( >=dev-util/yacc-1.9.1-r7 )
 	!<dev-util/yacc-1.9.1-r7
 	!<sys-devel/bison-3.8.2-r1
 "
 
 src_install() {
-	if use bison; then
+	local alt=$(get_alternative)
+
+	case ${alt} in
 		# bison installs its own small wrapper script 'yacc-bison'
 		# around bison(1).
-		dosym yacc.bison /usr/bin/yacc
-		newman - yacc.1 <<<".so yacc.bison.1"
-
-		# Leaving this for now to be safe, as it's closer to pre-alternatives
-		# status quo to leave it unset and let autoconf probe for Bison by itself
-		# as it prefers it anyway, and might be a CPP-like situation wrt
-		# calling bison or bison -y if YACC is set.
-		#newenvd - 90yacc <<-EOF
-		#	YACC=yacc.bison
-		#EOF
-	elif use byacc; then
-		dosym byacc /usr/bin/yacc
-		newman - yacc.1 <<<".so byacc.1"
-
-		newenvd - 90yacc <<-EOF
-			YACC=byacc
-		EOF
-	elif use reference; then
-		dosym yacc-reference /usr/bin/yacc
-		newman - yacc.1 <<<".so yacc-reference.1"
-
+		bison) alt=yacc.bison;;
+		reference) alt=yacc-reference;;
+	esac
+
+	dosym "${alt}" /usr/bin/yacc
+	newman - yacc.1 <<<".so ${alt}.1"
+
+	# Leaving this for now to be safe, as it's closer to pre-alternatives
+	# status quo to leave it unset and let autoconf probe for Bison by itself
+	# as it prefers it anyway, and might be a CPP-like situation wrt
+	# calling bison or bison -y if YACC is set.
+	if [[ ${alt} != yacc.bison ]]; then
 		newenvd - 90yacc <<-EOF
-			YACC=yacc
+			YACC=${alt}
 		EOF
-	else
-		die "Invalid USE flag combination (broken REQUIRED_USE?)"
 	fi
 }

[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[Sam James]

commit:     2772a3ebcc857baee23ce298627bdc8f787a7f24
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 11:31:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 11:31:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2772a3eb

app-alternatives/yacc: Stabilize 1-r2 amd64, #886017

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/yacc/yacc-1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-alternatives/yacc/yacc-1-r2.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
index 2a3e288c2f8b..11d9be697ef7 100644
--- a/app-alternatives/yacc/yacc-1-r2.ebuild
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="yacc 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="
 	!<dev-util/yacc-1.9.1-r7

[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[Sam James]

commit:     fa3599db863f97e3cf338b61fda06ac130e70739
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 13:39:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 13:39:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3599db

app-alternatives/yacc: Stabilize 1-r2 arm64, #886017

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/yacc/yacc-1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-alternatives/yacc/yacc-1-r2.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
index b300d3c48bf9..f3530cc61e9f 100644
--- a/app-alternatives/yacc/yacc-1-r2.ebuild
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="yacc 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="
 	!<dev-util/yacc-1.9.1-r7

[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[Sam James]

commit:     a84dfad1a8a298c9ec6ff735d3edbad112c83abb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 19:36:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 19:45:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a84dfad1

app-alternatives/yacc: Stabilize 1-r2 hppa, #886017

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/yacc/yacc-1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-alternatives/yacc/yacc-1-r2.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
index 7acdcd951502..8faeb5c84d26 100644
--- a/app-alternatives/yacc/yacc-1-r2.ebuild
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="yacc 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="
 	!<dev-util/yacc-1.9.1-r7

[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[Sam James]

commit:     1f5afb545e21ed1f7e79ae276d65631b2a0b5ae2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 19:47:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 19:53:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f5afb54

app-alternatives/yacc: Stabilize 1-r2 ppc64, #886017

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/yacc/yacc-1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-alternatives/yacc/yacc-1-r2.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
index fe5b39d40962..2ea175912138 100644
--- a/app-alternatives/yacc/yacc-1-r2.ebuild
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="yacc 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="
 	!<dev-util/yacc-1.9.1-r7

[gentoo-commits] repo/gentoo:master commit in: app-alternatives/yacc/

[Sam James]

commit:     b89f1ba57111f1f319e6eff64b73aedfec26398d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 23:50:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 00:32:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b89f1ba5

app-alternatives/yacc: drop 0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-alternatives/yacc/yacc-0.ebuild | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/app-alternatives/yacc/yacc-0.ebuild b/app-alternatives/yacc/yacc-0.ebuild
deleted file mode 100644
index 40f51b6795ac..000000000000
--- a/app-alternatives/yacc/yacc-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for yacc (yet another compiler compiler)"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="metapackage"
-SLOT="0"
-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/bison dev-util/byacc dev-util/yacc )"