summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-02-16 22:40:37 +0000
committerMichał Górny <mgorny@gentoo.org>2013-02-16 22:40:37 +0000
commite195781b290bd2f4401ce47ed7ce31ba86037085 (patch)
tree5485102f941c7c87401dc3b4d41fa5d087038861 /app-doc
parentStable for x86, wrt bug #457886 (diff)
downloadhistorical-e195781b290bd2f4401ce47ed7ce31ba86037085.tar.gz
historical-e195781b290bd2f4401ce47ed7ce31ba86037085.tar.bz2
historical-e195781b290bd2f4401ce47ed7ce31ba86037085.zip
Migrate to python-any-r1, bug #457870.
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0x42B9401D
Diffstat (limited to 'app-doc')
-rw-r--r--app-doc/doxygen/ChangeLog5
-rw-r--r--app-doc/doxygen/Manifest22
-rw-r--r--app-doc/doxygen/doxygen-1.8.3.1.ebuild12
3 files changed, 16 insertions, 23 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/Manifest b/app-doc/doxygen/Manifest
index 07007495a44e..f4ba517fc73d 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -23,23 +23,15 @@ EBUILD doxygen-1.4.7.ebuild 3763 SHA256 9ea68529c5d394994b9c65453e740171ce2e8eda
EBUILD doxygen-1.5.4.ebuild 4600 SHA256 269bd42ab1d0e6fd4e51aaca5377117e0028567aa882167c93877310c532b691 SHA512 ba87262eb07c99e3bba8cc0fd35749c346247f210f10b08a20cf3f57af684f39266f48708f6e524a3364f58dde88c1e83f4829f83bf1f92aede1be4cc5c8b11e WHIRLPOOL ec6ee7038a783c7894b3a6fa32742848e3d7a2eb8568b3fbdcbe8ea5e35e0f1e19cdd5540877124abb7e33609c3f3f6959b2321f9ec57606d0f5d344bc87a543
EBUILD doxygen-1.5.8-r1.ebuild 5491 SHA256 5fe8c3b911dd47b2344545734ee200f625019d237ab556cc3c2adeb664c94b86 SHA512 6b79030d0d6590825484e1595a1280451eb110210e60c662b99be6f1732e9c6b4c457c5dfa7ff8056f385808c4b12e222161ac6b4e25a770a61594b1c6192670 WHIRLPOOL a10daaac34a57b53aaddd1a86a54ed70069cc0371299ffc5cd76ec19665f36d4dbbf829f23adc751c82ffd3d5c94da8796b6da291e12f2e4d6f805043b4b1308
EBUILD doxygen-1.7.6.1.ebuild 6424 SHA256 e985f6328e76a235e3d1476bf81ebab2e0803d034a525664452f166fb486bb3a SHA512 9c587dded160b28e501b0507c5b56764d129ef5154a4d60bb87c9aaf138c7515cba823bebb738efbac6228b95ca905a14138495e8cfe6ad3e1df9336fa801a7e WHIRLPOOL 8a56de36dbe17d2fb94bd6056a3cf525907922b4cc7bbce541e2a8dd0bfa747121516e042d20c26be552f233a9d787f9f79e404d027f986ec752d361293d20c9
-EBUILD doxygen-1.8.3.1.ebuild 6876 SHA256 6210c92fe78319fff298538fc69f7cf64e39c727aff13629e1aff3e3ee030a61 SHA512 cb928aef1115f00534370ecea8d94f05d905ace2bce2b2636ab89bea9c2e56eb9d7cd2d06aac845474358b4b5f7594e497034c241206ed8ad07fa745b01285e3 WHIRLPOOL 25febe901b4cacce1f64f8c35aa2ce82359d088e0d77e8812f5037abb5a59059e1b6141d2003ca6ba9a4b7e573a718b77d0ce1692d665e00f9aa2d59166a63bd
-MISC ChangeLog 40149 SHA256 c3163557f24aebb233636290d729088133b72240e7232cfc42ccb977a6a16ac1 SHA512 1f10b699fade2e787a897a8d6f884395fe5321bc00ba7b38193acd0b7206e04b5231564941e5ce4d9e1a5263baf18800b10662e7448888090d20f043eefe2eaa WHIRLPOOL fb4671a40c58de4d4cf985e95db163e803eee861bf6f251eefcbd8032faa9c8f5f41587c1178588dccd2d2494fb3146a9e79a05dc177bf23e5d5d7632bc18ca0
+EBUILD doxygen-1.8.3.1.ebuild 6877 SHA256 9d225dba3bd410177656c7948f8c7ad9c3a7f2047e9984ef4cfe90360f4e21a6 SHA512 fe73206e3987a6a970c28fdb4c9e263636c4d8271da52684014c1ce5c93a229d1f5ed8988d69239d83c3c009c4e97a28cfbec15cb962c5cccf7f8f54ef3d8c33 WHIRLPOOL 6c0f36a49cc60468b91d9a941fe98e08f48bd9deea1c11924ce0e0f4003978ebb2fa3700661eab057f27d30208d6b3249a9bec6d352a46dd6b1431cce486f177
+MISC ChangeLog 40261 SHA256 c8a67d492dcb6c3544c859edce87fbda7aca979d13f84f8a6541aa3c0a624ed7 SHA512 fb8af1dbd452586c184bcd755c28e43a1d9e64fc84e4145fb9c79b610fdfd7ba962e7053e2d6ce899eb83e21154e378783c68608b9637a629d7c5c48dbc8499e WHIRLPOOL 221e6249747ab3a0a85f57f11a9056ece4789d3d4c928a3f804e931fcaa8de0f67bc1328d5e4f1de3116b2a58754e41c2d6af3e8a13d4b30b95362b711e67bb6
MISC metadata.xml 833 SHA256 a1612d5400b6e418c45fa45da7b064d391bef410cf31b47b72f2808e7af25b44 SHA512 69c56f20d98619a74f0ab9e19b06b5251a77738e806db61ad3c5fc7874add0163f087d5f074d2d8e1141e5e919c3fd965bce39b23f55d42d28b7726602b25cae WHIRLPOOL fc799fb6c0e8ef4facea0766797a0c1324a012d2f7aa299991687ac2b2c1163bc7d8b2ed9e938317967899a80bc66ecf17ca83470bf1d46442f5d68cf8defa75
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJRDi7WAAoJEF0huFKJUZL5yA4P/1FBexWUgZg2AIeLKocG6C7/
-J/QUVkti8ZlsiKBkfPxGE2k05hJTAqUfx1k3fhwn6kr7SMTamgSgwL66uPs8CQBb
-tM2QwqG+DkjETYO4tHhs6AWBxWbecRVsqEkn2fv3/B9qrK1SSrsdN++OHxTcRk2r
-C0B8lxjaaxeuok4vAJbnDRi06uUaUITeOoYZR+dhVDJvrwd3TaJMoa8sAfimvdcQ
-FMBvWM474btlKkZ5IxH7ZFYcf6y9SbLuU6gUEsjhsPHdcZ7etd+djwcQAv6zWvdW
-EedseTGWDFFyDUq/Xk+SKcNLVNHDT6dVatKMo/S4S+4nTWgBQETygkLyft8CC3EW
-CsmBH6MuG5xeVDjyOeuoyV4p8hD8yLvrNT8pccEllj07UoJFyMKZ0+9av6gNVFq5
-XvtXyyagQ9KHAm2YNBJz38e/Z4jFR1Vh3v8rU5Xf5uLcJMQbICSAfzf47idjwULP
-4ZvrzNddsV6l4cj5IkNw9z2TFiskcn/APShA5kQVy8xANUsN2v8/nAgArrKRc9HP
-0ccyPFh2yhSYzPxuP+LSbQL43TS/3Kngfk88DGe7n3v612PFKh01jzyHdq9dk2cy
-K8rP4CMUD5O97PvGGHO8WSg98BSMoN1o3E15KzM4tNoBRI8npbEUpBWJw7pRqvZ0
-LgoEXTOUG+vP1UtTCXbM
-=+j6T
+iJwEAQEIAAYFAlEgCvMACgkQfXuS5UK5QB0MvgP/XJhgR7mAEFiljdXKF2aHqTqd
+6RlC2lGRvwRBzWCxs8nw5U403ln7jlDSJUK09LYpUQbWZ1IECOG3QKk1rzgBfjyC
+aZPHoS5ivwOVuBEJSZaj99WEASOJq66A0xcCrqOrBX7rwFL9x05NSylOv1OJ2ue8
+OHvIbX8Vb2zGy7aLoVs=
+=SJqI
-----END PGP SIGNATURE-----
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() {