gtk-doc is really required to get docs finally installed because package doesn't really provide precompiled docs (#458428 by Nikoli), drop old.

(Portage version: 2.1.11.60/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 10 insertions, 63 deletions

diff --git a/dev-python/pygoocanvas/ChangeLog b/dev-python/pygoocanvas/ChangeLog
index 8bc5067ca8d6..2847a8fa49c8 100644
--- a/dev-python/pygoocanvas/ChangeLog
+++ b/dev-python/pygoocanvas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pygoocanvas
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoocanvas/ChangeLog,v 1.28 2013/03/26 16:50:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoocanvas/ChangeLog,v 1.29 2013/04/06 09:10:36 pacho Exp $
+
+  06 Apr 2013; Pacho Ramos <pacho@gentoo.org> -pygoocanvas-0.14.1.ebuild,
+  pygoocanvas-0.14.1-r1.ebuild:
+  gtk-doc is really required to get docs finally installed because package
+  doesn't really provide precompiled docs (#458428 by Nikoli), drop old.
 
   26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> pygoocanvas-0.14.1-r1.ebuild:
   Stable for ppc, wrt bug #458984
diff --git a/dev-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild b/dev-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild
index 8235c1da3013..6d87680b6363 100644
--- a/dev-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild
+++ b/dev-python/pygoocanvas/pygoocanvas-0.14.1-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-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild,v 1.5 2013/03/26 16:50:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild,v 1.6 2013/04/06 09:10:36 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ HOMEPAGE="http://live.gnome.org/PyGoocanvas"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="examples"
+IUSE="doc examples"
 
 RDEPEND="
 	>=dev-python/pygobject-2.11.3:2[${PYTHON_USEDEP}]
@@ -25,7 +25,7 @@ RDEPEND="
 	>=x11-libs/goocanvas-0.14:0
 "
 DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
+	doc? ( >=dev-util/gtk-doc-1.4 )
 	virtual/pkgconfig
 "
 
@@ -40,7 +40,7 @@ src_configure() {
 	# docs installs gtk-doc and xsltproc is not actually used
 	configure_binding() {
 		ECONF_SOURCE="${S}" gnome2_src_configure \
-			--enable-docs \
+			$(use_enable doc docs) \
 			XSLTPROC=$(type -P true)
 	}
 	python_foreach_impl run_in_build_dir configure_binding
diff --git a/dev-python/pygoocanvas/pygoocanvas-0.14.1.ebuild b/dev-python/pygoocanvas/pygoocanvas-0.14.1.ebuild
deleted file mode 100644
index fb056b6631cb..000000000000
--- a/dev-python/pygoocanvas/pygoocanvas-0.14.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoocanvas/pygoocanvas-0.14.1.ebuild,v 1.11 2012/05/04 15:12:15 patrick Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-
-inherit gnome2 python
-
-DESCRIPTION="GooCanvas python bindings"
-HOMEPAGE="http://live.gnome.org/PyGoocanvas"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-python/pygobject-2.11.3:2
-	>=dev-python/pygtk-2.10.4:2
-	>=dev-python/pycairo-1.8.4
-	>=x11-libs/goocanvas-0.14:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-libs/libxslt
-		dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog NEWS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable doc docs)"
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 1 failed"
-	python_src_prepare
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-
-	if use examples; then
-		rm demo/Makefile*
-		cp -R demo "${D}"/usr/share/doc/${PF}
-	fi
-}