gentoo resync : 12.03.2021

3 files changed, 3 insertions, 44 deletions

diff --git a/app-doc/linuxfromscratch/Manifest b/app-doc/linuxfromscratch/Manifest
index 35bce65ebf82..3c252839f39f 100644
--- a/app-doc/linuxfromscratch/Manifest
+++ b/app-doc/linuxfromscratch/Manifest
@@ -1,6 +1,3 @@
-DIST LFS-BOOK-7.10-NOCHUNKS.html 2104674 BLAKE2B 505f339de625e3fea75a9c03008f46378d59ad426de7d7ccc85b9c1faf6f294b69deec4ff104376a7fcd664bd6f05dc1996d924a32f455e3c73f145a081f2663 SHA512 6f925a3daf8cdc137f1640322d30775d22de6fc4749cf0a4bc2f5214ba7e1332d6fae926932f3205f360fe77ac54d0e5930961053d54a004925d796f568fcfab
-DIST LFS-BOOK-7.10.pdf 1753105 BLAKE2B 6bc945c6a0e8144d262f00837df6225701a9800d2ad7aec44c35f0bb2d2826addc8b9b86fa003f841c8d7fcd998247ee27c5b321dba3c88fd242bbf7b8ae1be0 SHA512 4165812910951ea4707c1a7eaf0b5162548569125bfff145548cc89c26f069a7bbf10bd2e0e3ecb9b3ffe722dddd5492c9dd2bbc14889b4a9dba0c22808b4af4
-DIST LFS-BOOK-7.10.tar.bz2 218705 BLAKE2B 1b63bc636347d113a4301e6aae2f9f0b2215da11056ee13757d57fe938d8f224c94317a99054d8d07c2a11a897078900a91316a1f0a798969644e45aaccb4ed2 SHA512 5aeff9d9e5040f43e30452645b98449285dbde6eed0ca65fa3cb2c127aec24616b86c665f7861b2ad31b5b375bb8b77d5a0ffee3881cf2b4437e51a18c6ee0d1
 DIST LFS-BOOK-8.0-NOCHUNKS.html 2103963 BLAKE2B 99203909e29dd83f6d7431c74b732072668a6955b53fd7f61f9286832cf7a1e5869550a44ce568b0fdaef9d5f222a5597332d963f5e7eb4fe5c8987cf1645dc4 SHA512 c190ad6ad20945a1c6ec477d085805e0a2d048ba6ad1e820a1ed5084fafdfa3edc9cffbf8d6af6468d2d5304bf2c7e4d3bc4f1ed830db48c2e07997d5d837179
 DIST LFS-BOOK-8.0-systemd-NOCHUNKS.html 1976336 BLAKE2B 16f9eeb5eac95c22fb1d00129e08da08fa82f5433542d4a6fb2da73fbdf0e4571936c5f3bd799d80cd7daf240005d230bb753ede80208aea2bb56c84dbd9baaf SHA512 d34dcf999a2ca1c467a5d4c082e926c48b265f01f856b619a877d423babebe71adbfa4d7d46cee58b60e3f9a9112d1bb967e542746c35aa6c66d1fa40077461a
 DIST LFS-BOOK-8.0-systemd.pdf 1607946 BLAKE2B ed0f135dc4cef005ad868e54c2012d2bf41fd78a2bc3606b6312b3ad03c049934ead97bd972e82458c33d008751034e9f9e26b083ca73fc41f175d45b4df1369 SHA512 2a89f85d2a4ab90102b28fb4926384312e2e34880a20a837213c34d20084cd6095c909515b52ec7e766d66b69eaa6aa02ac20c391cfda9f0a36a4ac216b2678d
@@ -14,7 +11,6 @@ DIST LFS-BOOK-8.2-systemd.tar.bz2 201088 BLAKE2B 807639ca7a8f7ec287996de7d331986
 DIST LFS-BOOK-8.2.pdf 1811466 BLAKE2B 3107ac22d67fafe10b053585e1b1401d31511e77572d5ec2e4441a2ac3be577be9b6df5a0e7cd400f30cafb354d1e0a99f491f87b706fb41f9b9b7172145cb06 SHA512 13f41ec1568e4d84015614a3d492a046d7dcfc2f6616983e6a15500b9e0ec1519ac3d77bd1e74eb942beb225dcaf53168c63f4599a8b5c4bb8cbb518a0cb909d
 DIST LFS-BOOK-8.2.tar.bz2 224525 BLAKE2B 7453bc4b6cf6b86a6adda0c95d7ce1cdc91df8b2230e313e530a731f6d5fe6b4ca6ab1d9aaff092dd66d44bd3b97f3e27e23c9eeed67abf790c8abedc6ee48a8 SHA512 3c6f4db9b4c48af9a74c28628c38fe6ab912093ec2641e37a9f2270fee97cd7469a3d10291ac2a002515d9b81bed2586594666a9c97746d3a9ecc7b004e213fd
 DIST lfs-bootscripts-20150222.tar.bz2 31584 BLAKE2B 662b8ab8f9e2cce47cb1d69bb43bb9a31935f8f4e146df218a92c741c5e694312ee0553648bf7c55d29fc157741ad8a2b17cdef3d3405ceeb1245be36352a5f1 SHA512 983da1da3ee1c3456c195b887c2bfab0ff0b338ee7f6cacba9faf6f416f8d92129ee92a0bc4402f64fea8fa647a386c439a81725fe0a30a68e337c0f0aea0916
