diff --git a/sys-kernel/calculate-sources/Manifest b/sys-kernel/calculate-sources/Manifest
index fc8d4b946..1d9e223f2 100644
--- a/sys-kernel/calculate-sources/Manifest
+++ b/sys-kernel/calculate-sources/Manifest
@@ -5,7 +5,6 @@ DIST linux-3.19.tar.xz 81688872 SHA256 be42511fe5321012bb4a2009167ce56a9e5fe362b
 DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
 DIST patch-3.12.42.xz 1207152 SHA256 43b79cde0a61471c11a1f90f70607a254263f3568a9d33563ac9446fb1cf0817 SHA512 5441162d835cdbd95e41107de010d29c3ac9fb94277d3d273614e13a9753bc16fedf9787b19c7b1dead5b72008983ed4ef716f268a6b6beb7820c7c7790e135e WHIRLPOOL 6faeb7463c5020894d085d6e1838ebfc283624bd518b29ddecd251818643f7180f0431441e2e929bc26d30d653019b7f2394983773a1fa14fe78317d5a426c70
 DIST patch-3.14.41.xz 876872 SHA256 64b3131606ff534ee27f61323ca1cc9693545edf4871bdbcb2bfa299ce5efca9 SHA512 d3426fce0b4709955167164f1226de5f7d7292fea57f5f0e565bd590a226b854424c428f3c28909132cd93330af0c3105eb53f77aa8ddc8bbfaef38a413a9992 WHIRLPOOL 3e193713b1c04ad1b48ff3d0dfc006faf00ad1a17298e4ec162eed468319adde93ad8bf80a8060201a7f6b1a3ec34e4e03a9cf2d3807d0b03dda140f13c1ce18
-DIST patch-3.18.11.xz 317140 SHA256 e4c44f887f507b2470a5c2f1c286a38fec6e84c4d433c929981abab7b83f80d5 SHA512 cc4ac5d341ca4e9d71ef1ba45a839b18947e3e7ffdc7f7efe2c211c95483518a1983bc3637edd607e0631f14c1cc9bfb9164926261d2cf5c2bb2eb91206f43b9 WHIRLPOOL 59321e2b67e2b7b21709cc109b3cff1c8f4e7ad47423961d09ada3b66f6b86c1a00eb5bf3b579e1068e34a8b42f83e3b721bbee76689039025ab49bbfa7c74e4
 DIST patch-3.18.13.xz 368132 SHA256 d9191eb7fa47e95c81945e561cdf35bb12fcdd2bbf12f37f60533cbf57be429c SHA512 4d85a6a64b2d07b94b817fd4c3e0406910dd7d2028e58cfb13cf04d9ebb3bfe0f99148742489e2d5a72d93018c85adbf0e37bd068c01084d305574a9c49f9dff WHIRLPOOL dba5b06eddd83a592f53af1c3d57d51afaf01dab7b43471ff071b2d33bd12363f3c14b1c6dc5dab0bcf1574eaa58db8f6ac0a63f7d8efff57d019b453f698b2a
 DIST patch-3.19.7.xz 249244 SHA256 8fb08f936b735172dcd89defc058cdfb7d7d9b401593efcbac179507a5c55cb8 SHA512 6ffad4a83a475d73d1d576af4d596ec354c8cbe7ca8964c03537209fe1a414449aa94f5a803bf1da3146d46daa3d9b5bdcd0c4c3083d0b4daf4e2016bcdbb68d WHIRLPOOL 24bd3e97d610feb6ce92b1d42ab05374a9f9f0f7f77fe9680cc9177c3ae80bb8625b474dae95ce7f6c2f4515068d530f7132ecacc931dd9a841f7bb62ea9e0df
 DIST patch-4.0.2.xz 73112 SHA256 c879ac300e9c1c8d2433ad9c66be5d374d15cf2175ac9876fb22d7d53a6b2e3b SHA512 bb633f5db560737295407d5d68522b2a0e05007aed15a9ef3a9e3d8ede9773fac127c96f063509d097294aa1beb596c746e622a9f55d9ba22f346d2e45c1d3d5 WHIRLPOOL 3487dd834b4bc324bd9a1decb6bdbe825ae95f9fd37666356392c73f1059f0208004ddf9af4d34f17e55aa72405c3eccd4a26f13f74f4cf2ca9efece8f2e5ff8
diff --git a/sys-kernel/calculate-sources/calculate-sources-3.18.11.ebuild b/sys-kernel/calculate-sources/calculate-sources-3.18.11.ebuild
deleted file mode 100644
index 3f883fafa..000000000
--- a/sys-kernel/calculate-sources/calculate-sources-3.18.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-ETYPE="sources"
-
-inherit calculate-kernel-6 eutils
-
-DESCRIPTION="Calculate Linux kernel image"
-KEYWORDS="amd64 x86"
-HOMEPAGE="http://www.calculate-linux.org"
-
-IUSE="plymouth themes firmware"
-
-DEPEND="vmlinuz? ( || ( app-arch/xz-utils app-arch/lzma-utils )
-		sys-apps/v86d
-		sys-boot/grub
-	)
-	firmware? ( sys-kernel/linux-firmware )
-	themes? ( media-gfx/plymouth-themes-calculate )
-	plymouth? ( sys-boot/plymouth sys-boot/plymouth-openrc-plugin )
-	"
-
-RDEPEND="${DEPEND}"
-
-SRC_URI="${KERNEL_URI} ${ARCH_URI}"
-
-src_unpack() {
-	calculate-kernel-6_src_unpack
-}
-
-pkg_postinst() {
-	calculate-kernel-6_pkg_postinst
-}
diff --git a/sys-kernel/calculate-sources/calculate-sources-3.18.13.ebuild b/sys-kernel/calculate-sources/calculate-sources-3.18.13.ebuild
index f9d8d172f..3f883fafa 100644
--- a/sys-kernel/calculate-sources/calculate-sources-3.18.13.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-3.18.13.ebuild
@@ -8,7 +8,7 @@ ETYPE="sources"
 inherit calculate-kernel-6 eutils
 
 DESCRIPTION="Calculate Linux kernel image"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 HOMEPAGE="http://www.calculate-linux.org"
 
 IUSE="plymouth themes firmware"