gentoo resync : 09.06.2018

5 files changed, 0 insertions, 239 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index d14be9e7b5ec..79151d144100 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub-static/Manifest b/sys-boot/grub-static/Manifest
index bf1ad06938dd..3d28fab93d6e 100644
--- a/sys-boot/grub-static/Manifest
+++ b/sys-boot/grub-static/Manifest
@@ -1,13 +1,7 @@
-DIST grub-static-0.96.tar.bz2 859179 BLAKE2B e41c1e0b8abc7d7f7ca1d1b08811e7987b6bd9c14366522d4ca5ee8944dcf6c6c285f1d544002e4f6af20156d18b20134c2fde8cf8c69611b3f38b356b13e818 SHA512 a623e230c3b2dd632daf65d897261a8b28a609b1adcfba67661cb42f43fe4f06bb4746f5095b41b689c2725f9d3379d03d02bca21b4acbf5faa3dccbad160a27
 DIST grub-static-0.97-r10.tar.bz2 888963 BLAKE2B 1891685b312c129efb47fd78ffd2a433655225b8dcb8a60592faabbc5300ce6d56efea70272cf9a1e8cfaa70224d1a3a313d1c2e2296bfd43593a4a12aec541e SHA512 2a18405c9f7b0712dac2246213f723c1a2be6734bff133b7906e7c18e4370faf924f35d3b834d74761cf50b3ab59e969fbff010e13292618187c65a72aa45a87
 DIST grub-static-0.97-r12.tar.bz2 1171586 BLAKE2B 066cde81f4b1849467d83ec982745dc8449e38895edc0eee979d6ea782a802c2a2c6b2a4f03eb976c03ce3f6e3213d3605e9bb6c99f8479e59fafb1716cbd0c9 SHA512 0a4c0b3b556db366df70c7c51a1a26f614f949be4002d7f9a053b7261b80c2c49410e8fd04c7e3717ea560e7cbc6a692d859d07bdfe2099a78a33bce78ac5395
-DIST grub-static-0.97-r6.tar.bz2 1005650 BLAKE2B 8f2a6fd51295cd4361d935a29f3164720d9516823b038e897d47f5429b08e119c9d269ed6728f5aceb3b2fe27320958a598d1c409d5e77bdd02848ce101a2e79 SHA512 a6edc311bcfccdb937c10ca1b4d33ecff52f3ee03ad827ecc849f6bb7d88204bcd29e8b7691bc1c0fd6386ed074ab8817667c0cf25cbb64bdd900fb01338727c
 DIST grub-static-0.97-r9.tar.bz2 937621 BLAKE2B a61fa8b41de4208cf30222fa742bb84a5f60bb924f5cf57f12ae9a382b1bf9e7feff740029ca3a08939d070275b4bb5389981c9a26f6decd18d4c7120f8d0f52 SHA512 a8b1f7cd416f2c41c88ba5c34889e7afe9615bf985e69b2d1d3ec2a20b7ceb13e53e8b3df91a5077bfa1a217f3274362033d72f9bafe3ad22be378f26728035c
-DIST grub-static-0.97.tar.bz2 954051 BLAKE2B 36e99e707a14ac73875222d4934e1f29084658f5b1937c39f8295ca3418e80cb69d8dec3d7a0fbce8426c12d0d4c7881dd7dad3e006189051aa2169686d97d64 SHA512 e60b1384e60bc1261482f3bc41b98c1595d4377da68b251d93894ae7a1b3b2ca77219ca9b7685d1cc8db950e35afb1b403cb3e9b7df15e0ab96d452341547668
-EBUILD grub-static-0.96-r1.ebuild 411 BLAKE2B 53bb5c4f085590ab9684d9c21b8df81a315af472a0e0e27ad250725e0b634f978253ef4779cc987536daa278d1cbfd5db4a2226bec87d9b7050d3ffba7cfd066 SHA512 edf492bd63e8deaf3ed29b07c1668c2371b09c823cb0f979c2fd77bcea194cdfc21d5313035ec04f9fa7a34b2fab75341208f7e6c3856d45b83ccd46a7e6a5b6
 EBUILD grub-static-0.97-r10.ebuild 5402 BLAKE2B 981e8f761083e4725de45b10d16db2b8e11b54eaaa0e4793b2e7633832c5d758f5abcbe47d846f3b3fc85eefb6d2946f354bc584358bb55034b39b7e00a8b1b0 SHA512 6523ea58548adfab70c50f136b179ce3cc03669fa78b6efac28208f8b68eb43bb5bfa2039b57f7516fc068ebc267e219df2567f1ac7750f713ff878bd15eb3bf
 EBUILD grub-static-0.97-r12.ebuild 5402 BLAKE2B 6e3fa13bd6349cd5d468a799c748fe5f64dcb2a743c10bae241b8148bde4b1ff3c2a56d920b8e9ead3de1ccd4014dce2514861b2e87ccfbba30e51ec5d317d31 SHA512 5d7be3447bf3eb2c0fade5fe31616a6ba8df5c52ecfb2a0782bb5a569ece553f98e1fbaa9caa6580160ffad4d9db135dfa491136727c43c0dbb96e3b292a4a1c
