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

2018-09-14 Thread Mart Raudsepp
commit: 13c8b1021b1d83c3dcf06779103d91136b6c7877
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Sep 14 08:52:39 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Sep 14 08:52:39 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=13c8b102

dev-libs/libpeas: remove, available in ::gentoo

Also remove  as it's hopelessly out of date

 dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch | 18 
 dev-libs/libpeas/libpeas-1.22.0.ebuild | 84 ---
 dev-libs/libpeas/libpeas-.ebuild   | 96 --
 dev-libs/libpeas/metadata.xml  | 13 ---
 4 files changed, 211 deletions(-)

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 c46cbee2..
--- 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.ebuild 
b/dev-libs/libpeas/libpeas-1.22.0.ebuild
deleted file mode 100644
index 021c7d5e..
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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
-}

diff --git a/dev-libs/libpeas/libpeas-.ebuild 
b/dev-libs/libpeas/libpeas-.ebuild
deleted file mode 100644
index f18229ac..
--- a/dev-libs/libpeas/libpeas-.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit gnome2 multilib python-r1 virtualx
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="http://developer.gnome.org/libpeas/stabl

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

2018-05-26 Thread Sobhan Mohammadpour
commit: ff3acaa2f4221c7b32d010b368c8e8fd10be16c9
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Sat May 26 21:39:01 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Sat May 26 21:39:01 2018 +
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 ..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 ..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
+}



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

2015-06-09 Thread Gilles Dartiguelongue
commit: 9b8b28bc5b03204e34ba039865ea96723ca5fb4e
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue Jun  9 11:03:37 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue Jun  9 13:48:43 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9b8b28bc

dev-libs/libpeas: moved to gentoo-x86

 dev-libs/libpeas/libpeas-1.14.0.ebuild | 84 --
 1 file changed, 84 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-1.14.0.ebuild 
b/dev-libs/libpeas/libpeas-1.14.0.ebuild
deleted file mode 100644
index 97b7a42..000
--- a/dev-libs/libpeas/libpeas-1.14.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit 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
-   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_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-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
-}



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

2015-05-14 Thread Gilles Dartiguelongue
commit: fbe2c1e8ef10a4707580711b64ae3525746c3bd8
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu May 14 22:35:19 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu May 14 22:37:43 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=fbe2c1e8

dev-libs/libpeas: fix repoman warnings

 dev-libs/libpeas/libpeas-1.14.0.ebuild | 4 ++--
 dev-libs/libpeas/libpeas-.ebuild   | 4 ++--
 dev-libs/libpeas/metadata.xml  | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-1.14.0.ebuild 
b/dev-libs/libpeas/libpeas-1.14.0.ebuild
index c5edaf4..97b7a42 100644
--- a/dev-libs/libpeas/libpeas-1.14.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.14.0.ebuild
@@ -24,8 +24,8 @@ RDEPEND="
gtk? ( >=x11-libs/gtk+-3:3[introspection] )
lua? (
dev-lua/lgi
-   jit? ( >=dev-lang/luajit-2 )
-   !jit? ( >=dev-lang/lua-5.1 ) )
+   jit? ( >=dev-lang/luajit-2:2 )
+   !jit? ( >=dev-lang/lua-5.1:0 ) )
python? (
${PYTHON_DEPS}
>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )

diff --git a/dev-libs/libpeas/libpeas-.ebuild 
b/dev-libs/libpeas/libpeas-.ebuild
index 7f4aaeb..1205c8c 100644
--- a/dev-libs/libpeas/libpeas-.ebuild
+++ b/dev-libs/libpeas/libpeas-.ebuild
@@ -32,8 +32,8 @@ RDEPEND="
gtk? ( >=x11-libs/gtk+-3:3[introspection] )
lua? (
dev-lua/lgi
-   jit? ( >=dev-lang/luajit-2 )
-   !jit? ( >=dev-lang/lua-5.1 ) )
+   jit? ( >=dev-lang/luajit-2:2 )
+   !jit? ( >=dev-lang/lua-5.1:0 ) )
python? (
${PYTHON_DEPS}
>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )

