Only setup python for USE=doc, bug #487574 by mgorny. Also tested by John W. Newman. Remove old.

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x30427902

4 files changed, 17 insertions, 72 deletions

diff --git a/dev-libs/jsoncpp/ChangeLog b/dev-libs/jsoncpp/ChangeLog
index 8b7f54df2c9a..fbf1ca2db69c 100644
--- a/dev-libs/jsoncpp/ChangeLog
+++ b/dev-libs/jsoncpp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/jsoncpp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v 1.8 2013/04/04 20:16:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v 1.9 2013/11/17 23:42:25 phajdan.jr Exp $
+
+  17 Nov 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org> -jsoncpp-0.5.0.ebuild,
+  jsoncpp-0.5.0-r1.ebuild:
+  Only setup python for USE=doc, bug #487574 by mgorny. Also tested by John W.
+  Newman. Remove old.
 
   04 Apr 2013; Agostino Sarubbo <ago@gentoo.org> jsoncpp-0.5.0-r1.ebuild:
   Stable for x86, wrt bug #463426
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index f8f10a2a0f13..20502c8616d8 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -2,24 +2,13 @@
 Hash: SHA256
 
 DIST jsoncpp-src-0.5.0.tar.gz 107466 SHA256 22b14ecd0de8cdad2b6b6839f6d0804d3b84e91f42861ebd843832a26a927433 SHA512 2815d3523f92c33a5be3221161a590a0fddd16cb22e5dc634791535ee44271ec4fbb64f81cc958a87b1f029a8108ed9f169cda5a2d0422f60699ac286386a1bc WHIRLPOOL f6174f08dc647a189fc17f93343a72fb83bea66f27e60707b6bf300a185d4d3e8d5f347dd6f0d06462e45086c7c1dbd352e22ac08fef13d9235a65bad44f0d67
