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.
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 86 insertions, 3 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/Manifest b/dev-libs/iniparser/Manifest
index 07d82a1d4f9d..344b4570742f 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -1,4 +1,6 @@
+AUX iniparser-3.0b-fix-set-functions.patch 1273 RMD160 42d9afa071b01a0ceb054ceaa202e49108a4d803 SHA1 41d49a0e866ad04acd359abab5153f3b572986fb SHA256 3d0cd6ec01d887c426fedf43d72425c61311af080dd528912ae4e91af4134892
 DIST iniparser3.0b.tar.gz 26080 RMD160 d60234e173a7e888feab24a21a8602834cf64e30 SHA1 0e3672eac056d457699d4121098f0fd3433b9809 SHA256 8a634cadcda15c53c427fc57b783b366df8213e7065646f67ceb526c5bf37426
+EBUILD iniparser-3.0b-r1.ebuild 1085 RMD160 191325a22cb4198243aa1381821674a873f9bd1f SHA1 926847ee9c587a7cdfdd33608400ffd4aab98717 SHA256 321b8139f102edfe6257fbc440f602015d2d206a63378661de38fc0b31978db7
 EBUILD iniparser-3.0b.ebuild 990 RMD160 3d6197d58c1f2cbf84aba3d1ce920f57f01933bb SHA1 d9541e14a435498c0dfdcca44f209dcc240a282e SHA256 5f09f4b541c6bfb727d75ff3e81387d902ccb909c891805b37204e0c1cb48e8b
-MISC ChangeLog 530 RMD160 cbd5d535757825022f8c0b6f35ee8f8a60326da8 SHA1 519a25881b031cbf158fc6e5d5bf1ac9c6167687 SHA256 9b70d25e36c82490660645e3860801c56432cd285b8149439e1639b361001cec
+MISC ChangeLog 877 RMD160 ecd39b84c45834832b0250d664cee6eca66a1495 SHA1 dd85e2303e9155ab5aaa72354d6e668dd638ab02 SHA256 4edff91c2ab8743aacf53467288f20e2531281d92a6cab5476c9051efd9c974a
 MISC metadata.xml 243 RMD160 118071f7d6f4da5758ad40dc83e4a18946a54555 SHA1 dd276307a403ff09de2ef4596d4f436e22a646ff SHA256 710a08f21d0ea625d85ffae3040a4f64777b318263dd5323d9b695ea9ded3b02
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/*
+}