Version bump, remove old

Package-Manager: portage-2.1.7.17/cvs/Linux ia64

5 files changed, 26 insertions, 137 deletions

diff --git a/sys-boot/silo/ChangeLog b/sys-boot/silo/ChangeLog
index 0c8a3a562ed8..ed97d3a95734 100644
--- a/sys-boot/silo/ChangeLog
+++ b/sys-boot/silo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/silo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.43 2010/03/21 18:01:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.44 2010/03/21 19:21:21 armin76 Exp $
+
+*silo-1.4.14_p20100228 (21 Mar 2010)
+
+  21 Mar 2010; Raúl Porcel <armin76@gentoo.org> -silo-1.4.13.ebuild,
+  -silo-1.4.13-r1.ebuild, -silo-1.4.13a_pre20070930_p2.ebuild,
+  +silo-1.4.14_p20100228.ebuild:
+  Version bump, remove old
 
   21 Mar 2010; Raúl Porcel <armin76@gentoo.org> silo-1.4.14.ebuild:
   Fix build with glibc-2.11, thanks to Mike Frysinger, bug #310569
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index f3d2dc6d8bf8..d3eda63cbb24 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -2,14 +2,10 @@ AUX gcc-4.3-compile.patch 3384 RMD160 01ff2be06946b07ccc9b844740d471fccba8380b S
 AUX qa-no-strip.patch 164 RMD160 f84a426b416692871750165464c73a1c9fc41ece SHA1 d43fc3463b5b54eef0c60a4bb4f2ad30cb7ab672 SHA256 1e33d17cea41f04b02426fb6b1b98a37694eeffc1efaedb2c7d4eade4120d796
 AUX sanitized-linuxheaders.patch 389 RMD160 20b04c20112674143c030a00e22be5d52f8a631c SHA1 434d18f9931fce362724e624607c02252923dbda SHA256 a58f7eeb5f4017b1f8d3d6f984dfe616d197e71d84f218de48cf5c7a4eac91b2
 AUX silo-1.4.x-noglibc_time.patch 407 RMD160 db46932d4ad90965b4cfb43e095e7bbfefc5c030 SHA1 3172e91e0741f64cc511a1d0a47c4b724eed1ac0 SHA256 de656cc0b9bb6a1a852aebd702ee9e90fa7a9f050603b32eed2e5a2100988c5a
-DIST silo-1.4.13-r1.tar.bz2 148563 RMD160 bb34e3d1f2c5377833ac0a590af56bb29311a797 SHA1 9e54156f36681a72b0af0f4c44623266b2414d0a SHA256 d1b9964f3305e0f4e808d6a836322f0ad9cd474336b5ee252de889eb9d1a4605
-DIST silo-1.4.13.tar.gz 168934 RMD160 7bf47998de80e9f1efc330aaef7a00ca51b0d1a0 SHA1 1d0f18757dd79d9735531e138a0d4cd0ae41532b SHA256 a6bc12c3b82d9e1b717e706a068274696914b798b79bdde198b2ed93ab079189
-DIST silo_1.4.13a+git20070930-2.diff.gz 9699 RMD160 9f2d9f9ba9b5d7bb13fd00a486c4f5bd6daeb39e SHA1 9ac099af673d53a431be64651574a21793758f4c SHA256 d11a906299e2e55baaf8459fa9723056bf14ba59aaa82ba8208da16699148e04
-DIST silo_1.4.13a+git20070930.orig.tar.gz 719187 RMD160 0b0b4e3738a003e08a94c64f4b9c95a27ee8f049 SHA1 7f6698962035adeedb5537817b05f89bb949ff25 SHA256 3c705acf98712a005935a87fc8f559c865ca7e4f2f4c69a4d829a42f51dedcbf
+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
 DIST silo_1.4.14.orig.tar.gz 181510 RMD160 88d835d695b26fd10f00d66ed94e33175f9b1c25 SHA1 9572835d9f6addae2287b400b55d6220006895ef SHA256 1f17faa150039faf7b2944098f358ee5bf4145969cad678cc53a2f8bb5d4d2dd
-EBUILD silo-1.4.13-r1.ebuild 1461 RMD160 c492661d3c970c6a07ede762d8db96179e4c0877 SHA1 8927a80ff8a8abe82ab8129c3516a2b083e45329 SHA256 bfbe1412469607511aaa5b8e3739313dab16c10cac647957e0e58dd5c048863c
-EBUILD silo-1.4.13.ebuild 1490 RMD160 ad47ae0ec4ca05f2aa0a940c40003f064ae5b9f6 SHA1 23299041be11c61702cb0d7c827f4d87247616bb SHA256 1f06907d8ec92d66004054f33a9a3910965518b29cf42c42680a01f18244c1a7
-EBUILD silo-1.4.13a_pre20070930_p2.ebuild 1849 RMD160 941b50996808bc4e4786cb8b9bb4eb8da0cb59a5 SHA1 d788c88af0a1db96e35da3f09c59972273416dc6 SHA256 8129825db6f542674f6384338ab485a6c589107ee5f791037627e8fd21e38432
 EBUILD silo-1.4.14.ebuild 1873 RMD160 b0ac944b94f2458bd5e47c81bea5811f06121144 SHA1 1d66f4580935c8f4fd515f7d5b70b655472d098e SHA256 01f2e4a42dbf0f93ec48e885f830a276a057daff173f8fa801e95f62975adc18
