gentoo auto-resync : 03:12:2022 - 02:58:11

4 files changed, 89 insertions, 4 deletions

diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index bdadf23939f1..a70d87a59ec4 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -1,6 +1,7 @@
 AUX bc-1.07.1-no-ed-its-sed.patch 452 BLAKE2B cb45680860706b3c240593bf8001be836a835cf749c1d1fa95d6821f069e118779d9f05e44d70acdac8d573fc2967eff0f3c6fb3e1e54a4c8d4b6cf657dcc003 SHA512 4e7481895d61edb51dfc40b88e4f37cb492d8566083a55713dac7a66f065ab2357f8f909acd44e34997b2e09c54dffcbd434b731015c1e1d331ff1829687ec07
 AUX bc-1.07.1-use-system-bc.patch 556 BLAKE2B 822c525fa2fd90822498fad72b9cda91b2af5d0318fc33e74dd407e3bc2a29c8d12b9cc38e80ebd7f3a084f78e302efe38b44eb70c780b8a2a76895d4d7afddb SHA512 2074adf83ac9d7c2210fc62cc5b98bde3a4f6a4d4e4cb81eb95d32ad7a8432cffc21e11b63a7b3f7090f5b814d739dabfbd6c891ec6f5bf0a9d27ace9d0582d6
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
-EBUILD bc-1.07.1-r4.ebuild 1423 BLAKE2B 7d0c539a9d8ba45d840726578b6d2e7912ebb864667648b251edf9065285c579df3e636c46968f1de43cce4211d4348515542b2eaf578bb82fa0a6bc6a277156 SHA512 08ab30a143a90d036fb11204f44333d9cccc017a534e513c0f10ec07c57b0066904011bed53c391a5620e242bcbe17a21694b98fb7600ca9caa7770605437587
-EBUILD bc-1.07.1-r5.ebuild 1734 BLAKE2B 15d77bd43138145c9c89e7e626ea0d04ee32e099b3c2206c7eef816c7c6c1a069078bcc806f82c02eb0413bc7ecc8444e24ad248799e75eb0f4f8ddba3f9e2b8 SHA512 7e42adbc602406895ec869f4778833a10e2593e4c5d5744defe407aedced597889826b15c62557c3bdffc5e3f7c47f9d66118d640f5e286b345d424ea1c060b7
+EBUILD bc-1.07.1-r4.ebuild 1432 BLAKE2B 89492e405008be632d5bbd1025b82057cae6aea1258093bc7f4d56fd255cfd2d12a7c352232a0b9989b982b7e4e182ee7a75f6f71cfeb91bf8b73f78501a9fdb SHA512 2f9f1e3e4cf74cf15b35c48e24440d6092c73a18c02c107baf7d3daeec3e1e5f11e36c6a40ea6ed1bc0b9ef055133176f353e10a366e285adbd2f0c104c38440
+EBUILD bc-1.07.1-r5.ebuild 1743 BLAKE2B e11a7f8d94232089f725af164c32ce65f3f7e246fbf204671e9e0b4fbcdc7a5f77d668c090e240fa1a2b1f764bb192df64d0d6cdecf65df14b0675da6706f483 SHA512 908902ce0be3d12e0afc37b0f152f7bcd9f6bf681a91a519c7e5cddf2a0ac7aed137e7a4ae9fa6de7b41402d11f3c7bccda03fd7ae8ce6e137b066fa604afbca
+EBUILD bc-1.07.1-r6.ebuild 2162 BLAKE2B fe88d10a81340889ee45c8284bb2eee000fa6453cd7d6695aaa63b9ac6bdc734b3f66c859207855af669c7be5ca11625a77f8293e9e20b7682ca73f61927a43c SHA512 0dbc786156ad3cb504bc67ee7950f04f126f3d9010cdbb36ead356c54974f65644b38bdeaddb4d53024e60515a9cb44e48251ebc77c28fe2b96ac217b0d16b27
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/sys-devel/bc/bc-1.07.1-r4.ebuild b/sys-devel/bc/bc-1.07.1-r4.ebuild
index 82f798fc4f69..2ac2c73b3ded 100644
--- a/sys-devel/bc/bc-1.07.1-r4.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r4.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/flex
-	virtual/yacc"
+	app-alternatives/yacc"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.07.1-no-ed-its-sed.patch )
 
diff --git a/sys-devel/bc/bc-1.07.1-r5.ebuild b/sys-devel/bc/bc-1.07.1-r5.ebuild
index 24a75264425a..78eefebc167f 100644
--- a/sys-devel/bc/bc-1.07.1-r5.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r5.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/flex
-	virtual/yacc"
+	app-alternatives/yacc"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.07.1-no-ed-its-sed.patch )
 
diff --git a/sys-devel/bc/bc-1.07.1-r6.ebuild b/sys-devel/bc/bc-1.07.1-r6.ebuild
new file mode 100644
index 000000000000..175d05638d79
--- /dev/null
+++ b/sys-devel/bc/bc-1.07.1-r6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Handy console-based calculator utility"
+HOMEPAGE="https://www.gnu.org/software/bc/bc.html"
+SRC_URI="mirror://gnu/bc/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+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="libedit readline static"
+
+RDEPEND="
+	!readline? ( libedit? ( dev-libs/libedit:= ) )
+	readline? (
+		sys-libs/readline:=
+		sys-libs/ncurses:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	app-alternatives/yacc"
+PDEPEND="app-alternatives/bc"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.07.1-no-ed-its-sed.patch )
+
+src_prepare() {
+	default
+
+	# Avoid bad build tool usage when cross-compiling. Bug #627126
+	tc-is-cross-compiler && eapply "${FILESDIR}"/${PN}-1.07.1-use-system-bc.patch
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with readline)
+		--program-suffix=-reference
+	)
+
+	if use readline ; then
+		myconf+=( --without-libedit )
+	else
+		myconf+=( $(use_with libedit) )
+	fi
+
+	use static && append-ldflags -static
+
+	# The libedit code isn't compatible currently. #830101
+	use libedit && append-flags -fcommon
+
+	# AC_SYS_LARGEFILE in configure.ac would handle this, but we don't patch
+	# autotools otherwise currently.  This change has been sent upstream, but
+	# who knows when they'll make another release.
+	append-lfs-flags
+
+	# configure dies with other lexes:
+	# "configure: error: readline works only with flex."
+	export LEX=flex
+
+	econf "${myconf[@]}"
+
+	# Do not regen docs -- configure produces a small fragment that includes
+	# the version info which causes all pages to regen (newer file). Bug #554774
+	touch -r doc doc/* || die
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlinks before app-alternatives/bc
+	# is installed
+	local x
+	for x in bc dc ; do
+		if [[ ! -h ${EROOT}/usr/bin/${x} ]] ; then
+			ln -s "${x}-reference" "${EROOT}/usr/bin/${x}" || die
+		fi
+	done
+}