-EBUILD linuxfromscratch-7.10.ebuild 982 BLAKE2B 2eb91fda18de0f277c3bde281b5288df297be4f1c815f9c9285efff2c1fa262db290addb15b5d6c4f7957df732e77adac27dcc39dfeb1cf158a05dd0b5931126 SHA512 9b559e357746cc3eebf56bf3f01906976d8ea578b4684fd6c48eef684e531fdcd2b7ac27045fc4933fc36aab3b90a515a3fffbc8a911eeffaf455f4717d0bf67
 EBUILD linuxfromscratch-8.0.ebuild 1182 BLAKE2B 158d24d5b0c236eea5bad255ad8ac71ceb326f0e9b8ac00ba3fc4e7e3c448a88d0547f898b1fde0f73328d4124d09f9ddd13ec7eeb2a7a45733555d9d76a8d7b SHA512 b63be71628346f1f053e59ca4f90b48fc6129cd157393ce55cb50f1d2fb0a061df94c1db73a0446f7b40c343e3ef99ea0129aca55fae176244d5961b12123481
-EBUILD linuxfromscratch-8.2.ebuild 1221 BLAKE2B 9e8445fa49f2a9aae127fc53df14467ddc0bfa99632de02013e0bae27685ca3b85759ee433a46ae1d88b487fbbf45085d93b873bcf85d318bf756895e5206fdd SHA512 8ce5609fe92970b7a16141b3dd178f91bf94885da584de9a410a886c43e3a17c9ceffebcf67f7246640b1c09462a3a37f5c7b6803ea719e680707f4b9b299936
+EBUILD linuxfromscratch-8.2.ebuild 1214 BLAKE2B d6f63ae7a106b012123b8425bbc4d3df6043f943a275925eeec6c69f64b3c18eb1e7541c7ed15758890df68e433f0606fbaff1ccc4f229521727951bd834a5d5 SHA512 fc480ff4c0b14870b3b999b7c1080096e2a7942f141b82b50d0efb99adffd40b3031c85f921f98a96e74d3818d4945afc1c458af53c910f2d234d3df6228d7db
 MISC metadata.xml 367 BLAKE2B 323d9f49fd0a09a710be4d78bc4645c5bb6bb225d45d05bc96c8b98e47636b2f0d3b4bb7b710b84146d55f550c90f206e524b319e78a2293a54666acde13a34f SHA512 c3de5d602dd7581a29eb17e65ba9f6c41be92ae67fbf2fd098dbbe93603e6e55bf6fe9a4c77738708dbcff13e3d0c54bf30719dfae090abba15ffcfa273b2995
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-7.10.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-7.10.ebuild
deleted file mode 100644
index e84225ebfd07..000000000000
--- a/app-doc/linuxfromscratch/linuxfromscratch-7.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_SRC="http://www.linuxfromscratch.org/lfs/downloads/${PV}"
-BOOTSCRIPT_PV="20150222"
-
-DESCRIPTION="LFS documents building a Linux system entirely from source"
-HOMEPAGE="http://www.linuxfromscratch.org/lfs"
-SRC_URI="${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
-		${MY_SRC}/lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2
-		htmlsingle? ( ${MY_SRC}/LFS-BOOK-${PV}-NOCHUNKS.html )
-		pdf? ( ${MY_SRC}/LFS-BOOK-${PV}.pdf )"
-
-LICENSE="CC-BY-NC-SA-2.5 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="htmlsingle pdf"
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack LFS-BOOK-${PV}.tar.bz2 \
-		lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2
-
-	use htmlsingle && cp "${DISTDIR}"/LFS-BOOK-${PV}-NOCHUNKS.html "${S}"
-	use pdf && cp "${DISTDIR}"/LFS-BOOK-${PV}.pdf "${S}"
-}
-
-src_install() {
-	dodoc -r *
-	docompress -x /usr/share/doc/${PF}
-}
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-8.2.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-8.2.ebuild
index d4ec1bd81805..369d697c4887 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-8.2.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="CC-BY-NC-SA-2.5 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="htmlsingle pdf"
 
 DEPEND=""