Applied patch to sync headers and source of iniparser. Thanks to John Keeping <john.keeping@lineone.net> - fixes bug 267753.

Applied with dev-zero's agreement.
(Portage version: 2.2_rc31/cvs/Linux x86_64)

3 files changed, 83 insertions, 2 deletions

diff --git a/dev-libs/iniparser/ChangeLog b/dev-libs/iniparser/ChangeLog
index a3f3cb31dc3c..c15e669580dd 100644
--- a/dev-libs/iniparser/ChangeLog
+++ b/dev-libs/iniparser/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/iniparser
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/ChangeLog,v 1.2 2008/08/15 15:46:03 dev-zero Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/ChangeLog,v 1.3 2009/05/04 09:02:47 jmbsvicetto Exp $
+
+*iniparser-3.0b-r1 (04 May 2009)
+
+  04 May 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +iniparser-3.0b-r1.ebuild, +files/iniparser-3.0b-fix-set-functions.patch:
+  Applied patch to sync headers and source of iniparser. Thanks to John
+  Keeping <john.keeping@lineone.net> - fixes bug 267753. Applied with
+  dev-zero's agreement.
 
   15 Aug 2008; Tiziano Müller <dev-zero@gentoo.org> iniparser-3.0b.ebuild:
   Added creation of symlink libiniparser.so->libiniparser.so.0 (bug
diff --git a/dev-libs/iniparser/files/iniparser-3.0b-fix-set-functions.patch b/dev-libs/iniparser/files/iniparser-3.0b-fix-set-functions.patch
new file mode 100644
index 000000000000..9bb7c7bfcfd0
--- /dev/null
+++ b/dev-libs/iniparser/files/iniparser-3.0b-fix-set-functions.patch
@@ -0,0 +1,27 @@
+diff -aur iniparser3.0b/src/iniparser.h iniparser3.0b.patched/src/iniparser.h
+--- iniparser3.0b/src/iniparser.h	2007-11-23 21:38:19.000000000 +0000
++++ iniparser3.0b.patched/src/iniparser.h	2009-04-28 11:08:28.644706261 +0100
+@@ -39,7 +39,8 @@
+  ---------------------------------------------------------------------------*/
+ /** For backwards compatibility only */
+ #define iniparser_getstr(d, k)  iniparser_getstring(d, k, NULL)
+-#define iniparser_setstr        iniparser_setstring
++#define iniparser_setstr        iniparser_set
++#define iniparser_setstring     iniparser_set
+ 
+ /*-------------------------------------------------------------------------*/
+ /**
+@@ -215,11 +216,11 @@
+   @return   int 0 if Ok, -1 otherwise.
+ 
+   If the given entry can be found in the dictionary, it is modified to
+-  contain the provided value. If it cannot be found, -1 is returned.
++  contain the provided value. If it cannot be found, it is inserted.
+   It is Ok to set val to NULL.
+  */
+ /*--------------------------------------------------------------------------*/
+-int iniparser_setstring(dictionary * ini, char * entry, char * val);
++int iniparser_set(dictionary * ini, char * entry, char * val);
+ 
+ 
+ /*-------------------------------------------------------------------------*/
diff --git a/dev-libs/iniparser/iniparser-3.0b-r1.ebuild b/dev-libs/iniparser/iniparser-3.0b-r1.ebuild
new file mode 100644
index 000000000000..8b8d7de069dd
--- /dev/null
+++ b/dev-libs/iniparser/iniparser-3.0b-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/iniparser-3.0b-r1.ebuild,v 1.1 2009/05/04 09:02:47 jmbsvicetto Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="A ree stand-alone ini file parsing library."
+HOMEPAGE="http://ndevilla.free.fr/iniparser/"
+SRC_URI="http://ndevilla.free.fr/iniparser/${MY_P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-fix-set-functions.patch"
+}
+
+src_compile() {
+	sed -i \
+		-e "s|\(CFLAGS  =\) -O2|\1 ${CFLAGS}|" \
+		-e "s|\(LDFLAGS =\)|\1 ${LDFLAGS}|" \
+		-e "s|/usr/lib|/usr/$(get_libdir)|" \
+		Makefile || die "sed failed"
+
+	emake CC=$(tc-getCC) AR="$(tc-getAR)" || die "emake failed"
+}
+
+src_install() {
+	dolib libiniparser.a libiniparser.so.0
+	dosym libiniparser.so.0 /usr/$(get_libdir)/libiniparser.so
+
+	insinto /usr/include
+	doins src/*.h
+
+	dodoc AUTHORS README
+	dohtml html/*
+}