[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2022-12-11 Thread Sam James 
commit: a2c0427a4d1ebec7629748b502fff237d9daeee7
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 11 21:24:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 11 21:24:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c0427a

media-gfx/graphviz: drop 6.0.1-r3, 7.0.0-r1

Signed-off-by: Sam James  gentoo.org>

 media-gfx/graphviz/Manifest|   2 -
 ...raphviz-6.0.1-private-ghostscript-symbols.patch |  31 ---
 media-gfx/graphviz/graphviz-6.0.1-r3.ebuild| 221 -
 media-gfx/graphviz/graphviz-7.0.0-r1.ebuild| 216 
 4 files changed, 470 deletions(-)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 08bfe0385ce1..1d958282ce22 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,4 +1,2 @@
 DIST graphviz-5.0.1.tar.xz 21493276 BLAKE2B 
1eabf7dc175cde4827db682ae7c0cb00f5bec4bee8aa9801bc6ac86b06011588260ce261e25613d6d4a1e708ccb4fd65aba73210df8cf0af84f2e20b7c914167
 SHA512 
c1c5784558fd6f32cd8ce9b63c2bc5232f47ea1c4abf8fbfc1b8b0175aa30845af452dbc6651642f07f2c5b7a73f5c792934ca99561608a104ae99898eca3bc7
-DIST graphviz-6.0.1.tar.xz 21492876 BLAKE2B 
36b8c2e922a73e35cddb2a252138193c9a413df823953faf387c964a31cf41e93b9c502ddc58831542aeea7e06cfd9ec377c390b45b859bdab1e0602c9b9683c
 SHA512 
78f58734c47a6e1531a00b9de881481108500bf0a38b0ee734ecd024b629d838d98dbb32d81d2c2fe3b5ac28cbad140452b4bb5fa808ec667cc6cbe7638156ee
-DIST graphviz-7.0.0.tar.xz 21486172 BLAKE2B 
f52a75b5938ba3a6fbad3efe9d0ca6413145f9355c3ad1c8dc39253e8db36e9862c70c4dc910afd05e601e5787640b5b4a3dd09c1527cc3bd39a97ef281a7215
 SHA512 
dfead861d2f6ad1ebc9e3e4bd30684e02005cc7a2b78dab3ad45a11a401e08aeb1b6f7d8ea7ad7655230275ab6c10fd791434489e4ba09ae6905970230a974dc
 DIST graphviz-7.0.2.tar.xz 21485860 BLAKE2B 
5a99bbe6748b01706faade8b17ec34c8ec2d645a8b9cbda6fd3d595f9720358df279de883a556206709ece76dcd44b7b4fe105b5645493480a204c05a2d9585f
 SHA512 
cff40066f80d29a8ca19f8c12410c293b58ef4abf03f2c3b36472a856bc39e6a2bf6badfad4f036e45e430b7d2fec40d5d1fdb0b47778b1857a46b2b07700d98

diff --git 
a/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch 
b/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch
deleted file mode 100644
index 8e409a9b5776..
--- a/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1288e430c6f6be992de09fc1f50ce7fef42b3f0a Mon Sep 17 00:00:00 2001
-From: Mark Hansen 
-Date: Mon, 26 Sep 2022 20:43:39 +1000
-Subject: [PATCH] Stop using now-hidden gs_error_names symbol
-
-GhostScript hid their gs_error_names symbol as part of a global by-default 
hiding of non-API symbols.
-
-It will probably take a while for GhostScript to get a public API for these 
symbols back into a release, so let's stop using the symbol for now, until then.
-
-Fixes #2280

- plugin/gs/gvloadimage_gs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c
-index e909c6f32..d852663af 100644
 a/plugin/gs/gvloadimage_gs.c
-+++ b/plugin/gs/gvloadimage_gs.c
-@@ -86,8 +86,8 @@ static void gs_error(GVJ_t * job, const char *name, const 
char *funstr, int err)
- else
-   errsrc = "Ghostscript internal error";
- 
--job->common->errorfn("%s: %s() returned: %d \"%s\" (%s)\n",
--  name, funstr, err, gs_error_names[-err - 1], errsrc);
-+job->common->errorfn("%s: %s() returned: %d (%s)\n",
-+  name, funstr, err, errsrc);
- }
- 
- static int gvloadimage_process_file(GVJ_t *job, usershape_t *us, void 
*instance)
--- 
-GitLab

