summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2012-02-14 14:06:32 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2012-02-14 14:06:32 +0000
commit682624dbd8a72cbaf94b9f02a15a630223e49fdb (patch)
tree8d2942ecb2cdecf00cc783f8c932997231d09feb /app-doc
parentwhitespaces (diff)
downloadgentoo-2-682624dbd8a72cbaf94b9f02a15a630223e49fdb.tar.gz
gentoo-2-682624dbd8a72cbaf94b9f02a15a630223e49fdb.tar.bz2
gentoo-2-682624dbd8a72cbaf94b9f02a15a630223e49fdb.zip
Improve Python-related code wrt #308353 by Arfrever Frehtes Taifersar Arahesis. Thanks to Ian Delaney <johneed@hotmail.com> for the patch
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'app-doc')
-rw-r--r--app-doc/doxygen/ChangeLog6
-rw-r--r--app-doc/doxygen/doxygen-1.7.6.1.ebuild11
2 files changed, 13 insertions, 4 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index ea5fc8fee787..6d4be6d02f71 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-doc/doxygen
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.208 2012/02/14 13:56:17 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.209 2012/02/14 14:06:32 xarthisius Exp $
+
+ 14 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> doxygen-1.7.6.1.ebuild:
+ Improve Python-related code wrt #308353 by Arfrever Frehtes Taifersar
+ Arahesis. Thanks to Ian Delaney <johneed@hotmail.com> for the patch
14 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> -doxygen-1.5.5.ebuild,
-doxygen-1.5.6.ebuild, -doxygen-1.5.7.1.ebuild, -doxygen-1.5.9.ebuild,
diff --git a/app-doc/doxygen/doxygen-1.7.6.1.ebuild b/app-doc/doxygen/doxygen-1.7.6.1.ebuild
index a28d0e2c8434..b0b85c35aa8a 100644
--- a/app-doc/doxygen/doxygen-1.7.6.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.7.6.1.ebuild
@@ -1,10 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.6.1.ebuild,v 1.3 2012/02/14 13:58:32 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.6.1.ebuild,v 1.4 2012/02/14 14:06:32 xarthisius Exp $
EAPI=4
-inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
+PYTHON_DEPEND="doc? 2"
+
+inherit eutils fdo-mime flag-o-matic python qt4-r2 toolchain-funcs
DESCRIPTION="Documentation system for most programming languages"
HOMEPAGE="http://www.doxygen.org/"
@@ -27,7 +29,6 @@ done
RDEPEND="qt4? ( x11-libs/qt-gui:4 )
latex? ( app-text/texlive[extra] )
- dev-lang/python
dev-lang/perl
virtual/libiconv
media-libs/libpng
@@ -75,6 +76,10 @@ get_langs() {
pkg_setup() {
tc-export CC CXX
+ if use doc; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
}
src_prepare() {