gentoo resync : 17.08.2021

4 files changed, 48 insertions, 33 deletions

diff --git a/sys-boot/sgibootcd/Manifest b/sys-boot/sgibootcd/Manifest
index 45f04d161d6c..d24af45be834 100644
--- a/sys-boot/sgibootcd/Manifest
+++ b/sys-boot/sgibootcd/Manifest
@@ -1,3 +1,3 @@
-DIST sgibootcd-0.12.tar.bz2 3810 BLAKE2B 973c6e01f1e90b9009b57725e59e295e8cbdcc30595735eab1a4cd3929aa71edde66d352bb04b61670eb7ad464916d0e4b83f6fabbc8f641c150edcf96f4985c SHA512 180e4f5a185b14c0b2c8158b368a50a3a55673fa86760e2a424c9533b1bb8ec37824c715ba02fd264621e2e31906ddd310398e9f24cf19147bce3e49fc62da3e
-EBUILD sgibootcd-0.12.ebuild 669 BLAKE2B 33f6f3a38ba889a6ab2ae893add569e985b2d78cbab3c54f6777498f5287c1737029a5f0e3589eda89e0ec38f79dba88c01f5c03b6bf771124446b63357e56fb SHA512 f8ae44145ce075054dc97e974782aea5d3980baff9a93b8c537c4e7eb4ac8044e3baf0787df9d4960c133cdc0386ff61336e9c5bd58bb3b89250bc135494392b
-MISC metadata.xml 241 BLAKE2B 37f8949a3e5fd20a0ef26ef406c6e1e254825f06a44974a46613ea233985c368fe7dca5797d418348d3031b30d93c453a278f537e116525305efb380fec65c88 SHA512 f6f7578f89007c938627fedf07141af9dd35f6f33514a5f103b16cbc4cc8da74d6088eda70f3d9016cf77eba88575833d5431a6c1105f784aa209a3da657c1b1
+DIST sgibootcd-0.13.tar.xz 3736 BLAKE2B 793825c9ad88449b187ceab28d474e5676d45d3ea2c649dbbf669f00cf6dc9d55bc1e9900a4bf321a7dfddd8f5bc65e5e2fbc61fe913e7be43df9064118efcac SHA512 aa7780e360e0b5d4c9c0d6b5894897fa5f6ff13b1a389ba913f27cbdf8173db123e59426391d2a0e154f836277a780dc004617608adb88e7e6f3e8b6348729f9
+EBUILD sgibootcd-0.13.ebuild 1090 BLAKE2B cbd1aaabf8161e8b7b21a4844ac6f1317752feb9651aa13aace5eddfeacd862d95a2c934585795b4c5704fa767d6b31efc289b5c669f1f30353316bd9f6905eb SHA512 f81d517eb1cd9a63202f77cd68778cc492ad5c096675e91e2899f4a68c13293c4d28a813d5573a35427c86884d5fdc3ec35e03aefb55518f22ff522d627227bf
+MISC metadata.xml 402 BLAKE2B ce15881617d1f900806f6f3f8f9caff26c048db1faf1b1f79969163094ff7717c715a2e768a30b6aaa63eeeea0822e1ffa598e810fe94e565cad9017ddcc0f25 SHA512 246206374fed809094722b6f3922d8928edc04e5ece2bf340f14c5658f4940e5cbf5dc0132f2df061a8401c2afc0484a1f6f8df8091dcd59c422ce5b550bb8e0
diff --git a/sys-boot/sgibootcd/metadata.xml b/sys-boot/sgibootcd/metadata.xml
index 73a6ab039600..62beb542de0a 100644
--- a/sys-boot/sgibootcd/metadata.xml
+++ b/sys-boot/sgibootcd/metadata.xml
@@ -5,4 +5,9 @@
 		<email>mips@gentoo.org</email>
 		<name>Mips Team</name>
 	</maintainer>
+
+	<longdescription>
+		sgibootcd is a small utility used to create the burnable,
+		non-ISO9660 image format for bootable CDs for SGI systems.
+	</longdescription>
 </pkgmetadata>
diff --git a/sys-boot/sgibootcd/sgibootcd-0.12.ebuild b/sys-boot/sgibootcd/sgibootcd-0.12.ebuild
deleted file mode 100644
index c9545e0a82f1..000000000000
--- a/sys-boot/sgibootcd/sgibootcd-0.12.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs
-
-DESCRIPTION="Creates burnable CD images for SGI LiveCDs"
-HOMEPAGE="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/"
-SRC_URI="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/${P}.tar.bz2"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~mips"
-
-IUSE=""
-RDEPEND=""
-DEPEND=""
-RESTRICT=""
-
-src_compile() {
-	local mycc="$(tc-getCC) ${CFLAGS}"
-
-	[ -f "${S}/sgibootcd" ] && rm -f "${S}"/sgibootcd
-	einfo "${mycc} sgibootcd.c -o sgibootcd"
-	${mycc} sgibootcd.c -o sgibootcd
-}
-
-src_install() {
-	dobin "${S}"/sgibootcd
-}
diff --git a/sys-boot/sgibootcd/sgibootcd-0.13.ebuild b/sys-boot/sgibootcd/sgibootcd-0.13.ebuild
new file mode 100644
index 000000000000..4ecf329c44a2
--- /dev/null
+++ b/sys-boot/sgibootcd/sgibootcd-0.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+inherit toolchain-funcs
+
+DESCRIPTION="Creates burnable CD images for SGI LiveCDs"
+HOMEPAGE="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/"
+SRC_URI="https://dev.gentoo.org/~kumba/distfiles/${P}.tar.xz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~mips"
+
+IUSE=""
+RDEPEND=""
+DEPEND=""
+RESTRICT=""
+
+# sgibootcd is a small utility used to build the image that is burned to a
+# CD and used to boot SGI systems.  Its compilation does not involve the
+# external linker, 'ld', and thus this makes it difficult to reliably pass
+# user LDFLAGS.  See Bug #725836.
+QA_FLAGS_IGNORED="/usr/bin/sgibootcd"
+
+src_compile() {
+	local mycc="$(tc-getCC) ${CFLAGS}"
+
+	# There is no Makefile, so check for an existing binary
+	# and remove it if necessary
+	[[ -f "${S}/sgibootcd" ]] && rm -f "${S}"/sgibootcd
+
+	# Compile sgibootcd.c to a standalone executable.
+	einfo "${mycc} sgibootcd.c -o sgibootcd"
+	${mycc} sgibootcd.c -o sgibootcd
+}
+
+src_install() {
+	dobin "${S}"/sgibootcd
+}