9 files changed, 11 insertions, 45 deletions
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index afcb8582b0cc..e4caab3d1b4a 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/halibut/Manifest b/app-doc/halibut/Manifest
index 14e3cdada2cc..984a1ba81a03 100644
--- a/app-doc/halibut/Manifest
+++ b/app-doc/halibut/Manifest
@@ -1,7 +1,5 @@
-DIST halibut-1.0.tar.gz 940897 BLAKE2B a4d6ad325b56ce1ec0685958c842891380c2c832698c7f9b0080a36b2116da27b0825231bf3f99c24b6f873d5ef0b6c69d9dc99f03c19f2a8f0c81fe7127d842 SHA512 9651ac0611060971f8b5412f6456e4e85b3107c90e7fab3352294b8c3de17dfa4935b86ec23a6431ee821b26d2d5fd2addf1114e69026d714bc9d9f94a79e12c
 DIST halibut-1.1.tar.gz 956743 BLAKE2B ba96e2847d57fd6736e7d3a3245527045fe0765c6fbcc857d3af1daf4d249ac81b5442d0ff1c9a00a153b970d83dbab59ab9430ff6cd53d7164cd7aeb4441c22 SHA512 01b0563ebb3678dc1ff1cef1d752d5ebffed70ef73a10d8266d84da3b4401006b686104bbe3e1984ebd3a54254f16d008011b3be8c29a3b9f1e3a033d61cdb15
 DIST halibut-1.2.tar.gz 991975 BLAKE2B e5751d2f90968240825e3ddadbc070de856f6a340e832bcf0977fb8d31f7b7c8eefa776f3bba4df58641d22cca7e9ac562eef236069e1d9a8e9cdb41324a7376 SHA512 b04cc5c52f2d7cd2bb9a36a1aa896c6a4fd11bcfc5fad3d9c74576bf2576ce237cd7ac3ceeff3bd10dfd5a229614d06d23323509d3a83ff74b4a1965e1d726fc
-EBUILD halibut-1.0.ebuild 717 BLAKE2B 5350a38ae014daaf24fe2e18930dc0b2c6395426fb74fd8861bb745aeb099213fac10d55f76a9c1b54ec6fc36d88a5b0552cc6190f94f560ff8ac91a1a92565f SHA512 2ea83f1557f756078593a0e240e128267f970c87cac4768c6d6f60f7f255cb7c747820a1f9716a7ef52b2f6d0d2d17a50604afd59f59c784b3a5c128d23ed0b0
-EBUILD halibut-1.1.ebuild 730 BLAKE2B b8c23a8c67609130ba239952e208af76ae2b9c5faeeedbcf2c4f2782d96e1a357f59143f111c47d613f768ce0bb2a66e78b44e61ca9725a78e83ffdd252585f8 SHA512 2e57e22344bb84a3920f103d2af0ebece3143f17fd28c6811db6cfcb0d2199e6b8eed1d7293915d3f407522be23e96b5eb5ad39f1335329a4cb151e25a72db4f
-EBUILD halibut-1.2.ebuild 897 BLAKE2B 2f0229f11070c9844f48d551a710935172e2e553dc01b255c12f301b6d203f0fdb6a12eccd5bb662211e1e42f3cc3de0e4de8891800d15fb17d1385e40766578 SHA512 00d5154d7091fd98da675994d9689763381e4f17acceae88e4b824af0f0dd2883ae4e2dbac2de2dd986c9631babeadd642ecf9a57e962da5304475d263470854
+EBUILD halibut-1.1.ebuild 732 BLAKE2B c72880cf39116571de0b822b1f43ef29c67cf07acf7f7f6248829c419bc32a37bfb50a02f5bcc7c031ac2c4911a822b33b1a64750f97421e823504f4a86f6f7e SHA512 81fafe93dc2f2ac96d28ced8de7e4dbaf1538d7b4c00293cb54cf2de00f30a4f4ac62adbf163465b2432391ace355ec0e8ebb66c01e5988aec3794a0ef34d1ec
+EBUILD halibut-1.2.ebuild 899 BLAKE2B 76e85c125209441b09c03f8d14a12d80d2e3119bf4ffcfc90d299e8fbfcbbdd25d2c31753ff371ff2bde9df0b193ac4f64c37911f28912a9734dab2acd289474 SHA512 2c5f82e652f5533ce75806b6b54de43ef2bd145582287e917aa96f32b852c9f3ffe027ce11e19916d0ed0fc49adc6f82c6d789c8d4f4f370ab772db6820f110d
 MISC metadata.xml 248 BLAKE2B 098d4976304542e71e494b46eb846b1ddc3f761a0e1eb4477c68fb0270bfd195de3fa8da7de3cf5a86d33442d7f1fc30fded9f56346e784edfbb969387d62eb5 SHA512 5a0cba98b94cc06306b0e352d40ff113de69408752b14e1ba9efdce3f564c9bd11f8f65e89fc24d2e2056056edef5b77ab1ca8aa33e7faad5d0eaef40b895c85
