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
commit845fadabefd4cd6ebcc1538b0049fbda429ccb43 (patch)
tree94644b5760cc9d1bececd23bb412bba60ad2af0a /app-doc
parentwhitespaces (diff)
downloadhistorical-845fadabefd4cd6ebcc1538b0049fbda429ccb43.tar.gz
historical-845fadabefd4cd6ebcc1538b0049fbda429ccb43.tar.bz2
historical-845fadabefd4cd6ebcc1538b0049fbda429ccb43.zip
Improve Python-related code wrt #308353 by Arfrever Frehtes Taifersar Arahesis. Thanks to Ian Delaney <johneed@hotmail.com> for the patch
Package-Manager: portage-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/Manifest30
-rw-r--r--app-doc/doxygen/doxygen-1.7.6.1.ebuild11
3 files changed, 28 insertions, 19 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/Manifest b/app-doc/doxygen/Manifest
index 18858c548f45..e923032211fd 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -32,23 +32,23 @@ EBUILD doxygen-1.6.3.ebuild 5218 RMD160 9c413a4cd4e277f604cb52a5fa4902b0066c4b2c
EBUILD doxygen-1.7.2.ebuild 5613 RMD160 b76a306f15b3eca9dcec1ce21af0ce35a2ce2abe SHA1 0c8e3c30489863a29333c29bdcbddfbc0895da8c SHA256 d2c717514f01616b17fe12fb66f2a442120a48e4e9fa8fd64b377476b22ff05a
EBUILD doxygen-1.7.3.ebuild 5796 RMD160 4547798c837597c70a767ec9628cda2511c0adc3 SHA1 339c951729eba8453b5beaf0f0cbbc61a11e9cc1 SHA256 f0cf6896e429869897fb452b7a04dbb50d9ede3d58936644e1edc8be6ca786d8
EBUILD doxygen-1.7.5.1.ebuild 5242 RMD160 bfcad734e8faa95d15e228124c34a42f2bb0d1b1 SHA1 9a7ce2f899e5997dd41592e91b54da5500b1a17f SHA256 c7f5b274c0dd7ba922c85acb3b8aa6c0cb554f5afe1c7e7a1a87e265c5c04720
-EBUILD doxygen-1.7.6.1.ebuild 6212 RMD160 cd17de372d929a1ed60b3434d4402330e6e97252 SHA1 58306465d5af7988c8b3139e56567270084f2023 SHA256 c5a5a6777c9ca670293aae2a9e0d58115d4e8f13538102745f46739309b82b6e
-MISC ChangeLog 35568 RMD160 ee0bd78daf7e6798cdd1018b44d3e2761ef2c31f SHA1 804ede9c9c66758a995da25100db2da94a1bdc7e SHA256 d92a5591be1e35db1cbf73f8f4a612b21b66a2b88438c70ac9cd77a7deda59f0
+EBUILD doxygen-1.7.6.1.ebuild 6297 RMD160 d4c675212d7d77de55795f911170884b5a11224c SHA1 fdbe2b6f3b96b7e0ae27b2069d9cad006a65038f SHA256 93a5b2f5e7d64228ce011409040d38eaa502102a0fce750e3986f4eafa87942b
+MISC ChangeLog 35789 RMD160 b70ef9f4e935f20fe7dd5582648bc09ce700ab52 SHA1 2bd7623fef34243969b72e55b8469b58d6117189 SHA256 3a5e4f2dacdd38273865faaf46210fcffb7d02940eda99aa207ac82c955efc31
MISC metadata.xml 1019 RMD160 b1d14f64119ee8cb68eeee22aa6178614438db9b SHA1 f2c94632397b23f9ebb778bd3814d939333ba32c SHA256 2f5b46f26e8aebd41be7ff37d05a0cb1de1e9b409a19e60bc26218306766384f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCAAGBQJPOmivAAoJEF0huFKJUZL5juMP/iXl1Cy6CdGl1VqXwhmz384b
-p0QwYK6tkeJA615TC/g7Mo5M4EEXX5Kg3dF3QM0TynyY77pbSi3Rz5vIRphumIsY
-7pXlMmqL01nbycM+bSwmzBLhowibPVatRtMtjDFDgMdmqcnvb1mXfgFIpZiEuWIY
-o4cosffQyMNM362Dmb4VW4pLV8THwC0iAAkP9uNisb8WryqPUAXhkVwqTJvybXPB
-zaEPtoCrFpolP47PZyvdnu0hxYfVqoX9K6FVIhPdVe1vi2ijnm4F8VdUs1XuBXLH
-LRJf+qpfYpe6TcyRkdsTvLT2i1zsSBxDGuXivaXj7DIAT3irR+0aHcwmh9Ws4+LV
-mn5ZkhfcayiwXLSbYPUJEHC5BCjnPUVNlrN+qVjA3Ub3ninaEVOhT2H8SlfYujz1
-eXcFmzpBL3hbYtx0iiZIc7+iL7fWxdZzqGt7JkqVdxnqTJHb9znQmQV7ZFvg8rxK
-Ra4DQ7fL/XjgAjLeBMgl02v8RRlF32r/RWJeQfkckXxs779fFemNPW4dDGPpKktG
-nHQIRw100uz7fGDWQ1chV9tKBwgrQEvasz++y/8QtU/hs3vdsGh6vy7jkqIBs8kr
-DSk7BOZqZjDTmGirHeYtlbfiWYZxFFmSmNdPaDyDvLLVhWe3tT6WXIPQqyrRRQjr
-KmrYc/TEPT82pk/JIn25
-=xQ5y
+iQIcBAEBCAAGBQJPOmqQAAoJEF0huFKJUZL5g0sP+QHTrw5Bh3+8A361MXKKL79P
+0IywMdyMoe6vFRmvhbz31CtHxpP2cRgiEsCl/l+5Brw62r+CgNoiBIqE0OZAwpJu
+jdtMfcrSpv3x+XUyZ5RxU7N+pJqrnKzKAU6PyU8DG2svIeInbifiDpZ6gt5PJXLy
+rYvflmMkJyOq661QYgN9gjorCs9Xu5GgxVjqlzugZLQHizYEW9djXCn9x/h/wUuq
+OfaM4bsGtbtfWj74xwOxOZ28moXHRMIqOpVvuO8gE26o/NDA6HgYqubFlr09hicZ
+EGY+lxOwOvd+uy1pzA5dvZyeswcu4dBdirckTQJyEvz3w3N9B9GZowN57yfaDE97
+QP2Ke5alywqanvwnlIYJS7R9HeGCMABKtw0gn2VK1fxyKmG+wpp0MUfJkyVs5IFv
+wl1w+Heg00jUeKKhMn49DxAKNwCdRLTu527ZR9ZETH7NEWHQov+s5jTD1TUdmEbu
+4mELmhDPGmKBwAzEnn71CJHQ+cOKlw9lRBh0k8AushTa1YO/CV4OBl7V7d3kpJoo
+zQ2h1IFp3UDm13O3JFolI9Q7hgSospzIg8FGp0CF+XwvDBH8ZC4rdlfLQKG/3wdj
+zg1LI0NlzKLEUHItmP6mRuQNf3vGsqW99IMbKa0sIKzkG2xeoNyuhyl4DV575DkX
++Ep+0RgfUJTPThGUaymH
+=OMnC
-----END PGP SIGNATURE-----
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() {