diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-09-05 23:43:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-09-05 23:43:13 +0000 |
| commit | b5a0046a4daac0e31a43b01eaf59815f0db14fd8 (patch) | |
| tree | 92143e896aa7522c127eef9c13ca4b33f19a36b7 /sys-apps | |
| parent | Sparc stable, Security Bug #234135. (diff) | |
| download | historical-b5a0046a4daac0e31a43b01eaf59815f0db14fd8.tar.gz historical-b5a0046a4daac0e31a43b01eaf59815f0db14fd8.tar.bz2 historical-b5a0046a4daac0e31a43b01eaf59815f0db14fd8.zip | |
Add workaround for compatibility with epydoc-3.
Package-Manager: portage-2.2_rc8_p11491/cvs/Linux 2.6.26-0820-x86-64 i686
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/portage/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.2_rc8.ebuild | 13 |
3 files changed, 18 insertions, 10 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index f853c8f2575b..ef60d9e825d1 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.540 2008/08/19 20:27:22 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.541 2008/09/05 23:43:13 zmedico Exp $ + + 05 Sep 2008; Zac Medico <zmedico@gentoo.org> portage-2.2_rc8.ebuild: + Add workaround for compatibility with epydoc-3. 19 Aug 2008; Zac Medico <zmedico@gentoo.org> -portage-2.2_rc6.ebuild, -portage-2.2_rc7.ebuild: diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 836e1984d0f8..7084bf9a6db6 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -21,13 +21,13 @@ EBUILD portage-2.0.51.22-r3.ebuild 5645 RMD160 aa9a32e18b1190c809eca4bf780d7a33a EBUILD portage-2.1.1-r2.ebuild 7071 RMD160 55ae2117db2a60ab4a63b5a21309be258082a947 SHA1 4a72145a36ca3da55c275a65de7999058411fe4f SHA256 8a26a0bde49de97906b6ec181e5ecbfe51679cc598d6b501e3f1f95ba2b6ac58 EBUILD portage-2.1.4.4.ebuild 8040 RMD160 a7503dd4cc751c71b9fc01b23b34c6a544c84355 SHA1 2079cbf4ad68622c340ab6971e3e01bc73a4781a SHA256 0b00f1d93651606931d3b6e6addd9fe70183f6d7a8127146d48e093b00ff6198 EBUILD portage-2.1.5.6.ebuild 8087 RMD160 4f60a69a380686583acb4de33c3d71abcaf9e304 SHA1 8998bc2244a040e23e6fc97dcd3135c2a46fdbb5 SHA256 c6af288fa2fa1636e41121f29a6b9cddd5ee42b00c6e4ae97ad5ecaa1cb74265 -EBUILD portage-2.2_rc8.ebuild 8246 RMD160 d5dd69102ded0634bf0d3120089d54911c6aea8a SHA1 1703abcd6cc8ceb22247ddbf925ffcf5f646b4db SHA256 f9f60f33702661e85d6e046650012dd165c1262cd46e861093757af549d96656 -MISC ChangeLog 15265 RMD160 4046d444ff98644ff371c6000a71abf12c04ac06 SHA1 ff09714b07d9b83b3e42e8c56eb7dabc5ff0d2c0 SHA256 5048552ceea875fcb62b9cc04d0fc168d04a7e119e38c06804d6536a7ee5082b +EBUILD portage-2.2_rc8.ebuild 8550 RMD160 fb886b2ee551da978610aedcbb46f64eb1d1968c SHA1 3490d8514b99e23fe7b7491161ceaa66aff4b22b SHA256 b9210e64bb0b61758e23c74d77a0d36a7731beae7a90e7167fd4a03838e4c071 +MISC ChangeLog 15387 RMD160 54a1a3434b3bd1bc0c6875b1522b74ce688b2d2c SHA1 bd4d1673bfba1ce46d052c979c08902f98e72de0 SHA256 ec8539576a4578033847f7b2912e489e45d074d6536321b3c55f5778a9cb0c91 MISC metadata.xml 365 RMD160 f4900ef937d765e123eca2314d4570aa51cba27c SHA1 29e235a40e6f70005374a6f5c4d9dd2eb0eac3cf SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkirLLgACgkQ/ejvha5XGaN9agCfcEllnt5nH9P1WuvPqW8fxH2R -DEgAmgINlKfX1rN4SXfXDvWe5bqLfbsv -=V09F +iEYEARECAAYFAkjBxD4ACgkQ/ejvha5XGaM+AwCfWyju/uVxzXBI6BqZOXO5SNYm +MpAAoNM4qm/wpdp3fUDSXkj9TjqzyQP5 +=vKWt -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.2_rc8.ebuild b/sys-apps/portage/portage-2.2_rc8.ebuild index 9e540c1417ee..24fa097e1d01 100644 --- a/sys-apps/portage/portage-2.2_rc8.ebuild +++ b/sys-apps/portage/portage-2.2_rc8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc8.ebuild,v 1.1 2008/08/12 20:20:44 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc8.ebuild,v 1.2 2008/09/05 23:43:13 zmedico Exp $ inherit eutils multilib python @@ -17,7 +17,7 @@ python_dep=">=dev-lang/python-2.4" DEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( =dev-python/epydoc-2* )" + epydoc? ( >=dev-python/epydoc-2.0 )" RDEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 @@ -93,12 +93,17 @@ src_compile() { if use epydoc; then einfo "Generating api docs" mkdir "${WORKDIR}"/api - local my_modules + local my_modules epydoc_opts="" + # A name collision between the portage.dbapi class and the + # module with the same name triggers an epydoc crash unless + # portage.dbapi is excluded from introspection. + has_version '>=dev-python/epydoc-3_pre0' && \ + epydoc_opts='--exclude-introspect portage\.dbapi' my_modules="$(find "${S}/pym" -name "*.py" \ | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ -e 's:/:.:g' | sort)" || die "error listing modules" PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ - -qqqqq --no-frames --show-imports \ + -qqqqq --no-frames --show-imports $epydoc_opts \ --name "${PN}" --url "${HOMEPAGE}" \ ${my_modules} || die "epydoc failed" fi |