diff --git a/sys-kernel/calculate-sources/Manifest b/sys-kernel/calculate-sources/Manifest
index bd1f14945..5f26ac07a 100644
--- a/sys-kernel/calculate-sources/Manifest
+++ b/sys-kernel/calculate-sources/Manifest
@@ -5,5 +5,4 @@ DIST linux-3.19.tar.xz 81688872 SHA256 be42511fe5321012bb4a2009167ce56a9e5fe362b
 DIST patch-3.12.39.xz 1140284 SHA256 3c192965ed5ead9d7563fd17e59cec0bdb5904db388baaca92401bd160ca0273 SHA512 e25deb2f286f119817986eee6f9b665342842b140f65415d11decb2a7162b85c78b819d9bbdeb64223189a44daddcefbe31abebab481a34433fe377c71b771fa WHIRLPOOL b8c1f30eb47020fd19a9aac346aedf81c4e1ed398e0f2beea60cceaa6dede315f0be7730070f6d17767183d5a53b38caeee0bec0ffbeb7a0405cbad2a80383ac
 DIST patch-3.14.37.xz 827032 SHA256 ae2c25e7c53bffaf4e6f951a56eaa8ca645e7125cd28f16f870b7dc8aaa66b49 SHA512 40439c1262331ffd594a110bab6c2da04abd7718fb3f79661de46e0c7cd99d4d8e003bb412be2348df843d7d9abe310caf1e3cc1ec5343e4b92f0769b9cfada4 WHIRLPOOL 3420d19cb74f8bf357eaa8bb1f5bd563b0b275891a34af5d23e52ff07d5fce419676018aa7657575d2e1fb58467d7708f9fbe9788fc8ddaab1e39551b79f11cb
 DIST patch-3.18.11.xz 317140 SHA256 e4c44f887f507b2470a5c2f1c286a38fec6e84c4d433c929981abab7b83f80d5 SHA512 cc4ac5d341ca4e9d71ef1ba45a839b18947e3e7ffdc7f7efe2c211c95483518a1983bc3637edd607e0631f14c1cc9bfb9164926261d2cf5c2bb2eb91206f43b9 WHIRLPOOL 59321e2b67e2b7b21709cc109b3cff1c8f4e7ad47423961d09ada3b66f6b86c1a00eb5bf3b579e1068e34a8b42f83e3b721bbee76689039025ab49bbfa7c74e4
-DIST patch-3.18.9.xz 249504 SHA256 7b5b2a952c3d956c7ca8945de2e1edd4e689039dfc59fdcda1b23cb7d9a9da5d SHA512 dd8f8c2a88b41e4907c213d3d7bc646f1291b4358ad5a840b652286ac67023f9cac119714b68cb00b295fe80b7efb5dc2b5b4af35f01bbcaa7357f877dad3a72 WHIRLPOOL 41785c03e46a6a8bfabb686506f5ff52e08340a22f1324a0fce31050583a4463f88d1a9c9dafbf744c0185398b3ce2a18c377627e31cb73c0b7742005de528cc
 DIST patch-3.19.3.xz 144892 SHA256 cd9474b61b859d68f83ff0b769bafef8489d2090e0a933d2a7e5f76a23cc071a SHA512 5e7b1bfc57b04386cd581d76afd341d0276ed0142b6f5f17c7d2b534e9807a0d21508edfecc670ee51e3353d7985bbe04cc10a22ad557f072fac15df4234cf0a WHIRLPOOL 3f252f5a4cd48d44c84c51d2b5824ba10918b7ca41be87e5f73f6a95224b0091a020439ba8e2fcf9076b07183d24aa96e1c1185454d1262ef371a329cb953bec
diff --git a/sys-kernel/calculate-sources/calculate-sources-3.18.11.ebuild b/sys-kernel/calculate-sources/calculate-sources-3.18.11.ebuild
index 377b59316..3f883fafa 100644
--- a/sys-kernel/calculate-sources/calculate-sources-3.18.11.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-3.18.11.ebuild
@@ -8,7 +8,7 @@ ETYPE="sources"
 inherit calculate-kernel-6 eutils
 
 DESCRIPTION="Calculate Linux kernel image"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 x86"
 HOMEPAGE="http://www.calculate-linux.org"
 
 IUSE="plymouth themes firmware"
diff --git a/sys-kernel/calculate-sources/calculate-sources-3.18.9.ebuild b/sys-kernel/calculate-sources/calculate-sources-3.18.9.ebuild
deleted file mode 100644
index 054896b33..000000000
--- a/sys-kernel/calculate-sources/calculate-sources-3.18.9.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="x86 amd64"
-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.19.3.ebuild b/sys-kernel/calculate-sources/calculate-sources-3.19.3.ebuild
index 377b59316..f9d8d172f 100644
--- a/sys-kernel/calculate-sources/calculate-sources-3.19.3.ebuild
+++ b/sys-kernel/calculate-sources/calculate-sources-3.19.3.ebuild
@@ -8,7 +8,7 @@ ETYPE="sources"
 inherit calculate-kernel-6 eutils
 
 DESCRIPTION="Calculate Linux kernel image"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 HOMEPAGE="http://www.calculate-linux.org"
 
 IUSE="plymouth themes firmware"