summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-02-16 22:40:35 +0000
committerMichał Górny <mgorny@gentoo.org>2013-02-16 22:40:35 +0000
commit98d5fbdea612bbcd88eeb217b2e692b432f53a1b (patch)
tree64e05de25a2847a106447b284c345fc90edd605c /app-doc/doxygen
parentStable for x86, wrt bug #457886 (diff)
downloadgentoo-2-98d5fbdea612bbcd88eeb217b2e692b432f53a1b.tar.gz
gentoo-2-98d5fbdea612bbcd88eeb217b2e692b432f53a1b.tar.bz2
gentoo-2-98d5fbdea612bbcd88eeb217b2e692b432f53a1b.zip
Migrate to python-any-r1, bug #457870.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Diffstat (limited to 'app-doc/doxygen')
-rw-r--r--app-doc/doxygen/ChangeLog5
-rw-r--r--app-doc/doxygen/doxygen-1.8.3.1.ebuild12
2 files changed, 9 insertions, 8 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 737bcb124e7c..f344536ae67d 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-doc/doxygen
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.236 2013/02/03 09:33:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.237 2013/02/16 22:40:35 mgorny Exp $
+
+ 16 Feb 2013; Michał Górny <mgorny@gentoo.org> doxygen-1.8.3.1.ebuild:
+ Migrate to python-any-r1, bug #457870.
03 Feb 2013; Kacper Kowalik <xarthisius@gentoo.org> doxygen-1.7.6.1.ebuild,
doxygen-1.8.3.1.ebuild:
diff --git a/app-doc/doxygen/doxygen-1.8.3.1.ebuild b/app-doc/doxygen/doxygen-1.8.3.1.ebuild
index e95779925a71..1e1eec2efe40 100644
--- a/app-doc/doxygen/doxygen-1.8.3.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.3.1.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.3.1.ebuild,v 1.3 2013/02/03 09:33:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.3.1.ebuild,v 1.4 2013/02/16 22:40:35 mgorny Exp $
EAPI=4
-inherit eutils fdo-mime flag-o-matic python qt4-r2 toolchain-funcs
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs
DESCRIPTION="Documentation system for most programming languages"
HOMEPAGE="http://www.doxygen.org/"
@@ -38,7 +39,7 @@ RDEPEND="qt4? ( x11-libs/qt-gui:4 )
DEPEND="sys-apps/sed
sys-devel/flex
sys-devel/bison
- doc? ( =dev-lang/python-2* )
+ doc? ( ${PYTHON_DEPS} )
${RDEPEND}"
RESTRICT="mirror"
@@ -74,10 +75,7 @@ get_langs() {
pkg_setup() {
tc-export CC CXX
- if use doc; then
- python_set_active_version 2
- python_pkg_setup
- fi
+ use doc && python-any-r1_pkg_setup
}
src_prepare() {