Set PYTHON_EXPORT_PHASE_FUNCTIONS instead of PYTHON_DEFINE_DEFAULT_FUNCTIONS.
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Mon, 1 Mar 2010 20:08:22 +0000 (20:08 +0000)
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Mon, 1 Mar 2010 20:08:22 +0000 (20:08 +0000)
Simplify installation of documentation.
Package-Manager: portage-15511-svn/cvs/Linux x86_64

dev-python/dbus-python/Manifest
dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild

index 7ec7e88d80081434cc70b278120afe75f2849f1c..bb5bc554a561acd726f7f3569ef83e6bae84f228 100644 (file)
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST dbus-python-0.83.0.tar.gz 494281 RMD160 a0b49521199320992b83834feccaa537b61ae8e2 SHA1 c2a6edaf69b52066e8fb205ebee96a1aae141944 SHA256 89dd1d5aa5c2ba04677d1aa2616caa50274d8c08f3d6bc164e6f7b9930776191
-EBUILD dbus-python-0.83.0-r1.ebuild 1892 RMD160 8ed618f5a6b7637001e1aaf91d57fc2ef3fccfe1 SHA1 de173e36b337e2dcb5c9779b1a5b4c67502b7b2f SHA256 4c7bab5b7d46571f1c5eb6c8aa637ba51cee105850798f72548872ce99ee2072
+EBUILD dbus-python-0.83.0-r1.ebuild 1719 RMD160 7dc9ecce28700ac43ea15993aea15e5ecf261c7b SHA1 efaf7719a60484427bc65ec6d1ead08039a0b0f3 SHA256 ef664da4f5add2fd99d8f2d7c2cb2fac662b2416df21ce4ba3f6425f9279c287
 MISC ChangeLog 6467 RMD160 53100f337c761e89b87d39414975257088ae3889 SHA1 166bf20206b4b475a30973f236980a10be5686f1 SHA256 f57e051e549870552fd1ebc8a17cfbeae895d7e84b4464409962747e8bd68cf5
 MISC metadata.xml 225 RMD160 969ea0402adc4a5ae2a7b40d10ccce887cb23ec9 SHA1 73724c62afe0c5e2e2686247e7a904d41db8d711 SHA256 86aaa193395f183fc39655fc18e6f97a64d944dcb7c86a156ccf35acfcb94241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt8cjIACgkQ1fmVwcYIWAbcqQCdE/Opvnu76PwYQx6OZHovTttG
-zjkAn2iZ3MjvoQJc9aGt0hoQNHqgDCl4
-=8XAi
------END PGP SIGNATURE-----
index 644857c66d6368ad638840e245716ad0f2b33b20..3bdef46f77e7dd76890d3a5251eb4145b5d0332e 100644 (file)
@@ -1,9 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild,v 1.16 2010/02/17 22:48:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild,v 1.17 2010/03/01 20:08:22 arfrever Exp $
 
 EAPI="2"
-PYTHON_DEFINE_DEFAULT_FUNCTIONS="1"
+PYTHON_DEPEND="2"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit multilib python
@@ -18,8 +19,7 @@ LICENSE="MIT"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
-RDEPEND=">=dev-lang/python-2.4.4-r5
-       >=dev-python/pyrex-0.9.3-r2
+RDEPEND=">=dev-python/pyrex-0.9.3-r2
        >=dev-libs/dbus-glib-0.71
        >=sys-apps/dbus-1.1.1"
 DEPEND="${RDEPEND}
@@ -30,8 +30,8 @@ RESTRICT_PYTHON_ABIS="3.*"
 
 src_prepare() {
        # Disable compiling of .pyc files.
-       mv "${S}"/py-compile "${S}"/py-compile.orig
-       ln -s $(type -P true) "${S}"/py-compile
+       mv py-compile py-compile.orig
+       ln -s $(type -P true) py-compile
 
        python_src_prepare
 }
@@ -41,7 +41,7 @@ src_configure() {
 
        configuration() {
                econf \
-                       --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+                       --docdir="${EPREFIX}/usr/share/doc/${PF}" \
                        $(use_enable doc api-docs)
        }
        python_execute_function -s configuration
@@ -51,14 +51,10 @@ src_install() {
        python_src_install
 
        if use doc; then
-               # Install documentation only once.
-               documentation_installed="0"
                install_documentation() {
-                       [[ "${documentation_installed}" == "1" ]] && return
                        dohtml api/* || return 1
-                       documentation_installed="1"
                }
-               python_execute_function -q -s install_documentation
+               python_execute_function -f -q -s install_documentation
        fi
 
        if use examples; then
@@ -74,5 +70,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       python_mod_cleanup
+       python_mod_cleanup dbus
 }