gentoo new year resync : 01.01.2021

3 files changed, 2 insertions, 70 deletions

diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 1e3188a57f77..0e729d21e86e 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,6 +1,4 @@
 AUX silo-1.4.14_p20120819-gnu90-inline.patch 544 BLAKE2B 6336a6713a706b8181cbb5d60f542f47fa4009347546bdb812369fb3fb054818e6230af239244ee9628a315df5c1bbdf0085be92448c9f2fca3f1ec7323f51dd SHA512 a3ac9e1226de694063bce8edcd0160ab7340a2821ec243ea45a79885da81eaf3a8af2bbe19350edaa45654a2d13ef070682ea7eca80e12f982e8a05ef49abcd7
-DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1 SHA512 bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
 DIST silo-1.4.14_p20200602.tar.gz 183668 BLAKE2B e229cdb9fbc5f0111aa49919f4b3b91c0770492fa06f91bda15c65af160b728b9409365c3ff0a93091b1e3011c60d0b0bec1101ffabaddbaef7e1083158830b1 SHA512 7a70fe25c1bb3ce655e4fbb85b00fe0d29fe0a6f98b80c1b8267b72bc9324ac0749cd050921163cc286e094f7d9bc81315d63ff02d2442b5c30ce350a537fcc1
-EBUILD silo-1.4.14_p20170829.ebuild 1750 BLAKE2B 64ec3de22ace15d3b5db8a188b5832143d99e620c71e9c166ed97db4b16d1f428a5f04b276a405d71109d9e8cfa4317a5aff072616a53f32267694ca91664075 SHA512 7e96c39c3d3297a4030493558a2993993b5df90a0184059b1f11a774e46595395dc28898b5fbe2ebadd1d2b0fda1a3177d5cfa61e7d53e6ff9b76324edc3a11e
-EBUILD silo-1.4.14_p20200602.ebuild 1719 BLAKE2B 4c2105b2bc9db5f2faa34db0cb0f1ea557dd49807e508572652febcea5884a9696faa92a7dda403b930bfe5dcd2d6f628841930609b4ccf4727ca65d956bed55 SHA512 ab0055665b5d6ea509478454fbe4b4ba05a7db69512782a5cb2f60fb60f87b37a9d2d46e2d2236fd55253b69196d65cc80875c31cc57b3fb053e54318e2de1f8
+EBUILD silo-1.4.14_p20200602.ebuild 1718 BLAKE2B d0366d3b403438aa96b97441e775b2f4975e01b887761f0cc2a9389d830ca64f0998fa1062b2202fa629e8bffe61f5668d5658506f09354dc23c50800556e7ba SHA512 ec427afc3cc7d3ce3bfdcf878ffcf9b05fcbc49d7b923a019caed7a5f0061ef53ef4d0d0b441c193692ed8c81c7252e9dbeb01c4b9c2afc080209e8039d93c9c
 MISC metadata.xml 338 BLAKE2B 67b4c6cb9a586c688c374a0e3e4019ce5714cd67f303ce719a8aad5ec274ab91ce93040d6b81fe46fba0beaf0e535cc6d283c1c9e3957de4d0e80e09de8a4756 SHA512 67785ade40e4a1266b6597c9404ce6e7c6fb749b89988223ebf94aab3870e23f9c93da65ec69550e49451e7f2bf271d4e0a6a64add3520accbdfeab094f5f25d
diff --git a/sys-boot/silo/silo-1.4.14_p20170829.ebuild b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
deleted file mode 100644
index 9fe244c7d56f..000000000000
--- a/sys-boot/silo/silo-1.4.14_p20170829.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mount-boot flag-o-matic toolchain-funcs vcs-snapshot
-
-MY_SNAPSHOT="${PN}-2506051d55dd5cb9fe10b4e978e22fa00363044b"
-
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/davem/silo.git/snapshot/${MY_SNAPSHOT}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* sparc"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs
-	sys-apps/sparc-utils"
-RDEPEND=""
-
-ABI_ALLOW="sparc32"
-
-src_prepare() {
-	default
-
-	# Set the correct version
-	sed -i -e "s/1.4.14/1.4.14_git20170829/g" Rules.make || die
-
-	# Fix build failure
-	# -fno-PIC is needed to shrink silo size back to manageable on
-	# profiles where gcc has -fPIC default (via --enable-default-pie).
-	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9 -fno-PIC/g" Rules.make || die
-
-	# Don't strip ieee32.b during compile
-	sed -i -e '/^	$(STRIP) ieee32.b/d' first/Makefile || die
-}
-
-src_compile() {
-	filter-flags "-fstack-protector"
-
-	emake CC="$(tc-getCC)" \
-		STRIP="$(tc-getSTRIP)" \
-		NM="$(tc-getNM)" \
-		LD="$(tc-getLD)"
-}
-
-src_install() {
-	default
-
-	dodoc first-isofs/README.SILO_ISOFS docs/README*
-
-	# Fix maketilo manpage
-	rm "${D}"/usr/share/man/man1/maketilo.1
-	dosym tilo.1 /usr/share/man/man1/maketilo.1
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	ewarn "NOTE: If this is an upgrade to an existing SILO install,"
-	ewarn "      you will need to re-run silo as the /boot/second.b"
-	ewarn "      file has changed, else the system will fail to load"
-	ewarn "      SILO at the next boot."
-	ewarn
-}
diff --git a/sys-boot/silo/silo-1.4.14_p20200602.ebuild b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
index 6e6b9cd4d3f2..bb1eadd65f27 100644
--- a/sys-boot/silo/silo-1.4.14_p20200602.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~sparc"
+KEYWORDS="-* sparc"
 IUSE="tilo-only"
 
 DEPEND="sys-fs/e2fsprogs