gentoo resync : 10.12.2017

3 files changed, 3 insertions, 101 deletions

diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index c6213ef757c5..d54dccc8d7f8 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,5 +1,4 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
-DIST libpeas-1.20.0.tar.xz 557872 SHA256 f392fffe2dc00072a51bb2a1b274224a06bdc5f9c3b3c0ac4816909e9933d354 SHA512 b3ddebf65e1a76493b5cd5150f60c13597c90398eea16c002e51d25449a595f7591bd0ccd1214ca3a8cbce724eb10f38a316e8c95092442034c048bc95cfdbf4 WHIRLPOOL 94e4bd69a13d07a0dbe3b959c7feed3bbe705767351fd9053f266c1120d5356f15b745fb57d357d5a56303afd40deec37033f575c047c28ffb748050f1a983e0
-EBUILD libpeas-1.20.0-r1.ebuild 2171 BLAKE2B 30e67364b89cef4e0eea3c567713aed22ce1980dad896964e31a5bf9549429b82809e0bacdf26ff8241d42980513bec38dcc14a876488d572ae46efc78fbb0d8 SHA512 335d16625421587381ffdf54dc33f52cfacef4d6eb1f1fecc4d54cec1e961ad42263554a8c7da3a3ee0273e279c3682c46734c9328aedcd04d20efb6abad6e70
-EBUILD libpeas-1.20.0.ebuild 2503 BLAKE2B dcf116ecd2ea3624f7479aede5c12f44433c909d5b46520f2b25b3588ff5660a97d109aa70997702e5fddd89b8a35cc2ad6a10515eb352b01e8ef12f2e3599d1 SHA512 6fa6f7dde97c922445dd9aa355a0c6f50b05ab859ab08460ed26e7bae31a98031f7a314c023e7ccef943e9541a93fd5d2c6cd3e5c32d9b8f6715fd4fc6eb9a2e
+DIST libpeas-1.20.0.tar.xz 557872 BLAKE2B c10cd85ff6f15f2124541aba3b437e3216322647e36f93a2202df14aebda7c35896a5f77a40ddcd5a5f0300df11c274334cc3a8dfba3fe2745e0b364cb7eac4c SHA512 b3ddebf65e1a76493b5cd5150f60c13597c90398eea16c002e51d25449a595f7591bd0ccd1214ca3a8cbce724eb10f38a316e8c95092442034c048bc95cfdbf4
+EBUILD libpeas-1.20.0-r1.ebuild 2175 BLAKE2B 728bb4eb437c03cbd0d430972fa7059571843de4e0b8b1ff3dc135333a9632aff3d0bca971f87135c6374700380151a8b3eebc6137fdc15c692f9908260b9c84 SHA512 3b5567dec6ae096a84000ed8cd1646aa6a1b90bf0776a5d6de4e1c95b093a06a8006706a7f72ff34ec7c371bfb7c1aaa0a7016bb5cfc21b38b5482c1280ca537
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
index b08429342cca..71803c6cb7fe 100644
--- a/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.20.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
 inherit autotools eutils gnome2 multilib python-single-r1 virtualx
 
diff --git a/dev-libs/libpeas/libpeas-1.20.0.ebuild b/dev-libs/libpeas/libpeas-1.20.0.ebuild
deleted file mode 100644
index 0418a2e4b1b4..000000000000
--- a/dev-libs/libpeas/libpeas-1.20.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils gnome2 multilib python-r1 virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="+gtk glade jit lua +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
-
-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
-		jit? ( >=dev-lang/luajit-2:2 )
-		!jit? ( =dev-lang/lua-5.1*:0 ) )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=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
-
-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?
-	local myconf=(
-		$(use_enable glade glade-catalog)
-		$(use_enable gtk)
-		--disable-static
-
-		# possibly overriden below
-		--disable-python{2,3}
-		--disable-lua5.1
-		--disable-luajit
-	)
-
-	if use lua ; then
-		if use jit ; then
-			myconf+=( --enable-lua5.1 --enable-luajit )
-		else
-			myconf+=( --enable-lua5.1 )
-		fi
-	fi
-
-	python_configure() {
-		local v
-		python_is_python3 && v=3 || v=2
-		myconf+=(
-			"--enable-python${v}"
-			# it is just 'PYTHON' for py3 in the build system
-			"PYTHON${v#3}=${PYTHON}"
-			"PYTHON${v}_CONFIG=$(python_get_PYTHON_CONFIG)"
-		)
-	}
-	use python && python_foreach_impl python_configure
-
-	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
-}