-EBUILD grub-static-0.97-r6.ebuild 4332 BLAKE2B 28819019b2ed2c8a1e72edb713ba49634be5a3b4731490da25fb4743ec3228753aea927622eea2ae0a3ad0e91b47ae2d2f5c6c7f25e8772851c34eaf32d5fa30 SHA512 a3b7d75ac9ea8cd904eefb951990e3ffa5bab29cc64c67f232ae34c7eccb080cfc9421e1a101e2418d0967ac2437bb1ded283d6dae695f4dc87705f9a2f1fd0c
 EBUILD grub-static-0.97-r9.ebuild 5297 BLAKE2B 692292ba38851671d6a7315a5deaca1f99b371cb254fd958271fa6ad490e450c0924de2b59be8a4096b1a545335923677a945d2aef34436b2b191083e07b573b SHA512 f44b2305b5d5691c0de0ae4acf75def1d1d5c52bfd2db9b44dfc268d7bb5f667d63c96fb8bea722fffeada7c8e623ee2505aefb43528ff9e225c306752f4ee8b
-EBUILD grub-static-0.97.ebuild 1925 BLAKE2B 3cfc741c96b4f07b153400ef7a21b0479e9caa556a3feeabc87a3cd9de9aad040f9da2c72cb9757ed0c0942b5b3672810de629702e82abc174004b0f33b8bed7 SHA512 1394f71ad0db33a14deaa83d4638ebed952467cbfb9a751fdff3fd037f60c290d1f4bfbcc3aba9651a6589f320e804342d42e381c84a0bf927ed912513d9a0b7
 MISC metadata.xml 242 BLAKE2B a110ca18fd86f3fcfe9a5c10ecd97d2c9727c04919ddf21976ceffcdf65dd1069c81e4ad554301b847665892de1313320836a327ca1f36381cb0f9e21219e9e8 SHA512 0891a67242a0cd36cac143b427affa9241ec8f8173b79423632349d542f9bc6e2097ffbb8e96b560c41e13b5b43ddf0f822962da98b5d2e58068d7855acb4965
