Merge branch 'edge' into next

4 files changed, 0 insertions, 139 deletions

diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 9c947f608ca5..6462fbb2d879 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,8 +1,4 @@
-AUX 1.22.0-py38-support.patch 994 BLAKE2B 1e8dafe6cf9f6a983bcb9f561cfd4e0d9e3a815806c35ac7b8c5b1bf3d881687438364ba59a749af5db7b43d58cc902caa8ccb2614f6c0dfbd71fa119c8ae1ce SHA512 5d6ee01c6f261a79f0cac611add0ed8e3e9840a9f8ac1d1b75f257a644a168ffad9c838833062e8ba9cbfd6639e50a3ebc87fa884dee2cc7981a65de5cc44a0a
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
-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
 DIST libpeas-1.26.0.tar.xz 191708 BLAKE2B 5845d5cb15724ba933572f48b9056a79cb2c167c7911ff1546c836fe56cd7e49d7461e5a413b79effa64e8e3fb2ed2eb370de665728e476e40ffb4d44c841543 SHA512 86157da14d17c16df2ef3f44ab48822ea1a8be8aec8f5419bc421bd475113f686cd16f9616ac53cbf3dc6f31f521384ac63eb8e9f1a46ea21b5cda8ba21e855f
-EBUILD libpeas-1.22.0-r2.ebuild 2286 BLAKE2B 9e37f758c7ff0dff08ba4341400e35f8d0e98cf414a844675b17ee38c07c5c0912156ff724ecbc71a9eabb4ba7121255d68399c27784f50e9fae46cc92a90de1 SHA512 7eccc83b4ae82c4657e246c2cdb982f3f7c4cc9c13e731c924bce1549da4fe9d0a4a2a566ec848b9c29efed7813f05765874e336b01719b81b894a34c0130fcf
 EBUILD libpeas-1.26.0.ebuild 1832 BLAKE2B 64baa0636c68e392bd6dbf82d38eb04c9751795b54888d0c4aef7173c00ad57847a1019759802b9938626b8d0c7170498cdb382f630cd5f3159a308bfb5a8d34 SHA512 ec196affec78d8a08b63aeacb5e0dcab6d1fd221cdf03d8724c14fdf97140780be716dd7ce4d7ca271b86fe7350c953fbdb036c277b03ba4c63e8cb842662da6
 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
deleted file mode 100644
index 6f4645da61c5..000000000000
--- a/dev-libs/libpeas/files/1.22.0-py38-support.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/files/libpeas-1.14.0-lua.pc.patch b/dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch
deleted file mode 100644
index c46cbee242e5..000000000000
--- a/dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Gentoo currently uses unversioned lua:0 - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
-
-diff --git a/configure.ac b/configure.ac
-index 810a288..51ca607 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -305,9 +305,9 @@ else
-     fi
- 
-     if test "x$found_lua51" != "xyes"; then
--        PKG_CHECK_EXISTS([lua5.1 >= $LUA51_REQUIRED], [
-+        PKG_CHECK_EXISTS([lua >= $LUA51_REQUIRED], [
-             found_lua51=yes
--            with_lua51=lua5.1
-+            with_lua51=lua
-         ], [
-             found_lua51=no
-         ])
diff --git a/dev-libs/libpeas/libpeas-1.22.0-r2.ebuild b/dev-libs/libpeas/libpeas-1.22.0-r2.ebuild
deleted file mode 100644
index 9918e9e75b87..000000000000
--- a/dev-libs/libpeas/libpeas-1.22.0-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="+gtk glade lua luajit +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39:=
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
-	lua? (
-		>=dev-lua/lgi-0.9.0
-		luajit? ( >=dev-lang/luajit-2:2 )
-		!luajit? ( =dev-lang/lua-5.1*:0 ) )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# 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_configure() {
-	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
-	# What do we do about gdb, valgrind, gcov, etc?
-	local myconf=(
-		$(use_enable glade glade-catalog)
-		$(use_enable gtk)
-		--disable-static
-
-		# py2 not supported anymore
-		--disable-python2
-		$(use_enable python python3)
-
-		# lua
-		$(use_enable lua lua5.1)
-		$(use_enable $(usex luajit lua luajit) luajit)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_test() {
-	# This looks fixed since 1.18.0:
-	#
-	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
-	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
-	# To reproduce:
-	# >>> from gi.repository import Gtk
-	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
-	# This should return True, it returns False for Xvfb
-	virtx emake check
-}