Fix gtk-doc support, bug #533858. Add missing dependencies.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

diff --git a/dev-python/nautilus-python/ChangeLog b/dev-python/nautilus-python/ChangeLog
index 9b70b0630c2f17ac87048b33cff057bc10f5eb23..c3a1e2af9daecdb63e8fe716d672f46cebbd7e60 100644 (file)
--- a/dev-python/nautilus-python/ChangeLog
+++ b/dev-python/nautilus-python/ChangeLog
@@ -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 <eva@gentoo.org>
+  nautilus-python-1.1-r2.ebuild:
+  Fix gtk-doc support, bug #533858. Add missing dependencies.
 
   25 Dec 2014; Michał Górny <mgorny@gentoo.org> nautilus-python-1.1-r2.ebuild:
   Add missing PYTHON_DEPS and PYTHON_REQUIRED_USE.

diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index d6d253ab323556fbaaece0c306b75617cac85573..e571c26a9477ac9a949bbafc2cc36057d8862228 100644 (file)
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -3,25 +3,13 @@ Hash: SHA256
 
 DIST nautilus-python-1.1.tar.xz 239392 SHA256 7825e08ada8e131f829d0e7d4144dcfac9fad7bfd7c0600bf3985349c20c496b SHA512 e721f46414a3efa4b5f5ec3f56cc00a308ec010a7a0612cef975d6f436494701f8bdbed39bdb5186c8013a582c7e63288a1c60adc4b8967c9ec69d6301a50fef WHIRLPOOL 280b6019a9850596b69777a758d89b06bfce5f30188feb274c8d5820ec6b9ecfcc8c0c402dbfee184378b2c02b6c29bc798ff061a139defd8cfae4e12b5d591d
 EBUILD nautilus-python-1.1-r1.ebuild 1210 SHA256 38d900d176b954b59e28cec70629622a1b6c176bfcc642222dbaa71bbf28dc5a SHA512 c52d93765b6d00eab71f0c8c64c8d53275d8dcd79b606d9c6f29ea3dbd33d3c21cb133b75d92207a3f3cf0b970a6e612199319bfb88e82632b3effe0d698ae74 WHIRLPOOL 8ff8692d2217ed4ee8f4d14f7ccffad917760173583b7c8c3f21cc36508425b3c31475e02037c9da92a84a667f5813b3d29d2cdd5ace79b43f033f519b05ff98
