Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/
Date: Sat, 14 Sep 2019 14:59:40
Message-Id: 1568472745.05cec3be5725f70c9c555a40386f1820d976a139.asturm@gentoo
1 commit: 05cec3be5725f70c9c555a40386f1820d976a139
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 14 13:01:23 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 14:52:25 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05cec3be
7
8 media-gfx/graphviz: Add missing media-libs/libpng slot op, einstalldocs
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-gfx/graphviz/graphviz-2.42.1.ebuild | 21 ++++++++++++---------
14 1 file changed, 12 insertions(+), 9 deletions(-)
15
16 diff --git a/media-gfx/graphviz/graphviz-2.42.1.ebuild b/media-gfx/graphviz/graphviz-2.42.1.ebuild
17 index b901f7c2f90..6a0e38d17e8 100644
18 --- a/media-gfx/graphviz/graphviz-2.42.1.ebuild
19 +++ b/media-gfx/graphviz/graphviz-2.42.1.ebuild
20 @@ -2,8 +2,8 @@
21 # Distributed under the terms of the GNU General Public License v2
22
23 EAPI=6
24 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
25
26 +PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
27 inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
28
29 DESCRIPTION="Open Source Graph Visualization Software"
30 @@ -29,7 +29,7 @@ COMMON_DEPEND="
31 >=media-libs/fontconfig-2.3.95
32 >=media-libs/freetype-2.1.10
33 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
34 - >=media-libs/libpng-1.2:0
35 + >=media-libs/libpng-1.2:0=
36 sys-libs/zlib
37 virtual/jpeg:0
38 virtual/libiconv
39 @@ -60,7 +60,8 @@ COMMON_DEPEND="
40 x11-libs/libXmu
41 x11-libs/libXpm
42 x11-libs/libXt
43 - )"
44 + )
45 +"
46 DEPEND="${COMMON_DEPEND}
47 sys-devel/flex
48 sys-devel/libtool
49 @@ -71,9 +72,11 @@ DEPEND="${COMMON_DEPEND}
50 perl? ( dev-lang/swig )
51 python? ( dev-lang/swig )
52 ruby? ( dev-lang/swig )
53 - tcl? ( dev-lang/swig )"
54 -RDEPEND="${COMMON_DEPEND}
55 - !<=sci-chemistry/cluster-1.3.081231"
56 + tcl? ( dev-lang/swig )
57 +"
58 +RDEPEND="${DEPEND}
59 + !<=sci-chemistry/cluster-1.3.081231
60 +"
61
62 # Dependency description / Maintainer-Info:
63
64 @@ -194,6 +197,7 @@ src_configure() {
65 myconf+=(
66 $(use_with cairo pangocairo)
67 $(use_with devil)
68 + $(use_enable gdk-pixbuf)
69 $(use_with gtk)
70 $(use_with gts)
71 $(use_with qt5 qt)
72 @@ -210,7 +214,6 @@ src_configure() {
73 --with-ipsepcola
74 --with-libgd
75 --with-sfdp
76 - $(use_enable gdk-pixbuf)
77 --without-ming
78 )
79
80 @@ -241,7 +244,7 @@ src_configure() {
81 $(use_enable tcl)
82 )
83
84 - econf ${myconf[@]}
85 + econf "${myconf[@]}"
86 }
87
88 src_install() {
89 @@ -263,7 +266,7 @@ src_install() {
90 find "${ED}" -name '*.la' -delete || die
91 fi
92
93 - dodoc AUTHORS ChangeLog NEWS README
94 + einstalldocs
95
96 use python && python_optimize \
97 "${D}$(python_get_sitedir)" \