diff --git a/app-doc/halibut/halibut-1.0.ebuild b/app-doc/halibut/halibut-1.0.ebuild
deleted file mode 100644
index d2d2862c5199..000000000000
--- a/app-doc/halibut/halibut-1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="yet another free document preparation system"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/halibut/"
-SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_compile() {
-	tc-export CC
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	LFLAGS="${LDFLAGS}" \
-	emake -j1 \
-		BUILDDIR="${S}/build" \
-		VERSION="${PV}" \
-		|| die "make failed"
-
-	emake -C doc || die "make in doc failed"
-}
-
-src_install() {
-	dobin build/halibut || die
-	doman doc/halibut.1 || die
-	dodoc doc/halibut.txt
-	dohtml doc/*.html
-}
diff --git a/app-doc/halibut/halibut-1.1.ebuild b/app-doc/halibut/halibut-1.1.ebuild
index a0353ec9a7c3..9b4f6966032f 100644
--- a/app-doc/halibut/halibut-1.1.ebuild
+++ b/app-doc/halibut/halibut-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit toolchain-funcs
 
 DESCRIPTION="yet another free document preparation system"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/halibut/"
-SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/halibut/"
+SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/app-doc/halibut/halibut-1.2.ebuild b/app-doc/halibut/halibut-1.2.ebuild
index efc39fd55892..81ec54f31f0c 100644
--- a/app-doc/halibut/halibut-1.2.ebuild
+++ b/app-doc/halibut/halibut-1.2.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
 inherit toolchain-funcs
 
 DESCRIPTION="yet another free document preparation system"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/halibut/"
-SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/halibut/"
+SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/app-doc/jargon/Manifest b/app-doc/jargon/Manifest
index cdd624c90fcf..59a7f94944bb 100644
--- a/app-doc/jargon/Manifest
+++ b/app-doc/jargon/Manifest
@@ -1,4 +1,4 @@
 DIST jargon-4.4.7.tar.gz 9061260 BLAKE2B f2e29464d0ed946a5a2f0529eba3110f55ae068796522c05402ff2addc626501a43cbc633aecee15d6289e7a5236ce196f065ab782e4686142c51ba21658b517 SHA512 afc8c44994f22de3fbae325e315fa101c04a5db2ef6af7c5592b4c072cc0e94a2bc523042ab9c894977c34f8321aea77c8208ae57040a4e3419cd240ce169803
-EBUILD jargon-4.4.7-r1.ebuild 598 BLAKE2B 03e77ee4760ffdf7942f8d2ac90dcece35f9e9ba9c531b11172dce62003fa7a5fa31caa2e65d33047356179ffcb62b9314d67d988c5dd4f1f808e09a3837835a SHA512 f28344985b4a14bc8a73ed0516c25fa7c18e731ad14088a9720df1a694185ddc2702c93f43096da1aabaf72b7583a049f4e107d1ef26c7ca6db18b21cb3481c3
+EBUILD jargon-4.4.7-r1.ebuild 597 BLAKE2B 95c8e31e573e5a7f590f153b160e16b2bfb26c61e6bd16fbf12532a3ee1a86dffa4b576023ba13ae2ea805e4da3624c36c8b5cd92178f409c9a5ce5e9a1c3387 SHA512 ab2ce7706e6c8917e34eb89c1dd8d33fc17d8f9bc61e0ad002afc9d894782e2494dee40c42e5468eff531458b81c0d5f40f682958f9eee630220d4788f875683
 EBUILD jargon-4.4.7.ebuild 602 BLAKE2B 977b6df3fd38534acc879fcb567d3488a88a3c344eca8b4517636a767b346cba46b64203bcf63d69a18dcee6a159897ee34543bbb2458d6a6f597dddefbdfd8e SHA512 ef9f1e5cee8130882ae2c02bb0af1245c2e2ae1d89c20ac6d726249d254d686e36bf560cf2e99ea5c4e98fbbd25baa45c57c9470c4a9ebdd9200712cf2600204
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-doc/jargon/jargon-4.4.7-r1.ebuild b/app-doc/jargon/jargon-4.4.7-r1.ebuild
index dbef9a30dcb7..5d9e0420a38e 100644
--- a/app-doc/jargon/jargon-4.4.7-r1.ebuild
+++ b/app-doc/jargon/jargon-4.4.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.catb.org/~esr/jargon/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-doc/linux-kernel-in-a-nutshell/Manifest b/app-doc/linux-kernel-in-a-nutshell/Manifest
index 9ed656bcc474..0e30d3b60a96 100644
--- a/app-doc/linux-kernel-in-a-nutshell/Manifest
+++ b/app-doc/linux-kernel-in-a-nutshell/Manifest
@@ -1,5 +1,5 @@
 DIST lkn_pdf.tar.bz2 3533339 BLAKE2B d67708c7b100707b6a74f1a983bc396f1068e60d74c63eb2ed99830f0ea4b37b4260504d45f27ceae70e9c01b92b65d9e5076476466eade84f9dbe8d1b384fbf SHA512 5a0815148b379347675e2c8f71476e8e950a8028fd625044457773c4e7b62fb886edc7151a46a9dd0cba47729c99317f779974e395149d87c4c9483c7404ede0
 DIST lkn_xml.tar.bz2 1058278 BLAKE2B f85cc277e7f313e00d26f53218d315c6b741b584a597b2b0adf3a9bf3dc13ddaa2203b1d6976e4189aa8dbeb167709f7ed3522a7c9cf8111e62b6f8d0425de2e SHA512 831b19f67b50f897f93720c19b7bbf90673c420c2b1ce257de3c656a01cb12ebee8499dc86c673cba9c14fb6fc50e644fbf84156d9d2580127affeabda87a83c
-EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 664 BLAKE2B dc7d9ff8e80e47fdd0cdd9a48532555ca27349e8fc4ee3e6f53c59b9e2b9ff754c956a0cbaa87035913c0bf2b058146f966b2346efebfcca72b0a322eb9f2cba SHA512 4496ffd2aa066865856a7f6d82871674f66a996d8bdf3d0b0066c3eeb40c3ddd00b4fb7741d83919314265c727b6addb567fe496e8faba08bf989d55a5f166ef
+EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 663 BLAKE2B 8aff176a9164daaf568327a48feed7ff38e5b551bfc3c6111d4d0f963a5cad05d6e161c2297c986aaf10fb1db6e61d32c1f6fcd9fb7253e4d528a9e5175ade4b SHA512 802e77c2bd54c6653f9af2714d4367cf89fdac26b903d573efdbf6a74f6924c2a3ec9741ee39d8807ed5eccd414de6b94c002c734d4ec82c93a920447495f652
 EBUILD linux-kernel-in-a-nutshell-1.ebuild 644 BLAKE2B 228bce01ce5ecf7c8bc8c441e5b1a9722c056d6e02004c6de56dd597c058d4baf7885b321e82c320a25eae14e2c78801b273eee7f17e8e202c03ee900e8daeac SHA512 de7e025ebefe5fbfd920411948524ad3261f7460c6f0eb1ef7f6bdb07f9f04f3383692de514a09ed6858f273ce5156eab51a5f90a98319a36f6103c11814e1b6
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
index 59158e8a83a5..cf8b7188f42c 100644
--- a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
+++ b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2
 
 LICENSE="CC-BY-SA-2.5"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=""