gentoo resync : 14.05.2020

3 files changed, 18 insertions, 30 deletions

diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index d1d953c41ab5..68ba518b35f3 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,6 +1,6 @@
 AUX dia-0.97.0-gnome-doc.patch 1961 BLAKE2B 6b6835a487e4b1ada0a1e67cb3ce123b0b4b3e67c86e9478ac0f401ae70f8f1381ef068a2ca6e116313db42d09bdb7abb523bf9a34856a1a39f7e4b0c9c3a84f SHA512 5200051f19d4a199f8c4e17e5f23c16ad4c13a9531b843be0a4d491aa8884efd4d90e6850c1cd1488e80b344ff18e5dc2b2ad7e57cb7417b6c574ad1e8d6f186
-AUX dia-0.97.2-underlinking.patch 1024 BLAKE2B 32fa473b806e740fb7c2b0e04c170c746bf523088e85dce281d0c87ef10c1542f1d77414dd49e6ce48b1e54c2e3e48d09c1820a8739bce6bb64539ba87b2485e SHA512 d45eb49c39227e9f11ce999083de0a83c60bfac2a5db2403e4bf083c275efdef6bd1adca678712253ec53f7b3d22a5c23f6f886839c32e6cb07a93c001f45e2e
+AUX dia-0.97.2-underlinking.patch 969 BLAKE2B 00c56ce70b89e2e78c565ac106633e00601f917c9964f36812f3eddb3031df26c3446591e043b90da6890a0623c99bdf5d0bbd34b468d54bcdfeee8b6ae13bf2 SHA512 556bfd779c6487b20fdca5cd4b6de3d4855db87d68db17549a802719024130cad55a249f9db5329960622a0857b1b3ec009f7a8fd173c27bb5ed1953af9a4ee0
 AUX dia-0.97.3-freetype_pkgconfig.patch 2574 BLAKE2B 870617b939e4ab7ecdfbf5bba4e78cee9f34ee10b1de2bb85380cc96d31c319132861b8ddd0e89a5a03cae2578588c9483ba62f0bf4006096c4074beef77cc4f SHA512 0e937bb17cb69d3f266f68658b11b209a913300d2366adfa4bb608212cd82f00d85272be784f0442d0dcba8659d020e5e848d2e02ee7310ec8cfd6c7170aa8b7
 DIST dia-0.97.3.tar.xz 5548500 BLAKE2B ab476ce48e57c1def01095a8d6d92208c11817580cfca1cfcf38af12943153116b31149ca187c65e5121ef9fb281bacc4c3e7f1726ed23b46ba14902faaaa34f SHA512 34298980be930b87cb4a636344e4cb2a7e43eedc00b0969a5e446cee9b74b616fdc8c798efcb9a5832b98741f2e20632a44037b2bcb436f59591d531ef441efa
-EBUILD dia-0.97.3.ebuild 2885 BLAKE2B ce2c5294ea1582a4fc3303338e90c05218227495c8e3ccea88b43a820a2acf4fc76fdaf43da0091ae00e53d367684a4f3328cea67fc7ffabf8032a1613a4b6a3 SHA512 ed840356e405e6d55fcb756e94deb5b50336adfd7e6475cabe9509b13af6374c90f1555552a4c272e887623443d3ed3b4ad0190052cea9e8f9ae0159ba82ec80
+EBUILD dia-0.97.3-r1.ebuild 2576 BLAKE2B fc8caf30e5e07e4f5fe68ba5b108d212daeec6bece8ea2ec9a0ca1b1f9d20b47e944b68dc3556e67703f9e1f960476130f4a085e40a721603038f3db82157188 SHA512 aa0ffadf4a0d0e60c71d340cdf9c7846ed968dc851a9ac7db008bae1967763be80daac42566c96cb44fc9ecd820fc2fac8467b37b9b5dba55ca308874b8ca1ec
 MISC metadata.xml 668 BLAKE2B 8efd2b23ae5c96f9c65cae27602a4e8a969d279b2400c0e5940541d2d9066ce0f5dcbb39e9a5dabf6ce8391f57d1b527a89bb7a015153922b378d40c121342c6 SHA512 2296acdf1f56496eb699d6acfc85ec64e1c514dc01184df367c77b505f8765d45b51d7753e1d6bcb5cb80cb239f6a05b0fcda9ddc412f7d72ed4a4a4733ea6ed
diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3-r1.ebuild
index d39f9d30be27..fc0207a5f053 100644
--- a/app-office/dia/dia-0.97.3.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG=yes
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
 
-inherit autotools eutils gnome2 python-single-r1 multilib
+GNOME2_EAUTORECONF="yes"
+inherit gnome2
 
 DESCRIPTION="Diagram/flowchart creation program"
 HOMEPAGE="https://wiki.gnome.org/Apps/Dia"
@@ -17,8 +15,7 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-
 # the doc USE flag doesn't seem to do anything without docbook2html
 # cairo support is preferred as explained by upstream at:
 # https://bugzilla.gnome.org/show_bug.cgi?id=729668#c6
-IUSE="+cairo doc python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+cairo doc"
 
 RDEPEND="
 	>=dev-libs/glib-2:2
@@ -35,9 +32,6 @@ RDEPEND="
 	doc? (
 		app-text/docbook-xml-dtd:4.5
 		app-text/docbook-xsl-stylesheets )
-	python? (
-		>=dev-python/pygtk-2
-		${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -45,21 +39,15 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( dev-libs/libxslt )"
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
+DOCS=( AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO )
 
-	epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690
-	epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
-	epatch "${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1
-
-	if use python; then
-		python_fix_shebang .
-	fi
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690
+	"${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685, upstream #678761
+	"${FILESDIR}"/${PN}-0.97.3-freetype_pkgconfig.patch #654814, upstream https://gitlab.gnome.org/GNOME/dia/merge_requests/1
+)
 
+src_prepare() {
 	if ! use doc; then
 		# Skip man generation
 		sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
@@ -88,7 +76,7 @@ src_configure() {
 		--disable-libemf \
 		$(use_enable doc db2html) \
 		$(use_with cairo) \
-		$(use_with python) \
+		--without-python \
 		--without-swig \
 		--without-hardbooks
 }
diff --git a/app-office/dia/files/dia-0.97.2-underlinking.patch b/app-office/dia/files/dia-0.97.2-underlinking.patch
index 903e077f23f4..297888cc9b6e 100644
--- a/app-office/dia/files/dia-0.97.2-underlinking.patch
+++ b/app-office/dia/files/dia-0.97.2-underlinking.patch
@@ -6,13 +6,13 @@ Subject: [PATCH] Fix missing linkage with gmodule-2.0.
 Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=678761
 Fixes: https://bugs.gentoo.org/show_bug.cgi?id=420685
 ---
- dia-0.97.2/configure.in | 2 +-
+ configure.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/dia-0.97.2/configure.in b/dia-0.97.2/configure.in
+diff --git a/configure.in b/configure.in
 index 72830de..6b7394a 100644
---- a/dia-0.97.2/configure.in
-+++ b/dia-0.97.2/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -55,7 +55,7 @@ AC_SUBST(GMODULE_CFLAGS)
  AC_SUBST(GMODULE_LIBS)
  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)