--- pciutils-3.3.0-r1.ebuild	2015-02-13 21:14:24.635786173 -0700
+++ pciutils-3.3.0-r2.ebuild	2015-02-13 21:14:23.075765735 -0700
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs multilib-minimal
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git"
@@ -17,16 +17,18 @@
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
 # our libssl.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )"
+LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
 DEPEND="kmod? ( sys-apps/kmod )
 	static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	udev? ( virtual/libudev )"
+	!static-libs? ( ${LIB_DEPEND//static-libs(+),} )
+	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
 	sys-apps/hwids"
 DEPEND="${DEPEND}
 	kmod? ( virtual/pkgconfig )"
 
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
 switch_config() {
 	[[ $# -ne 2 ]] && return 1
 	local opt=$1 val=$2
@@ -40,7 +42,10 @@
 
 	if use static-libs ; then
 		cp -pPR "${S}" "${S}.static" || die
+		mv "${S}.static" "${S}/static" || die
 	fi
+	
+	multilib_copy_sources
 }
 
 pemake() {
@@ -48,6 +53,8 @@
 		HOST="${CHOST}" \
 		CROSS_COMPILE="${CHOST}-" \
 		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
 		DNS=$(usex dns) \
 		IDSDIR='$(SHAREDIR)/misc' \
 		MANDIR='$(SHAREDIR)/man' \
@@ -58,25 +65,28 @@
 		PCI_COMPRESSED_IDS=0 \
 		PCI_IDS=pci.ids \
 		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		LIBKMOD=$(usex kmod) \
+		LIBKMOD=$(multilib_native_usex kmod) \
 		HWDB=$(usex udev) \
 		"$@"
 }
 
-src_compile() {
+multilib_src_compile() {
 	pemake OPT="${CFLAGS}" all
 	if use static-libs ; then
 		pemake \
-			-C "${S}.static" \
+			-C "${BUILD_DIR}/static" \
 			OPT="${CFLAGS}" \
 			SHARED="no" \
 			lib/libpci.a
 	fi
 }
 
-src_install() {
+multilib_src_install() {
 	pemake DESTDIR="${D}" install install-lib
-	use static-libs && dolib.a "${S}.static/lib/libpci.a"
+	use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
+}
+
+multilib_src_install_all() {
 	dodoc ChangeLog README TODO
 
 	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \