3 files changed, 0 insertions, 128 deletions
diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest
index 558f4ee8baa2..e82f629d1eb6 100644
--- a/sys-boot/tboot/Manifest
+++ b/sys-boot/tboot/Manifest
@@ -1,2 +1 @@
 DIST tboot-1.9.11.tar.gz 709092 BLAKE2B 97b6ea5a09e1adbf1fbdc36516e0e80d3acc67469f297603125542aed8235e6533afb96e6c38885b87e4584392da40d9f65d00eced2b8a87a2ecf61a17c3a985 SHA512 5c2466438ad3ab95ca66fe4d460f4e6b31ccd3c6ac79221b129883df4180fce4878dd07a5f180bb79fae13b59fa90c05aeda7339159d1d950011a59645024b8a
-DIST tboot-1.9.6_p20171118.tar.gz 691068 BLAKE2B c269f9b14cb07139983bd3b1c99511458d5ab5bbd74b097d0aa3b32e0c3e9054d0a67ff18ce7b8090389727acdf47b8c48af6599ecb3148a68786083fe8ded73 SHA512 6476b783516909bf9cf10915fc23e71dca03d521dcc7bf71fbd19684c996c2c588955bb8f896f02afe56feddf9c639b6349635651c852a90319429b2943ec950
diff --git a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch b/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch
deleted file mode 100644
index 4914be6e4e7d..000000000000
--- a/sys-boot/tboot/files/tboot-1.9.5-genkernel-path.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur tboot-1.9.5.orig/tboot/20_linux_tboot tboot-1.9.5/tboot/20_linux_tboot
---- tboot-1.9.5.orig/tboot/20_linux_tboot	2016-12-21 06:29:15.000000000 +0800
-+++ tboot-1.9.5/tboot/20_linux_tboot	2017-08-02 23:33:52.732748172 +0800
-@@ -171,6 +171,15 @@
- EOF
- }
- 
-+machine=`uname -m`
-+case "$machine" in
-+    i?86) GENKERNEL_ARCH="x86" ;;
-+    mips|mips64) GENKERNEL_ARCH="mips" ;;
-+    mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
-+    arm*) GENKERNEL_ARCH="arm" ;;
-+    *) GENKERNEL_ARCH="$machine" ;;
-+esac
-+
- linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
-     	basename=$(basename $i)
- 	version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
-@@ -217,7 +226,9 @@
- 		 "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
- 		 "initrd-${alt_version}" "initramfs-${alt_version}.img" \
- 		 "initramfs-genkernel-${version}" \
--		 "initramfs-genkernel-${alt_version}"; do
-+		 "initramfs-genkernel-${alt_version}" \
-+		 "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-+		 "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
- 	    if test -e "${dirname}/${i}" ; then
- 		initrd="$i"
- 		break
-diff -ur tboot-1.9.5.orig/tboot/20_linux_xen_tboot tboot-1.9.5/tboot/20_linux_xen_tboot
---- tboot-1.9.5.orig/tboot/20_linux_xen_tboot	2016-12-21 06:29:54.000000000 +0800
-+++ tboot-1.9.5/tboot/20_linux_xen_tboot	2017-08-02 23:34:01.347685520 +0800
-@@ -165,6 +165,15 @@
- EOF
- }
- 
-+machine=`uname -m`
-+case "$machine" in
-+    i?86) GENKERNEL_ARCH="x86" ;;
-+    mips|mips64) GENKERNEL_ARCH="mips" ;;
-+    mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
-+    arm*) GENKERNEL_ARCH="arm" ;;
-+    *) GENKERNEL_ARCH="$machine" ;;
-+esac
-+
- linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
-     if grub_file_is_not_garbage "$i"; then
-     	basename=$(basename $i)
-@@ -232,7 +241,9 @@
-                 "initrd-${version}" "initrd.img-${alt_version}" \
-                 "initrd-${alt_version}.img" "initrd-${alt_version}" \
-                 "initramfs-genkernel-${version}" \
--                "initramfs-genkernel-${alt_version}" ; do
-+                "initramfs-genkernel-${alt_version}" \
-+                "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-+                "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
-                 if test -e "${dirname}/${i}" ; then
-                     initrd="$i"
-                     break
diff --git a/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild b/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild
deleted file mode 100644
index 1b591eb5a46f..000000000000
--- a/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic mount-boot
-
-DESCRIPTION="Performs a measured and verified boot using Intel Trusted Execution Technology"
-HOMEPAGE="https://sourceforge.net/projects/tboot/"
-SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="custom-cflags selinux"
-
-# requires patching the kernel src
-RESTRICT="test"
-
-DEPEND="app-crypt/trousers
-app-crypt/tpm-tools
-dev-libs/openssl:0=[-bindist]"
-
-RDEPEND="${DEPEND}
-sys-boot/grub:2
-selinux? ( sec-policy/selinux-tboot )"
-
-DOCS=( README COPYING CHANGELOG )
-PATCHES=( "${FILESDIR}/${PN}-1.9.5-genkernel-path.patch" )
-
-src_prepare() {
-	sed -i 's/ -Werror//g' Config.mk || die
-	sed -i 's/^INSTALL_STRIP = -s$//' Config.mk || die # QA Errors
-
-	default
-}
-
-src_compile() {
-	use custom-cflags && export TBOOT_CFLAGS=${CFLAGS} || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
-	if use amd64; then
-		export MAKEARGS="TARGET_ARCH=x86_64"
-	else
-		export MAKEARGS="TARGET_ARCH=i686"
-	fi
-
-	default
-}
-
-src_install() {
-	emake DISTDIR="${D}" install
-
-	dodoc "${DOCS[@]}"
-	dodoc docs/*.txt lcptools/*.{txt,pdf}
-
-	cd "${D}"
-	mkdir -p usr/lib/tboot/ || die
-	mv boot usr/lib/tboot/ || die
-}
-
-pkg_postinst() {
-	cp ${ROOT%/}/usr/lib/tboot/boot/* ${ROOT%/}/boot/
-
-	ewarn "Please remember to download the SINIT AC Module relevant"
-	ewarn "for your platform from:"
-	ewarn "http://software.intel.com/en-us/articles/intel-trusted-execution-technology/"
-}