Adding -r1 and restoring keywords, as it should be from the previous commit

Package-Manager: portage-2.2.1/cvs/Linux x86_64

4 files changed, 61 insertions, 17 deletions

diff --git a/dev-libs/iniparser/ChangeLog b/dev-libs/iniparser/ChangeLog
index 1cb92b65ce9f..97d81ec5b832 100644
--- a/dev-libs/iniparser/ChangeLog
+++ b/dev-libs/iniparser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/iniparser
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/ChangeLog,v 1.32 2014/02/01 19:59:14 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/ChangeLog,v 1.33 2014/02/02 02:40:15 vostorga Exp $
+
+*iniparser-3.1-r1 (02 Feb 2014)
+
+  02 Feb 2014; Víctor Ostorga <vostorga@gentoo.org> iniparser-3.1.ebuild,
+  +iniparser-3.1-r1.ebuild:
+  Adding -r1 and restoring keywords, as it should be from the previous commit
 
   01 Feb 2014; Victor Ostorga iniparser-3.1.ebuild:
   Adding multilib support, bug #493746 , patch thanks to Alexander Stein
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 7a9acb3e2ab0..f53c2bfbffa1 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX iniparser-3.0-autotools.patch 978 SHA256 0f415fcf919f94489b5447af32d118a470b1b79862775eee4fd90ee786cd7cd7 SHA512 b03cc1dbd6dc108a9122a58146a28995f46a7626874970991731d9c7afbfdb709f46a0f948101490615054849c35865a58416d7659b870a8fb07b65be7acb03a WHIRLPOOL 398993be7b0cc6f4f6b2466261ecce9921b034e5cc83ca951df9447fd2edd5f16135253f7c9dc476d00d03a7612b4c17eb91469f1a975ec5189adea7eec5ee5e
 AUX iniparser-3.0b-cpp.patch 1446 SHA256 219c40b19e61191ef64de77d02351326f058f5eaf3447a7f5b5594c58fa3b378 SHA512 8eb2058e332783ae11ef5cbebec153ee1938352f111e3efe332035aa013cf6d01a917aef9a7b8f46f7bd070986e5e686e584d46dedf30276baeb8da0954631a9 WHIRLPOOL d8a31bf5459174af39c49fe83577910a61250f1b2982dc96ab6644375d7f4b3044bb5fab51e6d5f9e3df0092a51ad5adfd361c5f6188e7d773318f7e70de69d8
 DIST iniparser-3.1.tar.gz 39097 SHA256 aedf23881b834519aea5e861b2400606d211da049cd59d3cfb4568e0d9eff5c5 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86 WHIRLPOOL 1b8e6d5c34918cf51db605a7bc81eed75b521a57b403bbf26b572506735d78f58bad250512d53cfc08959c827713c8477a877b66b900a553a9c8099757df6d89
