3 files changed, 11 insertions, 55 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/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
-}