QA: Revbump. Fix ruby bindings and perl-5.10 issues. Non-maintainer commit. Fixes bug #117061 and #256686.

Package-Manager: portage-2.2_rc56/cvs/Linux i686

4 files changed, 39 insertions, 8 deletions

diff --git a/dev-util/libconf/ChangeLog b/dev-util/libconf/ChangeLog
index 2e07e056ca3f..b61d6c838073 100644
--- a/dev-util/libconf/ChangeLog
+++ b/dev-util/libconf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/libconf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/ChangeLog,v 1.48 2009/07/02 23:57:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/ChangeLog,v 1.49 2009/12/09 14:12:49 scarabeus Exp $
+
+*libconf-0.42.10-r2 (09 Dec 2009)
+
+  09 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.42.10-perl5.10.patch, -libconf-0.42.10-r1.ebuild,
+  +libconf-0.42.10-r2.ebuild:
+  QA: Revbump. Fix ruby bindings and perl-5.10 issues. Non-maintainer
+  commit. Fixes bug #117061 and #256686.
 
   02 Jul 2009; Jeroen Roovers <jer@gentoo.org> libconf-0.42.10-r1.ebuild:
   Marked ~hppa too.
diff --git a/dev-util/libconf/Manifest b/dev-util/libconf/Manifest
index 971e0475e70a..a42406b06514 100644
--- a/dev-util/libconf/Manifest
+++ b/dev-util/libconf/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.42.10-fbsd.patch 1850 RMD160 534d06dac6a2190a21d03cbc01e97bc50d2f17f1 SHA1 22688c4f67bb36d33672881ce03934b98a5c4b1e SHA256 760b13b41e618c7de9a0132e00e7be3f00cc64cfa51869fd3bbf432164183e73
+AUX 0.42.10-perl5.10.patch 486 RMD160 c541f314b16acdbd8a6be8cfcf591f93d2ad1486 SHA1 3eae14f495303b5bc32700e5d3bb4a8cb2aebc47 SHA256 88176bf4ac5d04e74bd86914a4408a0902f5853a7e1f4a5fb1685fbb80262372
 DIST perl-Libconf-0.40.00.tar.bz2 321119 RMD160 7e6dd1c172e58fae3bfd0e287773040e8acab2ec SHA1 27821d97b17de246c8b1e2fbc5e33df639c4fda2 SHA256 9ae847b73d1aabb6d60ceaeda3a8cc14041b557bcfc91c8951c97659fa94eaf1
 DIST perl-Libconf-0.42.10.tar.bz2 203303 RMD160 55e59e22fb8f2a0b4954abe52af03a58a1ed9847 SHA1 278200ceb40a51be14a250bcf35f4f0d6e46afb3 SHA256 91fc840042f0072c2de8520a044e5842df63c0f6f1c41ff989090c34c01ad40e
 EBUILD libconf-0.40.00.ebuild 735 RMD160 3961fcd62d0931df9acb7acbcdfecb5068dbd130 SHA1 19baf47bb6061f82116d15ee321665e329e1bef3 SHA256 82866b609134b79fd2084a68df4f4fb97ea1a407bc1c8cd44a467e1a7b137a9a
