# HG changeset patch # User Nathan Phillip Brink # Date 2010-11-02 18:11:30 # Node ID 2222fea1b95b874abd41da24b8ab41d166978504 # Parent 0e27c01cdf8e414943c60bc426d4bccbaff90ffe dev-libs/iniparser: Initial import from Gentoo's Portage diff --git a/dev-libs/iniparser/ChangeLog b/dev-libs/iniparser/ChangeLog new file mode 100644 --- /dev/null +++ b/dev-libs/iniparser/ChangeLog @@ -0,0 +1,81 @@ +# ChangeLog for dev-libs/iniparser +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/ChangeLog,v 1.19 2010/09/26 16:58:44 leio Exp $ + + 26 Sep 2010; Mart Raudsepp iniparser-3.0b-r2.ebuild: + Add ~mips + + 11 Apr 2010; Tiziano Müller + iniparser-3.0b-r2.ebuild: + ... and install the *.ini example files as well. + + 11 Apr 2010; Tiziano Müller + iniparser-3.0b-r2.ebuild: + ... and disable tests since they are useless. + +*iniparser-3.0b-r2 (11 Apr 2010) + + 11 Apr 2010; Tiziano Müller + iniparser-3.0b-r1.ebuild, +iniparser-3.0b-r2.ebuild, + +files/iniparser-3.0b-cpp.patch, +files/iniparser-3.0b-makefile.patch: + Respect CC properly (bug #296050, thanks to Jeroen Roovers). Make headers + C++ compatible (bug #264508, thanks to Lei Qing). + + 27 Dec 2009; Joseph Jezak iniparser-3.0b-r1.ebuild: + Marked ppc/ppc64 stable for bug #291428. + + 15 Dec 2009; Raúl Porcel iniparser-3.0b-r1.ebuild: + ia64/sparc stable wrt #291428 + + 07 Dec 2009; Jeroen Roovers iniparser-3.0b-r1.ebuild: + Stable for HPPA (bug #291428). + + 06 Dec 2009; Tobias Klausmann + iniparser-3.0b-r1.ebuild: + Stable on alpha, bug #291428 + + 26 Nov 2009; Víctor Ostorga iniparser-3.0b.ebuild, + iniparser-3.0b-r1.ebuild: + Fixing typo in ebuild DESCRIPTION, bug #294755 + + 26 Nov 2009; Markus Meier iniparser-3.0b-r1.ebuild: + amd64/arm/x86 stable, bug #291428 + + 22 Jul 2009; Joseph Jezak iniparser-3.0b-r1.ebuild: + Marked ~ppc/~ppc64 for bug #275429. + + 05 Jul 2009; Javier Villavicencio + iniparser-3.0b-r1.ebuild: + Add ~x86-fbsd. + + 01 Jul 2009; Raúl Porcel iniparser-3.0b-r1.ebuild: + Add ~arm/~s390/~sh + + 30 Jun 2009; Raúl Porcel iniparser-3.0b-r1.ebuild: + Add ~ia64/~sparc wrt #275429 + + 28 Jun 2009; Tobias Klausmann + iniparser-3.0b-r1.ebuild: + Keyworded on alpha, bug #275429 + + 26 Jun 2009; Jeroen Roovers iniparser-3.0b-r1.ebuild: + Marked ~hppa (bug #275429). + +*iniparser-3.0b-r1 (04 May 2009) + + 04 May 2009; Jorge Manuel B. S. Vicetto + +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 - fixes bug 267753. Applied with + dev-zero's agreement. + + 15 Aug 2008; Tiziano Müller iniparser-3.0b.ebuild: + Added creation of symlink libiniparser.so->libiniparser.so.0 (bug + #231352). + +*iniparser-3.0b (08 Mar 2008) + + 08 Mar 2008; Tiziano Müller +metadata.xml, + +iniparser-3.0b.ebuild: + Initial commit for samba-3.2_pre2 + diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest new file mode 100644 --- /dev/null +++ b/dev-libs/iniparser/Manifest @@ -0,0 +1,9 @@ +AUX iniparser-3.0b-cpp.patch 1446 RMD160 d4fd1920f5f86eb4975b51f317d3e2c517e346ff SHA1 376a3789aacf26b909ef77d73330d965a304db82 SHA256 219c40b19e61191ef64de77d02351326f058f5eaf3447a7f5b5594c58fa3b378 +AUX iniparser-3.0b-fix-set-functions.patch 1273 RMD160 42d9afa071b01a0ceb054ceaa202e49108a4d803 SHA1 41d49a0e866ad04acd359abab5153f3b572986fb SHA256 3d0cd6ec01d887c426fedf43d72425c61311af080dd528912ae4e91af4134892 +AUX iniparser-3.0b-makefile.patch 1351 RMD160 fc0345bfd6640e8f898436e9fc8460ca5c11a20c SHA1 918fbcadedadefc15cbbce7561f2512ce6dc1b0e SHA256 f06c8679a53d135b9d4c1c9141beba9eff32dbb1f0cc09e8631259ec28e37120 +DIST iniparser3.0b.tar.gz 26080 RMD160 d60234e173a7e888feab24a21a8602834cf64e30 SHA1 0e3672eac056d457699d4121098f0fd3433b9809 SHA256 8a634cadcda15c53c427fc57b783b366df8213e7065646f67ceb526c5bf37426 +EBUILD iniparser-3.0b-r1.ebuild 1162 RMD160 d8060c9c5f8a354edada8409194ff59d5f92d839 SHA1 fcfe2758649f04f2add4c5085c715f4206ba2878 SHA256 5063f62b20f723116cd215ecce9b4e36a8a16225f41b7aeaaaa0affe15a499af +EBUILD iniparser-3.0b-r2.ebuild 1413 RMD160 87ea15f94aef8fdb3e78e3397d0bc2d3c5d21f69 SHA1 135ce9aad939ceb4343bd10bd230fd567cc719fb SHA256 0aacc261c3fcdaeebc4050000582b3db0affd0826a774b821d0a1f5c05e961ef +EBUILD iniparser-3.0b.ebuild 991 RMD160 3d112ce8a20c1ff28e2966cb1ee77596241d253a SHA1 6d405104a8c7ec1ea7f1cce786373c2b75f8d8bc SHA256 868815596f962402ac06e03ad006f50ef738c9989100022b9cbbc22761467a7b +MISC ChangeLog 2918 RMD160 6d00df74afeab0fcadcc9e207696c0d474241e8b SHA1 d6a4d109442bd06c0daa9fece683a23cd1303657 SHA256 8cb3c0d33cf8c7a5fb2ea8d0811b83da08a62d5b141643c5a846bbc8ed4a0772 +MISC metadata.xml 243 RMD160 118071f7d6f4da5758ad40dc83e4a18946a54555 SHA1 dd276307a403ff09de2ef4596d4f436e22a646ff SHA256 710a08f21d0ea625d85ffae3040a4f64777b318263dd5323d9b695ea9ded3b02 diff --git a/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch b/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch new file mode 100644 --- /dev/null +++ b/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch @@ -0,0 +1,47 @@ +diff -ur iniparser3.0b/src/dictionary.c iniparser3.0b-patched/src/dictionary.c +--- iniparser3.0b/src/dictionary.c 2007-11-24 05:39:18.000000000 +0800 ++++ iniparser3.0b-patched/src/dictionary.c 2009-04-01 21:38:09.000000000 +0800 +@@ -38,6 +38,9 @@ + /*--------------------------------------------------------------------------- + Private functions + ---------------------------------------------------------------------------*/ ++#ifdef __cplusplus ++extern "C" { ++#endif + + /* Doubles the allocated size associated to a pointer */ + /* 'size' is the current allocated size. */ +@@ -401,5 +404,10 @@ + dictionary_del(d); + return 0 ; + } ++ ++#ifdef __cplusplus ++} ++#endif ++ + #endif + /* vim: set ts=4 et sw=4 tw=75 */ +diff -ur iniparser3.0b/src/iniparser.h iniparser3.0b-patched/src/iniparser.h +--- iniparser3.0b/src/iniparser.h 2007-11-24 05:38:19.000000000 +0800 ++++ iniparser3.0b-patched/src/iniparser.h 2009-04-01 21:38:02.000000000 +0800 +@@ -41,6 +41,10 @@ + #define iniparser_getstr(d, k) iniparser_getstring(d, k, NULL) + #define iniparser_setstr iniparser_setstring + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + /*-------------------------------------------------------------------------*/ + /** + @brief Get number of sections in a dictionary +@@ -277,4 +281,8 @@ + /*--------------------------------------------------------------------------*/ + void iniparser_freedict(dictionary * d); + ++#ifdef __cplusplus ++} ++#endif ++ + #endif 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 --- /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/files/iniparser-3.0b-makefile.patch b/dev-libs/iniparser/files/iniparser-3.0b-makefile.patch new file mode 100644 --- /dev/null +++ b/dev-libs/iniparser/files/iniparser-3.0b-makefile.patch @@ -0,0 +1,49 @@ +diff -Naur iniparser3.0b.orig/Makefile iniparser3.0b/Makefile +--- iniparser3.0b.orig/Makefile 2010-04-07 08:02:48.771242264 +0200 ++++ iniparser3.0b/Makefile 2010-04-07 08:10:51.403895732 +0200 +@@ -3,16 +3,16 @@ + # + + # Compiler settings +-CC = gcc +-CFLAGS = -O2 -fPIC -Wall -ansi -pedantic ++CC ?= gcc ++CFLAGS += -fPIC -Wall -ansi -pedantic + + # Ar settings to build the library +-AR = ar ++AR ?= ar + ARFLAGS = rcv + + SHLD = ${CC} ${CFLAGS} +-LDSHFLAGS = -shared -Wl,-Bsymbolic -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib +-LDFLAGS = -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib ++LDSHFLAGS = -shared -Wl,-Bsymbolic ++LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib + + # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX) + # RANLIB = ranlib +@@ -28,7 +28,7 @@ + COMPILE.c=$(CC) $(CFLAGS) -c + .c.o: + @(echo "compiling $< ...") +- @($(COMPILE.c) -o $@ $<) ++ $(COMPILE.c) -o $@ $< + + + SRCS = src/iniparser.c \ +@@ -40,11 +40,11 @@ + default: libiniparser.a libiniparser.so + + libiniparser.a: $(OBJS) +- @($(AR) $(ARFLAGS) libiniparser.a $(OBJS)) +- @($(RANLIB) libiniparser.a) ++ $(AR) $(ARFLAGS) libiniparser.a $(OBJS) ++ $(RANLIB) libiniparser.a + + libiniparser.so: $(OBJS) +- @$(SHLD) $(LDSHFLAGS) -o $@.0 $(OBJS) $(LDFLAGS) \ ++ $(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@.0 $(OBJS) \ + -Wl,-soname=`basename $@`.0 + + clean: diff --git a/dev-libs/iniparser/iniparser-3.0b-r1.ebuild b/dev-libs/iniparser/iniparser-3.0b-r1.ebuild new file mode 100644 --- /dev/null +++ b/dev-libs/iniparser/iniparser-3.0b-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2010 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.15 2010/04/11 08:18:38 dev-zero Exp $ + +inherit eutils multilib toolchain-funcs + +MY_P="${PN}${PV}" + +DESCRIPTION="A free 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="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}/${P}-fix-set-functions.patch" +} + +src_compile() { + echo "CFLAGS: ${CFLAGS}" + 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/* +} diff --git a/dev-libs/iniparser/iniparser-3.0b-r2.ebuild b/dev-libs/iniparser/iniparser-3.0b-r2.ebuild new file mode 100644 --- /dev/null +++ b/dev-libs/iniparser/iniparser-3.0b-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/iniparser-3.0b-r2.ebuild,v 1.4 2010/09/26 16:58:44 leio Exp $ + +EAPI="2" + +inherit eutils multilib + +MY_P="${PN}${PV}" + +DESCRIPTION="A free 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="examples static-libs" + +DEPEND="" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +# the tests are rather examples than tests, no point in running them +RESTRICT="test" + +src_prepare() { + epatch \ + "${FILESDIR}/${P}-fix-set-functions.patch" \ + "${FILESDIR}/${P}-cpp.patch" \ + "${FILESDIR}/${P}-makefile.patch" + + sed -i \ + -e "s|/usr/lib|/usr/$(get_libdir)|g" \ + Makefile || die "sed failed" +} + +src_compile() { + local targets="libiniparser.so" + use static-libs && targets="${targets} libiniparser.a" + + emake ${targets} || die "emake failed" +} + +src_install() { + dolib libiniparser.so.0 + dosym libiniparser.so.0 /usr/$(get_libdir)/libiniparser.so + + use static-libs && dolib libiniparser.a + + insinto /usr/include + doins src/*.h + + dodoc AUTHORS README + dohtml html/* + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins test/*.c test/*.ini + fi +} diff --git a/dev-libs/iniparser/iniparser-3.0b.ebuild b/dev-libs/iniparser/iniparser-3.0b.ebuild new file mode 100644 --- /dev/null +++ b/dev-libs/iniparser/iniparser-3.0b.ebuild @@ -0,0 +1,41 @@ +# 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.ebuild,v 1.3 2009/11/26 20:57:30 vostorga Exp $ + +inherit multilib toolchain-funcs + +MY_P="${PN}${PV}" + +DESCRIPTION="A free 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_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/* +} diff --git a/dev-libs/iniparser/metadata.xml b/dev-libs/iniparser/metadata.xml new file mode 100644 --- /dev/null +++ b/dev-libs/iniparser/metadata.xml @@ -0,0 +1,9 @@ + + + +samba + + samba@gentoo.org + Samba Team + +