diff --git a/dev-libs/libpeas/metadata.xml b/dev-libs/libpeas/metadata.xml
index cc3500e..1ee0353 100644
--- a/dev-libs/libpeas/metadata.xml
+++ b/dev-libs/libpeas/metadata.xml
@@ -6,7 +6,5 @@
Install the glade catalog
Build support for loading 
dev-lang/python
plugins
-   Build support for loading JavaScript plugins 
using
-   dev-libs/seed

 



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

2015-05-10 Thread Gilles Dartiguelongue
commit: 2bbedc7f3e2f2e5c4711b17c334a58a902bf244c
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun May 10 15:54:58 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun May 10 15:57:16 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bbedc7f

dev-libs/libpeas: 1.12.1-r1 → 1.14.0

 .../{libpeas-.ebuild => libpeas-1.14.0.ebuild} | 44 +++---
 dev-libs/libpeas/libpeas-.ebuild   | 30 ++-
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-.ebuild 
b/dev-libs/libpeas/libpeas-1.14.0.ebuild
similarity index 73%
copy from dev-libs/libpeas/libpeas-.ebuild
copy to dev-libs/libpeas/libpeas-1.14.0.ebuild
index 0a8665d..c5edaf4 100644
--- a/dev-libs/libpeas/libpeas-.ebuild
+++ b/dev-libs/libpeas/libpeas-1.14.0.ebuild
@@ -1,40 +1,34 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit gnome2 multilib python-r1 virtualx
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
 
 DESCRIPTION="A GObject plugins library"
 HOMEPAGE="http://developer.gnome.org/libpeas/stable/";
 
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="+gtk glade +python seed"
+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*') ) )"
-if [[ ${PV} =  ]]; then
-   IUSE="${IUSE} doc"
-   KEYWORDS=""
-else
-   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-fi
 
 RDEPEND="
-   >=dev-libs/glib-2.32:2
+   >=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
+   jit? ( >=dev-lang/luajit-2 )
+   !jit? ( >=dev-lang/lua-5.1 ) )
python? (
${PYTHON_DEPS}
-   >=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
-   seed? ( >=dev-libs/seed-2.91.91 )
+   >=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.11
@@ -42,23 +36,27 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
 "
 
-if [[ ${PV} =  ]]; then
-   DEPEND="${DEPEND} doc? ( >=dev-util/gtk-doc-1.11 )"
-fi
-
 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)
-   $(use_enable seed)
-   --disable-deprecation
--disable-static
 
# possibly overriden below
--disable-python{2,3}
+   --disable-lua5.1
+   --disable-luajit
)
-   # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
-   # What do we do about gdb, valgrind, gcov, etc?
+
+   if use lua ; then
+   if use jit ; then
+   myconf+=( --enable-luajit )
+   else
+   myconf+=( --enable-lua5.1 )
+   fi
+   fi
 
python_configure() {
local v

diff --git a/dev-libs/libpeas/libpeas-.ebuild 
b/dev-libs/libpeas/libpeas-.ebuild
index 0a8665d..7f4aaeb 100644
--- a/dev-libs/libpeas/libpeas-.ebuild
+++ b/dev-libs/libpeas/libpeas-.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit gnome2 multilib python-r1 virtualx
@@ -17,7 +16,7 @@ HOMEPAGE="http://developer.gnome.org/libpeas/stable/";
 
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="+gtk glade +python seed"
+IUSE="+gtk glade jit lua +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 
'python3*') ) )"
 if [[ ${PV} =  ]]; then
IUSE="${IUSE} doc"
@@ -27,14 +26,17 @@ else
 fi
 
 RDEPEND="
