gentoo auto-resync : 28:12:2022 - 02:11:45

3 files changed, 2 insertions, 64 deletions

diff --git a/dev-util/yacc/Manifest b/dev-util/yacc/Manifest
index 952044b5daf8..24b59a89e33d 100644
--- a/dev-util/yacc/Manifest
+++ b/dev-util/yacc/Manifest
@@ -2,6 +2,5 @@ AUX yacc-1.9.1-CVE-2008-3196.patch 1199 BLAKE2B 665c89923dd7e9860518cff582390b74
 AUX yacc-1.9.1-ia64.patch 504 BLAKE2B b9733e07639ce5bc456576237be7623cae2f488f13bbc203dd0f81e7174c4f51e23ae498d80278ff1fc7873af456844087c72096ec05d621598362c048c68357 SHA512 6525f6c3f9d0011fea00781a24fb0f2d4f80a13835746d8ea8b05a762d789d5f17984da04f32178dbdd73ab098be38fe044bf108ed2e145888cf5ebfe84bb1ec
 AUX yacc-1.9.1-mkstemp.patch 417 BLAKE2B 1413aab68d930593c707723683a1a7938b4bf9d09671cb3539785ec163aa09a0e0bbbd1fee0657e34a8ac03fb9d71a97f1d1dda1af7329f56cda79f93fcb6de2 SHA512 c36d07d4fafc363fcb0173fc17cf4e37dfe20fcfe7df7faaa11d5cc47f9b933a4f192c55f738d1cdcf7f87ddb07311bbc54aa502d8e68b8e7831bf1daba8da03
 DIST yacc-1.9.1.tar.Z 64805 BLAKE2B 3eeebea1dad52a26c8e90ae6aec99fe3643f040100af4516faed02295b203f717a41aec0231ecee97aa31b14c9c29cae6704e875a03e8b18a71255be9859dd09 SHA512 6adb51c5f07e8084a86688589f52d9eee0183fb4d77508e36621a6b0ba91a5c4195feb87db3401ec69560554f71f2f6984dec01266e41e0fd54fa72ef1780e80
-EBUILD yacc-1.9.1-r6.ebuild 1548 BLAKE2B 3e064af91beae4f05d0815c77d87c70fcf139fd81b5899efc13b5f2b654a207f34c4b1c6f669df27909c6446633e2d2070042cc02a36b0b8286541a9e5159cb7 SHA512 466cc137922fe7b13a892eaa4469318d57904ae72473bb680220ee9c0bbd772a9cd9c950e88d7a8c87972a0bcf13124bef30c53c79c1d03696ea85c48e9f8784
-EBUILD yacc-1.9.1-r7.ebuild 1114 BLAKE2B e6fd1c718618a5940a76546adae0553f278aa3079b22ec9c397d3b30d736f60fa694ecf36bdc99f6b55a8f7295083237bdbbe11ba2c159726602b93a1eb31fdb SHA512 a26c878d187a41ff77a4fa0a9058b6a332848c7a59712bc5e3503d3bd995296070487241cad5d9010a3a74902ff7f2df7111bb8aae85a3fce94b9e56255c1e71
+EBUILD yacc-1.9.1-r7.ebuild 1109 BLAKE2B 9355e3e2e55a6dac29ad5a459edc31134175c46ffc9f3e0c411660db952948e7cea022248a18c55847aaa9f9745bf7b9aab22448a4897f4226b0f022d1d17c5d SHA512 b7d90711ab3fb17e4ab5944787d21bd09d832607c170fb3284182c6267076ce094898427f95f402b086a61e15900cdda64874f40dd7fe414f35b125968f3bff9
 MISC metadata.xml 221 BLAKE2B b43b26fbdad8e1ac12cf97bc9bfbf06f5633feefed4f3e7c9623dcf4c45b97a3b753f8c8787d267f6cf6412878f4f5893a5201279401571ca7e53bc255296324 SHA512 5b5336bc7e4015c10967f6a0f8525f2235a438789cfbaa08b8261eea6fa2019191de60e3ec310660e0e5eb931835004b9db604dd18278822cf9d0254469a0bad
diff --git a/dev-util/yacc/yacc-1.9.1-r6.ebuild b/dev-util/yacc/yacc-1.9.1-r6.ebuild
deleted file mode 100644
index 15a1b35331fb..000000000000
--- a/dev-util/yacc/yacc-1.9.1-r6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Yacc: Yet Another Compiler-Compiler"
-HOMEPAGE="http://dinosaur.compilertools.net/#yacc"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-PATCHES=(
-	# mkstemp patch from byacc ebuild.
-	"${FILESDIR}/${P}-mkstemp.patch"
-
-	# The following patch fixes yacc to run correctly on ia64 (and
-	# other 64-bit arches). See bug 46233.
-	"${FILESDIR}/${P}-ia64.patch"
-
-	# Avoid stack access error. See bug 232005.
-	"${FILESDIR}/${P}-CVE-2008-3196.patch"
-)
-
-src_prepare() {
-	default
-
-	# Use our CFLAGS and LDFLAGS.
-	sed -i -e 's: -O : $(CFLAGS) $(LDFLAGS) :' Makefile || die 'sed failed'
-}
-
-src_compile() {
-	emake clean
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	dodoc 00README* ACKNOWLEDGEMENTS NEW_FEATURES NO_WARRANTY NOTES README*
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors. See bug 90089.
-	if [[ -L "${ROOT}/usr/bin/${PN}" ]]; then
-		rm -v "${ROOT}/usr/bin/${PN}" || die
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# let's restore the /usr/bin/yacc symlink.
-	if [[ ! -e "${ROOT}/usr/bin/${PN}" ]] && [[ -e "${ROOT}/usr/bin/${PN}.bison" ]]; then
-		ln -s yacc.bison "${ROOT}/usr/bin/${PN}" || die
-	fi
-}
diff --git a/dev-util/yacc/yacc-1.9.1-r7.ebuild b/dev-util/yacc/yacc-1.9.1-r7.ebuild
index 27fb180bd251..7b9345fad4e0 100644
--- a/dev-util/yacc/yacc-1.9.1-r7.ebuild
+++ b/dev-util/yacc/yacc-1.9.1-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 PATCHES=(
 	# mkstemp patch from byacc ebuild.