-EBUILD nautilus-python-1.1-r2.ebuild 1216 SHA256 f7ea4b6afef46dd25bfd9110eb31f3472bb186f486b2ec6d0df0a50a09dcb4da SHA512 06545b65354b54496abe171b0423c8d563e54b2f9e378d57be3fd60633845f7075b3e954b048becf757eb416fefeb4625166e9cd3d1e1159f5c3542ce1c2ddfa WHIRLPOOL c42d6468f8e63db1a0f769f8759ebf4c3610e1de7dc79c99e450ab84657a84a1d72ee6d20373950cb0330935967580c8bfe02092f467a7988c50a15a9c4c222b
-MISC ChangeLog 4586 SHA256 6b3e93e8797df370f4dff4aa2ba2cf30e061ca6a8368c2c90ff03dcc6d9c7749 SHA512 b5bd0f2b3bed1a0a5fee79159508527829469efb1c8960259b8571d27fc5c251ef299943421a215f796bb71248e9c731a852899084678dac35415199338e1406 WHIRLPOOL 34a5b0f229a13e908f87c317cf7e68aa689a2fd97ef9d1c8af26f157170e6cddaec897dc1ee62436cc669952ba863d510d2ba83154322e66ddbaea88730303c1
+EBUILD nautilus-python-1.1-r2.ebuild 1378 SHA256 e60e3ac4680b8f4ca80344863ebb654a4f039bf4d416722a05f717427efbbb76 SHA512 315785ed507c797d7c48b3da7ace8243463ea77c359bada4708eb6fc3c93e028ce16102abae8fb28f82eec21bfd6f56f13753f97257442eb1c4a70d12223f918 WHIRLPOOL 8703b88c7ffc9aeb16b0482808f0245642a9752f134f602c4421dea01a32d488578eb1e23d9dd26f756e15ba94494747c1f7671dc74eb4e961d75ed076852948
+MISC ChangeLog 4733 SHA256 bad5752bd48c2ce49ab872c7737f8eadbb6a45edabfbeff2cebf0fce4eb2b2c4 SHA512 085a4d94ec0d20aeae3f1b592ea302d799221bad20a02b9713dd86ab2197182cc49994806b4f8859f814645cd5ddf7034dc9091b5df53a2de7a6e9b6df290087 WHIRLPOOL c556ffae71dc1a2e4842d8bce6c478b87173557b8036e2f113a5758d12a7b6d365b49b11fa86f0bdee6480ab7aee24f49f5269e35e9831be2b67ccb89c3a9cbe
 MISC metadata.xml 242 SHA256 7fb8fe5634c39989d9f91191ceba0b89d51b64f6260f63ca9600de7c37ff06fe SHA512 811e917de58f151535d54508ab5732b74e76a2017ef050dff535e9b481929232ea5567249d4204a28650c8bc4fef5b2cb27c330a4d10a75f4bedf3c4602b0c9d WHIRLPOOL 38e97d40ff1904236f3c1dbc5a73e40fdbd4e96308111f199c637f40291b5f3389bd7cb06a138fb9d7768a95062e2cd6bfd281bb0be3cc5625c93678cca93f96
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUm1WMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkrkQANWUJVjY/qUiNH1C5YTt9jiB
-77445zF6lQczu+g08PlQzL+78ok1SH+SCedqk+0/XwbtdOdEmWm4fNNZD4a4YJ+f
-J57ec/mAThqOYpu5StaQgu8dQNPB/UJ4a6d+bR348lxTP3Btpgo7bxshXdnv/XXF
-Cl04Homz3/wDBwNV1FPCyqpBzdvxFH3N46gq4A2+vD0/2zy1hY9UX5hMeSdoTNZG
-fb8edP12aRxSfxS0LxF2vT9kmvFkpJlf8YKzX5Ak6K+xiQivP3TY/3hrMOl12bwY
-l8WTdRvW3kbg3qAQCC9+F8Y/DgCbtcPKk1kP+J7yjimvGtKt5VuuKrovsyG0YYX3
-Su2KuWkWbZ2TTfXdQPQHuLcBNDbfQVztKfCPvGV7WA0Dx0PhlVRkGqOsabvl3Uvy
-3UHHIzOAQO5DfTwUfcIgvkspgbvMiUyxpSVbn2lP8QinuxVxA53DFOxXCrFTpKci
-2Wu20mgqTZTjrmpMg7Gwwnjr84ClyRFWkgSAdNylPvi4fg/DH3PxwB0XvS5Fdmsa
-NjBhInGZ9V1XxpkVTQ/tT0RIT2yKlQw5MihdwTlcvsNPmkZX6eG2/6J0ZI2BOUqn
-FJ19CFLrD2fInK7FgctOsLG3wC5/MaADjwyBBePTriprjEFyWS+aF0dLtKHWrevs
-09JKw/8ob2t5CkP3BFsw
-=9URB
+iEYEAREIAAYFAlShC3MACgkQ1fmVwcYIWAaeAgCeI3ZETzqAOOzja51S4jGQ3Zbc
+bH4An3V5kN4O/d8jQ2gDBy3MjEfROtyb
+=qOqY
 -----END PGP SIGNATURE-----

diff --git a/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild b/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
index ff2eb26c1f1f3b4dca825c8e6bfe4abbd027ac78..cb44d4a05dc1a1dcdfa235dce351ea571170bf75 100644 (file)
--- a/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
@@ -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 @@ LICENSE="GPL-2"
 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
-}