diff --git a/media-gfx/graphviz/graphviz-6.0.1-r3.ebuild 
b/media-gfx/graphviz/graphviz-6.0.1-r3.ebuild
deleted file mode 100644
index fd076e96e4c7..
--- a/media-gfx/graphviz/graphviz-6.0.1-r3.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/;
-# Unfortunately upstream uses an "artifact" store for the pre-generated
-# tarball now, which makes predictable URLs impossible.
-SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz;
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript 
python qt5 ruby svg tcl webp X"
-
-REQUIRED_USE="
-   !cairo? ( !X !gtk2 !postscript !lasi )
-   pdf? ( cairo )
-   python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Requires ksh, tests

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2021-10-26 Thread David Seifert 
commit: 325cf3ee39a8ce5fabe97f6b462353d25e65aa56
Author: David Seifert  gentoo  org>
AuthorDate: Tue Oct 26 17:57:38 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Oct 26 17:57:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=325cf3ee

media-gfx/graphviz: drop 2.47.1-r1

Signed-off-by: David Seifert  gentoo.org>

 media-gfx/graphviz/Manifest|   1 -
 .../files/graphviz-2.34.0-Xaw-configure.patch  |  81 --
 .../graphviz/files/graphviz-2.47.1-bashisms.patch  |  12 -
 media-gfx/graphviz/graphviz-2.47.1-r1.ebuild   | 279 -
 4 files changed, 373 deletions(-)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 15b0d2b11b5..085986d24c2 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,2 +1 @@
-DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 
7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a
 SHA512 
4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb
 DIST graphviz-2.49.0.tar.xz 23040392 BLAKE2B 
74bc90e433c29662b292c0f086777648db4cded69b7640586647f46e3df46137044fa287d170a780e58f552289fec2d65e10def9ed68095bd4ec8efe9208f929
 SHA512 
5396b6cb4615ba509233a5a079956aef014245cac64635f01467dcb26e9d6e4b1d044110bc3a85132c747ba410597fa289bef3e503e84fa000c845e1e75c89b0

diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch 
b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
deleted file mode 100644
index 2283cc5dab4..000
--- a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
+++ /dev/null
@@ -1,81 +0,0 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -560,8 +560,8 @@
-   use_xlib="Yes"
- #no x11.pc on centos4
- #  PKG_CHECK_MODULES(X11, [x11])
--  PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
- fi
-+PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
- AM_CONDITIONAL(WITH_X, [test "x$use_xlib" = "xYes"])
- AM_CONDITIONAL(WITH_XRENDER, [test "x$,HAVE_XRENDER" = "xyes"])
- 
-@@ -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.47.1-bashisms.patch 
b/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch
deleted file mode 100644
index 4e9aab6ae34..000
--- a/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
 a/configure.ac 2019-07-13 03:14:04.0 +
-+++ b/configure.ac 2020-05-15 19:44:57.715169627 +
-@@ -315,7 +315,7 @@
- dnl 
===
- dnl Set GCC compiler flags
- 
--if [test "${GCC}" == "yes"]
-+if [test "${GCC}" = "yes"]
- then
-   # Enable common warnings

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2021-04-24 Thread David Seifert 
commit: b762a11ed8579ad0de77bc9f2873026bb3505696
Author: David Seifert  gentoo  org>
AuthorDate: Sat Apr 24 11:01:04 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Apr 24 11:01:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b762a11e

media-gfx/graphviz: Bump to 2.47.1

Bug: https://bugs.gentoo.org/684844
Closes: https://bugs.gentoo.org/723286
Closes: https://bugs.gentoo.org/770067
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 media-gfx/graphviz/Manifest|   1 +
 .../graphviz/files/graphviz-2.47.1-bashisms.patch  |  12 +
 media-gfx/graphviz/graphviz-2.47.1.ebuild  | 277 +
 3 files changed, 290 insertions(+)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index eec2245c13b..c94ad19da08 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1 +1,2 @@
 DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 
90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d
 SHA512 
42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
+DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 
7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a
 SHA512 
4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb

diff --git a/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch 
b/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch
new file mode 100644
index 000..4e9aab6ae34
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch
@@ -0,0 +1,12 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac 2019-07-13 03:14:04.0 +
 b/configure.ac 2020-05-15 19:44:57.715169627 +