-   >=dev-libs/glib-2.32:2
+   >=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
+   jit? ( >=dev-lang/luajit-2 )
+   !jit? ( >=dev-lang/lua-5.1 ) )
python? (
${PYTHON_DEPS}
-   >=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
-

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

2014-12-22 Thread Gilles Dartiguelongue
commit: 0e6d1bd8cda60be439523ba5ba41552ad62b8ac6
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Mon Dec 22 18:24:10 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Mon Dec 22 18:24:10 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0e6d1bd8

dev-libs/libpeas: moved to gentoo-x86

---
 dev-libs/libpeas/libpeas-1.12.1.ebuild | 74 --
 1 file changed, 74 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-1.12.1.ebuild 
b/dev-libs/libpeas/libpeas-1.12.1.ebuild
deleted file mode 100644
index 8d5a6c1..000
--- a/dev-libs/libpeas/libpeas-1.12.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit 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 +python seed"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 
'python3*') ) )"
-
-RDEPEND="
-   >=dev-libs/glib-2.32:2
-   >=dev-libs/gobject-introspection-1.39
-   glade? ( >=dev-util/glade-3.9.1:3.10 )
-   gtk? ( >=x11-libs/gtk+-3:3[introspection] )
-   python? (
-   ${PYTHON_DEPS}
-   >=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
-   seed? ( >=dev-libs/seed-2.91.91 )
-"
-DEPEND="${RDEPEND}
-   >=dev-util/gtk-doc-am-1.11
-   >=dev-util/intltool-0.40
-   virtual/pkgconfig
-"
-
-src_configure() {
-   local myconf=(
-   $(use_enable glade glade-catalog)
-   $(use_enable gtk)
-   $(use_enable seed)
-   --disable-deprecation
-   --disable-static
-
-   # possibly overriden below
-   --disable-python{2,3}
-   )
-   # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
-   # What do we do about gdb, valgrind, gcov, etc?
-
-   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
-}



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

2014-11-25 Thread Michał Górny
commit: 6f9dc03814c38c48464696d53c168b4b287d3272
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Nov 25 22:07:28 2014 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Nov 25 22:07:28 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6f9dc038

dev-libs/libpeas: simplify multi-Python impl support

Simplify the multi-Python implementation support to reuse the upstream
build system. We can't properly support plugins for more than one
version of Python 2 and more than one version of Python 3 anyway, so no
point in wrapping the build to pretend supporting more.

Package-Manager: portage-2.2.14
Manifest-Sign-Key: EFB4464E!

---
 dev-libs/libpeas/libpeas-1.12.1.ebuild | 52 --
 dev-libs/libpeas/libpeas-.ebuild   | 52 --
 2 files changed, 36 insertions(+), 68 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-1.12.1.ebuild 
b/dev-libs/libpeas/libpeas-1.12.1.ebuild
index ccacf2e..8d5a6c1 100644
--- a/dev-libs/libpeas/libpeas-1.12.1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.12.1.ebuild
@@ -34,49 +34,33 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
 "
 
-if_use_python_python_foreach_impl() {
-   if use python; then
-   python_foreach_impl run_in_build_dir "$@"
-   else
-   "$@"
-   fi
-}
-
-src_prepare() {
-   use python && python_copy_sources
-   if_use_python_python_foreach_impl gnome2_src_prepare
-}
-
 src_configure() {
-   local myconf="
+   local myconf=(
$(use_enable glade glade-catalog)
$(use_enable gtk)
$(use_enable seed)
--disable-deprecation
-   --disable-static"
+   --disable-static
+
+   # possibly overriden below
+   --disable-python{2,3}
+   )
# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
# What do we do about gdb, valgrind, gcov, etc?
 
-   configuration() {
-   local myconf="$@"
-   [[ ${EPYTHON} == python2* ]] && myconf+=" --enable-python2 
--disable-python3 PYTHON2_CONFIG=/usr/bin/python-config"
-   [[ ${EPYTHON} == python3* ]] && myconf+=" --enable-python3 
--disable-python2 PYTHON3_CONFIG=/usr/bin/python-config"
-   gnome2_src_configure ${myconf}
+   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
 
-   if use python; then
-   python_foreach_impl run_in_build_dir configuration ${myconf}
-   else
-   gnome2_src_configure ${myconf}
-   fi
-}
-
-src_compile() {
-   if_use_python_python_foreach_impl gnome2_src_compile
-}
-
-src_install() {
-   if_use_python_python_foreach_impl gnome2_src_install
+   gnome2_src_configure "${myconf[@]}"
 }
 
 src_test() {
@@ -86,5 +70,5 @@ src_test() {
# >>> from gi.repository import Gtk
# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
# This should return True, it returns False for Xvfb
-   if_use_python_python_foreach_impl Xemake check
+   Xemake check
 }

diff --git a/dev-libs/libpeas/libpeas-.ebuild 
b/dev-libs/libpeas/libpeas-.ebuild
index ed81c96..0a8665d 100644
--- a/dev-libs/libpeas/libpeas-.ebuild
+++ b/dev-libs/libpeas/libpeas-.ebuild
@@ -46,49 +46,33 @@ if [[ ${PV} =  ]]; then
DEPEND="${DEPEND} doc? ( >=dev-util/gtk-doc-1.11 )"
 fi
 
-if_use_python_python_foreach_impl() {
-   if use python; then
-   python_foreach_impl run_in_build_dir "$@"
-   else
-   "$@"
-   fi
-}
-
-src_prepare() {
-   use python && python_copy_sources
-   if_use_python_python_foreach_impl gnome2_src_prepare
-}
-
 src_configure() {
-   local myconf="
+   local myconf=(
$(use_enable glade glade-catalog)
$(use_enable gtk)
$(use_enable seed)
--disable-deprecation
-   --disable-static"
+   --disable-static
+
+   # possibly overriden below
+   --disable-python{2,3}
+   )
# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
# What do we do about gdb, valgrind, gcov, etc?
 
-   configuration() {
-   local myconf="$@"
-   [[ ${EPYTHON} == python2* ]] && myconf+=" --enable-python2 
--disable-python3 PYTHON2_CONFIG=/usr/bin/python-config"
-   [[ ${EPYTHON} == python3* ]] && myconf+=" --enable-python3 
--disable-python2 PYTHON3_CONFIG=/usr/bin/python-config"
-   gnome2_s

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

2014-11-25 Thread Michał Górny
commit: fa061778caa5581ae0fd8fb2a4e90aa24667254d
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Nov 25 21:08:27 2014 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Nov 25 21:08:27 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fa061778

dev-libs/libpeas: enforce at most one Python 3.* version

Force only one Python 3.* version being enabled for the library
design allows for only one Python 3 plugin loader. The remaining
implementations were silently discarded and could have caused
issues for reverse dependencies.

Package-Manager: portage-2.2.14
Manifest-Sign-Key: EFB4464E!

---
 dev-libs/libpeas/libpeas-1.12.1.ebuild | 2 +-
 dev-libs/libpeas/libpeas-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-1.12.1.ebuild 
b/dev-libs/libpeas/libpeas-1.12.1.ebuild
index 3fc2a32..ccacf2e 100644
--- a/dev-libs/libpeas/libpeas-1.12.1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.12.1.ebuild
@@ -16,7 +16,7 @@ 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 +python seed"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 
'python3*') ) )"
 
 RDEPEND="
>=dev-libs/glib-2.32:2

diff --git a/dev-libs/libpeas/libpeas-.ebuild 
b/dev-libs/libpeas/libpeas-.ebuild
index 514c3df..ed81c96 100644
--- a/dev-libs/libpeas/libpeas-.ebuild
+++ b/dev-libs/libpeas/libpeas-.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://developer.gnome.org/libpeas/stable/";
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="+gtk glade +python seed"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 
'python3*') ) )"
 if [[ ${PV} =  ]]; then
