Version bump to 3.1 wrt bug#417467.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

5 files changed, 71 insertions, 110 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/Manifest b/dev-libs/iniparser/Manifest
index 537008b86bc0..77765d058080 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -6,17 +6,27 @@ AUX iniparser-3.0b-cpp.patch 1446 RMD160 d4fd1920f5f86eb4975b51f317d3e2c517e346f
 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 iniparser-3.0.tar.gz 17045 RMD160 bcb077323941e342aa0f8ff658baa60ad87d3762 SHA1 57ee1259d32d9fa67f2818d998191b890d45947c SHA256 d6d7546a66f071d5a2bffe4c63fe7300a7962369b88c58084a36a8b7cfb9bd6d
+DIST iniparser-3.1.tar.gz 39097 RMD160 164665a6f905dc0a272cbcf6ae33e20a56d0fc6b SHA1 41eae7b414cad9cd42ae2c2a64394c10d7ab655e SHA256 aedf23881b834519aea5e861b2400606d211da049cd59d3cfb4568e0d9eff5c5
 DIST iniparser3.0b.tar.gz 26080 RMD160 d60234e173a7e888feab24a21a8602834cf64e30 SHA1 0e3672eac056d457699d4121098f0fd3433b9809 SHA256 8a634cadcda15c53c427fc57b783b366df8213e7065646f67ceb526c5bf37426
 EBUILD iniparser-3.0.0.ebuild 1184 RMD160 3fe563f043f7ca438d17eacd61e351cc6221ed68 SHA1 247fba57d888043d4a82c8675d4d646c862423de SHA256 19ebb2914cec0129757c2d5034cf4200291d5f56e8f521c9320aee5d815e5d9a
 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 3317 RMD160 9f4675fa2112422ad564cb27c597efe6536d1658 SHA1 33bdcd488933ce886c638fcc2425112be992d5e3 SHA256 75ca8cf39ba0726daaa7c4df6675a20ab767cc9127be31d26fad59c0bf39e95a
+EBUILD iniparser-3.1.ebuild 1115 RMD160 8d4ed950b7c14d118ab3d44cb173889fb6bb5180 SHA1 b9b8986537c4995622d0ea1746ad67b5e96443aa SHA256 947d402310919eb50b122328fdad1b64ba097775a276464f3a03a94d928d96d9
+MISC ChangeLog 3518 RMD160 af1d39cc77883fa2aa1657022b9b246ffa0d8e40 SHA1 61f2584f18dbd81ddb8f415fe43fe878a249e698 SHA256 ca41380e7cddb60a68f592fe84de39d5a9d2cf0e2048a579a119fb690e96755b
 MISC metadata.xml 243 RMD160 118071f7d6f4da5758ad40dc83e4a18946a54555 SHA1 dd276307a403ff09de2ef4596d4f436e22a646ff SHA256 710a08f21d0ea625d85ffae3040a4f64777b318263dd5323d9b695ea9ded3b02
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+znqMACgkQvFcC4BYPU0pVzACgonoCANEo9/QXaeiwm73ShLaR
-wJYAn1YezRzEJAsmTlnvmAG2CSjD2P1O
-=BvWW
+iQIcBAEBAgAGBQJPv4gGAAoJEOSiRoyO7jvoBrgQAI7UVUTaDaKrXu5TnCjm1ptP
+Vv1aovzjC72LQu+4VPwQw0l6imT1zm8ylAQZ7eJ7FytuDgvrG5R9NpbGX2v2rs88
+VMoth6k8ACJ6dbzJFtgU4j3qn4zLdTZo5uxZ6Q3/Bn4LRZxHXqLQJDnVfjIrRl3c
+z2rUTYQebOaI1D3PI4rURBEZgs3L3DeTompk1grASXDgyMzPc5o4cUBNfe0VERsn
+WFYiGtnYKBi6Ns56KkBb4mfTy382rPlgegls2ABfaZdmE6frktXMfg8HpN5TJ2L7
+Z41oLccMZJGmHqmlCVckHGImNZc3NmGSBI/udf6qmj0Fg/XKg0N1hrmD4h1UbuOx
+EBY7Olkidr9uPYoJOyB4sPSiQFMouoBzzzbGd87OvBIeWfFFDz+UOa1+t8wCPirB
+/WwxoV4F/j8AQ3f0jnsZKT9z7Bp3K3HklIPavjNVI+Qg6+yADuoN9oSdZC8idVbu
+9VKfK+CEb7PbFx1iMUyh2EptLgmSRQU5C8eXUxkxbdLgxLb8tBSJ2gUOZCJeh5NX
+vyG9eRDk6do5JdE3d5dkZzKEz4pI3CDkWsdEk0TmgxPVSRcc+8n6Y3K+iUDAd5bF
+cC+2IUwJCV3PVuWJuxXxxVondSaY1l+cbhnEHKBIgbguvaww2uCHnDsF2E39yzCf
+stezUokcAHQ+YDuIRZv0
+=OYaS
 -----END PGP SIGNATURE-----
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
+}