gentoo resync : 15.12.2019

4 files changed, 68 insertions, 204 deletions

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 93db8be007be..12dacc76d7e1 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,9 +1,8 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
-AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad1aab5182ec410dfd527732fefdf335cda392f1036409ac3a6b86be15794b80546ff9cbfd47454bd01266d861945 SHA512 bd1d51ae10d17ef321bba7dfa619054642debbb02ea1458b0597e6c62471e7750bf5d2cfc68ccb6fd2964b0fbe072b2e7642dd8b097c7e046f8877a2e36d3f44
 AUX graphviz-2.42.1-libgv_python.patch 621 BLAKE2B fa1d3e0f37870c46d8e6266ac812691f2f2bc8a0cdfaa6e4183da2f46714f8621d14578cc8f4dbf7a96e276f272822dd447d61145133d5d47a9c6ae686e24439 SHA512 637c344698cbfd7f698f5615fd04644bb5b704761dccaf9abd4fa98b9b60e1572cd3f2b8af4ae46ce3aa7b57cd1a633b781d1642d4ee0c97c5812f38719f8a37
 AUX graphviz-2.42.1-math.patch 843 BLAKE2B 3ceeeec968dd45478f4bb07d819cb5a4b5a215c36728dd9212db9a81841ad4ffcc1c02a56b850fb9cfde0de3689eb595eb1f73feb97c11e77d0fdfea5e708127 SHA512 17494f6795b4ed8cdef8652089132243808acd76fe970a6297cb93907cd15ad91460dbffd5ab3251d8c84a4e0ca0ec4cc96268682ef93f4b5f6b1dc88bb0b64d
-DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 DIST graphviz-2.42.1.tar.gz 25543401 BLAKE2B e64044923a823f6fbe91b498b04fffe3e5b6803c55c5ce29a60b16a38d97260061b013e8bd13bc99f360d035c840f18a01301b29ca1cb73c4be87843f18c45fc SHA512 ac263df086eea6faf682f493756b79a0af8bae3f515cd8c09238e89f295226baf743a3fd22d977ef6f223388769ef11241dfb2fdb6087305ce4fdd3fa8ed2f78
-EBUILD graphviz-2.40.1-r1.ebuild 7929 BLAKE2B 954fb0e307df7e28ae4cf0806aa5b1969615c542416532d11930b3327075977be13b38eb127639fe153bac3819f28a7ef1c0be926391331d3f01e60a4ebdbba8 SHA512 c0cf4c8aa2954391a46b3698c445b2dc100db6c8194cd191c8ecc4ea3b2ac2616b47ec8117b180abae6c8dd9edbde9c2e8731af78bccd6364932447c6a289a72
-EBUILD graphviz-2.42.1.ebuild 7928 BLAKE2B 56671e7d38854644335c6d16e86fac6ac03631e1a42ad71359f6450f0d8e95faef2f2f3854161d26bcdd1c343b7cbe5d78540aad50bae5a744fe2f6201b032fd SHA512 666ddedd9ebb69072f67644332fb0b88aa0369fa54c33ea6cce605e29c9f3d406c3feebd865cc93e31e7deb2511492c3bab8046afda4605b190e91c1308e87b3
+DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
+EBUILD graphviz-2.42.1-r1.ebuild 7935 BLAKE2B 1ac923f722297c1c12e5a8c38ced5b5568c76267be5be645503f64cc3977d1b352083edbeda259a05aad67ace7268906e55d3103c4aa456b27d6ce2cc66c9acb SHA512 7b122f160d5e886a4bd9a5844040eff974d5f86774fabd6938cebe85f01a40f49799fc64ba2708b7d8f8885a2efd506a9e6d401908d5ac970fc2ebc2ade46cb3
+EBUILD graphviz-2.42.3.ebuild 7823 BLAKE2B b10b894caa51995e558f5c28c3d247ba54055d9c82133f57a4d708d84255bcb7b212c71a712a29f1c732fed7506c8cbef0d21ef55b73ca36b419a72f6ffccd21 SHA512 8652c04572d91396521bad94323d72433a4a7a82d6f0084f2efd937517d76e7e735b9050abb03344dc8f319940fdfc29f5f1b6160400c3902fd09e989bdb1107
 MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71
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 02e81fac1d25..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-Submitted By:            Pierre Labastie <pierre dot labastie at neuf dot fr>
-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.000000000 +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 <QtGui>
-+#include <QtWidgets>
- #include <qfile.h>
- #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.000000000 +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 <QtGui>
-+#include <QtWidgets>
- #include <QMainWindow>
- #include <QPrinter>
- 
-diff -Naur a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp
---- a/cmd/gvedit/mainwindow.cpp	2016-09-20 06:45:02.000000000 +0200
-+++ b/cmd/gvedit/mainwindow.cpp	2017-08-28 17:05:32.226578375 +0200
-@@ -11,7 +11,7 @@
-  * Contributors: See CVS logs. Details at http://www.graphviz.org/
-  *************************************************************************/
- 
--#include <QtGui>
-+#include <QtWidgets>
- #include <qframe.h>
- #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.000000000 +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.000000000 +0200
-+++ b/cmd/gvedit/mdichild.cpp	2017-08-28 17:05:32.226578375 +0200
-@@ -12,7 +12,7 @@
-  *************************************************************************/
- 
- 
--#include <QtGui>
-+#include <QtWidgets>
- 
- #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.000000000 +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 <QtCore/QVariant>
--#include <QtGui/QAction>
--#include <QtGui/QApplication>
--#include <QtGui/QButtonGroup>
--#include <QtGui/QComboBox>
--#include <QtGui/QDialog>
--#include <QtGui/QFrame>
--#include <QtGui/QHBoxLayout>
--#include <QtGui/QHeaderView>
--#include <QtGui/QLabel>
--#include <QtGui/QLineEdit>
--#include <QtGui/QPushButton>
--#include <QtGui/QSpacerItem>
--#include <QtGui/QTextEdit>
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QWidget>
-+#include <QVariant>
-+#include <QAction>
-+#include <QApplication>
-+#include <QButtonGroup>
-+#include <QComboBox>
-+#include <QDialog>
-+#include <QFrame>
-+#include <QHBoxLayout>
-+#include <QHeaderView>
-+#include <QLabel>
-+#include <QLineEdit>
-+#include <QPushButton>
-+#include <QSpacerItem>
-+#include <QTextEdit>
-+#include <QVBoxLayout>
-+#include <QWidget>
- 
- QT_BEGIN_NAMESPACE
- 
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2016-12-22 06:44:41.000000000 +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.42.1.ebuild b/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild
index a87a88648f07..4dac9f5771e0 100644
--- a/media-gfx/graphviz/graphviz-2.42.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild
@@ -74,7 +74,7 @@ DEPEND="${COMMON_DEPEND}
 	ruby?	( dev-lang/swig )
 	tcl?	( dev-lang/swig )
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	!<=sci-chemistry/cluster-1.3.081231
 "
 
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.42.3.ebuild
index cb6f4538d330..67b51ca4f754 100644
--- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3.ebuild
@@ -1,79 +1,87 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
+PYTHON_COMPAT=( python2_7 python3_{5,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="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
+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"
+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
+# Requires ksh, tests against installed package, missing files and directory
 RESTRICT="test"
 
-COMMON_DEPEND="
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	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
+	>=media-libs/libpng-1.2:0=
 	sys-libs/zlib
 	virtual/jpeg:0
 	virtual/libiconv
-	cairo?	(
+	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:= )
+	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?	(
+	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= )
+	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"
+	)
+"
+DEPEND="${RDEPEND}
+	guile? (
+		dev-lang/swig
+		dev-scheme/guile
+	)
+	java? (
+		dev-lang/swig
+		>=virtual/jdk-1.5
+	)
+"
 
 # Dependency description / Maintainer-Info:
 
@@ -104,6 +112,7 @@ RDEPEND="${COMMON_DEPEND}
 # 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)
@@ -134,10 +143,7 @@ RDEPEND="${COMMON_DEPEND}
 #   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}-qt5.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -163,11 +169,6 @@ src_prepare() {
 	# delete the dir since we don't need to eautoreconf it
 	rm -r libltdl || die
 
-	# no nls, no gettext, no iconv macro, so disable it
-	if ! use nls ; then
-		sed -i -e '/^AM_ICONV/d' configure.ac || die
-	fi
-
 	# Nuke the dead symlinks for the bindings
 	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
 
@@ -182,30 +183,22 @@ src_prepare() {
 
 	use java && append-cppflags $(java-pkg_get-jni-cflags)
 
-	append-cxxflags -std=c++11  # bug 648764
-
 	eautoreconf
 }
 
 src_configure() {
 	local myconf=(
 		--enable-ltdl
-		--disable-silent-rules
-		$(use_enable static-libs static)
-	)
-
-	# libtool file collision, bug 276609
-	myconf+=( --without-included-ltdl --disable-ltdl-install )
-
-	myconf+=(
 		$(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)
@@ -216,36 +209,34 @@ src_configure() {
 		--with-ipsepcola
 		--with-libgd
 		--with-sfdp
-		$(use_enable gdk-pixbuf)
 		--without-ming
-	)
-
-	# new/experimental features, to be tested, disable for now
-	myconf+=(
+		# new/experimental features, to be tested, disable for now
 		--with-cgraph
 		--without-glitz
 		--without-ipsepcola
 		--without-smyrna
 		--without-visio
-	)
-
-	# Bindings:
-	myconf+=(
+		# Bindings:
 		$(use_enable guile)
-		--disable-io
 		$(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
-		$(use_enable perl)
 		--disable-php
-		$(use_enable python)
+		--disable-python
 		--disable-r
-		$(use_enable ruby)
 		--disable-sharp
-		$(use_enable tcl)
+		# libtool file collision, bug #276609
+		--without-included-ltdl
+		--disable-ltdl-install
 	)
-
-	econf ${myconf[@]}
+	econf "${myconf[@]}"
 }
 
 src_install() {
@@ -267,11 +258,12 @@ src_install() {
 		find "${ED}" -name '*.la' -delete || die
 	fi
 
-	dodoc AUTHORS ChangeLog NEWS README
+	einstalldocs
 
 	use python && python_optimize \
 		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python"
+		"${D}/usr/$(get_libdir)/graphviz/python2" \
+		"${D}/usr/$(get_libdir)/graphviz/python3"
 }
 
 pkg_postinst() {
@@ -282,5 +274,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	# Remove cruft, bug #547344
-	rm -rf "${EROOT}"usr/lib/graphviz/config{,6} || die
+	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
 }