-MISC ChangeLog 8571 RMD160 19ff62034449f13e71507db32d8b99c0f134b6a0 SHA1 0259f3f37f284b72e7cf0017249e3ba83f355597 SHA256 fffd97b8c8d04aa190f7c9e29fd78dac8059bd645bf9df2adba404999907bb4e
+EBUILD silo-1.4.14_p20100228.ebuild 1909 RMD160 09759de38e7481424db327a5045151686b44a6fa SHA1 db86181d15394ebab95422b2fa215ef117da0735 SHA256 dd8679c0526ae05945871d30861e71adf154bf2b0bb1fdc4fde13647974866ce
+MISC ChangeLog 8803 RMD160 df8a27025ed030d433edafa2e1d6e9cb0c0299b7 SHA1 40558eeb0d75a26c8e0329c1395526ac96781c3b SHA256 6e220de8b4212f41e7405b50469f967e2cc1b8184746fc85efdda8d1a815feed
 MISC metadata.xml 282 RMD160 8eda0577518bd9d63fffd12838529c4a90635e03 SHA1 a85093a86ad24fe08b02cf3d33f6a98193924004 SHA256 cb00fd9fed9bb03fc750aa7fdf8232e1f5b8d46e65a14e4f6629a91c2120423f
diff --git a/sys-boot/silo/silo-1.4.13-r1.ebuild b/sys-boot/silo/silo-1.4.13-r1.ebuild
deleted file mode 100644
index f071edd6d3d1..000000000000
--- a/sys-boot/silo/silo-1.4.13-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/silo-1.4.13-r1.ebuild,v 1.3 2008/06/12 20:33:51 bluebird Exp $
-
-inherit mount-boot flag-o-matic toolchain-funcs
-
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
-SRC_URI="http://dev.gentoo.org/~gustavoz/dist/${PF}.tar.bz2"
-HOMEPAGE="http://www.sparc-boot.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* sparc"
-IUSE="hardened"
-
-PROVIDE="virtual/bootloader"
-
-DEPEND="sys-fs/e2fsprogs
-	sys-apps/sparc-utils"
-
-ABI_ALLOW="sparc32"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/silo-1.4.x-noglibc_time.patch
-
-	# make it compile with gcc 4.3
-	epatch "${FILESDIR}"/gcc-4.3-compile.patch
-}
-
-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() {
-	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."
-}
diff --git a/sys-boot/silo/silo-1.4.13.ebuild b/sys-boot/silo/silo-1.4.13.ebuild
deleted file mode 100644
index e988c60549b6..000000000000
--- a/sys-boot/silo/silo-1.4.13.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/silo-1.4.13.ebuild,v 1.3 2007/02/07 14:40:05 gustavoz Exp $
-
-inherit mount-boot flag-o-matic toolchain-funcs
-
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
-SRC_URI="http://www.sparc-boot.org/pub/silo/${P}.tar.gz"
-HOMEPAGE="http://www.sparc-boot.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* sparc"
-IUSE="hardened"
-
-PROVIDE="virtual/bootloader"
-
-DEPEND="sys-fs/e2fsprogs
-	sys-apps/sparc-utils"
-
-ABI_ALLOW="sparc32"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Sanitized headers bug #162537
-	sed -i -e 's/linux\/ufs_fs.h/non-linux\/ufs_fs.h/' second/fs/ufs.c
-
-	epatch ${FILESDIR}/silo-1.4.x-noglibc_time.patch
-}
-
-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 COPYING ChangeLog 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() {
-	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."
-}
diff --git a/sys-boot/silo/silo-1.4.13a_pre20070930_p2.ebuild b/sys-boot/silo/silo-1.4.14_p20100228.ebuild
index 5f9ddfe0b813..4355f276573b 100644
--- a/sys-boot/silo/silo-1.4.13a_pre20070930_p2.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20100228.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/silo-1.4.13a_pre20070930_p2.ebuild,v 1.2 2008/06/12 20:33:51 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/silo-1.4.14_p20100228.ebuild,v 1.1 2010/03/21 19:21:21 armin76 Exp $
 
 inherit mount-boot flag-o-matic toolchain-funcs
 
-DEB_PL="${P##*_p}"
-MY_PV="${PV##*_pre}"
+DEB_PL="1"
+MY_PV="${PV##*_p}"
 MY_GIT="git${MY_PV%%_*}"
 MY_PV="${PV%%_*}"
 MY_P="${PN}_${MY_PV}+${MY_GIT}"
@@ -13,7 +13,7 @@ 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://www.sparc-boot.org"
+HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -32,17 +32,18 @@ S="${WORKDIR}/${PN}"
 src_unpack() {
 	unpack ${A}
 
-	epatch ${MY_P}-${DEB_PL}.diff
+#	epatch ${MY_P}-${DEB_PL}.diff
 
 	cd "${S}"
-	epatch "${WORKDIR}"/${MY_P/_/-}/debian/patches/*.patch
-	epatch "${FILESDIR}"/sanitized-linuxheaders.patch
-
-	# make it compile with gcc 4.3
-	epatch "${FILESDIR}"/gcc-4.3-compile.patch
+#	epatch "${WORKDIR}"/${MY_P/_/-}/debian/patches/*.patch
+#	epatch "${FILESDIR}"/sanitized-linuxheaders.patch
 
 	#Set the correct version
-	sed -i -e "s/1.4.13/1.4.13_git20070830_p2/g" Rules.make
+	sed -i -e "s/1.4.14/1.4.14_git2010228_p1/g" Rules.make
+
+	# Fix build failure
+	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE/g" Rules.make
+	
 }
 
 src_compile() {
@@ -70,4 +71,4 @@ pkg_postinst() {
 	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."
-}
+}
\ No newline at end of file