Build-time updates

src/etc/init.d/tordate

@@ -3,7 +3,7 @@
 description="Sets date from Tor consensus and handles Tor restarts."
 
 command=/usr/local/sbin/tordate
-start_stop_daemon_args="-bm"
+command_background="true"
 pidfile=/var/run/tordate.pid
 
 depend() {

src/etc/portage/make.conf

@@ -88,5 +88,7 @@ DONT_MOUNT_BOOT=1
 # amd-ucode                   = distribution for AMD-supporting products
 # Conexant-firmware           = unrestricted distribution (cx23418)
 # Hauppauge-Firmware          = distribution for Hauppage component products
+# Broadcom                    = should probably be "as-is" (#446658)
 ACCEPT_LICENSE="-* @FREE as-is freedist unRAR lha @BINARY-REDISTRIBUTABLE Atmel
-                   SIL-freeware amd-ucode Conexant-firmware Hauppauge-Firmware"
+                   SIL-freeware amd-ucode Conexant-firmware Hauppauge-Firmware
+                   Broadcom"

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 768 SHA256 efb891cd96bc932631df3fd57da640aeae6524e2febd1b7d32078ce4f3e82b59 SHA512 8bb236dafa82385e03e49dae0312f780fdbfbf0fd83cfe2a248314568bc0fb8d600f8a7c779e190ebc8bd13b87858da5d358a3f4df4103af89213051b33c85fc WHIRLPOOL 8fc5a26be618b97362e22432b3cb367f2c1ac31ef1050cde5b7950703a42cc1c57a2fd69571c7be3034dda518edb3e96919b0ed645089477a9592a3fe3af4ee3
+EBUILD sbsigntool-0.6.ebuild 840 SHA256 732da78d4ebf6c71c8cfb7ed83241b417e1b06d6e9fe42c7ae629eaed7c195c4 SHA512 c56af68d8d5e2807e03a880c99fc58099ca78381ad7ea374862ae94e94db4dafe2780583d3d7b39f1e9140da818affcde0d5fd30b9274953013ad5b6879c90d5 WHIRLPOOL cf0c2d65289d7e95299b5c9af8ef9afec647f21a5946114f01957ca8a92149a3a56a91ceb7bbd809238a1709dcca921e0a2afa545fe72d1d2d6b7fca28fde9ce

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

@@ -2,9 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
-
-inherit autotools eutils
+EAPI="4"
 
 DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
 HOMEPAGE="http://packages.ubuntu.com/quantal/sbsigntool"
@@ -12,21 +10,25 @@ SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
-RESTRICT="x86? ( test )"
+#RESTRICT="x86? ( test )"
 
-RDEPEND="dev-libs/openssl"
+RDEPEND="dev-libs/openssl
+	sys-apps/util-linux"
 DEPEND="${RDEPEND}
-	sys-boot/gnu-efi"
+	sys-apps/help2man
+	sys-boot/gnu-efi
+	virtual/pkgconfig"
 
 src_prepare() {
-	# 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
+	local iarch
+	case ${ARCH} in
+		ia64)  iarch=ia64 ;;
+		x86)   iarch=ia32 ;;
+		amd64) iarch=x86_64 ;;
+		*)     die "unsupported architecture: ${ARCH}" ;;
+	esac
+	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure
+	sed -i "s/-m64$/& -march=x86-64/" tests/Makefile.am
 }