commit: b762a11ed8579ad0de77bc9f2873026bb3505696 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Apr 24 11:01:04 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Apr 24 11:01:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b762a11e
media-gfx/graphviz: Bump to 2.47.1 Bug: https://bugs.gentoo.org/684844 Closes: https://bugs.gentoo.org/723286 Closes: https://bugs.gentoo.org/770067 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-gfx/graphviz/Manifest | 1 + .../graphviz/files/graphviz-2.47.1-bashisms.patch | 12 + media-gfx/graphviz/graphviz-2.47.1.ebuild | 277 +++++++++++++++++++++ 3 files changed, 290 insertions(+) diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index eec2245c13b..c94ad19da08 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -1 +1,2 @@ DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42 +DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a SHA512 4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb diff --git a/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch b/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch new file mode 100644 index 00000000000..4e9aab6ae34 --- /dev/null +++ b/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch @@ -0,0 +1,12 @@ +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2019-07-13 03:14:04.000000000 +0000 ++++ b/configure.ac 2020-05-15 19:44:57.715169627 +0000 +@@ -315,7 +315,7 @@ + dnl =========================================================================== + dnl Set GCC compiler flags + +-if [test "${GCC}" == "yes"] ++if [test "${GCC}" = "yes"] + then + # Enable common warnings flags + CFLAGS="${CFLAGS} -Wall" diff --git a/media-gfx/graphviz/graphviz-2.47.1.ebuild b/media-gfx/graphviz/graphviz-2.47.1.ebuild new file mode 100644 index 00000000000..570be52f339 --- /dev/null +++ b/media-gfx/graphviz/graphviz-2.47.1.ebuild @@ -0,0 +1,277 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils + +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/graphviz/graphviz/-/package_files/9573974/download -> ${P}.tar.xz" + +LICENSE="CPL-1.0" +SLOT="0" +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" +IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl X" + +REQUIRED_USE=" + !cairo? ( !X !gtk !postscript !lasi ) + pdf? ( cairo ) + python? ( ${PYTHON_REQUIRED_USE} )" + +# Requires ksh, tests against installed package, missing files and directory +RESTRICT="test" + +BDEPEND=" + sys-devel/flex + sys-devel/libtool + x11-libs/gdk-pixbuf:2 + virtual/pkgconfig + doc? ( + app-text/ghostscript-gpl + sys-apps/groff + ) + guile? ( + dev-lang/swig + dev-scheme/guile + ) + java? ( + dev-lang/swig + virtual/jdk:* + ) + nls? ( >=sys-devel/gettext-0.14.5 ) + perl? ( dev-lang/swig ) + python? ( dev-lang/swig ) + ruby? ( dev-lang/swig ) + tcl? ( dev-lang/swig )" +RDEPEND=" + >=dev-libs/expat-2 + >=dev-libs/glib-2.11.1:2 + dev-libs/libltdl:0 + >=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/libpng-1.2:0= + sys-libs/zlib + virtual/jpeg:0 + virtual/libiconv + cairo? ( + >=x11-libs/cairo-1.1.10[svg] + >=x11-libs/pango-1.12 + ) + devil? ( media-libs/devil[png,jpeg] ) + gtk? ( x11-libs/gtk+:2 ) + gts? ( sci-libs/gts ) + guile? ( dev-scheme/guile ) + java? ( virtual/jdk:* ) + 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:0= ) + X? ( + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + )" +DEPEND="${RDEPEND}" + +# 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 +# Disabled, GTK-1 junk. +# - glitz +# Disabled, no particular reason +# 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) +# - java (enabled via java) *2 +# - 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, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :) +# sci-libs/gts can be used for some of these +# - lefty: +# needs Xaw and X to build +# - 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=( + "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch + "${FILESDIR}"/${PN}-2.47.1-bashisms.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + # ToDo: Do the same thing for examples and/or + # write a patch for a configuration-option + # and send it to upstream + # note - the longer sed expression removes multi-line assignments that are extended via '\' + if ! use doc ; then + find . -iname Makefile.am \ + | xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \ + -e '/^\(html\|pdf\)_DATA/d' || die + fi + + # Nuke the dead symlinks for the bindings + sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die + + # replace the whitespace with tabs + sed -i -e 's: :\t:g' doc/info/Makefile.am || die + + # use correct version of qmake. bug #567236 + sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die + + use java && append-cppflags $(java-pkg_get-jni-cflags) + + eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + --enable-ltdl + --enable-gdk-pixbuf + $(use_with cairo pangocairo) + $(use_with devil) + $(use_with gtk) + $(use_with gts) + $(use_with qt5 qt) + $(use_with lasi) + $(use_with pdf poppler) + $(use_with postscript ghostscript) + $(use_with svg rsvg) + $(use_with X x) + $(use_with X xaw) + $(use_with X lefty) + --with-digcola + --with-fontconfig + --with-freetype2 + --with-ipsepcola + --with-libgd + --with-sfdp + --without-ming + # new/experimental features, to be tested, disable for now + --with-cgraph + --without-glitz + --without-ipsepcola + --without-smyrna + --without-visio + # Bindings: + $(use_enable guile) + $(use_enable java) + $(use_enable perl) + $(use_enable python python2) + $(use_enable python python3) + $(use_enable ruby) + $(use_enable tcl) + --disable-go + --disable-io + --disable-lua + --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() { + sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die + + emake DESTDIR="${D}" \ + txtdir="${EPREFIX}"/usr/share/doc/${PF} \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \ + pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \ + pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \ + install + + if ! use examples; then + rm -rf "${ED}"/usr/share/graphviz/demo || die + fi + + find "${ED}" -name '*.la' -delete || die + + einstalldocs + + use python && python_optimize \ + "${D}"$(python_get_sitedir) \ + "${ED}"/usr/$(get_libdir)/graphviz/python3 +} + +pkg_postinst() { + # This actually works if --enable-ltdl is passed + # to configure + dot -c || die +} + +pkg_postrm() { + # Remove cruft, bug #547344 + rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die +}
