gentoo auto-resync : 28:02:2024 - 11:40:46

4 files changed, 17 insertions, 41 deletions

diff --git a/sys-devel/qbe/Manifest b/sys-devel/qbe/Manifest
index 9aee8c22bc50..f28177842397 100644
--- a/sys-devel/qbe/Manifest
+++ b/sys-devel/qbe/Manifest
@@ -1,10 +1,9 @@
-DIST qbe-1.0.tar.xz 237756 BLAKE2B ca6e1ee81f7329a8aee1f4597de391dcc44595fb8371468360fbcf1a5fc9fa404c614d49e4668fba568fa8d11e753d10b4c46380884fa635a56331b059b69abd SHA512 7f53d4440fda36b21dbf390aa8b9c17ae7c137a6e034dd73ca1c2068d84dbe236a452d86cab8d8bce0b3d66c3f08e70f2bf54bc7cc2e93208cc1900014c18ad1
 DIST qbe-1.1.tar.xz 244740 BLAKE2B fdadca56ff5a6b56f30e0a99724908e356b3c1b545e5b35a27080a92ca0d417ff53deb8f4c0a31b9289acab58fb79568384669004b0275cddd83afb198a7a5aa SHA512 1e5d7d1df3d73849dbf19dd1d84c9bba63a5041622823a5a239496032f9d82bd1640dd2bbd03e28c8a180b8e66a1fe10deb940b5d8fde996bf593f7e8d943e8b
+DIST qbe-1.2.tar.xz 246364 BLAKE2B b4cf4562caf6db191f1b2bfd078e2dfebfbe526a454552691ff78fba7b2d6c27b09df8ea5c795b49b9509a73b6981c17684d6e887999878f6e5bc7923c5047ef SHA512 b3ffd172e95346b3bfae1d2aff4c22a32af8bd4443d073f6fbb711f41db01f072ca7a8108901508cd4a8366567dab46510e0438716d35548591fdf37cee49971
 DIST qbe-dbgfile.patch 3813 BLAKE2B fbe0dd9c4fab8399054c091bb50fd8002c43108c53f2177ea000784f0707e9fb4fe432d637d03ccd87247f0ab1d232d5ba81e3a3e61347b7e1f31bb61b701c62 SHA512 41694848c95341f16618cd8f8d3222415e551b36b3428467e7ad066e257bc235dedbae4a1da4a6ae9034d102e359ecd69f51c580ad3f613e0e427df1882d1c65
 DIST qbe-info-tracking.patch 6305 BLAKE2B 03cb80de722e642812558fe7fe93eb3683f0fb54a2d78a1ceacf68016c779dee47f314651f0a6f1690d8b3ddc3089d41a894caafa83ec408d46b9375d24c9e3d SHA512 00d37894fca754f23024a8d64591e22f74b8f50022de77c1b25b474a68d204f0d89f2f3dbbfb822c5293ebccdadd923516c28b1e3c358c07de7a284fa0ef722f
 DIST qbe-parseline-tweaks.patch 1519 BLAKE2B 88940d42dbed988a5ecff68f18a1fab9c5024d5fb4d8219a1984f676808f9b5dbc4c4a729bf419358e0be71244aa4b97e23b3575aa4458a5c4059f7f1cd2151e SHA512 8701657032f26f8f7fe0de768573c5f111f80e5cc9d62fb4bfcf895b421532f039f08234bca8b4156b097f80893483fa8323cde3a8f3c8a5c729412328097bb2
-EBUILD qbe-1.0.ebuild 626 BLAKE2B dfde2632cd7e020c676e451dc92d3733b1747c6af97d6108a2fb779674d8a5f988039e84a7bcf3563a04a3111b7d105d7a412c28fb1fbbd11edb19f6fcfbbeb6 SHA512 909d5e5249a4556ca2c8fbedfe345b9618d2b2405fa4250fb0d6999446fddc1f2ef58d03e50e1bfcaabfe216d52f3f9c844f1c1a40d4d3a023fdd82c1705c931
 EBUILD qbe-1.1-r1.ebuild 1073 BLAKE2B e91e45736e09b5788c1013e693c8c2d1591d2d77396e8e0bb3788bcc872dd8d1c1a3883a8a01ce348dacc4ffa20f72a600dbcbfa96db0c420036eb42a6b02cfb SHA512 720c54018aed15871143d698878306acef2309e3e8938fa10e6e73661171303a06dce8cc609078adc6d5d31974f5484681b10828ebf2527841e2d295c08a8b55
