eva 14/12/29 08:06:10 Modified: nautilus-python-1.1-r2.ebuild ChangeLog Log: Fix gtk-doc support, bug #533858. Add missing dependencies. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Revision Changes Path 1.3 dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild?r1=1.2&r2=1.3 Index: nautilus-python-1.1-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nautilus-python-1.1-r2.ebuild 25 Dec 2014 00:08:43 -0000 1.2 +++ nautilus-python-1.1-r2.ebuild 29 Dec 2014 08:06:10 -0000 1.3 @@ -1,13 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild,v 1.2 2014/12/25 00:08:43 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild,v 1.3 2014/12/29 08:06:10 eva Exp $ EAPI=5 -PYTHON_COMPAT=( python2_7 ) - GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python2_7 ) inherit eutils gnome2 python-single-r1 @@ -18,31 +17,36 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~x86" IUSE="doc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Depend on pygobject:3 for sanity, and because it's automagic -RDEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}] +RDEPEND=" + dev-python/pygobject:3[${PYTHON_USEDEP}] >=gnome-base/nautilus-2.32[introspection] - ${PYTHON_DEPS}" + ${PYTHON_DEPS} +" DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.9 + virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 - >=dev-util/gtk-doc-1.9 )" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -DOCS="AUTHORS ChangeLog NEWS README" + dev-libs/libxslt + >=dev-util/gtk-doc-1.9 ) +" + +src_configure() { + # FIXME: package does not ship pre-built documentation + # and has broken logic for dealing with gtk-doc + gnome2_src_configure $(use_enable doc gtk-doc) +} src_install() { gnome2_src_install # Directory for systemwide extensions keepdir /usr/share/nautilus-python/extensions # Doesn't get installed by "make install" for some reason - if use doc; then + if use doc ; then insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp doins -r docs/html/. fi } - -pkg_postinst() { - gnome2_pkg_postinst -} 1.24 dev-python/nautilus-python/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/nautilus-python/ChangeLog?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/nautilus-python/ChangeLog?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/nautilus-python/ChangeLog?r1=1.23&r2=1.24 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/ChangeLog,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ChangeLog 25 Dec 2014 00:08:43 -0000 1.23 +++ ChangeLog 29 Dec 2014 08:06:10 -0000 1.24 @@ -1,6 +1,10 @@ # ChangeLog for dev-python/nautilus-python # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/ChangeLog,v 1.23 2014/12/25 00:08:43 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/ChangeLog,v 1.24 2014/12/29 08:06:10 eva Exp $ + + 29 Dec 2014; Gilles Dartiguelongue <[email protected]> + nautilus-python-1.1-r2.ebuild: + Fix gtk-doc support, bug #533858. Add missing dependencies. 25 Dec 2014; Michał Górny <[email protected]> nautilus-python-1.1-r2.ebuild: Add missing PYTHON_DEPS and PYTHON_REQUIRED_USE.
