Version bump, remove old

(Portage version: 2.1.7.17/cvs/Linux ia64)

4 files changed, 22 insertions, 129 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/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