-EBUILD jsoncpp-0.5.0-r1.ebuild 1195 SHA256 c8875fcff1c12de3a8417873c82f6a16eef0384d16eafac0fa6511439d982f50 SHA512 993fb09165f06e9a66e345ad7f27576df4ae3748b497c9c4a3b118d6b00521a18ad0466d416da6e6fc1828159b571c3a2736007700b459187bd26df5d27748ee WHIRLPOOL 69d3a3c1839ef6b342f001ba146e68b6bb4e919cfa63299a79da72b50bdd8b5ecdfca12a0e5a7d6345aa3a4a7596955108ea73a029702fd9d1f7bc893d1240d5
-EBUILD jsoncpp-0.5.0.ebuild 1124 SHA256 674e45c93469843f388f0e92a4d789d72d75d4e20d2d85138a3202a592c78da3 SHA512 bef66ff6301844b46c68834525ada32a6304fc2d36a19ad233a47d6845d4a7cc581c4e17cde88959b08a2785d3cb0c76367d56c10ba58459f1c0aa1a019a3e2b WHIRLPOOL de73e8c2d735da5622825bbf843dde94578f8cc12f240a6c63841d73877a4527f9eb17568a5bc4888bc6940f222b43a3418ab029459b20215c874f55a1e54941
-MISC ChangeLog 1136 SHA256 88e2f00e9f76e905fcb52c48e58c1d231721984433ee87151090cf31c6018afc SHA512 5a2c0138e33f7dda6dba9c09cc920877f7146e6260e6ba8fffa57cd48d7a544ca2f055eb2d4afe667b434104c4c41890a77051c39f46348bf76783e3af747d7f WHIRLPOOL 55f213d483d20ce77ea0fa2c18a20c15885962ceed90bdfa9a958cbeb3518e1fe40efb5e9359ff2ad3c544212ee390eff376a880a763fd2fc6086cacaf62f653
+EBUILD jsoncpp-0.5.0-r1.ebuild 1255 SHA256 c61db8f16bd9d0e77deb7d1b965fee0e419b05a3b4950d17211f6fadb0764b48 SHA512 3605de7eed9486b316a6e4317d92042745089bcff7d472131607f6f5c04c902e760985c77ff7c8cc62c8926a7c823db1010fcb3306c44a0600113249dd42fa21 WHIRLPOOL c6cff36b942b530850618f83006a2e5d838a427ff78b8d3c70f7ed31d7600ba564199446f1cae2a0751c82446bc9299bdd311606a99477631f7366f6c80d38e2
+MISC ChangeLog 1350 SHA256 05925ca2d5f03381b32464493fa15d757ef3ce7c79942554d59c6bc72ef1be9f SHA512 81e8435c82e8ecd96b2b20f69a085b5caeabcbb2c99823e1132900a93de04da2150384e6d890ba3234519f70a016c5879526ea11ac0de41902580e611334bb80 WHIRLPOOL 2b2e124ea2fb82733d4cdddd6f88cafe6e265e36409b83a0ac0063631ddac28c026765a9f86d0688121fe0115d14484902610dc02e05966cdecfe3c727ede503
 MISC metadata.xml 244 SHA256 bc7750e1a8d70d96ac39e308a77b152a272341f25f054405057dfb8b2863db0b SHA512 3561f3f7d1f6cfc3b8c6e4572cbbca69c634348ec49129a57e2588e98c5d37f62218e5af2a04c839672ea074b93791ae1b2bd85ee5d05abfd018a582ac68b323 WHIRLPOOL f62094c68aabd3354056778f514430546997d68f32dc8fb117b378c448e9d37a1ee5789f19014078c698244d780f352f08aa478001886632f11adbb10c08f510
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRXd+aAAoJELp701BxlEWfeBwP/1tGISFTl+jAAZ4gPtHsDe7Q
-rGqRAFjLjoRlmu5bi8u0wXLnWAl1/O3yhsDz+BFGz4p5nBFXiLCJj3w2ndQwVJiq
-/N0CvekYsod5O/xtOU0dIaF5LH15JoyUqbcNJlAvtY52BvhTQrbG0WVJ4frQh+EZ
-VO+ha4yoqAAFfIaIU6xFcKilJDYKYEJ5qNnlluClRXQs8JIUnaShNQggWInswLP1
-HGB3UwmageBKpjXSXQp1nmu16SXSqlqV6OmHL1hgS64xljTryGUW3sxeOzeepOpy
-us7vhUtwmMp4x00z9mohLY7ZAKZ8l6JyWeEsm3xRHQOSLRqraje6XDdj545kdGJs
-AcQ9buDeaytmlj+j+1R84CxG35purD2B1hN3qtBlR7yyD85vEyKjlTHV5MRyjH/P
-FmYwRQPrJrJGtUeQBVWpFQNbWhm4QTqGmNEg0sBhu/MsuBfbfKs+6E2CHLLe0lrp
-QTl/5FdwLemGVU1LFmHMm5u4SzXsHCOt6SAROYxWojDxkiyUvVqxBXH1lMoquO54
-itnh79IzWhTDRzfUxwgoh0P0XvPMCpzoiWZ4fQv9xC+inqaFA6UEXIqzhM0L5b69
-Qvotx5tSfVKe6z+peI1yk2EMW5+HTLrmZo394hwPmSlAvqMwdcB4S/4NOrpOuGD1
-OBZ4dwAyrwypnnq/CX1J
-=PEgt
+iEYEAREIAAYFAlKJVGgACgkQuUQtlDBCeQIdmQCffQ5e99Fo+dhZ6P5q+f/fLGCY
+hqgAoIE7er9VxRXbRfW+PryKCWGDuqlN
+=VbFe
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/jsoncpp/jsoncpp-0.5.0-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-0.5.0-r1.ebuild
index 2296984c9649..54a194917c75 100644
--- a/dev-libs/jsoncpp/jsoncpp-0.5.0-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.5.0-r1.ebuild,v 1.3 2013/04/04 20:16:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.5.0-r1.ebuild,v 1.4 2013/11/17 23:42:25 phajdan.jr Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -27,6 +27,10 @@ RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
 cxx_wrapper() {
 	set -- $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "$@"
 	echo "$@"
diff --git a/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild b/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild
deleted file mode 100644
index abd2f8475911..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.5.0.ebuild,v 1.5 2013/02/25 21:05:18 phajdan.jr Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit multilib toolchain-funcs python-any-r1
-
-MY_P="${PN}-src-${PV}"
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="http://jsoncpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="public-domain"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		${PYTHON_DEPS}
-	)"
-RDEPEND="!<dev-libs/json-c-0.10"
-
-S="${WORKDIR}/${MY_P}"
-
-cxx_wrapper() {
-	set -- $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	soname=libjsoncpp.so.${PV}
-	cxx_wrapper src/lib_json/*.cpp -Iinclude -shared -fPIC \
-		-Wl,-soname,${soname} -o ${soname} || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r include
-
-	dolib ${soname}
-	dosym ${soname} /usr/$(get_libdir)/libjsoncpp.so
-
-	if use doc; then
-		${EPYTHON} doxybuild.py --doxygen=/usr/bin/doxygen || die
-		dohtml dist/doxygen/jsoncpp*/*
-	fi
-}