Add "doc" USE flag.

Package-Manager: portage-14479-svn/cvs/Linux x86_64

3 files changed, 28 insertions, 15 deletions

diff --git a/dev-python/dbus-python/ChangeLog b/dev-python/dbus-python/ChangeLog
index 6fd4116a1092..113640248d6b 100644
--- a/dev-python/dbus-python/ChangeLog
+++ b/dev-python/dbus-python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/dbus-python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/ChangeLog,v 1.47 2009/08/02 00:45:44 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/ChangeLog,v 1.48 2009/10/03 17:26:13 arfrever Exp $
+
+  03 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  dbus-python-0.83.0-r1.ebuild:
+  Add "doc" USE flag.
 
   02 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   dbus-python-0.83.0-r1.ebuild:
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index bed13f1f13fe..024837e39c8c 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -3,7 +3,7 @@ DIST dbus-python-0.82.4.tar.gz 473346 RMD160 c934c38c7b6681aa419d005a4a73ab05ffd
 DIST dbus-python-0.83.0.tar.gz 494281 RMD160 a0b49521199320992b83834feccaa537b61ae8e2 SHA1 c2a6edaf69b52066e8fb205ebee96a1aae141944 SHA256 89dd1d5aa5c2ba04677d1aa2616caa50274d8c08f3d6bc164e6f7b9930776191
 EBUILD dbus-python-0.80.2.ebuild 1302 RMD160 7e96e6b4e8ae6b5c8593e752a3a010df3321ed70 SHA1 9bcd885a322b4156518e2d761a366db2b57fd27d SHA256 2e5196be3453f31ab7e5587f3860ba24d48464faac0302347fb2bf7c1c3df052
 EBUILD dbus-python-0.82.4.ebuild 1284 RMD160 2679f29a22f507311e7d6c971f59afbe3a416e23 SHA1 b653cf11337704b0302066a464de9eda0361471c SHA256 89ae023f9186432213f2cf29b1fb5579ed5d50e9c6f6472c0767957c7827bc7e
-EBUILD dbus-python-0.83.0-r1.ebuild 1473 RMD160 cef82474011cb698afefb359ca9f724fc6d86433 SHA1 dd2ebc2f99545f8a7036747f50f3287c4c14551a SHA256 5be6c867677f004c44d60151d7a14c099daee756b148f591bc52c9b40d93d81a
+EBUILD dbus-python-0.83.0-r1.ebuild 1809 RMD160 eaaa3ec08447c8a6ca51d512045785392513c431 SHA1 3bb617a25f95b11a9c77624307a9ef04c09fefdc SHA256 fb6fed08fe3395231c1b5fe68c019b3d35ff823209b7eab499b4702739e80e3b
 EBUILD dbus-python-0.83.0.ebuild 1296 RMD160 e5910b7de34349d748b22c459491194273a6520d SHA1 bc591263f801004b5812cca10874e9924dcae2aa SHA256 c8656fc5577d889e53b582600cd359074fdfa43740ddc5e2b3a10267ba972b17
-MISC ChangeLog 5091 RMD160 bd7c407b5a34b2a4b575ea165bc92752634ccf5e SHA1 3471978cafe0ef83c64ff185b825fcfd7c43fd6a SHA256 eec0a8f1c2516fb10ae5352c187781a9e72bccd189ffa64b4aada3e72fbbab75
+MISC ChangeLog 5219 RMD160 1f68d70ef1042509b89853d493285025f7c2c1f5 SHA1 bbd5d050ec2890781df99dc884d2e0698b386248 SHA256 bf3147f2f6a727cf7ead4bd4506db6fb089b193f576cd2b1a17fd2c3cd5ec0ac
 MISC metadata.xml 225 RMD160 969ea0402adc4a5ae2a7b40d10ccce887cb23ec9 SHA1 73724c62afe0c5e2e2686247e7a904d41db8d711 SHA256 86aaa193395f183fc39655fc18e6f97a64d944dcb7c86a156ccf35acfcb94241
diff --git a/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild b/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild
index 3fe201fb020b..be3310ed789f 100644
--- a/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild
+++ b/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 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.5 2009/10/03 05:19:23 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.83.0-r1.ebuild,v 1.6 2009/10/03 17:26:13 arfrever Exp $
 
 EAPI="2"
+PYTHON_DEFINE_DEFAULT_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit multilib python
@@ -15,42 +16,50 @@ SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="examples test"
+IUSE="doc examples test"
 
 RDEPEND=">=dev-lang/python-2.4.4-r5
 	>=dev-python/pyrex-0.9.3-r2
 	>=dev-libs/dbus-glib-0.71
 	>=sys-apps/dbus-1.1.1"
-
 DEPEND="${RDEPEND}
+	doc? ( =dev-python/epydoc-3* )
 	test? ( dev-python/pygobject )
 	dev-util/pkgconfig"
-
-RESTRICT_PYTHON_ABIS="3*"
+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
 
-	python_copy_sources
+	python_src_prepare
 }
 
 src_configure() {
 	configuration() {
-		econf --docdir=/usr/share/doc/dbus-python-${PV}
+		econf \
+			--docdir=/usr/share/doc/dbus-python-${PV} \
+			$(use_enable doc api-docs)
 	}
 	python_execute_function -s configuration
 }
 
-src_compile() {
-	python_execute_function -d -s
-}
-
 src_install() {
 	python_need_rebuild
 
-	python_execute_function -d -s
+	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
+	fi
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/