Add multilib support by Karl Lindén (bug #464128).

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 79 insertions, 1 deletions

diff --git a/dev-libs/libconfig/ChangeLog b/dev-libs/libconfig/ChangeLog
index 05902fe3ccb9..7b716a77736a 100644
--- a/dev-libs/libconfig/ChangeLog
+++ b/dev-libs/libconfig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libconfig
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/ChangeLog,v 1.52 2013/03/05 03:38:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/ChangeLog,v 1.53 2013/04/02 18:55:41 jer Exp $
+
+*libconfig-1.4.9-r1 (02 Apr 2013)
+
+  02 Apr 2013; Jeroen Roovers <jer@gentoo.org> +libconfig-1.4.9-r1.ebuild,
+  +files/libconfig-1.4.9-out-of-source-build.patch:
+  Add multilib support by Karl Lindén (bug #464128).
 
   05 Mar 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Add proxy-maintainers herd.
diff --git a/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch b/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch
new file mode 100644
index 000000000000..1f883a16e1cd
--- /dev/null
+++ b/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch
@@ -0,0 +1,17 @@
+diff -ur libconfig-1.4.9.orig/tests/Makefile.am libconfig-1.4.9/tests/Makefile.am
+--- libconfig-1.4.9.orig/tests/Makefile.am	2011-08-04 05:36:33.000000000 +0200
++++ libconfig-1.4.9/tests/Makefile.am	2013-04-01 21:50:54.413811947 +0200
+@@ -3,10 +3,10 @@
+ 
+ libconfig_tests_SOURCES = tests.c
+ 
+-libconfig_tests_CPPFLAGS = -I../tinytest -I../lib
++libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib
+ 
+-libconfig_tests_LDADD = -L../tinytest -ltinytest \
+-	-L../lib/.libs -lconfig
++libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \
++	-L$(top_builddir)/lib/.libs -lconfig
+ 
+ 
+ EXTRA_DIST = \
diff --git a/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild b/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild
new file mode 100644
index 000000000000..6dcceff9312d
--- /dev/null
+++ b/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild,v 1.1 2013/04/02 18:55:41 jer Exp $
+
+EAPI="5"
+
+inherit eutils autotools-multilib
+
+DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files"
+HOMEPAGE="http://www.hyperrealm.com/libconfig/libconfig.html"
+SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="+cxx examples static-libs"
+
+DEPEND="
+	sys-devel/libtool
+	sys-devel/bison"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${P}-out-of-source-build.patch" )
+
+AUTOTOOLS_AUTORECONF="1"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable cxx)
+		--disable-examples
+	)
+	autotools-multilib_src_configure
+}
+
+local_src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	emake test || die "test failed"
+	popd > /dev/null || die
+}
+
+src_test() {
+	# It responds to check but that does not work as intended
+	multilib_foreach_abi local_src_test
+}
+
+src_install() {
+	autotools-multilib_src_install
+	if use examples; then
+		local dir
+		for dir in examples/c examples/c++; do
+			insinto /usr/share/doc/${PF}/${dir}
+			doins ${dir}/*
+		done
+	fi
+}