-EBUILD qbe-1.1.ebuild 626 BLAKE2B 4d46ca6024d940a2f896ec9ba043f8164fd60ebc26068ca3aef8b914fa81dc568781fe6b57786d91379889b862063841d65969ee33846a37cc69a79a909b81ec SHA512 de036dd43638a77b15cb82999c38351e16d9851b22ec68bda1ffc248fbea2ac5b6d0346faa8b769f6a91723beb39cf9df3440c4f8519a4865beac15053dadb5d
-EBUILD qbe-9999.ebuild 626 BLAKE2B dfde2632cd7e020c676e451dc92d3733b1747c6af97d6108a2fb779674d8a5f988039e84a7bcf3563a04a3111b7d105d7a412c28fb1fbbd11edb19f6fcfbbeb6 SHA512 909d5e5249a4556ca2c8fbedfe345b9618d2b2405fa4250fb0d6999446fddc1f2ef58d03e50e1bfcaabfe216d52f3f9c844f1c1a40d4d3a023fdd82c1705c931
+EBUILD qbe-1.2.ebuild 702 BLAKE2B b38e425ffac5456c4e85ab232f1bccd824c2e67767c936c59d5bafae9af69da7b29a54d0a873e90026a1bcf567197e3ee9fef9f6be5c135788e76554f1fa24e7 SHA512 a062c0853319b72b31657dc80bd185c42b4793cbf4fc4283d1cecdd8638dcf34c4d19f381615f533292cc8ebeda6cef75b21a53bf51caf09a0bc6894701f3842
+EBUILD qbe-9999.ebuild 702 BLAKE2B b38e425ffac5456c4e85ab232f1bccd824c2e67767c936c59d5bafae9af69da7b29a54d0a873e90026a1bcf567197e3ee9fef9f6be5c135788e76554f1fa24e7 SHA512 a062c0853319b72b31657dc80bd185c42b4793cbf4fc4283d1cecdd8638dcf34c4d19f381615f533292cc8ebeda6cef75b21a53bf51caf09a0bc6894701f3842
 MISC metadata.xml 409 BLAKE2B 61d1ac0ebe8ac2bbd208fe98e5f7f32e208315ddf71e19faf0d1b5c39f5b93fe9896ff0b9738d607d7baef54c8b026d55bc83a0d27813be65a5404f507ef2754 SHA512 3e1d53e71543488d3e9308a6b8a4ee454a69ffb26e542e0218029fe19c2eeba07aaef2167d4c9280ede9ef7d0901514d7ff82656b798a947e469b730a9e4cf85
diff --git a/sys-devel/qbe/qbe-1.1.ebuild b/sys-devel/qbe/qbe-1.1.ebuild
deleted file mode 100644
index c32cbd4d13b6..000000000000
--- a/sys-devel/qbe/qbe-1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="git://c9x.me/qbe.git"
-	inherit git-r3
-else
-	SRC_URI="https://c9x.me/compile/release/${P}.tar.xz"
-
-	# 64-bit RISC-V only
-	KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-
-DESCRIPTION="Pure-C embeddable compiler backend"
-HOMEPAGE="https://c9x.me/compile/"
-
-LICENSE="MIT"
-SLOT="0"
-
-DOCS=( README doc )
-
-src_compile() {
-	tc-export CC
-
-	emake CFLAGS="-std=c99 ${CPPFLAGS} ${CFLAGS}"
-}
-
-src_install() {
-	einstalldocs
-	emake install DESTDIR="${ED}" PREFIX=/usr
-}
diff --git a/sys-devel/qbe/qbe-1.0.ebuild b/sys-devel/qbe/qbe-1.2.ebuild
index d041b7d0b849..baaab97b66c1 100644
--- a/sys-devel/qbe/qbe-1.0.ebuild
+++ b/sys-devel/qbe/qbe-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,12 @@ SLOT="0"
 
 DOCS=( README doc )
 
+src_prepare() {
+	default
+
+	sed -i 's;^CC *=.*;CC ?= cc;' Makefile || die
+}
+
 src_compile() {
 	tc-export CC
 
diff --git a/sys-devel/qbe/qbe-9999.ebuild b/sys-devel/qbe/qbe-9999.ebuild
index d041b7d0b849..baaab97b66c1 100644
--- a/sys-devel/qbe/qbe-9999.ebuild
+++ b/sys-devel/qbe/qbe-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,12 @@ SLOT="0"
 
 DOCS=( README doc )
 
+src_prepare() {
+	default
+
+	sed -i 's;^CC *=.*;CC ?= cc;' Makefile || die
+}
+
 src_compile() {
 	tc-export CC