gentoo resync : 04.08.2018

6 files changed, 4 insertions, 54 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index ee31a8ee15eb..955d7b636049 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/getdvhoff/Manifest b/sys-boot/getdvhoff/Manifest
deleted file mode 100644
index 39c213c45a59..000000000000
--- a/sys-boot/getdvhoff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sgibootcd-0.12.tar.bz2 3810 BLAKE2B 973c6e01f1e90b9009b57725e59e295e8cbdcc30595735eab1a4cd3929aa71edde66d352bb04b61670eb7ad464916d0e4b83f6fabbc8f641c150edcf96f4985c SHA512 180e4f5a185b14c0b2c8158b368a50a3a55673fa86760e2a424c9533b1bb8ec37824c715ba02fd264621e2e31906ddd310398e9f24cf19147bce3e49fc62da3e
-EBUILD getdvhoff-0.12-r1.ebuild 1111 BLAKE2B b571063f5fb556d21ded56476e55e9bb42fae2db1440186111185da846a1025297604c14bedb790c14246aad121a974e2a76ae767a4e55d2d250aab8979e91d5 SHA512 0237e2e6e784edb5c98efcff2cfc7c59bb0a4edb9f0b349303281907d98239ccc8e344942bfe88394e7efba84f2dafef4f5d90a048c4c354013b064c7b38a076
-MISC metadata.xml 376 BLAKE2B c21ad4d586a4990b98e1417f303e1ba840273bdb1de51ff45a95148dde2a900e78bed72bfcf6d3c02f6fd5226e8be4d803a03129045cab00fd8a17770d33d117 SHA512 9ebced4e75b5b65674d03e6cf1ac6c7c13cce64bca5bcaef4d31a718428e1954b06d2869d56cfc7b0dbeb63c450d48f14b389cf30789ce21a52bb841b4542fb5
diff --git a/sys-boot/getdvhoff/getdvhoff-0.12-r1.ebuild b/sys-boot/getdvhoff/getdvhoff-0.12-r1.ebuild
deleted file mode 100644
index 44d53d1e9199..000000000000
--- a/sys-boot/getdvhoff/getdvhoff-0.12-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility for use on LiveCDs to calculate offset of the ext2 partition for losetup"
-HOMEPAGE="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/"
-SRC_URI="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/sgibootcd-${PV}.tar.bz2"
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~mips"
-IUSE=""
-DEPEND="dev-libs/klibc"
-RESTRICT=""
-S="${WORKDIR}/sgibootcd-${PV}"
-MY_S="${S}/helpers"
-
-src_compile() {
-	cd ${MY_S}
-	local mycc="$(tc-getCC)"
-	local mysrc="getdvhoff.c"
-	local klloc="/usr/lib/klibc"
-	local klobjs="${klloc}/lib/crt0.o ${klloc}/lib/libc.a"
-	local klcflags="-march=mips3 -Os -fno-pic -mno-abicalls -I${klloc}/include -I${klloc}/include/bits32 -D__KLIBC__ -nostdlib"
-
-	[ -f "${MY_S}/getdvhoff" ] && rm -f ${MY_S}/${PN}
-	einfo "${mycc} ${klcflags} ${mysrc} ${klobjs} -o ${PN} -N"
-	${mycc} ${klcflags} ${mysrc} ${klobjs} -o ${PN} -N
-}
-
-src_install() {
-	cd ${MY_S}
-	dodir /usr/lib/${PN}
-	cp "${MY_S}"/"${PN}" "${D}"/usr/lib/"${PN}"
-}
diff --git a/sys-boot/getdvhoff/metadata.xml b/sys-boot/getdvhoff/metadata.xml
deleted file mode 100644
index e4344125b38d..000000000000
--- a/sys-boot/getdvhoff/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>mips@gentoo.org</email>
-		<name>Mips Team</name>
-	</maintainer>
-
-	<longdescription>
-		getdvhoff - Utility for use on LiveCDs to calculate offset of the ext2 partition for losetup
-	</longdescription>
-</pkgmetadata>
diff --git a/sys-boot/shim/Manifest b/sys-boot/shim/Manifest
index 55efec597720..c70cd98ff171 100644
--- a/sys-boot/shim/Manifest
+++ b/sys-boot/shim/Manifest
@@ -1,5 +1,5 @@
 DIST shim-aa64-15-5.aarch64.rpm 397028 BLAKE2B 4e89dd2029238e9b455c469b2857610bfa0d686c43a6f93b7daa70625317c68552967e6761e2c4912b098880c2ccf04278736ca51b7c2e95bcfc700a716bf69d SHA512 1d27ec70bf8b18777bb38cec6769172bd56aa72e9f910e9fa21039dc1c133ebf789fe46fbfe079df6167c3982f6c47bdcad26d3175d6cf9494f89dc9a8a0c823
 DIST shim-ia32-15-5.x86_64.rpm 1026312 BLAKE2B 42f018888463b0da1edbb2ae7379e63b79cea84208ef7ce069c3753bad2f232cb156d73e16864da279c31e8f8f25daa01d6ccc16a6fd13daa286d88460232f9b SHA512 a5d297265480b6a77f05050ecb31b31d2275df0b2f9bfa5ef1a4851163501f295fb81c142aa9fd30826b9e001f876c3d864b3d7b2f89575e6839f3939bca4755
 DIST shim-x64-15-5.x86_64.rpm 669944 BLAKE2B 25d7fb6a4869212610158313f9b8d55f102d6d4e8fc562a43b4654e29fcdb6cef4ba4421d56afb1ad98b7df1c7fe121558a757f06db86cc391ea0ad3e2f9982e SHA512 4888e9422d71f4f8f05343e8dc161f8e48a31ba28469fe3671ce20283e5f7fced656f2d0583d76532dddecc49c2a8504a504b5da951a1e2c6302bf38fac5048e
-EBUILD shim-15.5.ebuild 842 BLAKE2B 78b9fd05d6db526a79fc1dbecfb1be165d067e1b40bad5c74bc3971ab89b044e82210fc7b8c331aeaeebc128b8b54f2f10e55c33803869b580cf104f59dea125 SHA512 dc90075eea258875c17bd507dd84d8fe5ccdb5230df37e5e9291dee8d5a34b337e3f441eeb9455075de38b0ae4602d9250d5c08c60c02aae5e6115fafe7f9033
+EBUILD shim-15.5-r1.ebuild 937 BLAKE2B df7a41642f40dc84691ed02eefe8f35d308b12ba4b3119d63d72c3b56f5fb4ac0fba039236500c1e3cf6124c871077e6d37390bc225337889d3bd6aa7560e44d SHA512 678451571481a2e8d802cc6b3e6a1ed8f602ff9e941b92ffc35847e668e4f22c92f802f42cfee40198d96ba7c1af35309cd8be17829f79790f02eea3d9119b38
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sys-boot/shim/shim-15.5.ebuild b/sys-boot/shim/shim-15.5-r1.ebuild
index e946b3ad5dc2..2d1591310850 100644
--- a/sys-boot/shim/shim-15.5.ebuild
+++ b/sys-boot/shim/shim-15.5-r1.ebuild
@@ -10,8 +10,9 @@ HOMEPAGE="https://apps.fedoraproject.org/packages/shim/"
 MY_PV="${PV/./-}"
 SRC_URI="amd64? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-${MY_PV}.x86_64.rpm
 				https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm )
-		arm64? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/aarch64/shim-aa64-${MY_PV}.aarch64.rpm )
-		x86? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm )"
+		x86? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-${MY_PV}.x86_64.rpm
+				https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-${MY_PV}.x86_64.rpm )
+		arm64? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/aarch64/shim-aa64-${MY_PV}.aarch64.rpm )"
 
 LICENSE="BSD"
 SLOT="0"