gentoo resync : 25.08.2020

4 files changed, 13 insertions, 11 deletions

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 6c4d860e986b..2dfcf42efd1b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,7 @@
 AUX dotty_change_button.patch 964 BLAKE2B d59c14fbcd967f28da141037f77ba57241c553f647af3f9bb0996c622b3728f294628279926f012cca4d4381a2ca17af6e4566727afba6568df7ff4a98c5bfbd SHA512 841c4c1eb820a9065f8530e7a5bca3743aaf808705177776b45100fbbeb73899c5c765feb14026866b42b7d5ee2b62de1cac5398edb01ef447451a529e350b3b
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
-DIST graphviz-2.44.0.tar.gz 32903746 BLAKE2B 05def6b50366900fe84b8d72b802461d33624444f00d1c648801da81708dcdf7dc601f95561d8f7dc8e745eef61326cb9a234a0db1bc45c8a7d7d46e552c373b SHA512 9fd54a5c7b0d8cf3e1bf7e80409b57022182b6bfe3f57a06a219d6d29684962ac935fc76d1e7420ba88b1ffc2ab5b967cc4617e56f810818f99801d31981a752
-EBUILD graphviz-2.42.3.ebuild 7841 BLAKE2B 3b0d6df9929c253cfca54cb76b504b12e1f74001486fc364da7ae83e3c5ff86a8066af3d62e859f083a418da107a24fb4be4d93df61d6b2fd6b3d8aaae7f8233 SHA512 20240f0f3e8cb2c0e6384b5f6eaf43066552ea267a61b14c9e4c283da2c0e485ab2b2df21768b5cbea2c0ae7eb1d4210b70f2c33f6b7b1d5afead4a7bce781eb
-EBUILD graphviz-2.44.0.ebuild 7848 BLAKE2B bf6deda1a51544782dbbfa20ae6d68f3ff84b13d5faa41b49c7d992bef941166ac8a6864ed27bb9034ddcdb83c4a02d7f3e00e1e51bd8e8be6a196ea2b4d6b58 SHA512 a4b34d28d1615b19c9cdbb9ec8ea7b4b333729eebed03bfc6764f3f5214564558672a9907b21d10c4b3a9f581bdd1df25ccd3aad1f710fb082da67ed0f6ea243
-MISC metadata.xml 2304 BLAKE2B 702643020c9a91f60460e6f6f63cb5ba6389b4307a454a47b24daba75e2ae104e8e93f3d4913a6007749a1d0e70157608b03b9b7d29ae422685e82aaabc3bfc4 SHA512 bc27ff36b8aaf76c265878095f74319314534bc28589b79e0bf4f3fed27ed965e172c1a8279a58f570b799961abb9c87281c3242dda950e936223999fa150e03
+DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
+EBUILD graphviz-2.42.3-r1.ebuild 7864 BLAKE2B 4390c7d22ec3e914d25445eda9ffab4bd879c5a1316355a69cd0cea756a3d85c15c3dc31bcbf97161de877eb70605e230b7a43b2c3201d980387f49653231278 SHA512 9105485fa2e67399edd207249ad80ed7b16c2f9378b33e2f844f402a4e7cbef53868ef8fb4800d06672deb75f62a51ec68949fd2d16c2cf345846116c0e68b74
+EBUILD graphviz-2.44.1-r1.ebuild 7828 BLAKE2B ccb3b572a5f9233f796e92972c0706a12873c8520d4b1ee5c688c37712cadc1621b6d05a7d48c78d8708c7b39333779a572e090a46c741b96d8216524b314e36 SHA512 6239cd60bdcf14260e92cc8a50b7c361d0eef7b115df705a3f0664023faf7ebe7667942ad0a06ba4a190306428dc2a2d501f1b726f81b0d079af74572cfd6b09
+MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/graphviz-2.42.3.ebuild b/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
index 25cc03cc6575..86275dffb43f 100644
--- a/media-gfx/graphviz/graphviz-2.42.3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
@@ -13,10 +13,11 @@ 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 ~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"
+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
@@ -25,6 +26,7 @@ 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 )
@@ -190,9 +192,9 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--enable-ltdl
+		--enable-gdk-pixbuf
 		$(use_with cairo pangocairo)
 		$(use_with devil)
-		$(use_enable gdk-pixbuf)
 		$(use_with gtk)
 		$(use_with gts)
 		$(use_with qt5 qt)
diff --git a/media-gfx/graphviz/graphviz-2.44.0.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index 25929d6e9b8b..cab048b373aa 100644
--- a/media-gfx/graphviz/graphviz-2.44.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -13,10 +13,11 @@ 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 ~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"
+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
@@ -25,6 +26,7 @@ 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 )
@@ -143,8 +145,7 @@ 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
-	  "${FILESDIR}"/dotty_change_button.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -190,9 +191,9 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--enable-ltdl
+		--enable-gdk-pixbuf
 		$(use_with cairo pangocairo)
 		$(use_with devil)
-		$(use_enable gdk-pixbuf)
 		$(use_with gtk)
 		$(use_with gts)
 		$(use_with qt5 qt)
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 2a32c622872f..0e17a85326a1 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -36,7 +36,6 @@
 	</longdescription>
 	<use>
 		<flag name="devil">Enables DevIL output plugin -Tdevil</flag>
-		<flag name="gdk-pixbuf">Enables gdk-pixbuf2 plugin</flag>
 		<flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
 		<flag name="gts">Enables support for GNU Triangulated Surface Library (required for sfdp to work)</flag>
 		<flag name="lasi">Enables PostScript output via <pkg>media-libs/lasi</pkg>, for plugin -Tlasi (needs cairo)</flag>