summaryrefslogtreecommitdiff
path: root/sys-boot
diff options
context:
space:
mode:
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/Manifest.gzbin7404 -> 7410 bytes
-rw-r--r--sys-boot/plymouth/Manifest3
-rw-r--r--sys-boot/plymouth/plymouth-0.9.3-r2.ebuild107
-rw-r--r--sys-boot/plymouth/plymouth-9999.ebuild14
-rw-r--r--sys-boot/silo/Manifest10
-rw-r--r--sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch54
-rw-r--r--sys-boot/silo/silo-1.4.14_p20100228.ebuild69
-rw-r--r--sys-boot/silo/silo-1.4.14_p20120226.ebuild69
-rw-r--r--sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild2
-rw-r--r--sys-boot/silo/silo-1.4.14_p20120819.ebuild63
10 files changed, 121 insertions, 270 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 9acd5f9e34eb..495ac5a859ae 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
Binary files differ
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index e1bec7849c2e..3837c44a1866 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -5,6 +5,7 @@ DIST plymouth-0.9.2.tar.bz2 1231336 BLAKE2B 2e565b0bb23dbab19bc164756165ca85793d
DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992872813a9f937211930f653207d77c1a331cb093156af5ec9502a04cf1f9e4123c42e07931eaf270fefedcc03700 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed
EBUILD plymouth-0.9.2-r1.ebuild 2494 BLAKE2B e0f1711a6fdfc2096eab5f90f4c85c16031d0505ed3fa114388645b8f0a2781dc15f77f9c7bac2be66e3c0a193a4a0e1797a60bfe7b31b702c50a11194135933 SHA512 4413aec2441e4466eaf308f352264abd9147c3eba073affe7b9e7ba84f97169f6be605f64e73c28b83b664699c981349c345576b855274cee9942f490d644435
EBUILD plymouth-0.9.3-r1.ebuild 2585 BLAKE2B d67507b56f0c864ce51d649d3a2a577aeb6b7a7688814045aea01e329cefd1899cc37ba019ee5ebce4db3011855df7146c61767fd37a8e5c2bed661609d55855 SHA512 291db5b95322b27a4798347b6e86c674f87a88380b72052f93c3f1a0fd1f35e3bfacf36fce2d3f67be0d5b8731307e6a387f05275622d26fb4ff4f07ccfa6a7b
+EBUILD plymouth-0.9.3-r2.ebuild 2686 BLAKE2B 4991ce88676c102ff2bd5062a5d59184e9bb53b5db22dda2f22c5138627663a2f1c107af549de7abcc935be0d19e2b15a56234a15315f3deb1464c6a1ecda9f5 SHA512 8232ace285011d537cd876df0cd343deb42ba1924811ad808cdb39b1ef3d5e8caaac70c0b91859d909e3306ab3a5e6296b84b13413028e136c6eea8f13da4608
EBUILD plymouth-0.9.3.ebuild 2473 BLAKE2B b490f8947be293aee67da6bb517d38393896d9a8afc391574f91fd1d3cd2b7c48a6479f5ea8081e795bc63728ae4b84004ddd59c04d56700e6b6d2649f8118d5 SHA512 5a92e14027c37c1f98061d92da74896f3955b41b6e2c76853ba3b1ddd7e8579267faadf06272156491e70ade5380c08382f2a5407e050b137586557386758997
-EBUILD plymouth-9999.ebuild 2522 BLAKE2B fdc1b56d96b6ba460d7c98f4b6ea3bbdd2e622836b47418a1af3d1afe34e08e23faaca36bab9b4c1ca02e4b7ef478cd4a6a942029cce6630dec617be8113bc82 SHA512 c7fc665ee59af6353c1baac23b1de212f65e438e5ef59b40873d2a0c1fae3433a1d18b79723bd45cabf82dcee5e0ef47bda2acb218ad725cbf0b6f83c735d86a
+EBUILD plymouth-9999.ebuild 2686 BLAKE2B 4991ce88676c102ff2bd5062a5d59184e9bb53b5db22dda2f22c5138627663a2f1c107af549de7abcc935be0d19e2b15a56234a15315f3deb1464c6a1ecda9f5 SHA512 8232ace285011d537cd876df0cd343deb42ba1924811ad808cdb39b1ef3d5e8caaac70c0b91859d909e3306ab3a5e6296b84b13413028e136c6eea8f13da4608
MISC metadata.xml 1154 BLAKE2B c2110cccc02da18e101a516922a8e6e7fafb5087d482490f2b06213bb08a473916d3c9c5cc9b676914f1ab598237f0aa971f8a996d89be3f5088a3f4b45ede4b SHA512 aa809296ffaf68e481a09ae75c1500bf01e7474dca0990cdb66182881d5bff269aa19c60a022e37157330a52c5319410061f0209cc08128828981a46f7dc1b4a
diff --git a/sys-boot/plymouth/plymouth-0.9.3-r2.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r2.ebuild
new file mode 100644
index 000000000000..5ffedf306a90
--- /dev/null
+++ b/sys-boot/plymouth/plymouth-0.9.3-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
+else
+ SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit autotools readme.gentoo-r1 systemd toolchain-funcs
+
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug gdm +gtk +libkms +pango static-libs"
+
+CDEPEND="
+ >=media-libs/libpng-1.2.16:=
+ gtk? (
+ dev-libs/glib:2
+ >=x11-libs/gtk+-3.14:3
+ x11-libs/cairo
+ )
+ libkms? ( x11-libs/libdrm[libkms] )
+ pango? ( >=x11-libs/pango-1.21 )
+"
+DEPEND="${CDEPEND}
+ elibc_musl? ( sys-libs/rpmatch-standalone )
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+# Block due bug #383067
+RDEPEND="${CDEPEND}
+ virtual/udev
+ !<sys-kernel/dracut-0.37-r3
+"
+
+DOC_CONTENTS="
+ Follow the following instructions to set up Plymouth:\n
+ https://wiki.gentoo.org/wiki/Plymouth#Configuration
+"
+
+PATCHES=(
+ "${FILESDIR}"/0.9.3-glibc-sysmacros.patch
+)
+
+src_prepare() {
+ use elibc_musl && append-ldflags -lrpmatch
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --with-system-root-install=no
+ --localstatedir=/var
+ --without-rhgb-compat-link
+ --enable-documentation
+ --enable-systemd-integration
+ --with-systemdunitdir="$(systemd_get_systemunitdir)"
+ $(use_enable !static-libs shared)
+ $(use_enable static-libs static)
+ $(use_enable debug tracing)
+ $(use_enable gtk gtk)
+ $(use_enable libkms drm)
+ $(use_enable pango)
+ $(use_enable gdm gdm-transition)
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ insinto /usr/share/plymouth
+ newins "${DISTDIR}"/gentoo-logo.png bizcom.png
+
+ # Install compatibility symlinks as some rdeps hardcode the paths
+ dosym /usr/bin/plymouth /bin/plymouth
+ dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
+ dosym /usr/sbin/plymouthd /sbin/plymouthd
+
+ readme.gentoo_create_doc
+
+ # looks like make install create /var/run/plymouth
+ # this is not needed for systemd, same should hold for openrc
+ # so remove
+ rm -rf "${D}"/var/run
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+ if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
+ ewarn "If you want initramfs builder with plymouth support, please emerge"
+ ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]."
+ fi
+}
diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild
index 375f98aabb34..5ffedf306a90 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-9999.ebuild
@@ -3,13 +3,15 @@
EAPI=6
+inherit flag-o-matic
SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
else
SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
inherit autotools readme.gentoo-r1 systemd toolchain-funcs
@@ -19,8 +21,6 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
LICENSE="GPL-2"
SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug gdm +gtk +libkms +pango static-libs"
CDEPEND="
@@ -28,11 +28,15 @@ CDEPEND="
gtk? (
dev-libs/glib:2
>=x11-libs/gtk+-3.14:3
- x11-libs/cairo )
+ x11-libs/cairo
+ )
libkms? ( x11-libs/libdrm[libkms] )
pango? ( >=x11-libs/pango-1.21 )
"
DEPEND="${CDEPEND}
+ elibc_musl? ( sys-libs/rpmatch-standalone )
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
virtual/pkgconfig
"
# Block due bug #383067
@@ -51,6 +55,7 @@ PATCHES=(
)
src_prepare() {
+ use elibc_musl && append-ldflags -lrpmatch
default
eautoreconf
}
@@ -60,6 +65,7 @@ src_configure() {
--with-system-root-install=no
--localstatedir=/var
--without-rhgb-compat-link
+ --enable-documentation
--enable-systemd-integration
--with-systemdunitdir="$(systemd_get_systemunitdir)"
$(use_enable !static-libs shared)
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 683776f0b56d..09ce8b21f72d 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,15 +1,7 @@
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_p20170829.tar.gz 183612 BLAKE2B 88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1 SHA512 bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
-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
-DIST silo_1.4.14+git20120226-1.diff.gz 10389 BLAKE2B ad2f6dfdb468a81b71f1f9b43668d162ca946278b03ce115527712beb49c5319e1e285df7e0fa45bc126264b6c35cb2e950184c0647da3a990e087c6dc28fbca SHA512 0dd39461357f862bc0eb7d0b4db8e3e9acadb30f70c8c638b1adef6f6c306d0c475bf59e29c72a91594fcbf544c80e05e5293b857265d4cd579696f10993483b
-DIST silo_1.4.14+git20120226.orig.tar.gz 747622 BLAKE2B c2c92c01516da82f4ee2a2c8dc3a992c26ac89ea22a224aae900761c011c3cb5f13aedfdffb1bf743385910b582928ca6c7d2bd5abef07abbca88a0c08f3aa82 SHA512 14d7ad363232e7520f2c1d6ea5ca26e5b0a2059be6b161799cc6cc155ecbe0590c890433a5442f48c2d2a47b784053063e08e4140895807fc595e291f42ab9e8
DIST silo_1.4.14+git20120819-1.diff.gz 10711 BLAKE2B c44a0204e3aece4eec8355f88b3a195c1ba7019c0aa648cc4e28ff6cb85fc6d96634bd282e5aaea9123dbc5835820acf2fc15054c91842d6b1040fc13cb0033b SHA512 60719b672a0f1dd2a005e763efd232bbf7aeb00198e0b46827208b78f1b32acc3a730d43944382dec4b95fddfbb373b1eb69dc911ad28ec9d1d1e6c45d84db20
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
+EBUILD silo-1.4.14_p20120819-r1.ebuild 1565 BLAKE2B 598fdbfd6184670c88d7023fa1f7713178b7be1fe68497c7e3f87bcaafcbdaca102f44ee589d9f73cdbb134178c7e9b2014e456a656e38e8974a35caaede0e9d SHA512 472d1e04e628d409dffcc77bcc17073591116ef6c77859d1f7a238b0bf9e87311c62c2a1e1988df3077c914d792dc61b3a9930b4687f9c14bec53392064a8aea
EBUILD silo-1.4.14_p20170829.ebuild 1613 BLAKE2B cc6dd35696d8eea18ea27cb702a6baff0e2458ced042e4b3e2ad2f3995c6c64b75c0145bcdf1da91b7b79c002e6dc8bae4601702973575b8c09cc78b0cdfe47f SHA512 6c1a1bca4ee295f3d64b883843307ecee5371e6a4272fbe42a065ee96dca70be586a2e2cd87c17fab8a56877ee671828f8bd92377cb3215303d96ed82bd07f42
MISC metadata.xml 383 BLAKE2B 30e20990d4d208db4d45f19aaab45fad2afdb238415163399d2665d1327f6932dbf420ecc455ad03ba69492a1ec9c18397362164873016427a624e8fb3e41844 SHA512 4d4c999f52f1dfb269edc79e10df3fe667273d895eceaa4db695e9bcfe5ba781a0f9f7367411fb4be71ecedc679ce792c2359801e28b2c164fd7f44b971ced5a
diff --git a/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch b/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch
deleted file mode 100644
index afcfc462ea87..000000000000
--- a/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-# Patch to make silo compile and work with >=e2fsprogs-1.4.14
-# http://bugs.gentoo.org/show_bug.cgi?id=350677
-# http://marc.info/?l=linux-sparc&m=129468771631829&w=2
---- silo.orig/common/malloc.c 2010-02-28 12:11:51.000000000 +0100
-+++ silo/common/malloc.c 2011-01-22 12:06:42.849946213 +0100
-@@ -27,6 +27,12 @@
-
- static char *last_alloc = 0;
-
-+static char *align_ptr_to(char *ptr, unsigned long align)
-+{
-+ return (char *) ((((unsigned long) ptr) + (align - 1UL)) &
-+ ~(align - 1UL));
-+}
-+
- void *malloc (int size)
- {
- char *caddr;
-@@ -34,10 +40,34 @@
- caddr = malloc_ptr;
- malloc_ptr += size;
- last_alloc = caddr;
-- malloc_ptr = (char *) ((((unsigned long) malloc_ptr) + 7) & (~7));
-+ malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
- return caddr;
- }
-
-+int posix_memalign(void **memptr, unsigned long alignment, unsigned long size)
-+{
-+ char *caddr;
-+
-+ if (alignment & (alignment - 1UL))
-+ return -1;
-+ if (alignment & (sizeof(void *) - 1UL))
-+ return -1;
-+
-+ if (size == 0) {
-+ *memptr = (void *) 0;
-+ return 0;
-+ }
-+
-+ caddr = align_ptr_to(malloc_ptr, alignment);
-+ malloc_ptr = (caddr + size);
-+ last_alloc = caddr;
-+ malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
-+
-+ *memptr = caddr;
-+
-+ return 0;
-+}
-+
- void free (void *m)
- {
- if (m == last_alloc)
diff --git a/sys-boot/silo/silo-1.4.14_p20100228.ebuild b/sys-boot/silo/silo-1.4.14_p20100228.ebuild
deleted file mode 100644
index 33094a3840cf..000000000000
--- a/sys-boot/silo/silo-1.4.14_p20100228.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="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_git2010228_p1/g" Rules.make
-
- # Fix build failure
- sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE/g" Rules.make
-
- # Fix bug #350677
- epatch "${FILESDIR}"/silo-e2fsprogs-1.4.14.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() {
- 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."
-}
diff --git a/sys-boot/silo/silo-1.4.14_p20120226.ebuild b/sys-boot/silo/silo-1.4.14_p20120226.ebuild
deleted file mode 100644
index f8ebb8a6813f..000000000000
--- a/sys-boot/silo/silo-1.4.14_p20120226.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="hardened"
-
-DEPEND="sys-fs/e2fsprogs
- sys-apps/sparc-utils"
-RDEPEND=""
-
-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_git20120226_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!!"
-}
diff --git a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
index 8cb43a1287e1..2431901f440d 100644
--- a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
@@ -18,7 +18,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=""
DEPEND="sys-fs/e2fsprogs
diff --git a/sys-boot/silo/silo-1.4.14_p20120819.ebuild b/sys-boot/silo/silo-1.4.14_p20120819.ebuild
deleted file mode 100644
index 40219701f90d..000000000000
--- a/sys-boot/silo/silo-1.4.14_p20120819.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- #Set the correct version
- sed -i -e "s/1.4.14/1.4.14_git20120819_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"
-
- make ${MAKEOPTS} CC="$(tc-getCC)" || die
-}
-
-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
-}