gentoo resync : 17.02.2020

3 files changed, 38 insertions, 8 deletions

diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 08f8b711bc11..e6b4bb1674ed 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,5 @@
+AUX 1.22.0-py38-support.patch 994 BLAKE2B 1e8dafe6cf9f6a983bcb9f561cfd4e0d9e3a815806c35ac7b8c5b1bf3d881687438364ba59a749af5db7b43d58cc902caa8ccb2614f6c0dfbd71fa119c8ae1ce SHA512 5d6ee01c6f261a79f0cac611add0ed8e3e9840a9f8ac1d1b75f257a644a168ffad9c838833062e8ba9cbfd6639e50a3ebc87fa884dee2cc7981a65de5cc44a0a
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
 DIST libpeas-1.22.0.tar.xz 561332 BLAKE2B 219918f8663cd60c9353f477ef905ce0d1e21bf5b7c09661c4cb3c8adbba3af9f5e93b9de8a1b098dab09b1f4071854a871c8ea1db878bda8fe9e51aa45e5f87 SHA512 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91
-EBUILD libpeas-1.22.0-r1.ebuild 2235 BLAKE2B 0a127c7459e00373fe163207b56e14bece19db601f9970f37c4a7e51f86e0cd88c17e9891b8cbe2964789a77c8b7e8ffe8fee84a10c5b339f732960ce2639d95 SHA512 125bd2134814f61805fcafa2547662c9d92cc1aadc360ff49d78b720d6634b70f203b28b88df19bd7ed858ec3b21d52948567c672b61ac0a296f7b8e706c87ff
+EBUILD libpeas-1.22.0-r2.ebuild 2286 BLAKE2B 9e37f758c7ff0dff08ba4341400e35f8d0e98cf414a844675b17ee38c07c5c0912156ff724ecbc71a9eabb4ba7121255d68399c27784f50e9fae46cc92a90de1 SHA512 7eccc83b4ae82c4657e246c2cdb982f3f7c4cc9c13e731c924bce1549da4fe9d0a4a2a566ec848b9c29efed7813f05765874e336b01719b81b894a34c0130fcf
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/files/1.22.0-py38-support.patch b/dev-libs/libpeas/files/1.22.0-py38-support.patch
new file mode 100644
index 000000000000..6f4645da61c5
--- /dev/null
+++ b/dev-libs/libpeas/files/1.22.0-py38-support.patch
@@ -0,0 +1,29 @@
+From 3571f4b23abbf5c63e38c82d24a1880fa440499e Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <mart@leio.tech>
+Date: Sat, 15 Feb 2020 23:23:09 +0200
+Subject: [PATCH] Fix python-3.8 compatibility
+
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bd561e2..d3d0073 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -442,7 +442,11 @@ else
+                 found_python3=yes
+                 PYTHON3_BIN="$PYTHON"
+                 PYTHON3_CFLAGS=`${PYTHON3_CONFIG} --includes`
+-                PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs`
++                if $PYTHON3_CONFIG --embed >/dev/null 2>&1; then
++                    PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs --embed`
++                else
++                    PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs`
++                fi
+                 PYTHON3_LDFLAGS=`${PYTHON3_CONFIG} --ldflags`
+                 AC_SUBST(PYTHON3_BIN)
+                 AC_SUBST(PYTHON3_CFLAGS)
+-- 
+2.20.1
+
diff --git a/dev-libs/libpeas/libpeas-1.22.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.22.0-r2.ebuild
index d2eec7dc5313..9918e9e75b87 100644
--- a/dev-libs/libpeas/libpeas-1.22.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.22.0-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit autotools eutils gnome2 multilib python-single-r1 virtualx
@@ -44,17 +45,16 @@ DEPEND="${RDEPEND}
 "
 # eautoreconf needs gobject-introspection-common, gnome-common
 
+PATCHES=(
+	# Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
+	"${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
+	"${FILESDIR}"/${PV}-py38-support.patch # Fix py3.8 support, bug 702810
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	# Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
-	eapply "${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
 src_configure() {
 	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
 	# What do we do about gdb, valgrind, gcov, etc?