Fix build and dependencies with USE="lua -jit" (bug #551704, thanks to tman and Ulrich Müller). Really build luajit support if USE="lua jit". Punt .la files.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

4 files changed, 138 insertions, 6 deletions

diff --git a/dev-libs/libpeas/ChangeLog b/dev-libs/libpeas/ChangeLog
index 89bd4746280b..cbd500484b9c 100644
--- a/dev-libs/libpeas/ChangeLog
+++ b/dev-libs/libpeas/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libpeas
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.46 2015/06/09 11:04:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.47 2015/06/11 01:45:08 tetromino Exp $
+
+*libpeas-1.14.0-r1 (11 Jun 2015)
+
+  11 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libpeas-1.14.0-r1.ebuild, +files/libpeas-1.14.0-lua.pc.patch:
+  Fix build and dependencies with USE="lua -jit" (bug #551704, thanks to tman
+  and Ulrich Müller). Really build luajit support if USE="lua jit". Punt .la
+  files.
 
 *libpeas-1.14.0 (09 Jun 2015)
 
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 3264a60a70ac..73aa665d1ffb 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,16 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libpeas-1.14.0-lua.pc.patch 553 SHA256 5ce7d73d6c1d5e00893a52055a6a839212562d95b9a1213774a0fc34f906c505 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349 WHIRLPOOL b830d8cf2163d5bd79f25c9bb681e7d3cd64d9acd8574443aa896366442a43113481811553bf6f11a3f977b3e8114c240dc2f30388b93ff94a181fec1831500b
 DIST libpeas-1.12.1.tar.xz 522616 SHA256 e610be31c9d382580fb5d8686f8311149f27413f55af6abf5c033178b99452d6 SHA512 3b3f973066d8237da666b60fd8b34c93159c98742b255dd0205d2cfeb474635e823b60412f833564ce6116101c2c2b263fed7a59f1fc624d0a727c9e2897b58c WHIRLPOOL adbaff8093c8d5b0f1c174be2d2011512aa98da471302910a7a52f5b70a39333f514e68b71803f5c74022146a0b6dfb657c9cc960fa755c98f453216e4ef2d25
 DIST libpeas-1.14.0.tar.xz 546092 SHA256 5e4b3a8968b71497ab26a7a528c414c4c640c5724328fa3507854f04788e2d76 SHA512 64559d317833c53d8c64cb627ccc2efff8df1469192bf71504aee8558c76562e987d9c7618c192e621422710d524b91a6496a1255a441242067fc71c9283bddf WHIRLPOOL dd2072446fbf2b36443e60745b53aab8d4eac8cb6c624108b722faa27eea29422f99d0cb0253f626a051d0754778ee48d9596e539f2e97916ddfa75ed7435cc2
 EBUILD libpeas-1.12.1-r1.ebuild 2086 SHA256 7aa827e468ffe0bd006c9ecd2a454db759eb95e34db041dd3ce5c78218d8d18b SHA512 c4d8b43d3b9aadc7abbfe6d2a529face7a00b58cbbb04ad45e58f0de3263e0b35de34f5bead2ccd9167ce38370964d7a89b83ef1f2880edabf4d2b07884fed1b WHIRLPOOL 3ae6b1740bce71ace90bb9e55834ecc9a44cef01593d620789e52f4b0834d98a2fa0ab4116a863418f0602eaef54d979ce89b9627ef532273b02c18c4769fd6f
+EBUILD libpeas-1.14.0-r1.ebuild 2496 SHA256 3e472f6638d114676822284048e80bf9e3c6028a3a119d7461987ed76387c4c5 SHA512 850a6f57735b24db09bfa5f660e3070280b1f017b198335ceb40ef968aa6bd02ff8175613704ecf19ca88284079a9e4bc89fab223bf8ce3bdb303f1cc130c128 WHIRLPOOL b92ce3af9f68824d2e328d1fd6f0e7e230346421bfac3562ff0bdda337850a63858a7b8df49f4c23b98624399b4cbc0ca73ddf683460d1991951b05f5fa7c6f3
 EBUILD libpeas-1.14.0.ebuild 2224 SHA256 498ca1df551d6b09df6e155a9363597b1390fe7683b80ee27543010af966d73c SHA512 b08d2f1a0678f161c923ffe2f29dd0a6bd93b5d70cbb58e9133be0a1338782eba99d1e2240b5fd12b101b2108f88d72628a45feadaaba44de6d146122ef48524 WHIRLPOOL 1b8f849094050adaabc9c979d0c57a2471eb02227c9ad0611af965c025589b5a33475fc91784976c3cf2132c7e555a1ce853f062574aea995dd67e088f5f9c73
-MISC ChangeLog 6635 SHA256 0f559c71832b6899a49c721c6440dfe9338cbd4469ed40ad596a51f68799d8d4 SHA512 f227d521825750b9ad0b8e378225be04adb6d539edc81d2a4ce33e632e8d25b38ede36ce0a2d96d53504d3234cfedd41dfbeb2e0d8fe5a111ee9fc0baca7a09a WHIRLPOOL 4b6ce111d2fa50d42f484a8fc00dfd681c74f8c9a601354d173464c2b0614ef05173079915547702ba84534bf619a1c9694310feda0fd921101872a7df5b345c
+MISC ChangeLog 6965 SHA256 6f336a8234af6b6b4e45184216ad5bce4b42bdc521bc2dea72285cb7a1c181dc SHA512 ca4105029e9c7a931150c02df1e3c99032a6e26c407ab15cad260a245055dc1200966ecb5b521e80ba1040b52fe3be7cf1c770421c9bb487f2f7847e799a2e83 WHIRLPOOL 5b1b8011384b17ac736d22e6334d27aadf63844eeaae66d09180db964ba150008d586b34fe2174191b9dafeb9ac5ddda471b8cc9cdf5368970f0eb4ee8f2b2ff
 MISC metadata.xml 321 SHA256 e5b001c435b2bce49ccc5d2134abfc71e9fe6a1e3a0fe0708faacb23f66bc88f SHA512 792928b55d51ffdbd8cd77c6b42a13af42e20016f80e622585b03968418793ed4ea5afb50118d077aebfd8e3d2d307247e7629e06d61ed044afda9243c91de46 WHIRLPOOL 80e81af852eb79564f9344826ca6bcf3bbc13a70d4d74a7bdd0a374f84296a2474cf2f9fbabab0b6ba1e611ee7ab4cc847207b1b30f53f066943f092d5d7ebf4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV2yCwACgkQ1fmVwcYIWAYcsACglses5N18ldH4JokY3iwAH2I2
-sAQAmgJSTGCXEJ409TyL1Y/tHsD66jw6
-=JeR0
+iQJ8BAEBCABmBQJVeOgmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyN9IQQAM2swIKdV/Rdn0ZKy6BKnj9/
+3OQjrGDfS2jYkR4zU1vbpv8dePnyjtdeEJX/35JMH2hzOv+pYnpHZ7HX5alSYd7L
+LdYXikFpu796tvAr/bj3OWUT0FIDWQDz3tWUhx57GiTZQQMSm6cNmrKLBB9pP1ht
+l0xgu9DxIaSDeIUgxIUEQvgIXfqpK/CBkX1ujc4QDq9e2EnGLodouTSrdvbRBG8p
+hJ5XdnI2myO/fTfQwKKPjQYX5CmJQA4Bww3onKgt3Fk5zLIVOXO9WgXmZaGzsQyg
++1QqeGQld3g9vNbkqu518WoRT6rJruV2D89waW49tx/PhYkP2j1MJLHr1ET2S9QI
+yfm6mWUa7pzTgmncpuqbLWe2+znj4fL2hTi9l6wvSuW6CQiuvXXdvM16wpluY0qO
+d+P+teuj/yS6T0je1dNczbcwxue4P2svIuOTd/+dAZ5ysSbyEBcBzV+C+LyffzSe
+F5CwDLMeesKbmENhitaQb4d8jkQ9LzZKsp4Ow5itpa5xdknm56zJ922VctysUhND
+125L60qd7qUyqCOLlcfm9RQ4tDE4e/4E2S8mO+8b4yPpo9eUJzndsNB6ErCwtYs+
+nvmXn8BQ7fb7dHtLmizKxsFOmdMjl51667L+yyA4dmj8+qkwO2s6gDLHoYuxqbLM
+8cqKKpLFMeJ72cBWZjk0
+=0VDJ
 -----END PGP SIGNATURE-----
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 000000000000..c46cbee242e5
--- /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.14.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..bd79b5d707ed
--- /dev/null
+++ b/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild,v 1.1 2015/06/11 01:45:08 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools eutils gnome2 multilib python-r1 virtualx
+
+DESCRIPTION="A GObject plugins library"
+HOMEPAGE="http://developer.gnome.org/libpeas/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-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
+"
+
+src_prepare() {
+	# Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
+	epatch "${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}-config"
+		)
+	}
+	use python && python_foreach_impl python_configure
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_test() {
+	# 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
+	Xemake check
+}