IUSE="${IUSE} doc"
KEYWORDS=""



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

2014-11-23 Thread Remi Cardona
commit: e57738d1495599499d7b01f7d07220a1c74cfa7e
Author: Rémi Cardona  gentoo  org>
AuthorDate: Sun Nov 23 08:55:18 2014 +
Commit: Remi Cardona  gentoo  org>
CommitDate: Sun Nov 23 08:55:18 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e57738d1

dev-libs/libpeas: remove support for old pythons, remove unused eutils eclass

The eutils eclass was dropped from the non-live ebuild during the last
major bump.

The python versions are now masked in portage.

---
 dev-libs/libpeas/libpeas-1.12.1.ebuild | 2 +-
 dev-libs/libpeas/libpeas-.ebuild   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-1.12.1.ebuild 
b/dev-libs/libpeas/libpeas-1.12.1.ebuild
index 22f8c3a..3fc2a32 100644
--- a/dev-libs/libpeas/libpeas-1.12.1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.12.1.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit gnome2 multilib python-r1 virtualx
 

diff --git a/dev-libs/libpeas/libpeas-.ebuild 
b/dev-libs/libpeas/libpeas-.ebuild
index 3de7afe..514c3df 100644
--- a/dev-libs/libpeas/libpeas-.ebuild
+++ b/dev-libs/libpeas/libpeas-.ebuild
@@ -5,9 +5,9 @@
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit eutils gnome2 multilib python-r1 virtualx
+inherit gnome2 multilib python-r1 virtualx
 if [[ ${PV} =  ]]; then
