commit: a2c0427a4d1ebec7629748b502fff237d9daeee7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Dec 11 21:24:46 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Dec 11 21:24:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c0427a
media-gfx/graphviz: drop 6.0.1-r3, 7.0.0-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/graphviz/Manifest | 2 - ...raphviz-6.0.1-private-ghostscript-symbols.patch | 31 --- media-gfx/graphviz/graphviz-6.0.1-r3.ebuild | 221 --------------------- media-gfx/graphviz/graphviz-7.0.0-r1.ebuild | 216 -------------------- 4 files changed, 470 deletions(-) diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index 08bfe0385ce1..1d958282ce22 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -1,4 +1,2 @@ DIST graphviz-5.0.1.tar.xz 21493276 BLAKE2B 1eabf7dc175cde4827db682ae7c0cb00f5bec4bee8aa9801bc6ac86b06011588260ce261e25613d6d4a1e708ccb4fd65aba73210df8cf0af84f2e20b7c914167 SHA512 c1c5784558fd6f32cd8ce9b63c2bc5232f47ea1c4abf8fbfc1b8b0175aa30845af452dbc6651642f07f2c5b7a73f5c792934ca99561608a104ae99898eca3bc7 -DIST graphviz-6.0.1.tar.xz 21492876 BLAKE2B 36b8c2e922a73e35cddb2a252138193c9a413df823953faf387c964a31cf41e93b9c502ddc58831542aeea7e06cfd9ec377c390b45b859bdab1e0602c9b9683c SHA512 78f58734c47a6e1531a00b9de881481108500bf0a38b0ee734ecd024b629d838d98dbb32d81d2c2fe3b5ac28cbad140452b4bb5fa808ec667cc6cbe7638156ee -DIST graphviz-7.0.0.tar.xz 21486172 BLAKE2B f52a75b5938ba3a6fbad3efe9d0ca6413145f9355c3ad1c8dc39253e8db36e9862c70c4dc910afd05e601e5787640b5b4a3dd09c1527cc3bd39a97ef281a7215 SHA512 dfead861d2f6ad1ebc9e3e4bd30684e02005cc7a2b78dab3ad45a11a401e08aeb1b6f7d8ea7ad7655230275ab6c10fd791434489e4ba09ae6905970230a974dc DIST graphviz-7.0.2.tar.xz 21485860 BLAKE2B 5a99bbe6748b01706faade8b17ec34c8ec2d645a8b9cbda6fd3d595f9720358df279de883a556206709ece76dcd44b7b4fe105b5645493480a204c05a2d9585f SHA512 cff40066f80d29a8ca19f8c12410c293b58ef4abf03f2c3b36472a856bc39e6a2bf6badfad4f036e45e430b7d2fec40d5d1fdb0b47778b1857a46b2b07700d98 diff --git a/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch b/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch deleted file mode 100644 index 8e409a9b5776..000000000000 --- a/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1288e430c6f6be992de09fc1f50ce7fef42b3f0a Mon Sep 17 00:00:00 2001 -From: Mark Hansen <markhan...@google.com> -Date: Mon, 26 Sep 2022 20:43:39 +1000 -Subject: [PATCH] Stop using now-hidden gs_error_names symbol - -GhostScript hid their gs_error_names symbol as part of a global by-default hiding of non-API symbols. - -It will probably take a while for GhostScript to get a public API for these symbols back into a release, so let's stop using the symbol for now, until then. - -Fixes #2280 ---- - plugin/gs/gvloadimage_gs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c -index e909c6f32..d852663af 100644 ---- a/plugin/gs/gvloadimage_gs.c -+++ b/plugin/gs/gvloadimage_gs.c -@@ -86,8 +86,8 @@ static void gs_error(GVJ_t * job, const char *name, const char *funstr, int err) - else - errsrc = "Ghostscript internal error"; - -- job->common->errorfn("%s: %s() returned: %d \"%s\" (%s)\n", -- name, funstr, err, gs_error_names[-err - 1], errsrc); -+ job->common->errorfn("%s: %s() returned: %d (%s)\n", -+ name, funstr, err, errsrc); - } - - static int gvloadimage_process_file(GVJ_t *job, usershape_t *us, void *instance) --- -GitLab diff --git a/media-gfx/graphviz/graphviz-6.0.1-r3.ebuild b/media-gfx/graphviz/graphviz-6.0.1-r3.ebuild deleted file mode 100644 index fd076e96e4c7..000000000000 --- a/media-gfx/graphviz/graphviz-6.0.1-r3.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit python-single-r1 - -DESCRIPTION="Open Source Graph Visualization Software" -HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" -# Unfortunately upstream uses an "artifact" store for the pre-generated -# tarball now, which makes predictable URLs impossible. -SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" - -REQUIRED_USE=" - !cairo? ( !X !gtk2 !postscript !lasi ) - pdf? ( cairo ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# Requires ksh, tests against installed package, missing files and directory -RESTRICT="test" - -RDEPEND=" - >=dev-libs/expat-2 - >=dev-libs/glib-2.11.1:2 - dev-libs/libltdl - >=media-libs/fontconfig-2.3.95 - >=media-libs/freetype-2.1.10 - >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] - media-libs/libjpeg-turbo:= - >=media-libs/libpng-1.2:= - sys-libs/zlib - virtual/libiconv - cairo? ( - >=x11-libs/cairo-1.1.10[svg(+)] - >=x11-libs/pango-1.12 - ) - devil? ( media-libs/devil[png,jpeg] ) - gtk2? ( - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - gts? ( sci-libs/gts ) - guile? ( dev-scheme/guile ) - lasi? ( media-libs/lasi ) - pdf? ( app-text/poppler ) - perl? ( dev-lang/perl:= ) - postscript? ( app-text/ghostscript-gpl:= ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - ) - ruby? ( dev-lang/ruby:* ) - svg? ( gnome-base/librsvg ) - tcl? ( >=dev-lang/tcl-8.3:= ) - webp? ( media-libs/libwebp:= ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - sys-devel/flex - sys-devel/libtool - virtual/pkgconfig - doc? ( - app-text/ghostscript-gpl - sys-apps/groff - ) - guile? ( - dev-lang/swig - dev-scheme/guile - ) - nls? ( >=sys-devel/gettext-0.14.5 ) - perl? ( dev-lang/swig ) - python? ( dev-lang/swig ) - ruby? ( dev-lang/swig ) - tcl? ( dev-lang/swig )" - -# Dependency description / Maintainer info: - -# Rendering is done via the following plugins (/plugins): -# - core, dot_layout, neato_layout, gd , dot -# the ones which are always compiled in, depend on zlib, gd -# - gtk -# Directly depends on gtk-2. -# needs 'pangocairo' enabled in graphviz configuration -# gtk-2 depends on pango, cairo and libX11 directly. -# - gdk-pixbuf -# Directly depends on gtk-2 and gdk-pixbuf. -# needs 'pangocairo' enabled in graphviz configuration -# - ming -# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's -# incomplete. -# - cairo/pango: -# Needs pango for text layout, uses cairo methods to draw stuff -# - xlib: -# needs cairo+pango, -# can make use of gnomeui and inotify support (??? unsure), -# needs libXaw for UI -# UI also links directly against libX11, libXmu, and libXt -# and uses libXpm if available so we make sure it always is - -# There can be swig-generated bindings for the following languages (/tclpkg/gv): -# - c-sharp (disabled) -# - scheme (enabled via guile) ... no longer broken on ~x86 -# - go (disabled) -# - io (disabled) -# - lua (enabled via lua) -# - ocaml (enabled via ocaml) -# - perl (enabled via perl) *1 -# - php (enabled via php) *2 -# - python (enabled via python) *1 -# - ruby (enabled via ruby) *1 -# - tcl (enabled via tcl) -# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location -# *2 = Those bindings don't build because the paths for the headers/libs aren't -# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) - -# There are several other tools in /tclpkg: -# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl -# tkspline, tkstubs ; enabled with: --with-tk - -# And the commands (/cmd): -# - dot, gvedit, gvpr, smyrna, tools/* :) -# sci-libs/gts can be used for some of these -# - gvedit (via 'qt5'): -# based on ./configure it needs qt-core and qt-gui only -# - smyrna : experimental opengl front-end (via 'smyrna') -# currently disabled -- it segfaults a lot -# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut -# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' -# with flags enabled at configure time - -PATCHES=( - # backport - "${FILESDIR}"/${P}-private-ghostscript-symbols.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myconf=( - # Speeds up the libltdl configure - --cache-file="${S}"/config.cache - --enable-ltdl - $(use_enable doc man-pdfs) - $(use_with cairo pangocairo) - $(use_with examples demos '$(docdir)/examples') - $(use_with devil) - $(use_with gtk2 gdk) - $(use_with gtk2 gdk-pixbuf) - $(use_with gtk2) - $(use_with gts) - $(use_with qt5 qt) - $(use_with lasi) - $(use_with pdf poppler) - $(use_with postscript ghostscript) - $(use_with svg rsvg) - $(use_with webp) - $(use_with X x) - --with-digcola - --with-fontconfig - --with-freetype2 - --with-ipsepcola - --with-libgd - --with-sfdp - --without-ming - # New/experimental features, to be tested, disable for now - --without-ipsepcola - --without-smyrna - --without-visio - # Bindings - $(use_enable guile) - $(use_enable perl) - $(use_enable python python3) - $(use_enable ruby) - $(use_enable tcl) - --disable-go - --disable-io - --disable-lua - --disable-java - --disable-ocaml - --disable-php - --disable-python - --disable-r - --disable-sharp - # libtool file collision, bug #276609 - --without-included-ltdl - --disable-ltdl-install - ) - econf "${myconf[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - use python && python_optimize \ - "${D}"$(python_get_sitedir) \ - "${ED}"/usr/$(get_libdir)/graphviz/python3 -} - -pkg_postinst() { - # We need to register all plugins before they become usable - dot -c || die -} - -pkg_postrm() { - # Remove cruft, bug #547344 - rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die -} diff --git a/media-gfx/graphviz/graphviz-7.0.0-r1.ebuild b/media-gfx/graphviz/graphviz-7.0.0-r1.ebuild deleted file mode 100644 index 9ad6331a1bb7..000000000000 --- a/media-gfx/graphviz/graphviz-7.0.0-r1.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit python-single-r1 - -DESCRIPTION="Open Source Graph Visualization Software" -HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" -# Unfortunately upstream uses an "artifact" store for the pre-generated -# tarball now, which makes predictable URLs impossible. -SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" - -REQUIRED_USE=" - !cairo? ( !X !gtk2 !postscript !lasi ) - pdf? ( cairo ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# Requires ksh, tests against installed package, missing files and directory -RESTRICT="test" - -RDEPEND=" - >=dev-libs/expat-2 - >=dev-libs/glib-2.11.1:2 - dev-libs/libltdl - >=media-libs/fontconfig-2.3.95 - >=media-libs/freetype-2.1.10 - >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] - media-libs/libjpeg-turbo:= - >=media-libs/libpng-1.2:= - sys-libs/zlib - virtual/libiconv - cairo? ( - >=x11-libs/cairo-1.1.10[svg(+)] - >=x11-libs/pango-1.12 - ) - devil? ( media-libs/devil[png,jpeg] ) - gtk2? ( - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - gts? ( sci-libs/gts ) - guile? ( dev-scheme/guile ) - lasi? ( media-libs/lasi ) - pdf? ( app-text/poppler ) - perl? ( dev-lang/perl:= ) - postscript? ( app-text/ghostscript-gpl:= ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - ) - ruby? ( dev-lang/ruby:* ) - svg? ( gnome-base/librsvg ) - tcl? ( >=dev-lang/tcl-8.3:= ) - webp? ( media-libs/libwebp:= ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - sys-devel/flex - sys-devel/libtool - virtual/pkgconfig - doc? ( - app-text/ghostscript-gpl - sys-apps/groff - ) - guile? ( - dev-lang/swig - dev-scheme/guile - ) - nls? ( >=sys-devel/gettext-0.14.5 ) - perl? ( dev-lang/swig ) - python? ( dev-lang/swig ) - ruby? ( dev-lang/swig ) - tcl? ( dev-lang/swig )" - -# Dependency description / Maintainer info: - -# Rendering is done via the following plugins (/plugins): -# - core, dot_layout, neato_layout, gd , dot -# the ones which are always compiled in, depend on zlib, gd -# - gtk -# Directly depends on gtk-2. -# needs 'pangocairo' enabled in graphviz configuration -# gtk-2 depends on pango, cairo and libX11 directly. -# - gdk-pixbuf -# Directly depends on gtk-2 and gdk-pixbuf. -# needs 'pangocairo' enabled in graphviz configuration -# - ming -# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's -# incomplete. -# - cairo/pango: -# Needs pango for text layout, uses cairo methods to draw stuff -# - xlib: -# needs cairo+pango, -# can make use of gnomeui and inotify support (??? unsure), -# needs libXaw for UI -# UI also links directly against libX11, libXmu, and libXt -# and uses libXpm if available so we make sure it always is - -# There can be swig-generated bindings for the following languages (/tclpkg/gv): -# - c-sharp (disabled) -# - scheme (enabled via guile) ... no longer broken on ~x86 -# - go (disabled) -# - io (disabled) -# - lua (enabled via lua) -# - ocaml (enabled via ocaml) -# - perl (enabled via perl) *1 -# - php (enabled via php) *2 -# - python (enabled via python) *1 -# - ruby (enabled via ruby) *1 -# - tcl (enabled via tcl) -# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location -# *2 = Those bindings don't build because the paths for the headers/libs aren't -# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) - -# There are several other tools in /tclpkg: -# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl -# tkspline, tkstubs ; enabled with: --with-tk - -# And the commands (/cmd): -# - dot, gvedit, gvpr, smyrna, tools/* :) -# sci-libs/gts can be used for some of these -# - gvedit (via 'qt5'): -# based on ./configure it needs qt-core and qt-gui only -# - smyrna : experimental opengl front-end (via 'smyrna') -# currently disabled -- it segfaults a lot -# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut -# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' -# with flags enabled at configure time - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myconf=( - # Speeds up the libltdl configure - --cache-file="${S}"/config.cache - --enable-ltdl - $(use_enable doc man-pdfs) - $(use_with cairo pangocairo) - $(use_with examples demos '$(docdir)/examples') - $(use_with devil) - $(use_with gtk2 gdk) - $(use_with gtk2 gdk-pixbuf) - $(use_with gtk2) - $(use_with gts) - $(use_with qt5 qt) - $(use_with lasi) - $(use_with pdf poppler) - $(use_with postscript ghostscript) - $(use_with svg rsvg) - $(use_with webp) - $(use_with X x) - --with-digcola - --with-fontconfig - --with-freetype2 - --with-ipsepcola - --with-libgd - --with-sfdp - --without-ming - # New/experimental features, to be tested, disable for now - --without-ipsepcola - --without-smyrna - --without-visio - # Bindings - $(use_enable guile) - $(use_enable perl) - $(use_enable python python3) - $(use_enable ruby) - $(use_enable tcl) - --disable-go - --disable-io - --disable-lua - --disable-java - --disable-ocaml - --disable-php - --disable-python - --disable-r - --disable-sharp - # libtool file collision, bug #276609 - --without-included-ltdl - --disable-ltdl-install - ) - econf "${myconf[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - use python && python_optimize \ - "${D}"$(python_get_sitedir) \ - "${ED}"/usr/$(get_libdir)/graphviz/python3 -} - -pkg_postinst() { - # We need to register all plugins before they become usable - dot -c || die -} - -pkg_postrm() { - # Remove cruft, bug #547344 - rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die -}