-EBUILD iniparser-3.1.ebuild 1147 SHA256 7faa981610fdf88c9639d085b8e13c9664f4b26fee7940ac52825a6d8b3bbdc5 SHA512 fcd71a4809f52ce7ae672a9a7abac7015deca805d9127ec1777ebd3a52778fb1a887b6d4db4b16d2952c2bb863de4344467c04340c5ac47367e55c9fcba0ae06 WHIRLPOOL 9b89a76cca95a968033e9c239b0f68d17d335672388580dfd10260185a0eb413d8172a9aa53ca0aaf1545a100285ad5d0f47038479a937b1be7928f8da93b15c
-MISC ChangeLog 4644 SHA256 34e92b6a64b5bd45c3fddc949c61f1d593af92345f154f8cde003e0c91c57d29 SHA512 1f5b6e9c231c809329bf97e377553111ca4e8c23e1a42411d21442cb8aa7331a581802311fab67fc8ba571b2383aad4cd485589ac0cf8d2e410d66fd8d26117f WHIRLPOOL 007cb65bf1b4599623f9fb7a29cab6f28dea7e30e4ecaf379d325d3ed78dc11c2191f439fbe5d68350745a3ed73a862c1f2b55125f16f7046f5eaadbde395feb
+EBUILD iniparser-3.1-r1.ebuild 1161 SHA256 34d667070f70eb363079c6ecadf7b308035314628174173cb497479a106bfd9e SHA512 8aba2435f787f69eb65796f02572d4aa21de9192ceda641446a6a8bfe7923459c95694d6b72cec1b828eb65910c872544b447d47222c3920ab61d2dc947edc93 WHIRLPOOL b6a543520fd244725afff13694e1195af2009131de37999247255e5134a2534109f0a55f9c1d96023c5dc35c65d0500430d1a7822793e5245734f3750dcea2d9
+EBUILD iniparser-3.1.ebuild 1127 SHA256 ee4bd2a9b94fdb23123a99ef391490cfef89eef6630d870e27c9128767f333de SHA512 a5bfaafe281537a4dcb213162768dd4f10aa8baeec9d02be73ca7d0106b2719a380c580079a8c2a5301ae069510f56cec169794a96b0bee1b95b4f1aa01d12eb WHIRLPOOL efda23388a7e972bdbf6bb79e14ac0fb98fac5fe588bd6d6180b8db54ff561f52dbb84a6cfcab53a0ae6aade59e82a05ca41bd55fc127c2499fc42a168345d05
+MISC ChangeLog 4859 SHA256 496289cecd1ff8182fc1b1bdfe9924631d21d5bd76408547e6d6c9afff2a462a SHA512 e106bf492b663d97636492d0a8d864279fa6d3579987b11c91be0e8269803a66fc126c83cb201ed878ef415e70ffdd0d33668a49a8e831b2676f261f969c839f WHIRLPOOL 36f7b9c933a62bd2f3bb2985778ebc04f8d437bf5eb35d9981174fd4ac76d0420765fbfd56e9d5f47c6a1a7591d05cd7e3803ba44e5af1c8f51b470d5017cacc
 MISC metadata.xml 243 SHA256 710a08f21d0ea625d85ffae3040a4f64777b318263dd5323d9b695ea9ded3b02 SHA512 558e567645cc5b407bc47e36eadb9f629581d613044b1cce1b11736d92438e5eca3ac75e5007d54a7231072ac7625d509cad239b87e51498c6e50acfb9537b5e WHIRLPOOL 0fc1cb21cc9efa3ec3912fa4d7c40e36c6a53bf13cd32015380715771db82c6cb7d6293cdf6151f9de061a4860317467ce7e840b79cb497e4560fd37b020b66e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlLtUr4ACgkQKQaZ7OJe4zYxZACeOpIIdzQi6xCRlNo5mGRqumQq
-wXgAn10EGPzoArcgZd29HokgimjPa6eE
-=WIZC
------END PGP SIGNATURE-----
diff --git a/dev-libs/iniparser/iniparser-3.1-r1.ebuild b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
new file mode 100644
index 000000000000..fdcb5a6b4bca
--- /dev/null
+++ b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/iniparser-3.1-r1.ebuild,v 1.1 2014/02/02 02:40:15 vostorga Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils autotools-multilib
+
+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 ~arm-linux ~x86-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-multilib_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
+}
diff --git a/dev-libs/iniparser/iniparser-3.1.ebuild b/dev-libs/iniparser/iniparser-3.1.ebuild
index d9252b53da20..4f22495d4634 100644
--- a/dev-libs/iniparser/iniparser-3.1.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 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.9 2014/02/01 19:59:13 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/iniparser/iniparser-3.1.ebuild,v 1.10 2014/02/02 02:40:15 vostorga Exp $
 
 EAPI=4
 
 AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils autotools-multilib
+inherit autotools-utils
 
 DESCRIPTION="A free stand-alone ini file parsing library."
 HOMEPAGE="http://ndevilla.free.fr/iniparser/"
@@ -20,7 +20,7 @@ DEPEND="doc? ( app-doc/doxygen )
 		sys-devel/libtool"
 RDEPEND=""
 
-# the tests are rather examples than tests, no point in running them
+# the tests are rather examples than tests, no point in running  them
 RESTRICT="test"
 
 S="${WORKDIR}/${PN}"
@@ -33,7 +33,7 @@ PATCHES=(
 )
 
 src_install() {
-	autotools-multilib_src_install
+	autotools-utils_src_install
 
 	if use doc; then
 		emake -C doc