inherit gnome2-live
 fi



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

2014-10-26 Thread Gilles Dartiguelongue
commit: 3b0e4039bc6d56a5c845c87a4782c71e6dcd1772
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Oct 26 23:43:21 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Oct 26 23:43:21 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3b0e4039

dev-libs/libpeas: clean up metadata.xml

---
 dev-libs/libpeas/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev-libs/libpeas/metadata.xml b/dev-libs/libpeas/metadata.xml
index 44e6eeb..cc3500e 100644
--- a/dev-libs/libpeas/metadata.xml
+++ b/dev-libs/libpeas/metadata.xml
@@ -3,8 +3,6 @@
 
gnome

-   Build support for loading JavaScript plugins 
using
-   dev-libs/gjs
Install the glade catalog
Build support for loading 
dev-lang/python
plugins



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

2014-10-11 Thread Gilles Dartiguelongue
commit: c14d8780cbc72a6c2d882ab2210e5f9c22174855
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sat Oct 11 16:16:29 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Oct 11 16:16:29 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c14d8780

dev-libs/libpeas: 1.10.1 → 1.12.1

---
 dev-libs/libpeas/{libpeas-1.10.0.ebuild => libpeas-1.12.1.ebuild} | 6 +++---
 dev-libs/libpeas/libpeas-.ebuild  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-1.10.0.ebuild 
b/dev-libs/libpeas/libpeas-1.12.1.ebuild
similarity index 92%
rename from dev-libs/libpeas/libpeas-1.10.0.ebuild
rename to dev-libs/libpeas/libpeas-1.12.1.ebuild
index 5b1dd2e..22f8c3a 100644
--- a/dev-libs/libpeas/libpeas-1.10.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.12.1.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit eutils gnome2 multilib python-r1 virtualx
+inherit gnome2 multilib python-r1 virtualx
 
 DESCRIPTION="A GObject plugins library"
 HOMEPAGE="http://developer.gnome.org/libpeas/stable/";
