diff -ur doxygen.orig/doxygen-1.7.3.ebuild doxygen/doxygen-1.7.3.ebuild --- doxygen.orig/doxygen-1.7.3.ebuild 2011-03-29 21:01:02.000000000 +0800 +++ doxygen/doxygen-1.7.3.ebuild 2011-11-18 18:03:51.073959129 +0800 @@ -3,8 +3,9 @@ # $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.3.ebuild,v 1.7 2011/03/29 12:45:58 jer Exp $ EAPI=3 +PYTHON_DEPEND="doc? 2" -inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime +inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime python DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages" HOMEPAGE="http://www.doxygen.org/" @@ -19,7 +20,7 @@ RDEPEND="qt4? ( x11-libs/qt-gui:4 ) latex? ( >=app-text/texlive-2008[extra] ) - dev-lang/python + doc? ( dev-lang/python ) virtual/libiconv media-libs/libpng app-text/ghostscript-gpl @@ -31,6 +32,13 @@ EPATCH_SUFFIX="patch" +pkg_setup() { + if use doc; then + python_set_active_version 2 + python_pkg_setup + fi +} + src_prepare() { # use CFLAGS, CXXFLAGS, LDFLAGS export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" @@ -145,7 +153,7 @@ } src_install() { - make DESTDIR="${D}" MAN1DIR=share/man/man1 \ + make DESTDIR="${ED}" MAN1DIR=share/man/man1 \ install || die '"make install" failed.' if use qt4; then diff -ur doxygen.orig/doxygen-1.7.5.1.ebuild doxygen/doxygen-1.7.5.1.ebuild --- doxygen.orig/doxygen-1.7.5.1.ebuild 2011-11-17 08:54:31.043981183 +0800 +++ doxygen/doxygen-1.7.5.1.ebuild 2011-11-18 17:56:20.718959266 +0800 @@ -4,8 +4,9 @@ RESTRICT="mirror" EAPI=3 +PYTHON_DEPEND="2" -inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime +inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime python DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages" HOMEPAGE="http://www.doxygen.org/" @@ -19,7 +20,7 @@ RDEPEND="qt4? ( x11-libs/qt-gui:4 ) latex? ( >=app-text/texlive-2008[extra] ) - dev-lang/python + doc? ( dev-lang/python ) virtual/libiconv media-libs/libpng app-text/ghostscript-gpl @@ -32,6 +33,13 @@ EPATCH_SUFFIX="patch" +pkg_setup() { + if use doc; then + python_set_active_version 2 + python_pkg_setup + fi +} + src_prepare() { # use CFLAGS, CXXFLAGS, LDFLAGS export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"