tetromino    15/06/11 01:45:08

  Modified:             ChangeLog
  Added:                libpeas-1.14.0-r1.ebuild
  Log:
  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.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0x18E5B6F2D8D5EC8D)

Revision  Changes    Path
1.47                 dev-libs/libpeas/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpeas/ChangeLog?rev=1.47&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpeas/ChangeLog?rev=1.47&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpeas/ChangeLog?r1=1.46&r2=1.47

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChangeLog   9 Jun 2015 11:04:11 -0000       1.46
+++ ChangeLog   11 Jun 2015 01:45:08 -0000      1.47
@@ -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 <tetrom...@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)
 



1.1                  dev-libs/libpeas/libpeas-1.14.0-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: libpeas-1.14.0-r1.ebuild
===================================================================
# 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
}




Reply via email to