Verion bump, bug #412197, straight to stable

Package-Manager: portage-2.1.11.5/cvs/Linux ia64
RepoMan-Options: --force

3 files changed, 88 insertions, 21 deletions

diff --git a/sys-boot/silo/ChangeLog b/sys-boot/silo/ChangeLog
index d8c2c5e37104..69fd692199d7 100644
--- a/sys-boot/silo/ChangeLog
+++ b/sys-boot/silo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/silo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.48 2012/05/24 05:12:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.49 2012/07/29 16:26:30 armin76 Exp $
+
+*silo-1.4.14_p20120226 (29 Jul 2012)
+
+  29 Jul 2012; Raúl Porcel <armin76@gentoo.org> +silo-1.4.14_p20120226.ebuild:
+  Verion bump, bug #412197, straight to stable
 
   24 May 2012; Mike Frysinger <vapier@gentoo.org> silo-1.4.14_p20100228.ebuild:
   Inherit eutils for epatch.
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 40ade08703d7..d8c96d572845 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,26 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX silo-e2fsprogs-1.4.14.patch 1349 RMD160 924d9c4e17c3e1be222913f72b9972a6352c5bf7 SHA1 a26019c69e3f7ca9bf10280d512132239cf17039 SHA256 8d8f7a88bda1b2b739a0fcbbe66d16a70492e34b7d62f21ed55fefd22da2e19a
-DIST silo_1.4.14+git20100228-1.diff.gz 10143 RMD160 499cade0bad6aaa1c688b54afced9306a9c32edf SHA1 613ddcd0379ab3b5eb6003de047041d645696c56 SHA256 e62e5be033f72f0bf948aa6538742b0647b9716302de7b553f45be234604ecb9
-DIST silo_1.4.14+git20100228.orig.tar.gz 738325 RMD160 9b318207270f3deb49fc9bc8339dde8aa40604fc SHA1 c04eb92e0a81d117e71f143e86528a30b7f88058 SHA256 3ed377c7ec122736655e49cdfdff193e9eed122807e4705a423d036223c9caa4
-EBUILD silo-1.4.14_p20100228.ebuild 1835 RMD160 e8b2b5c9351a12eb1e8a2014b90c7e6e59b2561c SHA1 0813f70f1f2daf5ffdc93fd5b926ccaa3929301c SHA256 00dcde9cd605b87a16c8c779873fd950020142d184ae19045af1dcc5f8d9d03a
-MISC ChangeLog 9556 RMD160 6f5d348695563b7935c7fb32fa29939d1289d9f7 SHA1 11923fc44edc13d79f5bc4639f19b190bb890a4b SHA256 3bec6b8c692e87400b8d44ad6bab950802f805c60542e039415215903a967761
-MISC metadata.xml 282 RMD160 8eda0577518bd9d63fffd12838529c4a90635e03 SHA1 a85093a86ad24fe08b02cf3d33f6a98193924004 SHA256 cb00fd9fed9bb03fc750aa7fdf8232e1f5b8d46e65a14e4f6629a91c2120423f
+AUX silo-e2fsprogs-1.4.14.patch 1349 SHA256 8d8f7a88bda1b2b739a0fcbbe66d16a70492e34b7d62f21ed55fefd22da2e19a SHA512 f914e1ddfbdbac71fc1b67ebf188a66f1f55a1d5b19654e77d1f6e614f9adc4f1848c90754be60bdc4a9b4a4750d66cf5ef4db13db08719dc0877e4b1205ef6b WHIRLPOOL d75a216e47c1545559f5f87d7fd596d7205397083644d34b1f49fcafddc50f25fe186e59d4649e644833e36deb7eb379694f72892c70b2952cbcb7f5690839d3
+DIST silo_1.4.14+git20100228-1.diff.gz 10143 SHA256 e62e5be033f72f0bf948aa6538742b0647b9716302de7b553f45be234604ecb9 SHA512 7209fd4fe65d7d72866ce41d25498e8369f59b51833550ecf9ae84badce33e82eccf97835558d560ca9937ebf37d0de99da7876ee4de1bafbe96e931c6d72cf0 WHIRLPOOL ba8f351c9ae61dcec1f2fb6fc0dd4caa76bb4bf9e84d66362acd8a388cd289a8621caeb3b38aa2563372f593726540c3bee5889d00275765aeebd328ae9caa12
+DIST silo_1.4.14+git20100228.orig.tar.gz 738325 SHA256 3ed377c7ec122736655e49cdfdff193e9eed122807e4705a423d036223c9caa4 SHA512 aa119893695fe0ce5eb30c7a461aa77b0f8935b1e2bcff9f83b232aad8b44cce72662c7c6716c61ea914dd5217edaf8d0e01b363010a2f7d9be9ac80a666bb77 WHIRLPOOL 506f6b78f5f0bce5920a8ba81154d3df25951cc33bddde26f6caa886d94683bb3e4905227b8cf27de85e4b62576806aa3727fd317ec60f97fc6b8ce1c24690d4
+DIST silo_1.4.14+git20120226-1.diff.gz 10389 SHA256 ea94c4a2f0fdbc84c666c0d7c4fd80b0f7eacfed4c55f2526b6ca425fb1a6231 SHA512 0dd39461357f862bc0eb7d0b4db8e3e9acadb30f70c8c638b1adef6f6c306d0c475bf59e29c72a91594fcbf544c80e05e5293b857265d4cd579696f10993483b WHIRLPOOL 0928aa877c96062e8035e2f52b1bfcd2e801baf3360c9da3c53004ab13655ef6893773606c7b63376928805613abc4adf385c8b8b50872975b536c50179d9506
+DIST silo_1.4.14+git20120226.orig.tar.gz 747622 SHA256 8a54ef3729790ff754f8ddcbc53af7432a0dabd2ddea2b912b46755e1afe1107 SHA512 14d7ad363232e7520f2c1d6ea5ca26e5b0a2059be6b161799cc6cc155ecbe0590c890433a5442f48c2d2a47b784053063e08e4140895807fc595e291f42ab9e8 WHIRLPOOL f573eb38d717f80146b72893a300cb339d49208f3fbbf4aada9304c604485d9cde340b1eabb0ca2bc55064dfac046cbc12c930c5c49c256207e1c6a4fbae1000
+EBUILD silo-1.4.14_p20100228.ebuild 1835 SHA256 00dcde9cd605b87a16c8c779873fd950020142d184ae19045af1dcc5f8d9d03a SHA512 4055e864333fa6f05d63f3f374f96e31b3fd187b326ce6f99b7b32054366f98fb4fd23761ed6c5c150bbc764f308dd1eaddd617c88dafef0b61d4f1756627581 WHIRLPOOL c943ae86a07b8f60a37acd3ba6d33671032cd8422b9a47bac43a4cfe0baa827f3bad350468bb6bdf81dd1261e7c5da4c6d5e7bf6892ced030ce770f522fece32
+EBUILD silo-1.4.14_p20120226.ebuild 1840 SHA256 a1ad1387da2e898687c8fdcce89be276d79ab09b18c4dc35f160ea71cfc71069 SHA512 c68d32c7949c7bcbaeadaa845f800052a3790b262eaca6205b00940849446eecdfa1525ac6a7b4ab866f61ab9b749e7bcb2f2effb73fb9452233ad550d6b0f89 WHIRLPOOL 3f43c077c4676e5c00b5d7a226e543fb51a756233bebf7562103b94a694a902142aa3b7a7136b02cc3f0573cebe1c5ce571dcb42dba44003533a3055bda9f8a0
+MISC ChangeLog 9723 SHA256 5ec06950318def0b4efd1fffc8f09948f756867d895b849ed807ecaba373588c SHA512 92e865fc2ebb7d9e690b15f1fb4961f1141226f8ab99be85c9e383b83450c9bad696f49224bcc2d8e6f36c6a1d5b7daf796a3601a2c653a2c29755700a550c99 WHIRLPOOL 2f7ee317e75e735e31928e51c02d9e857145285db1fdb15ff54ad389ff10fdf98d2880de468d65b5a96b832525beec469a751471989c851343b695ce86312008
+MISC metadata.xml 282 SHA256 cb00fd9fed9bb03fc750aa7fdf8232e1f5b8d46e65a14e4f6629a91c2120423f SHA512 84a464fcd33d7a6c0066d86755769645c61d9c99396dc96e9023e5680661a7ceee6aba6279b3e97819c1a3b4743fd4da9ddaf04c14fd81fcc0cce78670e05817 WHIRLPOOL d164a2c4441f0db12e26d87606d3dea85518efe595c309fe507bc1e0e3d72469ed9ae699afc7f6963770be3819abbb0457e385449f6c2f79fdb0d1dd64ed2cfc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvcOHAAoJELEHsLL7fEFWe8kQAK/xaYgl1hscBhAfR5+jgOWU
-xBhNKvu8lQ8zlUKEWrACTdrcXwNfCWGAUBHAAhHuxN0PeFBrsZYSixphtNf1QjdF
-u6mUV04IURZoaT30e0Mcelq18PLUCXX4xkpYR+aKxWdNZjKR/w/cZwdZGAwGqi6Y
-kJFMAQP4uLJjxMPnBRBXNAe688J6qN8Oi4CdX2rfe9BO10sSZuW5r4QmrMwDZjZF
-jHyZv0W/9Yg6Odh++BrMCCceWZf9nwLYMSqbecVB2OSOSXC7ktBVAh/+e8dz+xVC
-hUoVhV2E9yC6ebsimONhsfcVLQnnnrXTbGnDx7fgtot5UX1B7Lbw0kbEZRfGSuGG
-us/kFJxUUrQwhai6Ad5SimE8hty7Vtjkn1Ta5jViSZhXH/KNqjtcMTkm5fAQvkEl
-JDjmrtsW+NduqAaOsNuxfB+FmLZ39ivoRTeNWRZPSEIjrSSW1wxiur6EDKlk4TPB
-3cVZF/5fNNSAzhKfrFTj2BoT3L5yaiUdgSEyuKSXLmlJf2pNRIIMmjf/JG4htN6E
-1/3g+/bhgduMohvQWlVMx8hyTR+4rccnT57o1+A5pb4DKH0ZPr0sbrK/LFYMB/rr
-6i4MyUB5Aou0UKwwsWLzbuM91k4Vfn3dQtlK99rgU4LIAHH3xKTe4QDvU79pmjY2
-AjiWZRQr2HynjVujb77p
-=lLdA
+iEYEARECAAYFAlAVZDwACgkQuQc30/atMkAarQCgsPNOs3TCnX0rNPNHRxpPjxk5
+1SMAoIhhlIsuARVdLPyYS+YZEPmmE0vs
+=1IVu
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/silo/silo-1.4.14_p20120226.ebuild b/sys-boot/silo/silo-1.4.14_p20120226.ebuild
new file mode 100644
index 000000000000..a06585701483
--- /dev/null
+++ b/sys-boot/silo/silo-1.4.14_p20120226.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/silo-1.4.14_p20120226.ebuild,v 1.1 2012/07/29 16:26:30 armin76 Exp $
+
+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="http://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* sparc"
+IUSE="hardened"
+
+DEPEND="sys-fs/e2fsprogs
+	sys-apps/sparc-utils"
+
+ABI_ALLOW="sparc32"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	#Set the correct version
+	sed -i -e "s/1.4.14/1.4.14_git2012226_p1/g" Rules.make
+
+	# Fix build failure
+	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9/g" Rules.make
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+
+	if use hardened
+	then
+		make ${MAKEOPTS} CC="$(tc-getCC) -fno-stack-protector -fno-pic"
+	else
+		make ${MAKEOPTS} CC="$(tc-getCC)" || die
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc first-isofs/README.SILO_ISOFS docs/README*
+
+	# Fix maketilo manpage
+	rm "${D}"/usr/share/man/man1/maketilo.1
+	dosym /usr/share/man/man1/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
+	ewarn "Support for EXT4 is broken, you've been warned!!"
+}