* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/
@ 2015-10-03 10:05 Pacho Ramos
0 siblings, 0 replies; 8+ messages in thread
From: Pacho Ramos @ 2015-10-03 10:05 UTC (permalink / raw
To: gentoo-commits
commit: 26681eadc76506344ab74c6523af57753f5aaf88
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 3 10:05:12 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 3 10:05:29 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26681ead
media-gfx/graphviz: Drop old
Package-Manager: portage-2.2.22
media-gfx/graphviz/Manifest | 3 -
.../files/graphviz-2.28.0-Xaw-configure.patch | 71 ------
.../files/graphviz-2.28.0-automake-1.11.2.patch | 33 ---
.../graphviz-2.28.0-dot-pangocairo-link.patch | 13 --
.../files/graphviz-2.38-fix-backslashes.patch | 34 ---
media-gfx/graphviz/graphviz-2.28.0.ebuild | 255 --------------------
media-gfx/graphviz/graphviz-2.34.0.ebuild | 260 ---------------------
media-gfx/graphviz/graphviz-2.36.0.ebuild | 256 --------------------
...-2.36.0-r1.ebuild => graphviz-2.38.0-r1.ebuild} | 20 +-
media-gfx/graphviz/graphviz-2.38.0.ebuild | 256 --------------------
10 files changed, 13 insertions(+), 1188 deletions(-)
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 0d3b41f..c42f116 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,5 +1,2 @@
DIST graphviz-2.26.3.tar.gz 17092429 SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1 SHA512 6225141752318af0b50714d70d31dd1ef1bc414d134d22f066f159843991194215bb9bc4e8df38a194e1de67ebbf137d371e875948fa6a6eebfca9df1a414a6d WHIRLPOOL ca35d0ed9cb3751ae968e1c6d425efe42e8b681685eb66f975c0ff1b73e245fc3db6418ec69300331c94275fe3bfcdcd168b931b880c280f3dd63f1f03c4d4db
-DIST graphviz-2.28.0.tar.gz 19620087 SHA256 d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76 SHA512 d6dbcd99487e382f9ca83ef63a3ff3fbe9208f6d3969cf03d15b8944dfb58c7fefe1bf96939e3e69019ae9a562619c6d64ad24e390c408b7271caade443233e0 WHIRLPOOL f0274567661f16993a107f45685f0716e64ea493e064efd2e72a4680120cbee8989fb0eab6429d432d18106d42bfc37d4113816efb14e7888d00014b83dea72a
-DIST graphviz-2.34.0.tar.gz 23921350 SHA256 d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764 SHA512 73dc8c25bc5747fda717d6d2162a8b37bf883544a13b487354a6000d528816a69a021f33cbeec0f6e718a7e9905ab2a04ee63f787ca7f79226055b2da21f4832 WHIRLPOOL 0fe3bf7420eccef9de51789ae9a8d8cab55b6fae7382e557604fb974e04eaa1e0610392dc7f6d5fa85a0b83a3cc955a4ff08d594bf8805c7f06625c7d9ac9007
-DIST graphviz-2.36.0.tar.gz 23846318 SHA256 37fd66d8def158575c75c4f6dbf536839e4ee468aa59314eb472d1aecb076361 SHA512 cca1339cea8d36acbae647a78ff6743a4f77bfa208e74fef615a99dc7d380d2a0a0f0b3fc00de09a9f67c3fad16dc3837ef3aefbfce5a8a3d0f974ed5afbbab5 WHIRLPOOL c9f25f28869afef943121a24b580518d822eb76f30b4c874554f2f1dd4f16ffaf2683644c59746f4295aa574c4b5541f1205787870eed5567cd4bd5c755e5f8b
DIST graphviz-2.38.0.tar.gz 25848858 SHA256 81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531 WHIRLPOOL b59bb517c4aa690ffd23e1b4d448d5dbaae5594eb1059d574e0cb3bf2091beb9ed867bd4fa7e8ca0259863f24849c96d4d1da056091922bf33ace7da43c8b5d4
diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch b/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch
deleted file mode 100644
index 095354f..0000000
--- a/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- configure.ac.old 2011-05-07 05:25:24.000000000 +0200
-+++ configure.ac 2011-06-24 13:24:49.000000000 +0200
-@@ -1924,6 +1924,10 @@
- # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
- #
-
-+AC_ARG_WITH(lefty,
-+ [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
-+ [],[with_xaw=yes])
-+
- AC_ARG_WITH(Xpmincludedir,
- [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
- [XPM_INCLUDES="-I$withval"])
-@@ -1931,6 +1935,17 @@
- [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
- [XPM_LIBS="-L$withval"])
-
-+AC_ARG_WITH(Xawincludedir,
-+ [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
-+ [XAW_INCLUDES="-I$withval"])
-+AC_ARG_WITH(Xawlibdir,
-+ [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
-+ [XAW_LIBS="-L$withval"])
-+
-+if test "x$with_xaw" != "xyes"; then
-+ use_lefty="No (disabled)"
-+else
-+
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
-@@ -1941,18 +1956,10 @@
- AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
- LDFLAGS=$save_LDFLAGS
- CPPFLAGS=$save_CPPFLAGS
--AC_SUBST(XPM_INCLUDES)
--AC_SUBST(XPM_LIBS)
-
- dnl -----------------------------------
- dnl INCLUDES and LIBS for XAW
-
--AC_ARG_WITH(Xawincludedir,
-- [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
-- [XAW_INCLUDES="-I$withval"])
--AC_ARG_WITH(Xawlibdir,
-- [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
-- [XAW_LIBS="-L$withval"])
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
-@@ -1978,12 +1985,17 @@
- fi
- LDFLAGS=$save_LDFLAGS
- CPPFLAGS=$save_CPPFLAGS
-+
-+fi
-+
-+AC_SUBST(XPM_INCLUDES)
-+AC_SUBST(XPM_LIBS)
- AC_SUBST(XAW_INCLUDES)
- AC_SUBST(XAW_LIBS)
--AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
--if test "x$with_xaw" = "xno"; then
-+AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"])
-+if test "x$with_xaw" != "xyes"; then
- if test "x$no_x" != "xyes"; then
-- AC_MSG_WARN(Lefty cannot be built)
-+ AC_MSG_WARN(Lefty will not be built)
- fi
- fi
-
diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch b/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
deleted file mode 100644
index 7b279fc..0000000
--- a/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Install dir ( buiding with media-libs/ming ):
- /usr/$(get_libdir)/graphviz/Bitstream_Vera_Serif.fdb
- /usr/$(get_libdir)/graphviz/Bitstream_Vera_Sans.fdb
- /usr/include/graphviz/gv.cpp
- /usr/include/graphviz/gv.i
-
-Due to the following change, {pkglib,pkginclude}_DATA is invalid:
- http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
----
---- a/plugin/ming/Makefile.am
-+++ b/plugin/ming/Makefile.am
-@@ -17,7 +17,8 @@ lib_LTLIBRARIES = libgvplugin_ming.la
- else
- pkglib_LTLIBRARIES = libgvplugin_ming.la
- endif
--pkglib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
-+fdblibdir = $(libdir)/@PACKAGE@
-+fdblib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
- endif
-
- libgvplugin_ming_C_la_SOURCES = \
---- a/tclpkg/gv/Makefile.am
-+++ b/tclpkg/gv/Makefile.am
-@@ -257,7 +257,7 @@ $(TCL_data): gv_tcl.cpp
- gv_tcl.cpp: gv.i
- $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
-
--pkginclude_DATA = gv.i gv.cpp
-+pkginclude_HEADERS = gv.i gv.cpp
- pkglib_LTLIBRARIES =
- man_MANS =
- DEVTSTS =
diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch b/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch
deleted file mode 100644
index cf1715c..0000000
--- a/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmd/dot/Makefile.am 2012-05-29 01:00:08.965321443 +0200
-+++ cmd/dot/Makefile.am 2012-05-29 01:01:57.471964924 +0200
-@@ -115,8 +115,8 @@
- endif
-
- if WITH_PANGOCAIRO
--dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS)
--dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS)
-+dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
-+dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
- endif
-
- EXTRA_DIST = Makefile.old dot.1 dot.1.pdf osage.1 osage.1.pdf patchwork.1 patchwork.1.pdf dot.vcproj
diff --git a/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch b/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch
deleted file mode 100644
index b4e911d..0000000
--- a/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-User reported a regression between 2.26 and 2.36
-when trying to .dot the following graph:
-
- digraph g {
- 1 -> 2 [label="\\"]
- }
-
-2.26 shows it as '\' while 2.36 fails as:
- $ dot -Tpng a.dot -o a.png
- Warning: 1.dot: syntax error in line 2 near ''
-
-Thanks to Ulya Trofimovich who found and bisected
-the problem down to this commit, which fixes problem
-only in git version.
-
-commit 386e47c14b3a8e83bdf3ec8772963213095a7294
-Author: Emden R. Gansner <erg@alum.mit.edu>
-Date: Thu Jan 30 08:45:06 2014 -0500
-
- Remove change made in d19b672a3c06f0ae95b1da38b63b068f71eb266f until we can
- remember why this change was made.
-
-diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l
-index 0a31f0c..5bb30b7 100644
---- a/lib/cgraph/scan.l
-+++ b/lib/cgraph/scan.l
-@@ -199,6 +199,7 @@ ID ({NAME}|{NUMBER})
- ["] BEGIN(qstring); beginstr();
- <qstring>["] BEGIN(INITIAL); endstr(); return (T_qatom);
- <qstring>[\\]["] addstr ("\"");
-+<qstring>[\\][\\] addstr ("\\\\");
- <qstring>[\\][\n] line_num++; /* ignore escaped newlines */
- <qstring>([^"\\]*|[\\]) addstr(yytext);
- [<] BEGIN(hstring); html_nest = 1; beginstr();
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
deleted file mode 100644
index b702ab3..0000000
--- a/media-gfx/graphviz/graphviz-2.28.0.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-#original KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk gts java lasi nls perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
- sys-libs/zlib
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1
- >=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
- !<=sci-chemistry/cluster-1.3.081231
- virtual/jpeg:0
- virtual/libiconv
- X? (
- x11-libs/libXaw
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- )
- cairo? (
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10[svg]
- )
- devil? ( media-libs/devil[png,jpeg] )
- postscript? ( app-text/ghostscript-gpl )
- gtk? ( x11-libs/gtk+:2 )
- gts? ( sci-libs/gts )
- lasi? ( media-libs/lasi )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- ruby? ( dev-lang/ruby )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- java? ( dev-lang/swig )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? (
- dev-lang/swig
- ${PYTHON_DEPS}
- )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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) ... broken on ~x86
-# - 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 'qt4'):
-# 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_prepare() {
- epatch \
- "${FILESDIR}"/${P}-Xaw-configure.patch \
- "${FILESDIR}"/${P}-automake-1.11.2.patch \
- "${FILESDIR}"/${P}-dot-pangocairo-link.patch
-
- # 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
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
-
- # no nls, no gettext, no iconv macro, so disable it
- use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
- # 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
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- eautoreconf
-}
-
-src_configure() {
- # libtool file collision, bug 276609
- local myconf="--without-included-ltdl --disable-ltdl-install"
-
- myconf="${myconf}
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt4)
- $(use_with lasi)
- $(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-gdk-pixbuf
- --without-ming"
-
- # new/experimental features, to be tested, disable for now
- myconf="${myconf}
- --without-cgraph
- --without-glitz
- --without-ipsepcola
- --without-smyrna
- --without-visio"
-
- # Bindings:
- myconf="${myconf}
- --disable-guile
- --disable-io
- $(use_enable java)
- --disable-lua
- --disable-ocaml
- $(use_enable perl)
- --disable-php
- $(use_enable python)
- --disable-r
- $(use_enable ruby)
- --disable-sharp
- $(use_enable tcl)"
-
- econf \
- --enable-ltdl \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- ${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
-
- use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
- dodoc AUTHORS ChangeLog NEWS README
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c
-}
diff --git a/media-gfx/graphviz/graphviz-2.34.0.ebuild b/media-gfx/graphviz/graphviz-2.34.0.ebuild
deleted file mode 100644
index 5844049..0000000
--- a/media-gfx/graphviz/graphviz-2.34.0.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-#original KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
- sys-libs/zlib
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1
- >=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
- !<=sci-chemistry/cluster-1.3.081231
- virtual/jpeg:0
- virtual/libiconv
- X? (
- x11-libs/libXaw
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- )
- cairo? (
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10[svg]
- )
- devil? ( media-libs/devil[png,jpeg] )
- postscript? ( app-text/ghostscript-gpl )
- gtk? ( x11-libs/gtk+:2 )
- gts? ( sci-libs/gts )
- lasi? ( media-libs/lasi )
- pdf? ( app-text/poppler )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- ruby? ( dev-lang/ruby )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- guile? ( dev-scheme/guile dev-lang/swig )
- java? ( >=virtual/jdk-1.5 dev-lang/swig )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? (
- dev-lang/swig
- ${PYTHON_DEPS}
- )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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
-# - 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 'qt4'):
-# 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
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-Xaw-configure.patch \
- "${FILESDIR}"/${P}-dot-pangocairo-link.patch
-
- # 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
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
-
- # no nls, no gettext, no iconv macro, so disable it
- use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
- # 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
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- use java && append-cppflags $(java-pkg_get-jni-cflags)
-
- eautoreconf
-}
-
-src_configure() {
- # libtool file collision, bug 276609
- local myconf="--without-included-ltdl --disable-ltdl-install"
-
- myconf="${myconf}
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt4)
- $(use_with lasi)
- $(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
- $(use_enable gdk-pixbuf)
- --without-ming"
-
- # new/experimental features, to be tested, disable for now
- myconf="${myconf}
- --with-cgraph
- --without-glitz
- --without-ipsepcola
- --without-smyrna
- --without-visio"
-
- # Bindings:
- myconf="${myconf}
- $(use_enable guile)
- --disable-io
- $(use_enable java)
- --disable-lua
- --disable-ocaml
- $(use_enable perl)
- --disable-php
- $(use_enable python)
- --disable-r
- $(use_enable ruby)
- --disable-sharp
- $(use_enable tcl)"
-
- econf \
- --enable-ltdl \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- ${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
-
- use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
- dodoc AUTHORS ChangeLog NEWS README
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c
-}
diff --git a/media-gfx/graphviz/graphviz-2.36.0.ebuild b/media-gfx/graphviz/graphviz-2.36.0.ebuild
deleted file mode 100644
index 19ce277..0000000
--- a/media-gfx/graphviz/graphviz-2.36.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
- sys-libs/zlib
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1
- >=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
- !<=sci-chemistry/cluster-1.3.081231
- sys-devel/libtool
- virtual/jpeg:0
- virtual/libiconv
- X? (
- x11-libs/libXaw
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- )
- cairo? (
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10[svg]
- )
- devil? ( media-libs/devil[png,jpeg] )
- postscript? ( app-text/ghostscript-gpl )
- gtk? ( x11-libs/gtk+:2 )
- gts? ( sci-libs/gts )
- lasi? ( media-libs/lasi )
- pdf? ( app-text/poppler )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- ruby? ( dev-lang/ruby )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- guile? ( dev-scheme/guile dev-lang/swig )
- java? ( >=virtual/jdk-1.5 dev-lang/swig )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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
-# - 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 'qt4'):
-# 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
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
- "${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
-
- # 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
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
-
- # no nls, no gettext, no iconv macro, so disable it
- use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
- # 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
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- use java && append-cppflags $(java-pkg_get-jni-cflags)
-
- eautoreconf
-}
-
-src_configure() {
- # libtool file collision, bug 276609
- local myconf="--without-included-ltdl --disable-ltdl-install"
-
- myconf="${myconf}
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt4)
- $(use_with lasi)
- $(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
- $(use_enable gdk-pixbuf)
- --without-ming"
-
- # new/experimental features, to be tested, disable for now
- myconf="${myconf}
- --with-cgraph
- --without-glitz
- --without-ipsepcola
- --without-smyrna
- --without-visio"
-
- # Bindings:
- myconf="${myconf}
- $(use_enable guile)
- --disable-io
- $(use_enable java)
- --disable-lua
- --disable-ocaml
- $(use_enable perl)
- --disable-php
- $(use_enable python)
- --disable-r
- $(use_enable ruby)
- --disable-sharp
- $(use_enable tcl)"
-
- econf \
- --enable-ltdl \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- ${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
-
- use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
- dodoc AUTHORS ChangeLog NEWS README
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c
-}
diff --git a/media-gfx/graphviz/graphviz-2.36.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
similarity index 96%
rename from media-gfx/graphviz/graphviz-2.36.0-r1.ebuild
rename to media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
index b29219c..6b1b1f6 100644
--- a/media-gfx/graphviz/graphviz-2.36.0-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
@@ -4,6 +4,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
+WANT_AUTOMAKE=1.13 #547168
inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
@@ -22,13 +23,13 @@ RESTRICT="test"
RDEPEND="
sys-libs/zlib
>=dev-libs/expat-2
- >=dev-libs/glib-2.11.1
+ >=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
!<=sci-chemistry/cluster-1.3.081231
- sys-devel/libtool
virtual/jpeg:0
virtual/libiconv
X? (
@@ -54,12 +55,13 @@ RDEPEND="
dev-qt/qtcore:4
dev-qt/qtgui:4
)
- ruby? ( dev-lang/ruby )
+ ruby? ( dev-lang/ruby:* )
svg? ( gnome-base/librsvg )
tcl? ( >=dev-lang/tcl-8.3:0= )"
DEPEND="${RDEPEND}
virtual/pkgconfig
sys-devel/flex
+ sys-devel/libtool
guile? ( dev-scheme/guile dev-lang/swig )
java? ( >=virtual/jdk-1.5 dev-lang/swig )
nls? ( >=sys-devel/gettext-0.14.5 )
@@ -141,9 +143,6 @@ src_prepare() {
"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
"${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
- epatch \
- "${FILESDIR}"/${PN}-2.38-fix-backslashes.patch
-
# ToDo: Do the same thing for examples and/or
# write a patch for a configuration-option
# and send it to upstream
@@ -185,8 +184,10 @@ src_configure() {
$(use_with devil)
$(use_with gtk)
$(use_with gts)
- $(use_with qt4)
+ $(use_with qt4 qt)
$(use_with lasi)
+ $(use_with pdf poppler)
+ $(use_with postscript ghostscript)
$(use_with svg rsvg)
$(use_with X x)
$(use_with X xaw)
@@ -257,3 +258,8 @@ pkg_postinst() {
# to configure
dot -c
}
+
+pkg_postrm() {
+ # Remove cruft, bug #547344
+ rm -f "${EROOT}usr/lib/graphviz/config{,6}"
+}
diff --git a/media-gfx/graphviz/graphviz-2.38.0.ebuild b/media-gfx/graphviz/graphviz-2.38.0.ebuild
deleted file mode 100644
index 19ce277..0000000
--- a/media-gfx/graphviz/graphviz-2.38.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
- sys-libs/zlib
- >=dev-libs/expat-2
- >=dev-libs/glib-2.11.1
- >=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
- !<=sci-chemistry/cluster-1.3.081231
- sys-devel/libtool
- virtual/jpeg:0
- virtual/libiconv
- X? (
- x11-libs/libXaw
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- )
- cairo? (
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10[svg]
- )
- devil? ( media-libs/devil[png,jpeg] )
- postscript? ( app-text/ghostscript-gpl )
- gtk? ( x11-libs/gtk+:2 )
- gts? ( sci-libs/gts )
- lasi? ( media-libs/lasi )
- pdf? ( app-text/poppler )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- ruby? ( dev-lang/ruby )
- svg? ( gnome-base/librsvg )
- tcl? ( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- guile? ( dev-scheme/guile dev-lang/swig )
- java? ( >=virtual/jdk-1.5 dev-lang/swig )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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
-# - 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 'qt4'):
-# 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
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
- "${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
-
- # 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
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
-
- # no nls, no gettext, no iconv macro, so disable it
- use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
- # 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
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- use java && append-cppflags $(java-pkg_get-jni-cflags)
-
- eautoreconf
-}
-
-src_configure() {
- # libtool file collision, bug 276609
- local myconf="--without-included-ltdl --disable-ltdl-install"
-
- myconf="${myconf}
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt4)
- $(use_with lasi)
- $(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
- $(use_enable gdk-pixbuf)
- --without-ming"
-
- # new/experimental features, to be tested, disable for now
- myconf="${myconf}
- --with-cgraph
- --without-glitz
- --without-ipsepcola
- --without-smyrna
- --without-visio"
-
- # Bindings:
- myconf="${myconf}
- $(use_enable guile)
- --disable-io
- $(use_enable java)
- --disable-lua
- --disable-ocaml
- $(use_enable perl)
- --disable-php
- $(use_enable python)
- --disable-r
- $(use_enable ruby)
- --disable-sharp
- $(use_enable tcl)"
-
- econf \
- --enable-ltdl \
- --disable-silent-rules \
- $(use_enable static-libs static) \
- ${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
-
- use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
- dodoc AUTHORS ChangeLog NEWS README
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/
@ 2016-08-26 21:15 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2016-08-26 21:15 UTC (permalink / raw
To: gentoo-commits
commit: eece1257212526702c8ba11fa31bffcb9c979911
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 21:14:45 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 21:15:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eece1257
media-gfx/graphviz: Add conditional macro definition
Gentoo-bug: 574484
* Merged the 3 following upstream commits into one patch:
- https://github.com/ellson/graphviz/commit/8da53964edec8a665c3996d483df243eb150c2c4
- https://github.com/ellson/graphviz/commit/f97c86e975aa472272d0a5b5a042b96eb77ebbc0
- https://github.com/ellson/graphviz/commit/c3e9169655c1fca8006d3d455381848730531bd4
Package-Manager: portage-2.3.0
.../files/graphviz-2.38.0-ghostscript-9.18.patch | 32 ++++++++++++++++++++++
media-gfx/graphviz/graphviz-2.38.0-r1.ebuild | 7 +++--
2 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch b/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch
new file mode 100644
index 00000000..9d0d78a
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch
@@ -0,0 +1,32 @@
+From 8da53964edec8a665c3996d483df243eb150c2c4 Mon Sep 17 00:00:00 2001
+From: Jakob Nixdorf <flocke@shadowice.org>
+Date: Fri, 22 Jan 2016 20:10:42 +0100
+Subject: [PATCH] Fix build with ghostscript-9.18.
+
+--- a/plugin/gs/gvloadimage_gs.c
++++ b/plugin/gs/gvloadimage_gs.c
+@@ -32,6 +32,24 @@
+ #include <ghostscript/ierrors.h>
+ #include <cairo/cairo.h>
+
++
++/**
++ * Ensure compatibility with Ghostscipt versions newer than 9.18
++ * while maintaining compatibility with the older versions.
++ **/
++
++#ifndef e_VMerror
++#define e_VMerror gs_error_VMerror
++#endif
++
++#ifndef e_unregistered
++#define e_unregistered gs_error_unregistered
++#endif
++
++#ifndef e_invalidid
++#define e_invalidid gs_error_invalidid
++#endif
++
+ #ifdef WIN32
+ #define NUL_FILE "nul"
+ #else
diff --git a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
index a8c0d44..bea6c12 100644
--- a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -140,7 +140,8 @@ pkg_setup() {
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
- "${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
+ "${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch \
+ "${FILESDIR}"/${PN}-2.38.0-ghostscript-9.18.patch
# ToDo: Do the same thing for examples and/or
# write a patch for a configuration-option
@@ -155,7 +156,7 @@ src_prepare() {
# This is an old version of libtool
# use the ./configure option to exclude its use, and
# delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
+ rm -rf libltdl || die
# no nls, no gettext, no iconv macro, so disable it
use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/
@ 2017-03-17 21:35 Andreas Hüttel
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Hüttel @ 2017-03-17 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 80232c73b05f744e16968c5e60968b5951a6f4cc
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 21:35:28 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 21:35:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80232c73
media-gfx/graphviz: Remove old
Now all versions without perl slot operator are gone.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-gfx/graphviz/Manifest | 1 -
.../files/graphviz-2.26.3-automake-1.11.2.patch | 35 ----
.../files/graphviz-2.26.3-libtool-configure.patch | 52 -----
.../graphviz/files/graphviz-2.26.3-libtool.patch | 27 ---
media-gfx/graphviz/graphviz-2.26.3-r4.ebuild | 223 ---------------------
5 files changed, 338 deletions(-)
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index c42f116e969..64a0ea90523 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,2 +1 @@
-DIST graphviz-2.26.3.tar.gz 17092429 SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1 SHA512 6225141752318af0b50714d70d31dd1ef1bc414d134d22f066f159843991194215bb9bc4e8df38a194e1de67ebbf137d371e875948fa6a6eebfca9df1a414a6d WHIRLPOOL ca35d0ed9cb3751ae968e1c6d425efe42e8b681685eb66f975c0ff1b73e245fc3db6418ec69300331c94275fe3bfcdcd168b931b880c280f3dd63f1f03c4d4db
DIST graphviz-2.38.0.tar.gz 25848858 SHA256 81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531 WHIRLPOOL b59bb517c4aa690ffd23e1b4d448d5dbaae5594eb1059d574e0cb3bf2091beb9ed867bd4fa7e8ca0259863f24849c96d4d1da056091922bf33ace7da43c8b5d4
diff --git a/media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch b/media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch
deleted file mode 100644
index 86280f2b05d..00000000000
--- a/media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Install dir ( buiding with media-libs/ming ):
- /usr/$(get_libdir)/graphviz/Bitstream_Vera_Serif.fdb
- /usr/$(get_libdir)/graphviz/Bitstream_Vera_Sans.fdb
- /usr/include/graphviz/gv.cpp
- /usr/include/graphviz/gv.i
-
-Due to the following change, {pkglib,pkginclude}_DATA is invalid:
- http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
----
-diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
---- a/plugin/ming/Makefile.am
-+++ b/plugin/ming/Makefile.am
-@@ -17,7 +17,8 @@ lib_LTLIBRARIES = libgvplugin_ming.la
- else
- pkglib_LTLIBRARIES = libgvplugin_ming.la
- endif
--pkglib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
-+fdblibdir = $(libdir)/@PACKAGE@
-+fdblib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
- endif
-
- libgvplugin_ming_C_la_SOURCES = \
-diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
---- a/tclpkg/gv/Makefile.am
-+++ b/tclpkg/gv/Makefile.am
-@@ -258,7 +258,7 @@ libgv_tcl_la_CPPFLAGS = $(BASECPPFLAGS)
- gv_tcl.cpp: gv.i
- $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
-
--pkginclude_DATA = gv.i gv.cpp
-+pkginclude_HEADERS = gv.i gv.cpp
- pkglib_LTLIBRARIES =
- man_MANS =
- pdf_DATA =
diff --git a/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch b/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch
deleted file mode 100644
index 142aea2843f..00000000000
--- a/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-backport newer libtool logic
-
-https://bugs.gentoo.org/539032
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -464,28 +464,15 @@
- dnl -----------------------------------
- dnl libtool ltdl on-demand plugin loading
-
--m4_ifdef([LT_INIT],
-- [ #code that is for Libtool 2.x
--AM_PROG_LIBTOOL
-- ],
-- [ #code that is for 1.5.x
-- ])
-+LT_INIT([dlopen])
-+LT_CONFIG_LTDL_DIR([libltdl])
-+LTDL_INIT
-+
- AC_ARG_ENABLE(ltdl,
- [AS_HELP_STRING([--enable-ltdl],[support on-demand plugin loading])])
- if test "x$enable_ltdl" != "xno"; then
- AC_DEFINE(ENABLE_LTDL,1,[Define if you want on-demand plugin loading])
-- AC_LIBTOOL_DLOPEN
--m4_ifdef([LT_INIT],
-- [ #code that is for Libtool 2.x
-- LT_CONFIG_LTDL_DIR([libltdl])
-- LTDL_INIT
-- ],
-- [ #code that is for 1.5.x
-- AC_CONFIG_SUBDIRS([libltdl])
-- ])
- use_ltdl="Yes"
--
-- AC_LIBLTDL_CONVENIENCE
- if test "x$DARWIN9" = "xyes"; then
- LIBLTDL_LDFLAGS="-Wl,-unexported_symbol,_lt_*"
- fi
-@@ -494,12 +483,6 @@
- AC_SUBST(INCLTDL)
- AC_SUBST(LIBLTDL)
- AC_SUBST(LIBLTDL_LDFLAGS)
--m4_ifdef([LT_INIT],
-- [ #code that is for Libtool 2.x
-- ],
-- [ #code that is for 1.5.x
--AM_PROG_LIBTOOL
-- ])
-
- # Checks for libraries.
- #AC_CHECK_LIB([ICE], [main])
diff --git a/media-gfx/graphviz/files/graphviz-2.26.3-libtool.patch b/media-gfx/graphviz/files/graphviz-2.26.3-libtool.patch
deleted file mode 100644
index f82312dbbeb..00000000000
--- a/media-gfx/graphviz/files/graphviz-2.26.3-libtool.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://bugs.gentoo.org/339298
-
---- lib/gvc/gvcext.h
-+++ lib/gvc/gvcext.h
-@@ -80,9 +80,11 @@
- #if defined(GVDLL)
- __declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
- #else
-+#if !defined(LTDL_H)
- extern lt_symlist_t lt_preloaded_symbols[];
- #endif
- #endif
-+#endif
-
-
- #ifdef __cplusplus
---- lib/gvc/Makefile.am
-+++ lib/gvc/Makefile.am
-@@ -18,7 +18,7 @@
- -I$(top_srcdir)/lib/pathplan \
- -I$(top_srcdir)/lib/$(GRAPH) \
- -I$(top_srcdir)/lib/cdt \
-- $(INCLTDL) -I$(top_srcdir)/libltdl \
-+ $(INCLTDL) \
- -DGVLIBDIR=\"$(pkglibdir)\"
-
- if WITH_WIN32
diff --git a/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild b/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild
deleted file mode 100644
index fd33185512e..00000000000
--- a/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-PYTHON_DEPEND="python? 2"
-
-inherit eutils autotools multilib python flag-o-matic
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="cairo doc examples gtk java lasi nls perl python ruby static-libs tcl elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/expat-2.0.0
- >=dev-libs/glib-2.11.1
- >=media-libs/fontconfig-2.3.95
- >=media-libs/freetype-2.1.10
- >=media-libs/gd-2.0.28[fontconfig,jpeg,png,truetype,zlib]
- >=media-libs/libpng-1.4
- virtual/jpeg:0
- virtual/libiconv
- cairo? (
- x11-libs/libXaw
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10[svg]
- )
- gtk? (
- x11-libs/gtk+:2
- x11-libs/libXaw
- >=x11-libs/pango-1.12
- >=x11-libs/cairo-1.1.10
- )
- lasi? ( media-libs/lasi )
- perl? ( dev-lang/perl )
- ruby? ( dev-lang/ruby )
- tcl? ( >=dev-lang/tcl-8.3:0 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- java? ( dev-lang/swig )
- 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.
-# gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-# Disabled, GTK-1 junk.
-# - ming
-# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-# incomplete.
-# - cairo:
-# Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib :
-# needs cairo+pango,
-# can make use of gnomeui and inotify support,
-# needs libXaw for UI
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... broken on ~x86
-# - 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, gvpr, lefty, lneato, tools/* :)
-# Lefty needs Xaw and X to build
-
-pkg_setup() {
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-libtool.patch \
- "${FILESDIR}"/${P}-libtool-configure.patch \
- "${FILESDIR}"/${P}-automake-1.11.2.patch
-
- # ToDo: Do the same thing for examples and/or
- # write a patch for a configuration-option
- # and send it to upstream
- if ! use doc ; then
- find . -iname Makefile.am \
- | xargs sed -i -e '/html_DATA/d' -e '/pdf_DATA/d' || die
- fi
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -rf libltdl
-
- # no nls, no gettext, no iconv macro, so disable it
- use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
-
- # 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
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- eautoreconf
-}
-
-src_configure() {
- # libtool file collision, bug 276609
- local myconf="--without-included-ltdl --disable-ltdl-install"
-
- # Core functionality:
- # All of X, cairo-output, gtk need the pango+cairo functionality
- if use gtk || use cairo; then
- myconf="${myconf} --with-x"
- else
- myconf="${myconf} --without-x"
- fi
- myconf="${myconf}
- $(use_with cairo pangocairo)
- $(use_with gtk)
- $(use_with lasi)
- --with-digcola
- --with-fontconfig
- --with-freetype2
- --with-ipsepcola
- --with-libgd
- --with-sfdp
- --without-gdk-pixbuf
- --without-ming"
-
- # new/experimental features, to be tested, disable for now
- myconf="${myconf}
- --without-cgraph
- --without-devil
- --without-digcola
- --without-ipsepcola
- --without-rsvg
- --without-smyrna"
-
- # Bindings:
- myconf="${myconf}
- --disable-guile
- --disable-io
- $(use_enable java)
- --disable-lua
- --disable-ocaml
- $(use_enable perl)
- --disable-php
- $(use_enable python)
- --disable-r
- $(use_enable ruby)
- --disable-sharp
- $(use_enable tcl)"
-
- econf \
- --enable-ltdl \
- $(use_enable static-libs static) \
- ${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 || die "emake install failed"
-
- use examples || rm -rf "${D}/usr/share/graphviz/demo"
-
- if ! use static-libs; then
- find "${ED}"/usr/$(get_libdir)/ -name '*.la' -delete || die
- fi
-
- dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
- # This actually works if --enable-ltdl is passed
- # to configure
- dot -c
- use python && python_mod_optimize gv.py
-}
-
-pkg_postrm() {
- use python && python_mod_cleanup gv.py
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/
@ 2020-01-01 15:19 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-01-01 15:19 UTC (permalink / raw
To: gentoo-commits
commit: e9da6dfe589403a731f97a663304866748dec627
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 15:15:48 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 15:19:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9da6dfe
media-gfx/graphviz: Drop 2.42.1-r1
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/graphviz/Manifest | 1 -
.../files/graphviz-2.42.1-libgv_python.patch | 15 --
.../graphviz/files/graphviz-2.42.1-math.patch | 38 ---
media-gfx/graphviz/graphviz-2.42.1-r1.ebuild | 277 ---------------------
4 files changed, 331 deletions(-)
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 24c3de5deac..fc54be26fd3 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,2 +1 @@
-DIST graphviz-2.42.1.tar.gz 25543401 BLAKE2B e64044923a823f6fbe91b498b04fffe3e5b6803c55c5ce29a60b16a38d97260061b013e8bd13bc99f360d035c840f18a01301b29ca1cb73c4be87843f18c45fc SHA512 ac263df086eea6faf682f493756b79a0af8bae3f515cd8c09238e89f295226baf743a3fd22d977ef6f223388769ef11241dfb2fdb6087305ce4fdd3fa8ed2f78
DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
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
deleted file mode 100644
index 426ebbe14a3..00000000000
--- a/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/tclpkg/gv/Makefile.am
-+++ b/tclpkg/gv/Makefile.am
-@@ -430,10 +430,10 @@
- (cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
- endif
- if WITH_PYTHON2
-- (cd $(DESTDIR)$(pkgpython2dir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
-+ (cd $(DESTDIR)$(pkgpython2dir); rm -f _gv.so; $(LN_S) libgv_python2.so _gv.so;)
- endif
- if WITH_PYTHON3
-- (cd $(DESTDIR)$(pkgpython3dir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
-+ (cd $(DESTDIR)$(pkgpython3dir); rm -f _gv.so; $(LN_S) libgv_python3.so _gv.so;)
- endif
- if WITH_R
- (cd $(DESTDIR)$(pkgRdir); rm -f gv.so; $(LN_S) libgv_R.so gv.so;)
diff --git a/media-gfx/graphviz/files/graphviz-2.42.1-math.patch b/media-gfx/graphviz/files/graphviz-2.42.1-math.patch
deleted file mode 100644
index 59b84817a99..00000000000
--- a/media-gfx/graphviz/files/graphviz-2.42.1-math.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/lib/sfio/sfdlen.c b/lib/sfio/sfdlen.c
-index 2b4f8b0a3..3b2c75066 100644
---- a/lib/sfio/sfdlen.c
-+++ b/lib/sfio/sfdlen.c
-@@ -13,6 +13,8 @@
-
- #include "sfhdr.h"
-
-+#include <math.h>
-+
- /* Return the length of a double value if coded in a portable format
- **
- ** Written by Kiem-Phong Vo
-diff --git a/lib/sfio/sfgetd.c b/lib/sfio/sfgetd.c
-index 535b2cb9a..607681e60 100644
---- a/lib/sfio/sfgetd.c
-+++ b/lib/sfio/sfgetd.c
-@@ -13,6 +13,8 @@
-
- #include "sfhdr.h"
-
-+#include <math.h>
-+
- /* Read a portably coded double value
- **
- ** Written by Kiem-Phong Vo
-diff --git a/lib/sfio/sfputd.c b/lib/sfio/sfputd.c
-index 64ab9eaf3..a2dbd225c 100644
---- a/lib/sfio/sfputd.c
-+++ b/lib/sfio/sfputd.c
-@@ -14,6 +14,7 @@
- #include "sfhdr.h"
-
- #include <float.h>
-+#include <math.h>
-
- /* Write out a floating point value in a portable format
- **
diff --git a/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild
deleted file mode 100644
index 4dac9f5771e..00000000000
--- a/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-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/"
-SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-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"
-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"
-
-REQUIRED_USE="
- !cairo? ( !X !gtk !postscript !lasi )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Requires ksh, tests against installed package, missing files and directory
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=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 )
- 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="${COMMON_DEPEND}
- sys-devel/flex
- sys-devel/libtool
- virtual/pkgconfig
- guile? ( dev-lang/swig dev-scheme/guile )
- java? ( dev-lang/swig >=virtual/jdk-1.5 )
- nls? ( >=sys-devel/gettext-0.14.5 )
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- tcl? ( dev-lang/swig )
-"
-RDEPEND="${COMMON_DEPEND}
- !<=sci-chemistry/cluster-1.3.081231
-"
-
-# 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}"/${P}-libgv_python.patch
- "${FILESDIR}"/${P}-math.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
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -r libltdl || die
-
- # 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
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- use java && append-cppflags $(java-pkg_get-jni-cflags)
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --enable-ltdl
- $(use_with cairo pangocairo)
- $(use_with devil)
- $(use_enable gdk-pixbuf)
- $(use_with gtk)
- $(use_with gts)
- $(use_with qt5 qt)
- $(use_with lasi)
- $(use_with pdf poppler)
- $(use_with postscript ghostscript)
- $(use_enable static-libs static)
- $(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
-
- if ! use static-libs; then
- find "${ED}" -name '*.la' -delete || die
- fi
-
- einstalldocs
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python2" \
- "${D}/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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/
@ 2021-01-23 21:13 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-01-23 21:13 UTC (permalink / raw
To: gentoo-commits
commit: ffccfc82f2951e38da387e1fcdedfa9e0c65e207
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 18:34:22 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 21:11:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffccfc82
media-gfx/graphviz: Drop 2.42.3-r1
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/graphviz/Manifest | 1 -
media-gfx/graphviz/files/dotty_change_button.patch | 22 --
media-gfx/graphviz/graphviz-2.42.3-r1.ebuild | 281 ---------------------
3 files changed, 304 deletions(-)
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index a56cb546665..eec2245c13b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,2 +1 @@
-DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
diff --git a/media-gfx/graphviz/files/dotty_change_button.patch b/media-gfx/graphviz/files/dotty_change_button.patch
deleted file mode 100644
index 8c5f34a2e12..00000000000
--- a/media-gfx/graphviz/files/dotty_change_button.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty
-index a8c9116..a708c61 100644
---- a/cmd/dotty/dotty_ui.lefty
-+++ b/cmd/dotty/dotty_ui.lefty
-@@ -342,7 +342,7 @@ dotty.protovt.normal.uifuncs = [
- else
- gt.insertedge (gt, data.pobj, null, data.obj, null, null, 1);
- };
-- 'rightdown' = function (data) {
-+ 'rightup' = function (data) {
- local vt, gt, menu, i;
-
- vt = dotty.views[data.widget];
-@@ -447,7 +447,7 @@ dotty.protovt.birdseye.uifuncs = [
- 'middledown' = dotty.protovt.normal.uifuncs.middledown;
- 'middlemove' = dotty.protovt.normal.uifuncs.middlemove;
- 'middleup' = dotty.protovt.normal.uifuncs.middleup;
-- 'rightdown' = dotty.protovt.normal.uifuncs.rightdown;
-+ 'rightup' = dotty.protovt.normal.uifuncs.rightup;
- 'keyup' = dotty.protovt.normal.uifuncs.keyup;
- 'redraw' = dotty.protovt.normal.uifuncs.redraw;
- 'closeview' = dotty.protovt.normal.uifuncs.closeview;
diff --git a/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild b/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
deleted file mode 100644
index 4f6683ad5e3..00000000000
--- a/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-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/"
-SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 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 static-libs svg tcl X elibc_FreeBSD"
-
-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
- 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 )
- 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}
- guile? (
- dev-lang/swig
- dev-scheme/guile
- )
- java? (
- dev-lang/swig
- >=virtual/jdk-1.5
- )
-"
-
-# 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}"/dotty_change_button.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
-
- # This is an old version of libtool
- # use the ./configure option to exclude its use, and
- # delete the dir since we don't need to eautoreconf it
- rm -r libltdl || die
-
- # 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
-
- # workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
- use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
- use java && append-cppflags $(java-pkg_get-jni-cflags)
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --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_enable static-libs static)
- $(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
-
- if ! use static-libs; then
- find "${ED}" -name '*.la' -delete || die
- fi
-
- einstalldocs
-
- use python && python_optimize \
- "${D}$(python_get_sitedir)" \
- "${D}/usr/$(get_libdir)/graphviz/python2" \
- "${D}/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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/
@ 2022-06-25 20:32 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2022-06-25 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 2882a4e42336fdcbc7d82476327a99e1f369d4dc
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 20:32:45 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 20:32:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2882a4e4
media-gfx/graphviz: fix -D_FORTIFY_SOURCE=2 with Clang
* Rebased patch by Nicholas Vinson <nvinson234 <AT> gmail.com>
Closes: https://bugs.gentoo.org/853175
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/graphviz-4.0.0-clang-printf-alike.patch | 221 +++++++++++++++++++++
...phviz-4.0.0.ebuild => graphviz-4.0.0-r1.ebuild} | 5 +
2 files changed, 226 insertions(+)
diff --git a/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch b/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch
new file mode 100644
index 000000000000..ef213bccd8ab
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch
@@ -0,0 +1,221 @@
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index f38cc8ff5..4f1a127a2 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
+
+ ## [Unreleased (4.0.1)]
+
++### Fixed
++
++- **Breaking**: The 4.0.0 change replacing the `Agiodisc_t` struct member
++ `putstr` by `printf` has been reverted
++
+ ## [4.0.0] – 2022-05-29
+
+ ### Changed
+diff --git a/cmd/gvpr/gvprmain.c b/cmd/gvpr/gvprmain.c
+index 188cfdf94..92872f8cd 100644
+--- a/cmd/gvpr/gvprmain.c
++++ b/cmd/gvpr/gvprmain.c
+@@ -47,14 +47,17 @@ static int iofread(void *chan, char *buf, int bufsize)
+ return (int)fread(buf, 1, (size_t)bufsize, chan);
+ }
+
++static int ioputstr(void *chan, const char *str)
++{
++ return fputs(str, chan);
++}
++
+ static int ioflush(void *chan)
+ {
+ return fflush(chan);
+ }
+
+-typedef int (*printfn)(void *chan, const char *format, ...);
+-
+-static Agiodisc_t gprIoDisc = { iofread, (printfn)fprintf, ioflush };
++static Agiodisc_t gprIoDisc = { iofread, ioputstr, ioflush };
+
+ static Agdisc_t gprDisc = { &AgMemDisc, &AgIdDisc, &gprIoDisc };
+
+diff --git a/lib/cgraph/cgraph.3 b/lib/cgraph/cgraph.3
+index ed7392c06..67e35c2e9 100644
+--- a/lib/cgraph/cgraph.3
++++ b/lib/cgraph/cgraph.3
+@@ -487,14 +487,14 @@ The I/O discipline provides an abstraction for the reading and writing of graphs
+ .P0
+ struct Agiodisc_s {
+ int (*fread)(void *chan, char *buf, int bufsize);
+- int (*printf)(void *chan, const char *format, ...);
++ int (*putstr)(void *chan, char *str);
+ int (*flush)(void *chan); /* sync */
+ } ;
+ .P1
+ Normally, the \fBFILE\fP structure and its related functions are used for I/O. At times, though,
+ an application may need to use a totally different type of character source. The associated
+ state or stream information is provided by the \fIchan\fP argument to \fBagread\fP or \fBagwrite\fP.
+-The discipline function \fIfread\fP and \fIprintf\fP provide the corresponding functions for
++The discipline function \fIfread\fP and \fIputstr\fP provide the corresponding functions for
+ read and writing.
+
+ .SH "MEMORY DISCIPLINE"
+diff --git a/lib/cgraph/cgraph.h b/lib/cgraph/cgraph.h
+index 7b005c442..cbec3bbe6 100644
+--- a/lib/cgraph/cgraph.h
++++ b/lib/cgraph/cgraph.h
+@@ -169,7 +169,7 @@ struct Agiddisc_s { /* object ID allocator */
+
+ struct Agiodisc_s {
+ int (*afread) (void *chan, char *buf, int bufsize);
+- int (*printf)(void *chan, const char *format, ...);
++ int (*putstr) (void *chan, const char *str);
+ int (*flush) (void *chan); /* sync */
+ /* error messages? */
+ };
+diff --git a/lib/cgraph/io.c b/lib/cgraph/io.c
+index d8b136804..66c605ae6 100644
+--- a/lib/cgraph/io.c
++++ b/lib/cgraph/io.c
+@@ -24,15 +24,17 @@ static int iofread(void *chan, char *buf, int bufsize)
+ }
+
+ /* default IO methods */
++static int ioputstr(void *chan, const char *str)
++{
++ return fputs(str, chan);
++}
+
+ static int ioflush(void *chan)
+ {
+ return fflush(chan);
+ }
+
+-typedef int (*printfn)(void *chan, const char *format, ...);
+-
+-Agiodisc_t AgIoDisc = { iofread, (printfn)fprintf, ioflush };
++Agiodisc_t AgIoDisc = { iofread, ioputstr, ioflush };
+
+ typedef struct {
+ const char *data;
+@@ -78,7 +80,7 @@ static Agraph_t *agmemread0(Agraph_t *arg_g, const char *cp)
+ rdr_t rdr;
+ Agdisc_t disc;
+
+- memIoDisc.printf = AgIoDisc.printf;
++ memIoDisc.putstr = AgIoDisc.putstr;
+ memIoDisc.flush = AgIoDisc.flush;
+ rdr.data = cp;
+ rdr.len = strlen(cp);
+diff --git a/lib/cgraph/write.c b/lib/cgraph/write.c
+index e14f7d835..9e72d2c5c 100644
+--- a/lib/cgraph/write.c
++++ b/lib/cgraph/write.c
+@@ -26,7 +26,7 @@ typedef void iochan_t;
+
+ static int ioput(Agraph_t * g, iochan_t * ofile, char *str)
+ {
+- return AGDISC(g, io)->printf(ofile, "%s", str);
++ return AGDISC(g, io)->putstr(ofile, str);
+
+ }
+
+diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c
+index a7fe27bf5..3704f51d9 100644
+--- a/lib/gvpr/compile.c
++++ b/lib/gvpr/compile.c
+@@ -66,14 +66,17 @@ static int iofread(void *chan, char *buf, int bufsize)
+ return (int)read(sffileno(chan), buf, bufsize);
+ }
+
++static int ioputstr(void *chan, const char *str)
++{
++ return sfputr(chan, str, -1);
++}
++
+ static int ioflush(void *chan)
+ {
+ return sfsync(chan);
+ }
+
+-typedef int (*printfn)(void *chan, const char *format, ...);
+-
+-static Agiodisc_t gprIoDisc = { iofread, (printfn)sfprintf, ioflush };
++static Agiodisc_t gprIoDisc = { iofread, ioputstr, ioflush };
+
+ #ifdef GVDLL
+ static Agdisc_t gprDisc = { 0, 0, &gprIoDisc };
+diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c
+index c45563460..63eb5e535 100644
+--- a/plugin/core/gvrender_core_dot.c
++++ b/plugin/core/gvrender_core_dot.c
+@@ -511,7 +511,7 @@ static void xdot_end_graph(graph_t* g)
+ textflags[EMIT_GLABEL] = 0;
+ }
+
+-typedef int (*printfn)(void *chan, const char *format, ...);
++typedef int (*putstrfn) (void *chan, const char *str);
+ typedef int (*flushfn) (void *chan);
+ static void dot_end_graph(GVJ_t *job)
+ {
+@@ -521,7 +521,7 @@ static void dot_end_graph(GVJ_t *job)
+
+ if (io.afread == NULL) {
+ io.afread = AgIoDisc.afread;
+- io.printf = (printfn)gvprintf;
++ io.putstr = (putstrfn)gvputs;
+ io.flush = (flushfn)gvflush;
+ }
+
+diff --git a/plugin/core/gvrender_core_json.c b/plugin/core/gvrender_core_json.c
+index bab5d64af..88715a93a 100644
+--- a/plugin/core/gvrender_core_json.c
++++ b/plugin/core/gvrender_core_json.c
+@@ -693,7 +693,7 @@ static void write_graph(Agraph_t * g, GVJ_t * job, int top, state_t* sp)
+ gvputs(job, "}");
+ }
+
+-typedef int (*printfn)(void *chan, const char *format, ...);
++typedef int (*putstrfn) (void *chan, const char *str);
+ typedef int (*flushfn) (void *chan);
+
+ static void json_end_graph(GVJ_t *job)
+@@ -704,7 +704,7 @@ static void json_end_graph(GVJ_t *job)
+
+ if (io.afread == NULL) {
+ io.afread = AgIoDisc.afread;
+- io.printf = (printfn)gvprintf;
++ io.putstr = (putstrfn)gvputs;
+ io.flush = (flushfn)gvflush;
+ }
+
+diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c
+index 335d8e469..b747124cf 100644
+--- a/tclpkg/tcldot/tcldot.c
++++ b/tclpkg/tcldot/tcldot.c
+@@ -163,7 +163,7 @@ int Tcldot_Init(Tcl_Interp * interp)
+ /* build disciplines dynamically so we can selectively replace functions */
+
+ ictx->myioDisc.afread = NULL; /* set in dotread() or dotstring() according to need */
+- ictx->myioDisc.printf = AgIoDisc.printf; /* no change */
++ ictx->myioDisc.putstr = AgIoDisc.putstr; /* no change */
+ ictx->myioDisc.flush = AgIoDisc.flush; /* no change */
+
+ ictx->mydisc.mem = &AgMemDisc; /* no change */
+diff --git a/lib/common/output.c b/lib/common/output.c
+index c91dfe41e..648409c5a 100644
+--- a/lib/common/output.c
++++ b/lib/common/output.c
+@@ -80,11 +80,11 @@ void write_plain(GVJ_t *job, graph_t *g,
+ bezier bz;
+ pointf pt;
+ char *lbl;
+ char* fillcolor;
+
+- print = g->clos->disc.io->printf;
++ print = g->clos->disc.io->putstr;
+ // setup_graph(job, g);
+ setYInvert(g);
+ pt = GD_bb(g).UR;
+ print(f, "graph %.5g %.5g %.5g\n", job->zoom, PS2INCH(pt.x), PS2INCH(pt.y));
+ for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
diff --git a/media-gfx/graphviz/graphviz-4.0.0.ebuild b/media-gfx/graphviz/graphviz-4.0.0-r1.ebuild
similarity index 98%
rename from media-gfx/graphviz/graphviz-4.0.0.ebuild
rename to media-gfx/graphviz/graphviz-4.0.0-r1.ebuild
index 1f4507432c23..53c156b50c4b 100644
--- a/media-gfx/graphviz/graphviz-4.0.0.ebuild
+++ b/media-gfx/graphviz/graphviz-4.0.0-r1.ebuild
@@ -138,6 +138,11 @@ BDEPEND="
# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
# with flags enabled at configure time
+PATCHES=(
+ # backport, remove on bump (bug #853175)
+ "${FILESDIR}"/${P}-clang-printf-alike.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/
@ 2022-07-24 9:34 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2022-07-24 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 89f39879b9de48f76d246e3c7881004de6b4d835
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 09:34:20 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 09:34:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f39879
media-gfx/graphviz: drop 4.0.0-r1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-gfx/graphviz/Manifest | 1 -
.../files/graphviz-4.0.0-clang-printf-alike.patch | 221 ---------------------
media-gfx/graphviz/graphviz-4.0.0-r1.ebuild | 221 ---------------------
3 files changed, 443 deletions(-)
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 37f8b492e946..96de3755e78f 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,2 @@
DIST graphviz-2.50.0.tar.xz 23031008 BLAKE2B a1789368a77384366bf813466d4a733765ffc0a04660cfcc002c643264780425b449087306b143cfddd70d2feabb67e82b6c04217684aba175824c3e83062085 SHA512 2b035559da20bad35e046bfa1b2c8ce1b395ff9b812f33bcf612d7f7c65ff9a226c9b209553b4283825330683fb925516563943de7922c2f6434baaf3c3b5ee2
-DIST graphviz-4.0.0.tar.xz 21494432 BLAKE2B b188feb5c6bad2537f7d404c330c314de38f6f274d72ce84040524d6be209642686161939a210f41e446dc37619266864353f7e1829d172c97e559632ba17971 SHA512 34e3e720152cb6a8f0d266f37ae1f66d432b89f44309f172d7abfcf8eba611a16e41250faa3eac64bf94e5e721a242ad5093ef8905238b61d6ad869b7853b9d2
DIST graphviz-5.0.0.tar.xz 21495572 BLAKE2B b28cbc5a20b202441ed7e98ebbb85b878f9362d1f95816ca89f7aedd62302c77974efc3b63e2ab8b577da59946ca63c7607706da2e79afcae9089f8c2743cd4a SHA512 51576c0d0405aa2005e908b57c3bac5e30069e6efb355b467a35a46559b002b34eaec77c35b6d41c635d6d874351da7261a11cf0f857cea72ff7259d5f6c860d
diff --git a/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch b/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch
deleted file mode 100644
index ef213bccd8ab..000000000000
--- a/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index f38cc8ff5..4f1a127a2 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-
- ## [Unreleased (4.0.1)]
-
-+### Fixed
-+
-+- **Breaking**: The 4.0.0 change replacing the `Agiodisc_t` struct member
-+ `putstr` by `printf` has been reverted
-+
- ## [4.0.0] – 2022-05-29
-
- ### Changed
-diff --git a/cmd/gvpr/gvprmain.c b/cmd/gvpr/gvprmain.c
-index 188cfdf94..92872f8cd 100644
---- a/cmd/gvpr/gvprmain.c
-+++ b/cmd/gvpr/gvprmain.c
-@@ -47,14 +47,17 @@ static int iofread(void *chan, char *buf, int bufsize)
- return (int)fread(buf, 1, (size_t)bufsize, chan);
- }
-
-+static int ioputstr(void *chan, const char *str)
-+{
-+ return fputs(str, chan);
-+}
-+
- static int ioflush(void *chan)
- {
- return fflush(chan);
- }
-
--typedef int (*printfn)(void *chan, const char *format, ...);
--
--static Agiodisc_t gprIoDisc = { iofread, (printfn)fprintf, ioflush };
-+static Agiodisc_t gprIoDisc = { iofread, ioputstr, ioflush };
-
- static Agdisc_t gprDisc = { &AgMemDisc, &AgIdDisc, &gprIoDisc };
-
-diff --git a/lib/cgraph/cgraph.3 b/lib/cgraph/cgraph.3
-index ed7392c06..67e35c2e9 100644
---- a/lib/cgraph/cgraph.3
-+++ b/lib/cgraph/cgraph.3
-@@ -487,14 +487,14 @@ The I/O discipline provides an abstraction for the reading and writing of graphs
- .P0
- struct Agiodisc_s {
- int (*fread)(void *chan, char *buf, int bufsize);
-- int (*printf)(void *chan, const char *format, ...);
-+ int (*putstr)(void *chan, char *str);
- int (*flush)(void *chan); /* sync */
- } ;
- .P1
- Normally, the \fBFILE\fP structure and its related functions are used for I/O. At times, though,
- an application may need to use a totally different type of character source. The associated
- state or stream information is provided by the \fIchan\fP argument to \fBagread\fP or \fBagwrite\fP.
--The discipline function \fIfread\fP and \fIprintf\fP provide the corresponding functions for
-+The discipline function \fIfread\fP and \fIputstr\fP provide the corresponding functions for
- read and writing.
-
- .SH "MEMORY DISCIPLINE"
-diff --git a/lib/cgraph/cgraph.h b/lib/cgraph/cgraph.h
-index 7b005c442..cbec3bbe6 100644
---- a/lib/cgraph/cgraph.h
-+++ b/lib/cgraph/cgraph.h
-@@ -169,7 +169,7 @@ struct Agiddisc_s { /* object ID allocator */
-
- struct Agiodisc_s {
- int (*afread) (void *chan, char *buf, int bufsize);
-- int (*printf)(void *chan, const char *format, ...);
-+ int (*putstr) (void *chan, const char *str);
- int (*flush) (void *chan); /* sync */
- /* error messages? */
- };
-diff --git a/lib/cgraph/io.c b/lib/cgraph/io.c
-index d8b136804..66c605ae6 100644
---- a/lib/cgraph/io.c
-+++ b/lib/cgraph/io.c
-@@ -24,15 +24,17 @@ static int iofread(void *chan, char *buf, int bufsize)
- }
-
- /* default IO methods */
-+static int ioputstr(void *chan, const char *str)
-+{
-+ return fputs(str, chan);
-+}
-
- static int ioflush(void *chan)
- {
- return fflush(chan);
- }
-
--typedef int (*printfn)(void *chan, const char *format, ...);
--
--Agiodisc_t AgIoDisc = { iofread, (printfn)fprintf, ioflush };
-+Agiodisc_t AgIoDisc = { iofread, ioputstr, ioflush };
-
- typedef struct {
- const char *data;
-@@ -78,7 +80,7 @@ static Agraph_t *agmemread0(Agraph_t *arg_g, const char *cp)
- rdr_t rdr;
- Agdisc_t disc;
-
-- memIoDisc.printf = AgIoDisc.printf;
-+ memIoDisc.putstr = AgIoDisc.putstr;
- memIoDisc.flush = AgIoDisc.flush;
- rdr.data = cp;
- rdr.len = strlen(cp);
-diff --git a/lib/cgraph/write.c b/lib/cgraph/write.c
-index e14f7d835..9e72d2c5c 100644
---- a/lib/cgraph/write.c
-+++ b/lib/cgraph/write.c
-@@ -26,7 +26,7 @@ typedef void iochan_t;
-
- static int ioput(Agraph_t * g, iochan_t * ofile, char *str)
- {
-- return AGDISC(g, io)->printf(ofile, "%s", str);
-+ return AGDISC(g, io)->putstr(ofile, str);
-
- }
-
-diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c
-index a7fe27bf5..3704f51d9 100644
---- a/lib/gvpr/compile.c
-+++ b/lib/gvpr/compile.c
-@@ -66,14 +66,17 @@ static int iofread(void *chan, char *buf, int bufsize)
- return (int)read(sffileno(chan), buf, bufsize);
- }
-
-+static int ioputstr(void *chan, const char *str)
-+{
-+ return sfputr(chan, str, -1);
-+}
-+
- static int ioflush(void *chan)
- {
- return sfsync(chan);
- }
-
--typedef int (*printfn)(void *chan, const char *format, ...);
--
--static Agiodisc_t gprIoDisc = { iofread, (printfn)sfprintf, ioflush };
-+static Agiodisc_t gprIoDisc = { iofread, ioputstr, ioflush };
-
- #ifdef GVDLL
- static Agdisc_t gprDisc = { 0, 0, &gprIoDisc };
-diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c
-index c45563460..63eb5e535 100644
---- a/plugin/core/gvrender_core_dot.c
-+++ b/plugin/core/gvrender_core_dot.c
-@@ -511,7 +511,7 @@ static void xdot_end_graph(graph_t* g)
- textflags[EMIT_GLABEL] = 0;
- }
-
--typedef int (*printfn)(void *chan, const char *format, ...);
-+typedef int (*putstrfn) (void *chan, const char *str);
- typedef int (*flushfn) (void *chan);
- static void dot_end_graph(GVJ_t *job)
- {
-@@ -521,7 +521,7 @@ static void dot_end_graph(GVJ_t *job)
-
- if (io.afread == NULL) {
- io.afread = AgIoDisc.afread;
-- io.printf = (printfn)gvprintf;
-+ io.putstr = (putstrfn)gvputs;
- io.flush = (flushfn)gvflush;
- }
-
-diff --git a/plugin/core/gvrender_core_json.c b/plugin/core/gvrender_core_json.c
-index bab5d64af..88715a93a 100644
---- a/plugin/core/gvrender_core_json.c
-+++ b/plugin/core/gvrender_core_json.c
-@@ -693,7 +693,7 @@ static void write_graph(Agraph_t * g, GVJ_t * job, int top, state_t* sp)
- gvputs(job, "}");
- }
-
--typedef int (*printfn)(void *chan, const char *format, ...);
-+typedef int (*putstrfn) (void *chan, const char *str);
- typedef int (*flushfn) (void *chan);
-
- static void json_end_graph(GVJ_t *job)
-@@ -704,7 +704,7 @@ static void json_end_graph(GVJ_t *job)
-
- if (io.afread == NULL) {
- io.afread = AgIoDisc.afread;
-- io.printf = (printfn)gvprintf;
-+ io.putstr = (putstrfn)gvputs;
- io.flush = (flushfn)gvflush;
- }
-
-diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c
-index 335d8e469..b747124cf 100644
---- a/tclpkg/tcldot/tcldot.c
-+++ b/tclpkg/tcldot/tcldot.c
-@@ -163,7 +163,7 @@ int Tcldot_Init(Tcl_Interp * interp)
- /* build disciplines dynamically so we can selectively replace functions */
-
- ictx->myioDisc.afread = NULL; /* set in dotread() or dotstring() according to need */
-- ictx->myioDisc.printf = AgIoDisc.printf; /* no change */
-+ ictx->myioDisc.putstr = AgIoDisc.putstr; /* no change */
- ictx->myioDisc.flush = AgIoDisc.flush; /* no change */
-
- ictx->mydisc.mem = &AgMemDisc; /* no change */
-diff --git a/lib/common/output.c b/lib/common/output.c
-index c91dfe41e..648409c5a 100644
---- a/lib/common/output.c
-+++ b/lib/common/output.c
-@@ -80,11 +80,11 @@ void write_plain(GVJ_t *job, graph_t *g,
- bezier bz;
- pointf pt;
- char *lbl;
- char* fillcolor;
-
-- print = g->clos->disc.io->printf;
-+ print = g->clos->disc.io->putstr;
- // setup_graph(job, g);
- setYInvert(g);
- pt = GD_bb(g).UR;
- print(f, "graph %.5g %.5g %.5g\n", job->zoom, PS2INCH(pt.x), PS2INCH(pt.y));
- for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
diff --git a/media-gfx/graphviz/graphviz-4.0.0-r1.ebuild b/media-gfx/graphviz/graphviz-4.0.0-r1.ebuild
deleted file mode 100644
index 53c156b50c4b..000000000000
--- a/media-gfx/graphviz/graphviz-4.0.0-r1.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: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/libjpeg-turbo:=
- >=media-libs/libpng-1.2:0=
- 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:0= )
- 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, remove on bump (bug #853175)
- "${FILESDIR}"/${P}-clang-printf-alike.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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/
@ 2022-10-02 19:57 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2022-10-02 19:57 UTC (permalink / raw
To: gentoo-commits
commit: b356ded56500ad7b9b69ef5a26ba4a2d675aeec0
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 19:56:50 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 19:56:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b356ded5
media-gfx/graphviz: add patch for hidden gs symbols
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...raphviz-6.0.1-private-ghostscript-symbols.patch | 31 ++++++++++++++++++++++
...phviz-6.0.1.ebuild => graphviz-6.0.1-r1.ebuild} | 5 ++++
2 files changed, 36 insertions(+)
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
new file mode 100644
index 000000000000..8e409a9b5776
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch
@@ -0,0 +1,31 @@
+From 1288e430c6f6be992de09fc1f50ce7fef42b3f0a Mon Sep 17 00:00:00 2001
+From: Mark Hansen <markhansen@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.ebuild b/media-gfx/graphviz/graphviz-6.0.1-r1.ebuild
similarity index 98%
rename from media-gfx/graphviz/graphviz-6.0.1.ebuild
rename to media-gfx/graphviz/graphviz-6.0.1-r1.ebuild
index e88942bff58b..9c60b9f2702c 100644
--- a/media-gfx/graphviz/graphviz-6.0.1.ebuild
+++ b/media-gfx/graphviz/graphviz-6.0.1-r1.ebuild
@@ -138,6 +138,11 @@ BDEPEND="
# 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
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-10-02 19:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-25 20:32 [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-10-02 19:57 David Seifert
2022-07-24 9:34 David Seifert
2021-01-23 21:13 Andreas Sturmlechner
2020-01-01 15:19 Andreas Sturmlechner
2017-03-17 21:35 Andreas Hüttel
2016-08-26 21:15 David Seifert
2015-10-03 10:05 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox