gentoo resync : 02.01.2018

3 files changed, 91 insertions, 0 deletions

diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index fede478792e3..10eb4dba38fb 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,3 +1,4 @@
+AUX silo-1.4.14_p20120819-gnu90-inline.patch 544 BLAKE2B 6336a6713a706b8181cbb5d60f542f47fa4009347546bdb812369fb3fb054818e6230af239244ee9628a315df5c1bbdf0085be92448c9f2fca3f1ec7323f51dd SHA512 a3ac9e1226de694063bce8edcd0160ab7340a2821ec243ea45a79885da81eaf3a8af2bbe19350edaa45654a2d13ef070682ea7eca80e12f982e8a05ef49abcd7
 AUX silo-e2fsprogs-1.4.14.patch 1349 BLAKE2B ad11dbaac011fa4f006f1cfd5cfb5a9e5b45af99d663295a02bd5473833ed3c4337c32e86d12cc16db25ce65573ca4223fbd3380c5b9a889cab17e6541f7fe69 SHA512 f914e1ddfbdbac71fc1b67ebf188a66f1f55a1d5b19654e77d1f6e614f9adc4f1848c90754be60bdc4a9b4a4750d66cf5ef4db13db08719dc0877e4b1205ef6b
 DIST silo_1.4.14+git20100228-1.diff.gz 10143 BLAKE2B 4282de2900dfa670164ab9c7d64c7793cb5a132fda015750355bad9d94269c223f850d23fe048c215df9653689774dadd8f9cbbdd2919751e574f00b10053e08 SHA512 7209fd4fe65d7d72866ce41d25498e8369f59b51833550ecf9ae84badce33e82eccf97835558d560ca9937ebf37d0de99da7876ee4de1bafbe96e931c6d72cf0
 DIST silo_1.4.14+git20100228.orig.tar.gz 738325 BLAKE2B 5e5e221a9df91b94523c366a9f6ab2d195567e9f2938f141d93750a2fd15ec3cf657ca48155ea1113c7b6db011953fa15c1c6fd05759d7bc47cfc274c43424da SHA512 aa119893695fe0ce5eb30c7a461aa77b0f8935b1e2bcff9f83b232aad8b44cce72662c7c6716c61ea914dd5217edaf8d0e01b363010a2f7d9be9ac80a666bb77
@@ -7,5 +8,6 @@ DIST silo_1.4.14+git20120819-1.diff.gz 10711 BLAKE2B c44a0204e3aece4eec8355f88b3
 DIST silo_1.4.14+git20120819.orig.tar.gz 755510 BLAKE2B f1185086671c12c901704c2aa1f582a4e983d2d4a2d5ec18194aebcd43a7bdf9e7ad329efebaf4911d40f8a417ff8c8566b61be4eac5fea13235ac44d0edf852 SHA512 2d1dd8f805fb0a272877b5e8e19e5a645aa9fe02cf2b5ef43b5d2894c0c6a5a82483a0e41556af50f01dc795dc5e43350ae92139485c19d64cda75c2aca01a38
 EBUILD silo-1.4.14_p20100228.ebuild 1719 BLAKE2B 758a07bd95c74f0f0e1c2ef7a80b76baebef3550d0f455b25526eb370caa4df16cf63d3b3002b6d638f3f00b034d7009c885ea4ba20ab54679a1a50ea4960d53 SHA512 e968690916ca701d8c55e682c3c8f599bab8bbd51fdd8567a9edc3f9959cf4c1727716dbd522c94eb1ba53c28949c7ae2ab5b0694cd541fb5ff3f55f1cb23b4d
 EBUILD silo-1.4.14_p20120226.ebuild 1735 BLAKE2B d5852234c99b0df9253a85e61e33adb9f48f2ae76baee9fa4ce3ffee67461c7a3dd60bd65cc2a1bb90733756965502f5508ee2b76935a358e60c99bbf3038c7c SHA512 93f02430b14ccd2ab7d64d32cf3edd7cb5b4824c61327e06cb04ef5f5c050058f13a9de3aaae21d789095af71efad6d79c0470e338950b21d576640eae8307d4
+EBUILD silo-1.4.14_p20120819-r1.ebuild 1566 BLAKE2B 888b6973d1320461d6f304577c143302077d375551a92d4c13e1c7e07191eae12cc5b4ffbefcb2ed5e9350c4f9c89848052be21085327274bd224eb54f20da97 SHA512 cd9758ed3e273c0ecc796f90b26bab81cf88719d5575f3e51b250c510ce5a7f00f6ab796d2ce9f84c873b370933f44ea5b3c07bffd7050978a4958babe1cf958
 EBUILD silo-1.4.14_p20120819.ebuild 1569 BLAKE2B 7c51160a48da6db1fa827f9e1f73afb72b3067f24a0f7f1804c66a7a644fb37566aad013505d500322dd6effea5dd07b2bfd194fe871e423a83d671bc4937109 SHA512 39d1ce19e0ffbd5743abc2e4141f8ede3877b0f438728be8c9913d06b2931080dc3503cd89ec8e1813e611a15751b522afa16d9229bfc0790c4df288cde03c13
 MISC metadata.xml 383 BLAKE2B 30e20990d4d208db4d45f19aaab45fad2afdb238415163399d2665d1327f6932dbf420ecc455ad03ba69492a1ec9c18397362164873016427a624e8fb3e41844 SHA512 4d4c999f52f1dfb269edc79e10df3fe667273d895eceaa4db695e9bcfe5ba781a0f9f7367411fb4be71ecedc679ce792c2359801e28b2c164fd7f44b971ced5a
diff --git a/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch b/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch
new file mode 100644
index 000000000000..bf6add0ce104
--- /dev/null
+++ b/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch
@@ -0,0 +1,20 @@
+--- a/Rules.make
++++ b/Rules.make
+@@ -26,2 +26,7 @@ CFLAGS += -fno-stack-protector
+ endif
++ifeq ($(call cc-option-yn, -std=gnu90),y)
++# In gcc-5+ c99 changed inline rules by forbidding
++# multiple extern definitions. Fall back to gnu90
++CFLAGS += -std=gnu90
++endif
+ 
+--- a/silo/Makefile
++++ b/silo/Makefile
+@@ -6,2 +6,7 @@ UFSDEPS=
+ CFLAGS=-O2 -Wall -I. -I../include
++ifeq ($(call cc-option-yn, -std=gnu90),y)
++# In gcc-5+ c99 changed inline rules by forbidding
++# multiple extern definitions. Fall back to gnu90
++CFLAGS += -std=gnu90
++endif
+ 
diff --git a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
new file mode 100644
index 000000000000..8cb43a1287e1
--- /dev/null
+++ b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mount-boot flag-o-matic toolchain-funcs eutils
+
+DEB_PL="1"
+MY_PV="${PV##*_p}"
+MY_GIT="git${MY_PV%%_*}"
+MY_PV="${PV%%_*}"
+MY_P="${PN}_${MY_PV}+${MY_GIT}"
+
+DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/s/${PN}/${MY_P}-${DEB_PL}.diff.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"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gnu90-inline.patch
+)
+
+src_prepare() {
+	default
+
+	#Set the correct version
+	sed -i -e "s/1.4.14/1.4.14_git20120819_p1/g" Rules.make || die
+
+	# Fix build failure
+	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9/g" Rules.make || die
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+
+	emake CC="$(tc-getCC)"
+}
+
+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
+}