--- /usr/portage/dev-libs/json-c/json-c-0.11.ebuild	2013-05-09 08:31:08.000000000 +0300
+++ /usr/local/portage/dev-libs/json-c/json-c-0.11-r1.ebuild	2013-10-16 22:49:24.640511548 +0300
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.11.ebuild,v 1.2 2013/05/09 05:15:10 vapier Exp $
+# $Header: $
 
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=true
 
-inherit autotools-utils
+inherit autotools-multilib
 
 DESCRIPTION="A JSON implementation in C"
 HOMEPAGE="https://github.com/json-c/json-c/wiki"
@@ -17,29 +17,35 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
-# tests break otherwise
-AUTOTOOLS_IN_SOURCE_BUILD=1
+# Tests assume in-source build, but autotools-multilib require out-of-source builds
+RESTRICT="test"
 
 src_prepare() {
 	sed -i -e "s:-Werror::" Makefile.am.inc || die
-	autotools-utils_src_prepare
+	rm config.status || die
+	autotools-multilib_src_prepare
 }
 
 src_configure() {
 	# Disable old lib compatibility
-	myeconfargs=(--disable-oldname-compat)
-	autotools-utils_src_configure
+	local myeconfargs=(
+		--disable-oldname-compat
+	)
+	autotools-multilib_src_configure
 }
 
 src_test() {
-	export USE_VALGRIND=0 VERBOSE=1
-	autotools-utils_src_test
+	export USE_VALGRIND=0 VERBOSE=1 INCLUDES=-I${S}
+
+	autotools-multilib_src_test
 }
 
 src_install() {
 	use doc && HTML_DOCS=( "${S}"/doc/html )
-	autotools-utils_src_install
+	autotools-multilib_src_install
 
-	# add symlink for projects not using pkgconfig
-	dosym ../json-c /usr/include/json-c/json
+	if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
+		# add symlink for projects not using pkgconfig
+		dosym ../json-c /usr/include/json-c/json
+	fi
 }