diff --git a/sys-boot/grub-static/grub-static-0.96-r1.ebuild b/sys-boot/grub-static/grub-static-0.96-r1.ebuild
deleted file mode 100644
index f06b0d48685a..000000000000
--- a/sys-boot/grub-static/grub-static-0.96-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Static GNU GRUB boot loader"
-
-HOMEPAGE="https://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/grub-static-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-IUSE=""
-DEPEND="!<sys-boot/grub-2"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cp -a "${WORKDIR}"/* "${D}"/
-}
diff --git a/sys-boot/grub-static/grub-static-0.97-r6.ebuild b/sys-boot/grub-static/grub-static-0.97-r6.ebuild
deleted file mode 100644
index 308d59ede032..000000000000
--- a/sys-boot/grub-static/grub-static-0.97-r6.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
-#      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
-#      we never updated any of the source code (it still all wants menu.lst),
-#      and there is no indication that upstream is making the transition.
-
-inherit eutils mount-boot
-
-PATCHVER="1.7" # Not used, just for tracking with main grub
-
-DESCRIPTION="GNU GRUB Legacy boot loader (static build)"
-
-HOMEPAGE="https://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${PF}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-IUSE=""
-DEPEND="!<sys-boot/grub-2"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cp -a "${WORKDIR}"/* "${D}"/
-}
-
-#
-# Below this point, everything is also used in grub-static!
-# Please keep in sync!
-#
-
-setup_boot_dir() {
-	local boot_dir=$1
-	local dir=${boot_dir}
-
-	[[ ! -e ${dir} ]] && die "${dir} does not exist!"
-	[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
-	dir="${dir}/grub"
-	if [[ ! -e ${dir} ]] ; then
-		mkdir "${dir}" || die "${dir} does not exist!"
-	fi
-
-	# change menu.lst to grub.conf
-	if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
-		mv -f "${dir}"/menu.lst "${dir}"/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-
-	if [[ ! -e ${dir}/menu.lst ]]; then
-		einfo "Linking from new grub.conf name to menu.lst"
-		ln -snf grub.conf "${dir}"/menu.lst
-	fi
-
-	if [[ -e ${dir}/stage2 ]] ; then
-		mv "${dir}"/stage2{,.old}
-		ewarn "*** IMPORTANT NOTE: you must run grub and install"
-		ewarn "the new version's stage1 to your MBR.  Until you do,"
-		ewarn "stage1 and stage2 will still be the old version, but"
-		ewarn "later stages will be the new version, which could"
-		ewarn "cause problems such as an unbootable system."
-		ewarn "This means you must use either grub-install or perform"
-		ewarn "root/setup manually! For more help, see the handbook:"
-		ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
-		ebeep
-	fi
-
-	einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}"
-	for x in \
-		"${ROOT}"/lib*/grub/*/* \
-		"${ROOT}"/usr/lib*/grub/*/* \
-		"${ROOT}"/usr/share/grub/* ; do
-		[[ -f ${x} ]] && cp -p "${x}" "${dir}"/
-	done
-
-	if [[ ! -e ${dir}/grub.conf ]] ; then
-		s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
-		[[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
-		[[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf
-		[[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
-	fi
-
-	# Per bug 218599, we support grub.conf.install for users that want to run a
-	# specific set of Grub setup commands rather than the default ones.
-	grub_config=${dir}/grub.conf.install
-	[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
-	if [[ -e ${grub_config} ]] ; then
-		egrep \
-			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
-			"${grub_config}" | \
-		/sbin/grub --batch \
-			--device-map="${dir}"/device.map \
-			> /dev/null
-	fi
-
-	# the grub default commands silently piss themselves if
-	# the default file does not exist ahead of time
-	if [[ ! -e ${dir}/default ]] ; then
-		grub-set-default --root-directory="${boot_dir}" default
-	fi
-	einfo "Grub has been installed to ${boot_dir} successfully."
-}
-
-pkg_postinst() {
-	if [[ -n ${DONT_MOUNT_BOOT} ]]; then
-		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
-		elog "the following instructions for your /boot!"
-		elog "Neglecting to do so may cause your system to fail to boot!"
-		elog
-	else
-		setup_boot_dir "${ROOT}"/boot
-		# Trailing output because if this is run from pkg_postinst, it gets mixed into
-		# the other output.
-		einfo ""
-	fi
-	elog "To interactively install grub files to another device such as a USB"
-	elog "stick, just run the following and specify the directory as prompted:"
-	elog "   emerge --config =${PF}"
-	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
-	elog "grub where to install in a non-interactive way."
-
-}
-
-pkg_config() {
-	local dir
-	if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then
-		einfo "Enter the directory where you want to setup grub:"
-		read dir
-	else
-		dir="${GRUB_ALT_INSTALLDIR}"
-	fi
-	setup_boot_dir "${dir}"
-}
diff --git a/sys-boot/grub-static/grub-static-0.97.ebuild b/sys-boot/grub-static/grub-static-0.97.ebuild
deleted file mode 100644
index f25a8ea41bf3..000000000000
--- a/sys-boot/grub-static/grub-static-0.97.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit mount-boot
-
-DESCRIPTION="Static GNU GRUB boot loader"
-
-HOMEPAGE="https://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/grub-static-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-IUSE=""
-DEPEND="!<sys-boot/grub-2"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cp -a "${WORKDIR}"/* "${D}"/
-}
-
-#
-# Everything below is directly copied from the grub ebuild
-# please try to keep it in sync
-#
-
-setup_boot_dir() {
-	local dir="${1}"
-
-	[[ ! -e "${dir}" ]] && die "${dir} does not exist!"
-	[[ ! -e "${dir}"/grub ]] && mkdir "${dir}/grub"
-
-	# change menu.lst to grub.conf
-	if [[ ! -e "${dir}"/grub/grub.conf ]] && [[ -e "${dir}"/grub/menu.lst ]] ; then
-		mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-
-	if [[ ! -e "${dir}"/grub/menu.lst ]]; then
-	einfo "Linking from new grub.conf name to menu.lst"
-		ln -snf grub.conf "${dir}"/grub/menu.lst
-	fi
-
-	[[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}"
-	for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
-		[[ -f "${x}" ]] && cp -p "${x}" "${dir}"/grub/
-	done
-
-	if [[ -e "${dir}"/grub/grub.conf ]] ; then
-		egrep \
-			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
-			"${dir}"/grub/grub.conf | \
-		/sbin/grub --batch \
-			--device-map="${dir}"/grub/device.map \
-			> /dev/null
-	fi
-}
-
-pkg_postinst() {
-	[[ "${ROOT}" != "/" ]] && return 0
-	[[ -n ${DONT_MOUNT_BOOT} ]] && return 0
-	setup_boot_dir /boot
-	einfo "To install grub files to another device (like a usb stick), just run:"
-	einfo "   emerge --config =${PF}"
-}
-
-pkg_config() {
-	local dir
-	einfo "Enter the directory where you want to setup grub:"
-	read dir
-	setup_boot_dir "${dir}"
-}