@@ -59,8 +59,8 @@ src_configure() {
 
configuration() {
local myconf="$@"
-   [[ ${EPYTHON} == python2* ]] && myconf+=" --enable-python2 
--disable-python3 PYTHON2_CONFIG=/usr/bin/python-config-${EPYTHON#python}"
-   [[ ${EPYTHON} == python3* ]] && myconf+=" --enable-python3 
--disable-python2 PYTHON3_CONFIG=/usr/bin/python-config-${EPYTHON#python}"
+   [[ ${EPYTHON} == python2* ]] && myconf+=" --enable-python2 
--disable-python3 PYTHON2_CONFIG=/usr/bin/python-config"
+   [[ ${EPYTHON} == python3* ]] && myconf+=" --enable-python3 
--disable-python2 PYTHON3_CONFIG=/usr/bin/python-config"
gnome2_src_configure ${myconf}
}
 

diff --git a/dev-libs/libpeas/libpeas-.ebuild 
b/dev-libs/libpeas/libpeas-.ebuild
index 8845db2..3de7afe 100644
--- a/dev-libs/libpeas/libpeas-.ebuild
+++ b/dev-libs/libpeas/libpeas-.ebuild
@@ -71,8 +71,8 @@ src_configure() {
 
configuration() {
local myconf="$@"
-   [[ ${EPYTHON} == python2* ]] && myconf+=" --enable-python2 
--disable-python3 PYTHON2_CONFIG=/usr/bin/python-config-${EPYTHON#python}"
-   [[ ${EPYTHON} == python3* ]] && myconf+=" --enable-python3 
--disable-python2 PYTHON3_CONFIG=/usr/bin/python-config-${EPYTHON#python}"
+   [[ ${EPYTHON} == python2* ]] && myconf+=" --enable-python2 
--disable-python3 PYTHON2_CONFIG=/usr/bin/python-config"
+   [[ ${EPYTHON} == python3* ]] && myconf+=" --enable-python3 
--disable-python2 PYTHON3_CONFIG=/usr/bin/python-config"
gnome2_src_configure ${myconf}
}
 



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

2014-04-20 Thread Gilles Dartiguelongue
commit: bc80401f7c97a554e20f07a3c480efa7d792916a
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue Apr 15 21:29:18 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Apr 20 13:51:56 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bc80401f

dev-libs/libpeas: 1.9.0 → 1.10.0

Dropped support for gjs.

---
 .../{libpeas-.ebuild => libpeas-1.10.0.ebuild} | 23 --
 dev-libs/libpeas/libpeas-.ebuild   |  9 +++--
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-.ebuild 
b/dev-libs/libpeas/libpeas-1.10.0.ebuild
similarity index 80%
copy from dev-libs/libpeas/libpeas-.ebuild
copy to dev-libs/libpeas/libpeas-1.10.0.ebuild
index 13122ab..5b1dd2e 100644
--- a/dev-libs/libpeas/libpeas-.ebuild
+++ b/dev-libs/libpeas/libpeas-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,28 +8,19 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils gnome2 multilib python-r1 virtualx
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
 
 DESCRIPTION="A GObject plugins library"
 HOMEPAGE="http://developer.gnome.org/libpeas/stable/";
 
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="gjs +gtk glade +python seed"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="+gtk glade +python seed"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-if [[ ${PV} =  ]]; then
-   IUSE="${IUSE} doc"
-   KEYWORDS=""
-else
-   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-fi
 
 RDEPEND="
>=dev-libs/glib-2.32:2
-   >=dev-libs/gobject-introspection-0.10.1
-   gjs? ( >=dev-libs/gjs-1.37.1 )
+   >=dev-libs/gobject-introspection-1.39
glade? ( >=dev-util/glade-3.9.1:3.10 )
gtk? ( >=x11-libs/gtk+-3:3[introspection] )
python? (
@@ -40,14 +31,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.11
>=dev-util/intltool-0.40
-   >=sys-devel/gettext-0.17
virtual/pkgconfig
 "
 
-if [[ ${PV} =  ]]; then
-   DEPEND="${DEPEND} doc? ( >=dev-util/gtk-doc-1.11 )"
-fi
-
 if_use_python_python_foreach_impl() {
if use python; then
python_foreach_impl run_in_build_dir "$@"
@@ -63,7 +49,6 @@ src_prepare() {
 
 src_configure() {
local myconf="
-   $(use_enable gjs)
$(use_enable glade glade-catalog)
$(use_enable gtk)
$(use_enable seed)

diff --git a/dev-libs/libpeas/libpeas-.ebuild 
b/dev-libs/libpeas/libpeas-.ebuild
index 13122ab..8845db2 100644
--- a/dev-libs/libpeas/libpeas-.ebuild
+++ b/dev-libs/libpeas/libpeas-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://developer.gnome.org/libpeas/stable/";
 
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="gjs +gtk glade +python seed"
+IUSE="+gtk glade +python seed"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 if [[ ${PV} =  ]]; then
IUSE="${IUSE} doc"
@@ -28,8 +28,7 @@ fi
 
 RDEPEND="
>=dev-libs/glib-2.32:2
-   >=dev-libs/gobject-introspection-0.10.1
-   gjs? ( >=dev-libs/gjs-1.37.1 )
+   >=dev-libs/gobject-introspection-1.39
glade? ( >=dev-util/glade-3.9.1:3.10 )
gtk? ( >=x11-libs/gtk+-3:3[introspection] )
python? (
@@ -40,7 +39,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.11
>=dev-util/intltool-0.40
-   >=sys-devel/gettext-0.17
virtual/pkgconfig
 "
 
@@ -63,7 +61,6 @@ src_prepare() {
 
 src_configure() {
local myconf="
-   $(use_enable gjs)
$(use_enable glade glade-catalog)
$(use_enable gtk)
$(use_enable seed)