[gentoo-commits] proj/gnome:master commit in: dev-libs/libpeas/files/, dev-libs/libpeas/

[gentoo-commits] proj/gnome:master commit in: dev-libs/libpeas/files/, dev-libs/libpeas/

[Sobhan Mohammadpour]

commit:     ff3acaa2f4221c7b32d010b368c8e8fd10be16c9
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 21:39:01 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Sat May 26 21:39:01 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ff3acaa2

dev-libs/libpeas: bump

Package-Manager: Portage-2.3.36, Repoman-2.3.9
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch | 18 +++++
 dev-libs/libpeas/libpeas-1.22.0.ebuild             | 84 ++++++++++++++++++++++
 2 files changed, 102 insertions(+)

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
new file mode 100644
index 00000000..c46cbee2
--- /dev/null
+++ b/dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch
@@ -0,0 +1,18 @@
+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.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
new file mode 100644
index 00000000..021c7d5e
--- /dev/null
+++ b/dev-libs/libpeas/libpeas-1.22.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+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-fbsd ~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}
+		>=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
+
+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?
+	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
+}