Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charm/
Date: Tue, 01 Sep 2020 09:07:19
Message-Id: 1598951221.2096697d7e5ec01f8060ed7789a9d3936a6de1ea.mgorny@gentoo
1 commit: 2096697d7e5ec01f8060ed7789a9d3936a6de1ea
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 1 08:39:29 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 1 09:07:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2096697d
7
8 sys-cluster/charm: Remove USE=doc (python2)
9
10 Closes: https://bugs.gentoo.org/735484
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 sys-cluster/charm/charm-6.8.2.ebuild | 38 +++---------------------------------
14 1 file changed, 3 insertions(+), 35 deletions(-)
15
16 diff --git a/sys-cluster/charm/charm-6.8.2.ebuild b/sys-cluster/charm/charm-6.8.2.ebuild
17 index 22e45cc2592..225db6dd57f 100644
18 --- a/sys-cluster/charm/charm-6.8.2.ebuild
19 +++ b/sys-cluster/charm/charm-6.8.2.ebuild
20 @@ -1,12 +1,11 @@
21 -# Copyright 1999-2018 Gentoo Foundation
22 +# Copyright 1999-2020 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=5
26
27 FORTRAN_STANDARD="90"
28 -PYTHON_COMPAT=( python2_7 )
29
30 -inherit eutils flag-o-matic fortran-2 multilib multiprocessing python-any-r1 toolchain-funcs
31 +inherit eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs
32
33 DESCRIPTION="Message-passing parallel language and runtime system"
34 HOMEPAGE="http://charm.cs.uiuc.edu/"
35 @@ -15,22 +14,11 @@ SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
36 LICENSE="charm"
37 SLOT="0"
38 KEYWORDS="~amd64 ~x86"
39 -IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi ampi numa smp static-libs syncft tcp"
40 +IUSE="charmdebug charmtracing charmproduction cmkopt examples mlogft mpi ampi numa smp static-libs syncft tcp"
41
42 RDEPEND="mpi? ( virtual/mpi )"
43 DEPEND="
44 ${RDEPEND}
45 - doc? (
46 - >=app-text/poppler-0.12.3-r3[utils]
47 - dev-tex/latex2html
48 - virtual/tex-base
49 - $(python_gen_any_dep '
50 - >=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
51 - dev-python/lxml[${PYTHON_USEDEP}]
52 - ')
53 - media-libs/netpbm
54 - ${PYTHON_DEPS}
55 - )
56 net-libs/libtirpc
57 "
58
59 @@ -40,10 +28,6 @@ REQUIRED_USE="
60
61 S="${WORKDIR}/${PN}-v${PV}"
62
63 -pkg_setup() {
64 - use doc && python-any-r1_pkg_setup
65 -}
66 -
67 get_opts() {
68 local CHARM_OPTS
69
70 @@ -129,11 +113,6 @@ src_compile() {
71 einfo "running ./build AMPI ${build_commandline}"
72 ./build AMPI ${build_commandline} || die "Failed to build charm++"
73 fi
74 -
75 - # make pdf/html docs
76 - if use doc; then
77 - emake -j1 -C doc/charm++
78 - fi
79 }
80
81 src_test() {
82 @@ -198,17 +177,6 @@ src_install() {
83 doins -r examples/charm++/*
84 docompress -x /usr/share/doc/${PF}/examples
85 fi
86 -
87 - # Install pdf/html docs
88 - if use doc; then
89 - cd "${S}/doc/charm++"
90 - # Install pdfs.
91 - insinto /usr/share/doc/${PF}/pdf
92 - doins *.pdf
93 - # Install html.
94 - docinto html
95 - dohtml -r manual/*
96 - fi
97 }
98
99 pkg_postinst() {