-EBUILD libconf-0.42.10-r1.ebuild 1690 RMD160 81b5c2e3ea0fc24bbe1f11268562118778171c55 SHA1 f3d90d934afaa2f249b5cee6e734c38087eb2dfc SHA256 901b968a2366d29a44da5e5fe6d41a2bc54004d53ce2ff3341fb0d809997cab1
-MISC ChangeLog 6182 RMD160 d5b724a910aaeebda94b01f25221da0a6188b115 SHA1 452e9d74d9063f23c718a7203c6a12f56add116c SHA256 a1178bb91ace73c7d13a3d3a4bcf9ac4db40ce5a652f07240bbef6ce230957cd
+EBUILD libconf-0.42.10-r2.ebuild 1810 RMD160 587058affd6fa606f4d158f90ad92cb89962357a SHA1 ac0faa408eb495f4ab98bd25cdf0dae0928b4665 SHA256 704e178a985c3063922193a6fdc57a5007323c4a4850973c303ceb84875aa453
+MISC ChangeLog 6481 RMD160 1dcdf2fce5f846360306d964089ee852fc0daeb4 SHA1 2ed69fbdc434899db8a4435a2509ad509577fcbd SHA256 c0141a7ab4bcf0237557d60b054fe8b2ca3f17bafc2f94e0b35b8eb9b1741d41
 MISC metadata.xml 284 RMD160 d34a08cf3b7481409cfe53b033da70d654e7a132 SHA1 65de00127c5630c17a87531fc68e5dcb6d06bc73 SHA256 b3f4651cafe0c058bff035950a89a8fd476f19a06bdc3b7f5ed0b5981ddd333a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksfsJMACgkQHB6c3gNBRYd7RwCfSkkZ4VRCwQy45D4L1UsW2MzW
+URMAoKC7lF1FR9LOq6MjlHGXOqNkhd7A
+=9SDV
+-----END PGP SIGNATURE-----
diff --git a/dev-util/libconf/files/0.42.10-perl5.10.patch b/dev-util/libconf/files/0.42.10-perl5.10.patch
new file mode 100644
index 000000000000..df146eb6f453
--- /dev/null
+++ b/dev-util/libconf/files/0.42.10-perl5.10.patch
@@ -0,0 +1,11 @@
+--- perl-Libconf-0.42.10/bindings/c/src/conf2xml.c	2005-11-07 01:02:03.000000000 -0800
++++ perl-Libconf-0.42.10/bindings/c/src/conf2xml.c.new	2008-07-22 17:01:33.000000000 -0700
+@@ -19,7 +19,7 @@
+     char *embedding[] = { "", "-e", "0" };
+ 
+     if (my_perl != NULL) conf2xml_free();
+-    PERL_SYS_INIT3(&argc,&argv,&env);
++    PERL_SYS_INIT3(NULL,NULL,NULL);
+     my_perl = perl_alloc();
+     perl_construct( my_perl );
+     perl_parse(my_perl, xs_init, 3, embedding, (char **)NULL);
diff --git a/dev-util/libconf/libconf-0.42.10-r1.ebuild b/dev-util/libconf/libconf-0.42.10-r2.ebuild
index dee32a26eded..5f38d84b5555 100644
--- a/dev-util/libconf/libconf-0.42.10-r1.ebuild
+++ b/dev-util/libconf/libconf-0.42.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/libconf-0.42.10-r1.ebuild,v 1.8 2009/07/02 23:57:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/libconf/libconf-0.42.10-r2.ebuild,v 1.1 2009/12/09 14:12:49 scarabeus Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -27,7 +27,8 @@ bindings() {
 	local mybindings
 	mybindings="bash"
 	use python && mybindings="${mybindings} python"
-	use ruby && mybindings="${mybindings} ruby"
+	# ruby bindings require c bindings - bug #117061
+	use ruby && mybindings="${mybindings} c ruby"
 	echo ${mybindings}
 }
 
@@ -36,6 +37,7 @@ src_unpack() {
 	cd "${S}"
 
 	[[ ${USERLAND} == *BSD ]] && epatch "${FILESDIR}/${PV}-fbsd.patch"
+	epatch "${FILESDIR}/${PV}-per5.10.patch"
 
 	# Multilib fix
 	sed -i \
@@ -63,7 +65,6 @@ src_install() {
 		BINDINGS="$(bindings)" \
 		PREFIX="${D}/usr" DESTDIR="${D}" ROOT="${D}" \
 		CPA="cp -pR" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog \
-		bindings/ruby/src/{AUTHORS,README} \
-		bindings/python/src/README
+	dodoc AUTHORS ChangeLog || die
+	use python && { newdoc newdoc bindings/ruby/src/AUTHORS AUTHORS.python || die ; }
 }