1 |
commit: 325cf3ee39a8ce5fabe97f6b462353d25e65aa56 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 26 17:57:38 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 26 17:57:38 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=325cf3ee |
7 |
|
8 |
media-gfx/graphviz: drop 2.47.1-r1 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
media-gfx/graphviz/Manifest | 1 - |
13 |
.../files/graphviz-2.34.0-Xaw-configure.patch | 81 ------ |
14 |
.../graphviz/files/graphviz-2.47.1-bashisms.patch | 12 - |
15 |
media-gfx/graphviz/graphviz-2.47.1-r1.ebuild | 279 --------------------- |
16 |
4 files changed, 373 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest |
19 |
index 15b0d2b11b5..085986d24c2 100644 |
20 |
--- a/media-gfx/graphviz/Manifest |
21 |
+++ b/media-gfx/graphviz/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a SHA512 4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb |
24 |
DIST graphviz-2.49.0.tar.xz 23040392 BLAKE2B 74bc90e433c29662b292c0f086777648db4cded69b7640586647f46e3df46137044fa287d170a780e58f552289fec2d65e10def9ed68095bd4ec8efe9208f929 SHA512 5396b6cb4615ba509233a5a079956aef014245cac64635f01467dcb26e9d6e4b1d044110bc3a85132c747ba410597fa289bef3e503e84fa000c845e1e75c89b0 |
25 |
|
26 |
diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch |
27 |
deleted file mode 100644 |
28 |
index 2283cc5dab4..00000000000 |
29 |
--- a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch |
30 |
+++ /dev/null |
31 |
@@ -1,81 +0,0 @@ |
32 |
---- a/configure.ac |
33 |
-+++ b/configure.ac |
34 |
-@@ -560,8 +560,8 @@ |
35 |
- use_xlib="Yes" |
36 |
- #no x11.pc on centos4 |
37 |
- # PKG_CHECK_MODULES(X11, [x11]) |
38 |
-- PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no") |
39 |
- fi |
40 |
-+PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no") |
41 |
- AM_CONDITIONAL(WITH_X, [test "x$use_xlib" = "xYes"]) |
42 |
- AM_CONDITIONAL(WITH_XRENDER, [test "x$,HAVE_XRENDER" = "xyes"]) |
43 |
- |
44 |
-@@ -1924,6 +1924,10 @@ |
45 |
- # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM |
46 |
- # |
47 |
- |
48 |
-+AC_ARG_WITH(lefty, |
49 |
-+ [AS_HELP_STRING([--with-lefty=yes],[build lefty])], |
50 |
-+ [],[with_xaw=yes]) |
51 |
-+ |
52 |
- AC_ARG_WITH(Xpmincludedir, |
53 |
- [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])], |
54 |
- [XPM_INCLUDES="-I$withval"]) |
55 |
-@@ -1931,6 +1935,17 @@ |
56 |
- [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])], |
57 |
- [XPM_LIBS="-L$withval"]) |
58 |
- |
59 |
-+AC_ARG_WITH(Xawincludedir, |
60 |
-+ [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])], |
61 |
-+ [XAW_INCLUDES="-I$withval"]) |
62 |
-+AC_ARG_WITH(Xawlibdir, |
63 |
-+ [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])], |
64 |
-+ [XAW_LIBS="-L$withval"]) |
65 |
-+ |
66 |
-+if test "x$with_xaw" != "xyes"; then |
67 |
-+ use_lefty="No (disabled)" |
68 |
-+else |
69 |
-+ |
70 |
- save_CPPFLAGS=$CPPFLAGS |
71 |
- save_LDFLAGS=$LDFLAGS |
72 |
- CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS" |
73 |
-@@ -1941,18 +1956,10 @@ |
74 |
- AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS]) |
75 |
- LDFLAGS=$save_LDFLAGS |
76 |
- CPPFLAGS=$save_CPPFLAGS |
77 |
--AC_SUBST([XPM_INCLUDES]) |
78 |
--AC_SUBST([XPM_LIBS]) |
79 |
- |
80 |
- dnl ----------------------------------- |
81 |
- dnl INCLUDES and LIBS for XAW |
82 |
- |
83 |
--AC_ARG_WITH(Xawincludedir, |
84 |
-- [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])], |
85 |
-- [XAW_INCLUDES="-I$withval"]) |
86 |
--AC_ARG_WITH(Xawlibdir, |
87 |
-- [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])], |
88 |
-- [XAW_LIBS="-L$withval"]) |
89 |
- save_CPPFLAGS=$CPPFLAGS |
90 |
- save_LDFLAGS=$LDFLAGS |
91 |
- CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS" |
92 |
-@@ -1978,12 +1985,17 @@ |
93 |
- fi |
94 |
- LDFLAGS=$save_LDFLAGS |
95 |
- CPPFLAGS=$save_CPPFLAGS |
96 |
-+ |
97 |
-+fi |
98 |
-+ |
99 |
-+AC_SUBST([XPM_INCLUDES]) |
100 |
-+AC_SUBST([XPM_LIBS]) |
101 |
- AC_SUBST([XAW_INCLUDES]) |
102 |
- AC_SUBST([XAW_LIBS]) |
103 |
--AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"]) |
104 |
--if test "x$with_xaw" = "xno"; then |
105 |
-+AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"]) |
106 |
-+if test "x$with_xaw" != "xyes"; then |
107 |
- if test "x$no_x" != "xyes"; then |
108 |
-- AC_MSG_WARN(Lefty cannot be built) |
109 |
-+ AC_MSG_WARN(Lefty will not be built) |
110 |
- fi |
111 |
- fi |
112 |
- |
113 |
|
114 |
diff --git a/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch b/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch |
115 |
deleted file mode 100644 |
116 |
index 4e9aab6ae34..00000000000 |
117 |
--- a/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch |
118 |
+++ /dev/null |
119 |
@@ -1,12 +0,0 @@ |
120 |
-diff -Naur a/configure.ac b/configure.ac |
121 |
---- a/configure.ac 2019-07-13 03:14:04.000000000 +0000 |
122 |
-+++ b/configure.ac 2020-05-15 19:44:57.715169627 +0000 |
123 |
-@@ -315,7 +315,7 @@ |
124 |
- dnl =========================================================================== |
125 |
- dnl Set GCC compiler flags |
126 |
- |
127 |
--if [test "${GCC}" == "yes"] |
128 |
-+if [test "${GCC}" = "yes"] |
129 |
- then |
130 |
- # Enable common warnings flags |
131 |
- CFLAGS="${CFLAGS} -Wall" |
132 |
|
133 |
diff --git a/media-gfx/graphviz/graphviz-2.47.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.47.1-r1.ebuild |
134 |
deleted file mode 100644 |
135 |
index 130d70d2a5f..00000000000 |
136 |
--- a/media-gfx/graphviz/graphviz-2.47.1-r1.ebuild |
137 |
+++ /dev/null |
138 |
@@ -1,279 +0,0 @@ |
139 |
-# Copyright 1999-2021 Gentoo Authors |
140 |
-# Distributed under the terms of the GNU General Public License v2 |
141 |
- |
142 |
-EAPI=7 |
143 |
- |
144 |
-PYTHON_COMPAT=( python3_{7..9} ) |
145 |
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils |
146 |
- |
147 |
-DESCRIPTION="Open Source Graph Visualization Software" |
148 |
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" |
149 |
-# unfortunately upstream uses an "artifact" store for the pre-generated |
150 |
-# tarball now, which makes predictable URLs impossible. |
151 |
-SRC_URI="https://gitlab.com/graphviz/graphviz/-/package_files/9573974/download -> ${P}.tar.xz" |
152 |
- |
153 |
-LICENSE="CPL-1.0" |
154 |
-SLOT="0" |
155 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" |
156 |
-IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" |
157 |
- |
158 |
-REQUIRED_USE=" |
159 |
- !cairo? ( !X !gtk !postscript !lasi ) |
160 |
- pdf? ( cairo ) |
161 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
162 |
- |
163 |
-# Requires ksh, tests against installed package, missing files and directory |
164 |
-RESTRICT="test" |
165 |
- |
166 |
-BDEPEND=" |
167 |
- sys-devel/flex |
168 |
- sys-devel/libtool |
169 |
- x11-libs/gdk-pixbuf:2 |
170 |
- virtual/pkgconfig |
171 |
- doc? ( |
172 |
- app-text/ghostscript-gpl |
173 |
- sys-apps/groff |
174 |
- ) |
175 |
- guile? ( |
176 |
- dev-lang/swig |
177 |
- dev-scheme/guile |
178 |
- ) |
179 |
- java? ( |
180 |
- dev-lang/swig |
181 |
- >=virtual/jdk-1.8:* |
182 |
- ) |
183 |
- nls? ( >=sys-devel/gettext-0.14.5 ) |
184 |
- perl? ( dev-lang/swig ) |
185 |
- python? ( dev-lang/swig ) |
186 |
- ruby? ( dev-lang/swig ) |
187 |
- tcl? ( dev-lang/swig )" |
188 |
-RDEPEND=" |
189 |
- >=dev-libs/expat-2 |
190 |
- >=dev-libs/glib-2.11.1:2 |
191 |
- dev-libs/libltdl:0 |
192 |
- >=media-libs/fontconfig-2.3.95 |
193 |
- >=media-libs/freetype-2.1.10 |
194 |
- >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] |
195 |
- >=media-libs/libpng-1.2:0= |
196 |
- sys-libs/zlib |
197 |
- virtual/jpeg:0 |
198 |
- virtual/libiconv |
199 |
- cairo? ( |
200 |
- >=x11-libs/cairo-1.1.10[svg] |
201 |
- >=x11-libs/pango-1.12 |
202 |
- ) |
203 |
- devil? ( media-libs/devil[png,jpeg] ) |
204 |
- gtk? ( x11-libs/gtk+:2 ) |
205 |
- gts? ( sci-libs/gts ) |
206 |
- guile? ( dev-scheme/guile ) |
207 |
- java? ( >=virtual/jre-1.8:* ) |
208 |
- lasi? ( media-libs/lasi ) |
209 |
- pdf? ( app-text/poppler ) |
210 |
- perl? ( dev-lang/perl:= ) |
211 |
- postscript? ( app-text/ghostscript-gpl ) |
212 |
- python? ( ${PYTHON_DEPS} ) |
213 |
- qt5? ( |
214 |
- dev-qt/qtcore:5 |
215 |
- dev-qt/qtgui:5 |
216 |
- dev-qt/qtprintsupport:5 |
217 |
- dev-qt/qtwidgets:5 |
218 |
- ) |
219 |
- ruby? ( dev-lang/ruby:* ) |
220 |
- svg? ( gnome-base/librsvg ) |
221 |
- tcl? ( >=dev-lang/tcl-8.3:0= ) |
222 |
- webp? ( media-libs/libwebp:= ) |
223 |
- X? ( |
224 |
- x11-libs/libX11 |
225 |
- x11-libs/libXaw |
226 |
- x11-libs/libXmu |
227 |
- x11-libs/libXpm |
228 |
- x11-libs/libXt |
229 |
- )" |
230 |
-DEPEND="${RDEPEND}" |
231 |
- |
232 |
-# Dependency description / Maintainer-Info: |
233 |
- |
234 |
-# Rendering is done via the following plugins (/plugins): |
235 |
-# - core, dot_layout, neato_layout, gd , dot |
236 |
-# the ones which are always compiled in, depend on zlib, gd |
237 |
-# - gtk |
238 |
-# Directly depends on gtk-2. |
239 |
-# needs 'pangocairo' enabled in graphviz configuration |
240 |
-# gtk-2 depends on pango, cairo and libX11 directly. |
241 |
-# - gdk-pixbuf |
242 |
-# Disabled, GTK-1 junk. |
243 |
-# - glitz |
244 |
-# Disabled, no particular reason |
245 |
-# needs 'pangocairo' enabled in graphviz configuration |
246 |
-# - ming |
247 |
-# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's |
248 |
-# incomplete. |
249 |
-# - cairo/pango: |
250 |
-# Needs pango for text layout, uses cairo methods to draw stuff |
251 |
-# - xlib: |
252 |
-# needs cairo+pango, |
253 |
-# can make use of gnomeui and inotify support (??? unsure), |
254 |
-# needs libXaw for UI |
255 |
-# UI also links directly against libX11, libXmu, and libXt |
256 |
-# and uses libXpm if available so we make sure it always is |
257 |
- |
258 |
-# There can be swig-generated bindings for the following languages (/tclpkg/gv): |
259 |
-# - c-sharp (disabled) |
260 |
-# - scheme (enabled via guile) ... no longer broken on ~x86 |
261 |
-# - go (disabled) |
262 |
-# - io (disabled) |
263 |
-# - java (enabled via java) *2 |
264 |
-# - lua (enabled via lua) |
265 |
-# - ocaml (enabled via ocaml) |
266 |
-# - perl (enabled via perl) *1 |
267 |
-# - php (enabled via php) *2 |
268 |
-# - python (enabled via python) *1 |
269 |
-# - ruby (enabled via ruby) *1 |
270 |
-# - tcl (enabled via tcl) |
271 |
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location |
272 |
-# *2 = Those bindings don't build because the paths for the headers/libs aren't |
273 |
-# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) |
274 |
- |
275 |
-# There are several other tools in /tclpkg: |
276 |
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl |
277 |
-# tkspline, tkstubs ; enabled with: --with-tk |
278 |
- |
279 |
-# And the commands (/cmd): |
280 |
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :) |
281 |
-# sci-libs/gts can be used for some of these |
282 |
-# - lefty: |
283 |
-# needs Xaw and X to build |
284 |
-# - gvedit (via 'qt5'): |
285 |
-# based on ./configure it needs qt-core and qt-gui only |
286 |
-# - smyrna : experimental opengl front-end (via 'smyrna') |
287 |
-# currently disabled -- it segfaults a lot |
288 |
-# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut |
289 |
-# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' |
290 |
-# with flags enabled at configure time |
291 |
- |
292 |
-PATCHES=( |
293 |
- "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch |
294 |
- "${FILESDIR}"/${PN}-2.47.1-bashisms.patch |
295 |
-) |
296 |
- |
297 |
-pkg_setup() { |
298 |
- use python && python-single-r1_pkg_setup |
299 |
- |
300 |
- java-pkg-opt-2_pkg_setup |
301 |
-} |
302 |
- |
303 |
-src_prepare() { |
304 |
- default |
305 |
- |
306 |
- # ToDo: Do the same thing for examples and/or |
307 |
- # write a patch for a configuration-option |
308 |
- # and send it to upstream |
309 |
- # note - the longer sed expression removes multi-line assignments that are extended via '\' |
310 |
- if ! use doc ; then |
311 |
- find . -iname Makefile.am \ |
312 |
- | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \ |
313 |
- -e '/^\(html\|pdf\)_DATA/d' || die |
314 |
- fi |
315 |
- |
316 |
- # Nuke the dead symlinks for the bindings |
317 |
- sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die |
318 |
- |
319 |
- # replace the whitespace with tabs |
320 |
- sed -i -e 's: :\t:g' doc/info/Makefile.am || die |
321 |
- |
322 |
- # use correct version of qmake. bug #567236 |
323 |
- sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die |
324 |
- |
325 |
- use java && append-cppflags $(java-pkg_get-jni-cflags) |
326 |
- |
327 |
- eautoreconf |
328 |
-} |
329 |
- |
330 |
-src_configure() { |
331 |
- local myconf=( |
332 |
- --disable-static |
333 |
- --enable-ltdl |
334 |
- --enable-gdk-pixbuf |
335 |
- $(use_with cairo pangocairo) |
336 |
- $(use_with devil) |
337 |
- $(use_with gtk) |
338 |
- $(use_with gts) |
339 |
- $(use_with qt5 qt) |
340 |
- $(use_with lasi) |
341 |
- $(use_with pdf poppler) |
342 |
- $(use_with postscript ghostscript) |
343 |
- $(use_with svg rsvg) |
344 |
- $(use_with webp) |
345 |
- $(use_with X x) |
346 |
- $(use_with X xaw) |
347 |
- $(use_with X lefty) |
348 |
- --with-digcola |
349 |
- --with-fontconfig |
350 |
- --with-freetype2 |
351 |
- --with-ipsepcola |
352 |
- --with-libgd |
353 |
- --with-sfdp |
354 |
- --without-ming |
355 |
- # new/experimental features, to be tested, disable for now |
356 |
- --with-cgraph |
357 |
- --without-glitz |
358 |
- --without-ipsepcola |
359 |
- --without-smyrna |
360 |
- --without-visio |
361 |
- # Bindings: |
362 |
- $(use_enable guile) |
363 |
- $(use_enable java) |
364 |
- $(use_enable perl) |
365 |
- $(use_enable python python2) |
366 |
- $(use_enable python python3) |
367 |
- $(use_enable ruby) |
368 |
- $(use_enable tcl) |
369 |
- --disable-go |
370 |
- --disable-io |
371 |
- --disable-lua |
372 |
- --disable-ocaml |
373 |
- --disable-php |
374 |
- --disable-python |
375 |
- --disable-r |
376 |
- --disable-sharp |
377 |
- # libtool file collision, bug #276609 |
378 |
- --without-included-ltdl |
379 |
- --disable-ltdl-install |
380 |
- ) |
381 |
- econf "${myconf[@]}" |
382 |
-} |
383 |
- |
384 |
-src_install() { |
385 |
- sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die |
386 |
- |
387 |
- emake DESTDIR="${D}" \ |
388 |
- txtdir="${EPREFIX}"/usr/share/doc/${PF} \ |
389 |
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
390 |
- htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \ |
391 |
- pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \ |
392 |
- pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \ |
393 |
- install |
394 |
- |
395 |
- if ! use examples; then |
396 |
- rm -rf "${ED}"/usr/share/graphviz/demo || die |
397 |
- fi |
398 |
- |
399 |
- find "${ED}" -name '*.la' -delete || die |
400 |
- |
401 |
- einstalldocs |
402 |
- |
403 |
- use python && python_optimize \ |
404 |
- "${D}"$(python_get_sitedir) \ |
405 |
- "${ED}"/usr/$(get_libdir)/graphviz/python3 |
406 |
-} |
407 |
- |
408 |
-pkg_postinst() { |
409 |
- # This actually works if --enable-ltdl is passed |
410 |
- # to configure |
411 |
- dot -c || die |
412 |
-} |
413 |
- |
414 |
-pkg_postrm() { |
415 |
- # Remove cruft, bug #547344 |
416 |
- rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die |
417 |
-} |