+@@ -315,7 +315,7 @@
+ dnl 
===
+ dnl Set GCC compiler flags
+ 
+-if [test "${GCC}" == "yes"]
++if [test "${GCC}" = "yes"]
+ then
+   # Enable common warnings flags
+   CFLAGS="${CFLAGS} -Wall"

diff --git a/media-gfx/graphviz/graphviz-2.47.1.ebuild 
b/media-gfx/graphviz/graphviz-2.47.1.ebuild
new file mode 100644
index 000..570be52f339
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.47.1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/;
+# unfortunately upstream uses an "artifact" store for the pre-generated
+# tarball now, which makes predictable URLs impossible.
+SRC_URI="https://gitlab.com/graphviz/graphviz/-/package_files/9573974/download 
-> ${P}.tar.xz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris"
+IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl 
postscript python qt5 ruby svg tcl X"
+
+REQUIRED_USE="
+   !cairo? ( !X !gtk !postscript !lasi )
+   pdf? ( cairo )
+   python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh, tests against installed package, missing files and directory
+RESTRICT="test"
+
+BDEPEND="
+   sys-devel/flex
+   sys-devel/libtool
+   x11-libs/gdk-pixbuf:2
+   virtual/pkgconfig
+   doc? (
+   app-text/ghostscript-gpl
+   sys-apps/groff
+   )
+   guile? (
+   dev-lang/swig
+   dev-scheme/guile
+   )
+   java? (
+   dev-lang/swig
+   virtual/jdk:*
+   )
+   nls? ( >=sys-devel/gettext-0.14.5 )
+   perl? ( dev-lang/swig )
+   python? ( dev-lang/swig )
+   ruby? ( dev-lang/swig )
+   tcl? ( dev-lang/swig )"
+RDEPEND="
+   >=dev-libs/expat-2
+   >=dev-libs/glib-2.11.1:2
+   dev-libs/libltdl:0
+   >=media-libs/fontconfig-2.3.95
+   >=media-libs/freetype-2.1.10
+   >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
+   >=media-libs/libpng-1.2:0=
+   sys-libs/zlib
+   virtual/jpeg:0
+   virtual/libiconv
+   cairo? (
+   >=x11-libs/cairo-1.1.10[svg]
+   >=x11-libs/pango-1.12
+   )
+   devil? ( media-libs/devil[png,jpeg] )
+   gtk? ( x11-libs/gtk+:2 )
+   gts? ( sci-libs/gts )
+   guile? ( dev-scheme/guile )
+   java? ( virtual/jdk:* )
+   lasi? ( media-libs/lasi )
+   pdf? ( app-text/poppler )
+   perl? ( dev-lang/perl:= )
+   postscript? ( app-text/ghostscript-gpl

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2020-06-18 Thread Mikle Kolyada 
commit: baa88e6698a7e9288d63f57b55cbc8f19b76c3fd
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jun 18 21:30:30 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jun 18 21:30:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa88e66

media-gfx/graphviz: fix dotty meny calls

Closes: https://bugs.gentoo.org/682524
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-gfx/graphviz/files/dotty_change_button.patch | 22 ++
 media-gfx/graphviz/graphviz-2.42.3.ebuild  |  3 ++-
 media-gfx/graphviz/graphviz-2.44.0.ebuild  |  3 ++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/media-gfx/graphviz/files/dotty_change_button.patch 
b/media-gfx/graphviz/files/dotty_change_button.patch
new file mode 100644
index 000..8c5f34a2e12
--- /dev/null
+++ b/media-gfx/graphviz/files/dotty_change_button.patch
@@ -0,0 +1,22 @@
+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.ebuild 
b/media-gfx/graphviz/graphviz-2.42.3.ebuild
index f27ec198047..25cc03cc657 100644
--- a/media-gfx/graphviz/graphviz-2.42.3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3.ebuild
@@ -143,7 +143,8 @@ DEPEND="${RDEPEND}
 #   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 )
+PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
+ "${FILESDIR}"/dotty_change_button.patch )
 
 pkg_setup() {
use python && python-single-r1_pkg_setup

diff --git a/media-gfx/graphviz/graphviz-2.44.0.ebuild 
b/media-gfx/graphviz/graphviz-2.44.0.ebuild
index cc960e3dcb4..25929d6e9b8 100644
--- a/media-gfx/graphviz/graphviz-2.44.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.0.ebuild
@@ -143,7 +143,8 @@ DEPEND="${RDEPEND}
 #   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 )
+PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
+ "${FILESDIR}"/dotty_change_button.patch )
 
 pkg_setup() {
use python && python-single-r1_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2019-11-24 Thread Andreas Sturmlechner 
commit: c60d0ab2d049b8a8cb579f4ac6c5da2e14a9a30c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 24 17:12:44 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 24 17:13:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c60d0ab2

media-gfx/graphviz: Drop 2.40.1-r1

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/graphviz/Manifest|   1 -
 media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch | 127 -
 media-gfx/graphviz/graphviz-2.40.1-r1.ebuild   | 286 -
 3 files changed, 414 deletions(-)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 2f5e30e9495..24c3de5deac 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,2 @@
-DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 
96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad646b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59
 SHA512 
a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 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.40.1-qt5.patch 
b/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
deleted file mode 100644
index 02e81fac1d2..000
--- a/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-Submitted By:Pierre Labastie 
-Date:2017-08-27
-Initial Package Version: 2.40.1
-Upstream Status: Unknown
-Origin:  
https://github.com/elkrejzi/pacman/blob/master/pkgbuild/graphviz/graphviz-qt5.patch
- Addition of patch for cmd/gvedit/Makefile.am by P. 
Labastie
-Description: Fixes use of Qt5
-
-diff -Naur a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp
 a/cmd/gvedit/csettings.cpp 2016-09-08 06:45:03.0 +0200
-+++ b/cmd/gvedit/csettings.cpp 2017-08-28 17:05:32.226578375 +0200
-@@ -16,7 +16,7 @@
- #include "csettings.h"
- #include "qmessagebox.h"
- #include "qfiledialog.h"
--#include 
-+#include 
- #include 
- #include "mdichild.h"
- #include "string.h"
-diff -Naur a/cmd/gvedit/imageviewer.h b/cmd/gvedit/imageviewer.h
 a/cmd/gvedit/imageviewer.h 2016-08-09 23:02:09.0 +0200
-+++ b/cmd/gvedit/imageviewer.h 2017-08-28 17:05:32.226578375 +0200
-@@ -15,7 +15,7 @@
- 
- #ifndef IMAGEVIEWER_H
- #define IMAGEVIEWER_H
--#include 
-+#include 
- #include 
- #include 
- 
-diff -Naur a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp
 a/cmd/gvedit/mainwindow.cpp2016-09-20 06:45:02.0 +0200
-+++ b/cmd/gvedit/mainwindow.cpp2017-08-28 17:05:32.226578375 +0200
-@@ -11,7 +11,7 @@
-  * Contributors: See CVS logs. Details at http://www.graphviz.org/
-  */
- 
--#include 
-+#include 
- #include 
- #include "mainwindow.h"
- #include "mdichild.h"
-diff -Naur a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
 a/cmd/gvedit/Makefile.am   2016-09-20 06:45:02.0 +0200
-+++ b/cmd/gvedit/Makefile.am   2017-08-28 17:06:21.012476088 +0200
-@@ -30,6 +30,8 @@
-   -DDEMAND_LOADING=1 \
-   -DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\"
- 
-+gvedit_CXXFLAGS = -fPIC
-+
- gvedit_LDADD = \
-   $(top_builddir)/lib/gvc/libgvc.la \
-   $(top_builddir)/lib/cgraph/libcgraph.la \
-diff -Naur a/cmd/gvedit/mdichild.cpp b/cmd/gvedit/mdichild.cpp
 a/cmd/gvedit/mdichild.cpp  2016-08-09 23:02:09.0 +0200
-+++ b/cmd/gvedit/mdichild.cpp  2017-08-28 17:05:32.226578375 +0200
-@@ -12,7 +12,7 @@
-  */
- 
- 
--#include 
-+#include 
- 
- #include "mdichild.h"
- #include "mainwindow.h"
-diff -Naur a/cmd/gvedit/ui_settings.h b/cmd/gvedit/ui_settings.h
 a/cmd/gvedit/ui_settings.h 2016-09-08 06:45:03.0 +0200
-+++ b/cmd/gvedit/ui_settings.h 2017-08-28 17:05:32.226578375 +0200
-@@ -10,22 +10,22 @@
- #ifndef UI_SETTINGS_H
- #define UI_SETTINGS_H
- 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
--#include 
-+#include 
-+#include 
-+#include 
-+#include

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2019-09-14 Thread Andreas Sturmlechner 
commit: f430eaf4ff2738fae69c577f0e1eb40429b42d23
Author: Chris Mayo  gmail  com>
AuthorDate: Sun Aug 25 18:56:52 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 14 14:52:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f430eaf4

media-gfx/graphviz: version bump to 2.42.1

Bug: https://bugs.gentoo.org/682522
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Chris Mayo  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12790
Signed-off-by: Andreas Sturmlechner  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.ebuild  | 283 +
 4 files changed, 337 insertions(+)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index b2df6ab0c2f..5159a80cab1 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1 +1,2 @@
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 
96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad646b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59
 SHA512 
a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
+DIST graphviz-2.42.1.tar.gz 25543401 BLAKE2B 
e64044923a823f6fbe91b498b04fffe3e5b6803c55c5ce29a60b16a38d97260061b013e8bd13bc99f360d035c840f18a01301b29ca1cb73c4be87843f18c45fc
 SHA512 
ac263df086eea6faf682f493756b79a0af8bae3f515cd8c09238e89f295226baf743a3fd22d977ef6f223388769ef11241dfb2fdb6087305ce4fdd3fa8ed2f78

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
new file mode 100644
index 000..426ebbe14a3
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 000..59b84817a99
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.42.1-math.patch
@@ -0,0 +1,38 @@
+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 
++
+ /*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 
++
+ /*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 
++#include 
+ 
+ /*Write out a floating point value in a portable format
+ **

diff --git a/media-gfx/graphviz/graphviz-2.42.1.ebuild 
b/media-gfx/graphviz/graphviz-2.42.1.ebuild
new file mode 100644
index 000..b901f7c2f90
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.42.1.ebuild
@@ -0,0 +1,283 @@
+# 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-fbsd ~x86-fbsd ~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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/

2018-04-08 Thread Aaron Bauman 
commit: ac094ade09017d50bcba522b10b0392cdddc8f0a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Apr  6 10:38:34 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Apr  9 00:12:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac094ade

media-gfx/graphviz: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/7836

 .../graphviz-2.34.0-dot-pangocairo-link.patch  | 17 
 .../files/graphviz-2.38.0-ghostscript-9.18.patch   | 32 --
 2 files changed, 49 deletions(-)

diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch 
b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
deleted file mode 100644
index df5ea34d329..000
--- a/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 a/cmd/dot/Makefile.am
-+++ b/cmd/dot/Makefile.am
-@@ -115,12 +115,8 @@
- dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a 
$(WEBP_LIBS)
- dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la 
$(WEBP_LIBS)
- endif
--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)
--if WITH_WEBP
--dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a 
$(WEBP_LIBS)
--dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la 
$(WEBP_LIBS)
--endif
-+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
- 
- if WITH_LASI

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
deleted file mode 100644
index 9d0d78a1580..000
--- a/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8da53964edec8a665c3996d483df243eb150c2c4 Mon Sep 17 00:00:00 2001
-From: Jakob Nixdorf 
-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 
- #include 
- 
-+
-+/**
-+ * 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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2018-01-07 Thread Andreas Sturmlechner 
commit: 466764e2d192316be446ceb1a2b760c223fab7fc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  7 10:42:55 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  7 13:42:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466764e2

media-gfx/graphviz: Switch USE qt4 to qt5

Bug: https://bugs.gentoo.org/638026
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch | 127 ++
 media-gfx/graphviz/graphviz-2.40.1-r1.ebuild   | 278 +
 2 files changed, 405 insertions(+)

diff --git a/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch 
b/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
new file mode 100644
index 000..02e81fac1d2
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
@@ -0,0 +1,127 @@
+Submitted By:Pierre Labastie 
+Date:2017-08-27
+Initial Package Version: 2.40.1
+Upstream Status: Unknown
+Origin:  
https://github.com/elkrejzi/pacman/blob/master/pkgbuild/graphviz/graphviz-qt5.patch
+ Addition of patch for cmd/gvedit/Makefile.am by P. 
Labastie
+Description: Fixes use of Qt5
+
+diff -Naur a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp
+--- a/cmd/gvedit/csettings.cpp 2016-09-08 06:45:03.0 +0200
 b/cmd/gvedit/csettings.cpp 2017-08-28 17:05:32.226578375 +0200
+@@ -16,7 +16,7 @@
+ #include "csettings.h"
+ #include "qmessagebox.h"
+ #include "qfiledialog.h"
+-#include 
++#include 
+ #include 
+ #include "mdichild.h"
+ #include "string.h"
+diff -Naur a/cmd/gvedit/imageviewer.h b/cmd/gvedit/imageviewer.h
+--- a/cmd/gvedit/imageviewer.h 2016-08-09 23:02:09.0 +0200
 b/cmd/gvedit/imageviewer.h 2017-08-28 17:05:32.226578375 +0200
+@@ -15,7 +15,7 @@
+ 
+ #ifndef IMAGEVIEWER_H
+ #define IMAGEVIEWER_H
+-#include 
++#include 
+ #include 
+ #include 
+ 
+diff -Naur a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp
+--- a/cmd/gvedit/mainwindow.cpp2016-09-20 06:45:02.0 +0200
 b/cmd/gvedit/mainwindow.cpp2017-08-28 17:05:32.226578375 +0200
+@@ -11,7 +11,7 @@
+  * Contributors: See CVS logs. Details at http://www.graphviz.org/
+  */
+ 
+-#include 
++#include 
+ #include 
+ #include "mainwindow.h"
+ #include "mdichild.h"
+diff -Naur a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
+--- a/cmd/gvedit/Makefile.am   2016-09-20 06:45:02.0 +0200
 b/cmd/gvedit/Makefile.am   2017-08-28 17:06:21.012476088 +0200
+@@ -30,6 +30,8 @@
+   -DDEMAND_LOADING=1 \
+   -DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\"
+ 
++gvedit_CXXFLAGS = -fPIC
++
+ gvedit_LDADD = \
+   $(top_builddir)/lib/gvc/libgvc.la \
+   $(top_builddir)/lib/cgraph/libcgraph.la \
+diff -Naur a/cmd/gvedit/mdichild.cpp b/cmd/gvedit/mdichild.cpp
+--- a/cmd/gvedit/mdichild.cpp  2016-08-09 23:02:09.0 +0200
 b/cmd/gvedit/mdichild.cpp  2017-08-28 17:05:32.226578375 +0200
+@@ -12,7 +12,7 @@
+  */
+ 
+ 
+-#include 
++#include 
+ 
+ #include "mdichild.h"
+ #include "mainwindow.h"
+diff -Naur a/cmd/gvedit/ui_settings.h b/cmd/gvedit/ui_settings.h
+--- a/cmd/gvedit/ui_settings.h 2016-09-08 06:45:03.0 +0200
 b/cmd/gvedit/ui_settings.h 2017-08-28 17:05:32.226578375 +0200
+@@ -10,22 +10,22 @@
+ #ifndef UI_SETTINGS_H
+ #define UI_SETTINGS_H
+ 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
+ 
+ QT_BEGIN_NAMESPACE
+ 
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac 2016-12-22 06:44:41.0 +0100
 b/configure.ac 2017-08-28 17:05:32.227578435 +0200
+@@ -2561,10 +2561,10 @@
+   use_qt="No (disabled)"
+ else
+ 
+-  AC_CHECK_PROGS(QMAKE,qmake-qt4 qmake-qt3 qmake,false)
++  AC_CHECK_PROGS(QMAKE,qmake-qt5 qmake,false)
+   if test "$QMAKE" != "false"; then
+-PKG_CHECK_MODULES(QTCORE, [QtCore],[
+-  PKG_CHECK_MODULES(QTGUI, [QtGui],[
++PKG_CHECK_MODULES(QTCORE, [Qt5Core],[
++  PKG_CHECK_MODULES(QTGUI, [Qt5Widgets Qt5PrintSupport],[
+   use_qt="Yes"
+   ],[
+ use_qt="No (QtGui not available)"

diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild 
b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
new file mode 100644
index 000..2c248dad22e
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2017-05-18 Thread Lars Wendler 
commit: 0bc3da861baed950bf23e0cb1f26c1afb5a8ae9a
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 18 11:05:43 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 18 11:15:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc3da86

media-gfx/graphviz: Bump to version 2.40.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/graphviz/Manifest|   1 +
 .../files/graphviz-2.34.0-Xaw-configure.patch  |   4 +-
 .../graphviz-2.34.0-dot-pangocairo-link.patch  |   4 +-
 media-gfx/graphviz/graphviz-2.40.1.ebuild  | 276 +
 4 files changed, 281 insertions(+), 4 deletions(-)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 64a0ea90523..2592d8f9ccc 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1 +1,2 @@
 DIST graphviz-2.38.0.tar.gz 25848858 SHA256 
81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e SHA512 
0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
 WHIRLPOOL 
b59bb517c4aa690ffd23e1b4d448d5dbaae5594eb1059d574e0cb3bf2091beb9ed867bd4fa7e8ca0259863f24849c96d4d1da056091922bf33ace7da43c8b5d4
+DIST graphviz-2.40.1.tar.gz 25633455 SHA256 
ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421 SHA512 
a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 WHIRLPOOL 
0ff4a23cf8c3e0bcbf12776d65ea0aa538050286d6b25bcc3707c7c1ad2d0f8c282239f57bfc0c3795bccf276e9d6627d77ed2920781008a2558af126787a72c

diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch 
b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
index ac91d4bd4d4..2283cc5dab4 100644
--- a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
+++ b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
@@ -1,5 +1,5 @@
 configure.ac   2011-05-07 05:25:24.0 +0200
-+++ configure.ac   2011-06-24 13:24:49.0 +0200
+--- a/configure.ac
 b/configure.ac
 @@ -560,8 +560,8 @@
use_xlib="Yes"
  #no x11.pc on centos4

diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch 
b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
index 143beabe505..df5ea34d329 100644
--- a/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
+++ b/media-gfx/graphviz/files/graphviz-2.34.0-dot-pangocairo-link.patch
@@ -1,5 +1,5 @@
 cmd/dot/Makefile.am2013-01-14 04:11:21.0 +0100
-+++ cmd/dot/Makefile.am2013-02-01 17:19:30.893949329 +0100
+--- a/cmd/dot/Makefile.am
 b/cmd/dot/Makefile.am
 @@ -115,12 +115,8 @@
  dot_static_LDADD += $(top_builddir)/plugin/webp/.libs/libgvplugin_webp_C.a 
$(WEBP_LIBS)
  dot_builtins_LDADD += $(top_builddir)/plugin/webp/libgvplugin_webp.la 
$(WEBP_LIBS)

diff --git a/media-gfx/graphviz/graphviz-2.40.1.ebuild 
b/media-gfx/graphviz/graphviz-2.40.1.ebuild
new file mode 100644
index 000..6cb0b627577
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.40.1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1 
qmake-utils
+
+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 ~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: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
+   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:= )
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2017-03-21 Thread Michał Górny 
commit: 05580a7d8816d031a44f52683d98b272d5a004aa
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Mar 16 20:52:24 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Mar 21 16:19:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05580a7d

media-gfx/graphviz: Drop old (python.eclass)

 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..000
--- 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..000
--- 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..000
---

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2017-03-17 Thread Andreas Hüttel 
commit: c6e75d6b2053befe075574e88b459d5ed62110c2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Mar 17 22:20:32 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Mar 17 22:20:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e75d6b

Revert "media-gfx/graphviz: Remove old", see bug 609772

This reverts commit 80232c73b05f744e16968c5e60968b5951a6f4cc.

 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 insertions(+)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 64a0ea90523..c42f116e969 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1 +1,2 @@
+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
new file mode 100644
index 000..86280f2b05d
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000..142aea2843f
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch
@@ -0,0 +1,52 @@
+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
new

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2017-02-18 Thread Michał Górny 
commit: 5288857b2244dfd9c7af66c446a0d2d7d7758ccd
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Feb 18 19:46:16 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Feb 18 19:47:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5288857b

media-gfx/graphviz: Revert "Clean old version up"

Turns out it breaks media-gfx/nip2.

 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   | 224 +
 5 files changed, 339 insertions(+)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 64a0ea9052..c42f116e96 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1 +1,2 @@
+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
new file mode 100644
index 00..86280f2b05
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.26.3-automake-1.11.2.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 00..142aea2843
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.26.3-libtool-configure.patch
@@ -0,0 +1,52 @@
+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
new file mode 100644
index 00..f82312dbbe

[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/files/, media-gfx/graphviz/

2017-02-18 Thread Michał Górny 
commit: 397e8f07981639ea30fabc24601ce5a7f1f30f12
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Feb 18 18:23:07 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Feb 18 18:52:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397e8f07

media-gfx/graphviz: Clean old version up

 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   | 224 -
 5 files changed, 339 deletions(-)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index c42f116e96..64a0ea9052 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 86280f2b05..00
--- 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 142aea2843..00
--- 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 f82312dbbe..00
---