1 |
commit: e9da6dfe589403a731f97a663304866748dec627 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 1 15:15:48 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 1 15:19:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9da6dfe |
7 |
|
8 |
media-gfx/graphviz: Drop 2.42.1-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-gfx/graphviz/Manifest | 1 - |
14 |
.../files/graphviz-2.42.1-libgv_python.patch | 15 -- |
15 |
.../graphviz/files/graphviz-2.42.1-math.patch | 38 --- |
16 |
media-gfx/graphviz/graphviz-2.42.1-r1.ebuild | 277 --------------------- |
17 |
4 files changed, 331 deletions(-) |
18 |
|
19 |
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest |
20 |
index 24c3de5deac..fc54be26fd3 100644 |
21 |
--- a/media-gfx/graphviz/Manifest |
22 |
+++ b/media-gfx/graphviz/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST graphviz-2.42.1.tar.gz 25543401 BLAKE2B e64044923a823f6fbe91b498b04fffe3e5b6803c55c5ce29a60b16a38d97260061b013e8bd13bc99f360d035c840f18a01301b29ca1cb73c4be87843f18c45fc SHA512 ac263df086eea6faf682f493756b79a0af8bae3f515cd8c09238e89f295226baf743a3fd22d977ef6f223388769ef11241dfb2fdb6087305ce4fdd3fa8ed2f78 |
25 |
DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9 |
26 |
|
27 |
diff --git a/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch b/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch |
28 |
deleted file mode 100644 |
29 |
index 426ebbe14a3..00000000000 |
30 |
--- a/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch |
31 |
+++ /dev/null |
32 |
@@ -1,15 +0,0 @@ |
33 |
---- a/tclpkg/gv/Makefile.am |
34 |
-+++ b/tclpkg/gv/Makefile.am |
35 |
-@@ -430,10 +430,10 @@ |
36 |
- (cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;) |
37 |
- endif |
38 |
- if WITH_PYTHON2 |
39 |
-- (cd $(DESTDIR)$(pkgpython2dir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;) |
40 |
-+ (cd $(DESTDIR)$(pkgpython2dir); rm -f _gv.so; $(LN_S) libgv_python2.so _gv.so;) |
41 |
- endif |
42 |
- if WITH_PYTHON3 |
43 |
-- (cd $(DESTDIR)$(pkgpython3dir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;) |
44 |
-+ (cd $(DESTDIR)$(pkgpython3dir); rm -f _gv.so; $(LN_S) libgv_python3.so _gv.so;) |
45 |
- endif |
46 |
- if WITH_R |
47 |
- (cd $(DESTDIR)$(pkgRdir); rm -f gv.so; $(LN_S) libgv_R.so gv.so;) |
48 |
|
49 |
diff --git a/media-gfx/graphviz/files/graphviz-2.42.1-math.patch b/media-gfx/graphviz/files/graphviz-2.42.1-math.patch |
50 |
deleted file mode 100644 |
51 |
index 59b84817a99..00000000000 |
52 |
--- a/media-gfx/graphviz/files/graphviz-2.42.1-math.patch |
53 |
+++ /dev/null |
54 |
@@ -1,38 +0,0 @@ |
55 |
-diff --git a/lib/sfio/sfdlen.c b/lib/sfio/sfdlen.c |
56 |
-index 2b4f8b0a3..3b2c75066 100644 |
57 |
---- a/lib/sfio/sfdlen.c |
58 |
-+++ b/lib/sfio/sfdlen.c |
59 |
-@@ -13,6 +13,8 @@ |
60 |
- |
61 |
- #include "sfhdr.h" |
62 |
- |
63 |
-+#include <math.h> |
64 |
-+ |
65 |
- /* Return the length of a double value if coded in a portable format |
66 |
- ** |
67 |
- ** Written by Kiem-Phong Vo |
68 |
-diff --git a/lib/sfio/sfgetd.c b/lib/sfio/sfgetd.c |
69 |
-index 535b2cb9a..607681e60 100644 |
70 |
---- a/lib/sfio/sfgetd.c |
71 |
-+++ b/lib/sfio/sfgetd.c |
72 |
-@@ -13,6 +13,8 @@ |
73 |
- |
74 |
- #include "sfhdr.h" |
75 |
- |
76 |
-+#include <math.h> |
77 |
-+ |
78 |
- /* Read a portably coded double value |
79 |
- ** |
80 |
- ** Written by Kiem-Phong Vo |
81 |
-diff --git a/lib/sfio/sfputd.c b/lib/sfio/sfputd.c |
82 |
-index 64ab9eaf3..a2dbd225c 100644 |
83 |
---- a/lib/sfio/sfputd.c |
84 |
-+++ b/lib/sfio/sfputd.c |
85 |
-@@ -14,6 +14,7 @@ |
86 |
- #include "sfhdr.h" |
87 |
- |
88 |
- #include <float.h> |
89 |
-+#include <math.h> |
90 |
- |
91 |
- /* Write out a floating point value in a portable format |
92 |
- ** |
93 |
|
94 |
diff --git a/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild |
95 |
deleted file mode 100644 |
96 |
index 4dac9f5771e..00000000000 |
97 |
--- a/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild |
98 |
+++ /dev/null |
99 |
@@ -1,277 +0,0 @@ |
100 |
-# Copyright 1999-2019 Gentoo Authors |
101 |
-# Distributed under the terms of the GNU General Public License v2 |
102 |
- |
103 |
-EAPI=6 |
104 |
- |
105 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
106 |
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils |
107 |
- |
108 |
-DESCRIPTION="Open Source Graph Visualization Software" |
109 |
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" |
110 |
-SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz" |
111 |
- |
112 |
-LICENSE="CPL-1.0" |
113 |
-SLOT="0" |
114 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" |
115 |
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD" |
116 |
- |
117 |
-REQUIRED_USE=" |
118 |
- !cairo? ( !X !gtk !postscript !lasi ) |
119 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
120 |
- |
121 |
-# Requires ksh, tests against installed package, missing files and directory |
122 |
-RESTRICT="test" |
123 |
- |
124 |
-COMMON_DEPEND=" |
125 |
- >=dev-libs/expat-2 |
126 |
- >=dev-libs/glib-2.11.1:2 |
127 |
- dev-libs/libltdl:0 |
128 |
- >=media-libs/fontconfig-2.3.95 |
129 |
- >=media-libs/freetype-2.1.10 |
130 |
- >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] |
131 |
- >=media-libs/libpng-1.2:0= |
132 |
- sys-libs/zlib |
133 |
- virtual/jpeg:0 |
134 |
- virtual/libiconv |
135 |
- cairo? ( |
136 |
- >=x11-libs/cairo-1.1.10[svg] |
137 |
- >=x11-libs/pango-1.12 |
138 |
- ) |
139 |
- devil? ( media-libs/devil[png,jpeg] ) |
140 |
- gtk? ( x11-libs/gtk+:2 ) |
141 |
- gts? ( sci-libs/gts ) |
142 |
- lasi? ( media-libs/lasi ) |
143 |
- pdf? ( app-text/poppler ) |
144 |
- perl? ( dev-lang/perl:= ) |
145 |
- postscript? ( app-text/ghostscript-gpl ) |
146 |
- python? ( ${PYTHON_DEPS} ) |
147 |
- qt5? ( |
148 |
- dev-qt/qtcore:5 |
149 |
- dev-qt/qtgui:5 |
150 |
- dev-qt/qtprintsupport:5 |
151 |
- dev-qt/qtwidgets:5 |
152 |
- ) |
153 |
- ruby? ( dev-lang/ruby:* ) |
154 |
- svg? ( gnome-base/librsvg ) |
155 |
- tcl? ( >=dev-lang/tcl-8.3:0= ) |
156 |
- X? ( |
157 |
- x11-libs/libX11 |
158 |
- x11-libs/libXaw |
159 |
- x11-libs/libXmu |
160 |
- x11-libs/libXpm |
161 |
- x11-libs/libXt |
162 |
- ) |
163 |
-" |
164 |
-DEPEND="${COMMON_DEPEND} |
165 |
- sys-devel/flex |
166 |
- sys-devel/libtool |
167 |
- virtual/pkgconfig |
168 |
- guile? ( dev-lang/swig dev-scheme/guile ) |
169 |
- java? ( dev-lang/swig >=virtual/jdk-1.5 ) |
170 |
- nls? ( >=sys-devel/gettext-0.14.5 ) |
171 |
- perl? ( dev-lang/swig ) |
172 |
- python? ( dev-lang/swig ) |
173 |
- ruby? ( dev-lang/swig ) |
174 |
- tcl? ( dev-lang/swig ) |
175 |
-" |
176 |
-RDEPEND="${COMMON_DEPEND} |
177 |
- !<=sci-chemistry/cluster-1.3.081231 |
178 |
-" |
179 |
- |
180 |
-# Dependency description / Maintainer-Info: |
181 |
- |
182 |
-# Rendering is done via the following plugins (/plugins): |
183 |
-# - core, dot_layout, neato_layout, gd , dot |
184 |
-# the ones which are always compiled in, depend on zlib, gd |
185 |
-# - gtk |
186 |
-# Directly depends on gtk-2. |
187 |
-# needs 'pangocairo' enabled in graphviz configuration |
188 |
-# gtk-2 depends on pango, cairo and libX11 directly. |
189 |
-# - gdk-pixbuf |
190 |
-# Disabled, GTK-1 junk. |
191 |
-# - glitz |
192 |
-# Disabled, no particular reason |
193 |
-# needs 'pangocairo' enabled in graphviz configuration |
194 |
-# - ming |
195 |
-# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's |
196 |
-# incomplete. |
197 |
-# - cairo/pango: |
198 |
-# Needs pango for text layout, uses cairo methods to draw stuff |
199 |
-# - xlib: |
200 |
-# needs cairo+pango, |
201 |
-# can make use of gnomeui and inotify support (??? unsure), |
202 |
-# needs libXaw for UI |
203 |
-# UI also links directly against libX11, libXmu, and libXt |
204 |
-# and uses libXpm if available so we make sure it always is |
205 |
- |
206 |
-# There can be swig-generated bindings for the following languages (/tclpkg/gv): |
207 |
-# - c-sharp (disabled) |
208 |
-# - scheme (enabled via guile) ... no longer broken on ~x86 |
209 |
-# - go (disabled) |
210 |
-# - io (disabled) |
211 |
-# - java (enabled via java) *2 |
212 |
-# - lua (enabled via lua) |
213 |
-# - ocaml (enabled via ocaml) |
214 |
-# - perl (enabled via perl) *1 |
215 |
-# - php (enabled via php) *2 |
216 |
-# - python (enabled via python) *1 |
217 |
-# - ruby (enabled via ruby) *1 |
218 |
-# - tcl (enabled via tcl) |
219 |
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location |
220 |
-# *2 = Those bindings don't build because the paths for the headers/libs aren't |
221 |
-# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) |
222 |
- |
223 |
-# There are several other tools in /tclpkg: |
224 |
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl |
225 |
-# tkspline, tkstubs ; enabled with: --with-tk |
226 |
- |
227 |
-# And the commands (/cmd): |
228 |
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :) |
229 |
-# sci-libs/gts can be used for some of these |
230 |
-# - lefty: |
231 |
-# needs Xaw and X to build |
232 |
-# - gvedit (via 'qt5'): |
233 |
-# based on ./configure it needs qt-core and qt-gui only |
234 |
-# - smyrna : experimental opengl front-end (via 'smyrna') |
235 |
-# currently disabled -- it segfaults a lot |
236 |
-# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut |
237 |
-# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' |
238 |
-# with flags enabled at configure time |
239 |
- |
240 |
-PATCHES=( |
241 |
- "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch |
242 |
- "${FILESDIR}"/${P}-libgv_python.patch |
243 |
- "${FILESDIR}"/${P}-math.patch |
244 |
-) |
245 |
- |
246 |
-pkg_setup() { |
247 |
- use python && python-single-r1_pkg_setup |
248 |
- |
249 |
- java-pkg-opt-2_pkg_setup |
250 |
-} |
251 |
- |
252 |
-src_prepare() { |
253 |
- default |
254 |
- |
255 |
- # ToDo: Do the same thing for examples and/or |
256 |
- # write a patch for a configuration-option |
257 |
- # and send it to upstream |
258 |
- # note - the longer sed expression removes multi-line assignments that are extended via '\' |
259 |
- if ! use doc ; then |
260 |
- find . -iname Makefile.am \ |
261 |
- | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \ |
262 |
- -e '/^\(html\|pdf\)_DATA/d' || die |
263 |
- fi |
264 |
- |
265 |
- # This is an old version of libtool |
266 |
- # use the ./configure option to exclude its use, and |
267 |
- # delete the dir since we don't need to eautoreconf it |
268 |
- rm -r libltdl || die |
269 |
- |
270 |
- # Nuke the dead symlinks for the bindings |
271 |
- sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die |
272 |
- |
273 |
- # replace the whitespace with tabs |
274 |
- sed -i -e 's: :\t:g' doc/info/Makefile.am || die |
275 |
- |
276 |
- # use correct version of qmake. bug #567236 |
277 |
- sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die |
278 |
- |
279 |
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895 |
280 |
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos) |
281 |
- |
282 |
- use java && append-cppflags $(java-pkg_get-jni-cflags) |
283 |
- |
284 |
- eautoreconf |
285 |
-} |
286 |
- |
287 |
-src_configure() { |
288 |
- local myconf=( |
289 |
- --enable-ltdl |
290 |
- $(use_with cairo pangocairo) |
291 |
- $(use_with devil) |
292 |
- $(use_enable gdk-pixbuf) |
293 |
- $(use_with gtk) |
294 |
- $(use_with gts) |
295 |
- $(use_with qt5 qt) |
296 |
- $(use_with lasi) |
297 |
- $(use_with pdf poppler) |
298 |
- $(use_with postscript ghostscript) |
299 |
- $(use_enable static-libs static) |
300 |
- $(use_with svg rsvg) |
301 |
- $(use_with X x) |
302 |
- $(use_with X xaw) |
303 |
- $(use_with X lefty) |
304 |
- --with-digcola |
305 |
- --with-fontconfig |
306 |
- --with-freetype2 |
307 |
- --with-ipsepcola |
308 |
- --with-libgd |
309 |
- --with-sfdp |
310 |
- --without-ming |
311 |
- # new/experimental features, to be tested, disable for now |
312 |
- --with-cgraph |
313 |
- --without-glitz |
314 |
- --without-ipsepcola |
315 |
- --without-smyrna |
316 |
- --without-visio |
317 |
- # Bindings: |
318 |
- $(use_enable guile) |
319 |
- $(use_enable java) |
320 |
- $(use_enable perl) |
321 |
- $(use_enable python python2) |
322 |
- $(use_enable python python3) |
323 |
- $(use_enable ruby) |
324 |
- $(use_enable tcl) |
325 |
- --disable-go |
326 |
- --disable-io |
327 |
- --disable-lua |
328 |
- --disable-ocaml |
329 |
- --disable-php |
330 |
- --disable-python |
331 |
- --disable-r |
332 |
- --disable-sharp |
333 |
- # libtool file collision, bug #276609 |
334 |
- --without-included-ltdl |
335 |
- --disable-ltdl-install |
336 |
- ) |
337 |
- econf "${myconf[@]}" |
338 |
-} |
339 |
- |
340 |
-src_install() { |
341 |
- sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die |
342 |
- |
343 |
- emake DESTDIR="${D}" \ |
344 |
- txtdir="${EPREFIX}"/usr/share/doc/${PF} \ |
345 |
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
346 |
- htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \ |
347 |
- pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \ |
348 |
- pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \ |
349 |
- install |
350 |
- |
351 |
- if ! use examples; then |
352 |
- rm -rf "${ED}"/usr/share/graphviz/demo || die |
353 |
- fi |
354 |
- |
355 |
- if ! use static-libs; then |
356 |
- find "${ED}" -name '*.la' -delete || die |
357 |
- fi |
358 |
- |
359 |
- einstalldocs |
360 |
- |
361 |
- use python && python_optimize \ |
362 |
- "${D}$(python_get_sitedir)" \ |
363 |
- "${D}/usr/$(get_libdir)/graphviz/python2" \ |
364 |
- "${D}/usr/$(get_libdir)/graphviz/python3" |
365 |
-} |
366 |
- |
367 |
-pkg_postinst() { |
368 |
- # This actually works if --enable-ltdl is passed |
369 |
- # to configure |
370 |
- dot -c || die |
371 |
-} |
372 |
- |
373 |
-pkg_postrm() { |
374 |
- # Remove cruft, bug #547344 |
375 |
- rm -rf "${EROOT}"usr/$(get_libdir)/graphviz/config{,6} || die |
376 |
-} |