Version bump.

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

4 files changed, 77 insertions, 5 deletions

diff --git a/dev-libs/libconfig/ChangeLog b/dev-libs/libconfig/ChangeLog
index 228714d48adc..a52b86f04dc5 100644
--- a/dev-libs/libconfig/ChangeLog
+++ b/dev-libs/libconfig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libconfig
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/ChangeLog,v 1.63 2014/07/02 06:08:47 dlan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/ChangeLog,v 1.64 2015/05/21 06:01:08 jer Exp $
+
+*libconfig-1.5 (21 May 2015)
+
+  21 May 2015; Jeroen Roovers <jer@gentoo.org> +libconfig-1.5.ebuild,
+  files/libconfig-1.4.9-out-of-source-build.patch,
+  +files/libconfig-1.5-out-of-source-build.patch:
+  Version bump.
 
   02 Jul 2014; Yixun Lan <dlan@gentoo.org> libconfig-1.4.9-r1.ebuild:
   fixed, bug #489596, thanks Johan Bergström
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
index 1f883a16e1cd..fe7c2cc42bec 100644
--- 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
@@ -1,6 +1,5 @@
-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
+--- a/libconfig-1.4.9/tests/Makefile.am
++++ b/libconfig-1.4.9/tests/Makefile.am
 @@ -3,10 +3,10 @@
  
  libconfig_tests_SOURCES = tests.c
diff --git a/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch b/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch
new file mode 100644
index 000000000000..d109b60d4363
--- /dev/null
+++ b/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch
@@ -0,0 +1,11 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -3,7 +3,7 @@
+ 
+ libconfig_tests_SOURCES = tests.c
+ 
+-libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I../lib
++libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib
+ 
+ libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \
+ 	-L$(top_builddir)/lib/.libs -lconfig
diff --git a/dev-libs/libconfig/libconfig-1.5.ebuild b/dev-libs/libconfig/libconfig-1.5.ebuild
new file mode 100644
index 000000000000..bfb74d539e16
--- /dev/null
+++ b/dev-libs/libconfig/libconfig-1.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.5.ebuild,v 1.1 2015/05/21 06:01:08 jer Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="1"
+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 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="+cxx examples static-libs"
+
+DEPEND="
+	sys-devel/libtool
+	sys-devel/bison"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5-out-of-source-build.patch" )
+
+src_prepare() {
+	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable cxx)
+		--disable-examples
+	)
+	autotools-utils_src_configure
+}
+
+multilib_src_test() {
+	# It responds to check but that does not work as intended
+	emake test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+
+	if use examples; then
+		find examples/ -name "Makefile.*" -delete || die
+		local dir
+		for dir in examples/c examples/c++; do
+			insinto /usr/share/doc/${PF}/${dir}
+			doins ${dir}/*
+		done
+	fi
+}