Improved app-crypt/sbsigntool ebuild (#444830)

src/etc/portage/package.keywords

@@ -9,6 +9,7 @@
 =sys-boot/grub-2.00*:2
 =app-cdr/cdrtools-3.01_alpha08*
 =sys-boot/efibootmgr-0.5.4*
+=app-crypt/sbsigntool-0.6*
 
 # Network
 =net-wireless/reaver-1.4*

src/usr/local/portage/app-crypt/sbsigntool/Manifest

@@ -1,2 +1,2 @@
 DIST sbsigntool_0.6.orig.tar.gz 212375 SHA256 84fb0c8f6fb1e79aa418a4f70a3139b38d5630043b28291c875f383e9b4294b8 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c WHIRLPOOL 3b86b9861f5e26586e8a9eb9bbf48adf1a12714b294f0acd605d53e37c27192006c6ecc81d31bf4f200f8e88508f38a52ef93e9e01e301c4245a11894227cecc
-EBUILD sbsigntool-0.6.ebuild 626 SHA256 89cec7ccc93752963c74a3408d9d63f99f1cb1432062a169aa360a8d260cb532 SHA512 e48e41d68215403b957c2404d862307ee17827a71df95704a242f6b1f60bb156d0fb49b75fb9dd56644e200146a705348e0d0f3cc95dbfcabf7f510cc38461f8 WHIRLPOOL 9c0ae83082e6f9664c3251f98203682a335ae651f23b1e5f8b4d3f6c1d0f2f90a43138fc00e97662d64df605b1f32006bc6146e5d6cb26250eb18c0bdc56f31f
+EBUILD sbsigntool-0.6.ebuild 768 SHA256 efb891cd96bc932631df3fd57da640aeae6524e2febd1b7d32078ce4f3e82b59 SHA512 8bb236dafa82385e03e49dae0312f780fdbfbf0fd83cfe2a248314568bc0fb8d600f8a7c779e190ebc8bd13b87858da5d358a3f4df4103af89213051b33c85fc WHIRLPOOL 8fc5a26be618b97362e22432b3cb367f2c1ac31ef1050cde5b7950703a42cc1c57a2fd69571c7be3034dda518edb3e96919b0ed645089477a9592a3fe3af4ee3

src/usr/local/portage/app-crypt/sbsigntool/sbsigntool-0.6.ebuild

@@ -12,15 +12,21 @@ SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="test"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+RESTRICT="x86? ( test )"
 
 RDEPEND="dev-libs/openssl"
 DEPEND="${RDEPEND}
 	sys-boot/gnu-efi"
 
 src_prepare() {
-	sed -i 's@^\(EFI_ARCH=\$(uname -m\))$@\1 | sed s/i686/ia32/)@' "${S}"/configure.ac
+	# need correct /usr/include/efi/${efi_arch} on include path
+	efi_arch=${ARCH}
+	use x86   && efi_arch=ia32
+	use amd64 && efi_arch=x86_64
+	sed -i "s/^\(EFI_ARCH\)=.*/\1=${efi_arch}/" "${S}"/configure.ac
+
 	eautoreconf
 	default
 }