From e6ba529df30e3fc9dfdf55ec5797f2f764df6e54 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 3 Dec 2022 08:59:05 +0000
Subject: gentoo auto-resync : 03:12:2022 - 08:59:05

---
 app-alternatives/yacc/Manifest         |  2 +-
 app-alternatives/yacc/yacc-1-r2.ebuild | 56 ++++++++++++++++++++++++++++++++++
 app-alternatives/yacc/yacc-1.ebuild    | 52 -------------------------------
 3 files changed, 57 insertions(+), 53 deletions(-)
 create mode 100644 app-alternatives/yacc/yacc-1-r2.ebuild
 delete mode 100644 app-alternatives/yacc/yacc-1.ebuild

(limited to 'app-alternatives/yacc')

diff --git a/app-alternatives/yacc/Manifest b/app-alternatives/yacc/Manifest
index b039656ce1e5..5cbc1ba68918 100644
--- a/app-alternatives/yacc/Manifest
+++ b/app-alternatives/yacc/Manifest
@@ -1,3 +1,3 @@
 EBUILD yacc-0.ebuild 536 BLAKE2B ccb4b1c59c0452254507b81a52c1d9147a109fdf968ad2e71b5776735e5c59c8aa0447964614941e22d927b995c5ec045bdfa8f890fb5a1874f462ca64459f21 SHA512 aff6ef4ac24044dcec4484395cd4b155617035f8c632fd6550e8a17b1c467e0c164880ca1d0ac9df86f00df09d0879f26063457b85807874361fac822879fe57
-EBUILD yacc-1.ebuild 1319 BLAKE2B 8b2e6c5fd3b6d612f0af1dd61359ac2af8efefeebdf6a321697328310fafb1cff8c6c3871fb366542b123e27ca6b4797b5aa41e1d1f041e659fda5461f72478f SHA512 ecae76ece51d15ac3c531912128c67bbbf31df0cfd089e2899a6c576fc5f8e18f9c8a01752e5130cc6f54a2ab73f65d5cbaa6dd13becfa0c31bddde14c94d4b0
+EBUILD yacc-1-r2.ebuild 1588 BLAKE2B dc3f5caa5eb6344cfda884841b2360257d1cd0d7665a2513fb970bb580f9f60f5eb1f7f4d1539db73bf06a267f7a91d78bfabf75f312bb822d01a96db96f58f0 SHA512 a242a4022a43c63809049a2fa07f1b4b3da80c7c983cac09eebea9f692e93939ecec3f4e61a0aef6d96c67f65d31ba1d071b75040cb3a362a7d83f953bb9c140
 MISC metadata.xml 604 BLAKE2B a40366e6a7aab1ac9658b2b46cc6409486d2e2b7ac456209b4151974f48facc65e68d2e44965a6eb0680af47663a379da050bfbcf480e6af50951ec6d03647e5 SHA512 24329bbcc9bd0a589559c621a89b0dc26f304f47cdbd62e09bf5d33cb190bdecfc352527970c072080a3c9a7e4a7193b6d7c71ab0a0c83d0dcb76f03e0699a5c
diff --git a/app-alternatives/yacc/yacc-1-r2.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
new file mode 100644
index 000000000000..e748c4e0ab73
--- /dev/null
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="yacc symlinks"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
+SRC_URI=""
+S=${WORKDIR}
+
+LICENSE="CC0-1.0"
+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"
+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
+		# 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"
+
+		newenvd - 90yacc <<-EOF
+			YACC=yacc
+		EOF
+	else
+		die "Invalid USE flag combination (broken REQUIRED_USE?)"
+	fi
+}
diff --git a/app-alternatives/yacc/yacc-1.ebuild b/app-alternatives/yacc/yacc-1.ebuild
deleted file mode 100644
index d5508b6ebb90..000000000000
--- a/app-alternatives/yacc/yacc-1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="yacc symlinks"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
-SRC_URI=""
-S=${WORKDIR}
-
-LICENSE="CC0-1.0"
-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"
-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
-		# 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"
-
-		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
-}
-- 
cgit v1.2.3