4 files changed, 54 insertions, 103 deletions
diff --git a/dev-libs/iniparser/ChangeLog b/dev-libs/iniparser/ChangeLog
index 749803564efe..1271bc8f09af 100644
--- a/dev-libs/iniparser/ChangeLog
+++ b/dev-libs/iniparser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/iniparser
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/ChangeLog,v 1.22 2012/05/16 12:33:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/ChangeLog,v 1.23 2012/05/25 13:24:06 scarabeus Exp $
+
+*iniparser-3.1 (25 May 2012)
+
+  25 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> +iniparser-3.1.ebuild,
+  -iniparser-3.0b-r2.ebuild, -iniparser-3.0b.ebuild:
+  Version bump to 3.1 wrt bug#417467.
 
   16 May 2012; Alexis Ballier <aballier@gentoo.org> iniparser-3.0.0.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-libs/iniparser/iniparser-3.0b-r2.ebuild b/dev-libs/iniparser/iniparser-3.0b-r2.ebuild
deleted file mode 100644
index 9960cb074f22..000000000000
--- a/dev-libs/iniparser/iniparser-3.0b-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
deleted file mode 100644
index 0b2d53a214c8..000000000000
--- a/dev-libs/iniparser/iniparser-3.0b.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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/iniparser-3.1.ebuild b/dev-libs/iniparser/iniparser-3.1.ebuild
new file mode 100644
index 000000000000..1855ef337f38
--- /dev/null
+++ b/dev-libs/iniparser/iniparser-3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/iniparser-3.1.ebuild,v 1.1 2012/05/25 13:24:06 scarabeus Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="A free stand-alone ini file parsing library."
+HOMEPAGE="http://ndevilla.free.fr/iniparser/"
+
+SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos"
+IUSE="doc examples static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )
+		sys-devel/libtool"
+RDEPEND=""
+
+# the tests are rather examples than tests, no point in running them
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( AUTHORS README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0b-cpp.patch"
+	"${FILESDIR}/${PN}-3.0-autotools.patch"
+)
+
+src_install() {
+	autotools-utils_src_install
+
+	if use doc; then
+		emake -C doc
+		dohtml -r html/*
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{c,ini,py}
+	fi
+}