update some ebuilds

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

8 files changed, 65 insertions, 100 deletions

diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 49ad87ad..d032c97b 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1 +1 @@
-EBUILD seahorse-9999-r1.ebuild 1961 RMD160 c1076dff3a069375c868b33f14122f884996a7de SHA1 cc751067cd2441efe846aa551dfe9371c697f5c8 SHA256 cbd37bf47618b9f4f32d860b63bd1b47b022c03877c47a016118018847a5b5ca
+EBUILD seahorse-9999-r1.ebuild 1622 RMD160 15fdb42e12224cc3908cd0bd6136299a3c82f041 SHA1 4d20ac8df2ea446f5318fd6717c3948f48c16392 SHA256 a0ee37c912af8ef83402351556883351ed1e88bbbaa6fe41a65e0cc0990a9357
diff --git a/app-crypt/seahorse/seahorse-9999-r1.ebuild b/app-crypt/seahorse/seahorse-9999-r1.ebuild
index a477abcd..7fe2bac6 100644
--- a/app-crypt/seahorse/seahorse-9999-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-9999-r1.ebuild
@@ -12,16 +12,13 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avahi debug doc +introspection ldap libnotify test"
+IUSE="avahi debug doc ldap test"
 KEYWORDS=""
 
-# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
 COMMON_DEPEND="
-	>=gnome-base/gconf-2:2
 	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.90.0:3[introspection?]
-	>=dev-libs/dbus-glib-0.72
-	>=gnome-base/gnome-keyring-2.91.2
+	>=x11-libs/gtk+-2.90.0:3
+	>=gnome-base/gnome-keyring-3.1.5
 	net-libs/libsoup:2.4
 	x11-misc/shared-mime-info
 
@@ -32,9 +29,7 @@ COMMON_DEPEND="
 		=app-crypt/gnupg-1.4* )
 
 	avahi? ( >=net-dns/avahi-0.6 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
 	ldap? ( net-nds/openldap )
-	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 "
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
@@ -58,12 +53,9 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-update-mime-database
 		--enable-hkp
-		--with-gtk=3.0
 		$(use_enable avahi sharing)
 		$(use_enable debug)
-		$(use_enable introspection)
 		$(use_enable ldap)
-		$(use_enable libnotify)
 		$(use_enable test tests)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
 }
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e396c036..bbde2b68 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,4 +3,4 @@ AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363
 AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb
 AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd401968464608d SHA1 76149f52677a337569dbab1b5f664c8fc16d44ff SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af
 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
-EBUILD glib-9999-r1.ebuild 6373 RMD160 47b68635242124c1f38ed2e0b9479496682e4144 SHA1 bb81209be70dc589dc8d5af7196a25a7aebb81df SHA256 b333a47f7733da4f04b76d2f9821e0337631ff33554e6749aeefb9a875446f33
+EBUILD glib-9999-r1.ebuild 7992 RMD160 f832910aba302f8466e1e5db5ed0184db7ad4cad SHA1 5a7e47f914e4ef4b31c0d4afc0d24a5f6ac90bbf SHA256 61c0e40c11dac78a8281ccdb0eb91f8bb98189b35dc091fe6fa3e047eb80300d
diff --git a/dev-libs/glib/glib-9999-r1.ebuild b/dev-libs/glib/glib-9999-r1.ebuild
index 95e72565..fb18a072 100644
--- a/dev-libs/glib/glib-9999-r1.ebuild
+++ b/dev-libs/glib/glib-9999-r1.ebuild
@@ -3,8 +3,10 @@
 # $Header: $
 
 EAPI="4"
+PYTHON_DEPEND="utils? 2"
+# Avoid runtime dependency on python when USE=test
 
-inherit autotools bash-completion-r1 gnome2-live libtool eutils flag-o-matic multilib pax-utils virtualx
+inherit autotools bash-completion-r1 gnome2-live libtool eutils flag-o-matic multilib pax-utils python virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -12,14 +14,15 @@ SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg
 
 LICENSE="LGPL-2"
 SLOT="2"
-IUSE="debug doc fam +introspection selinux +static-libs systemtap test xattr"
+IUSE="debug doc fam +introspection selinux +static-libs systemtap test utils xattr"
 KEYWORDS=""
 
 RDEPEND="virtual/libiconv
-	>=dev-libs/libffi-3.0.0
+	virtual/libffi
 	sys-libs/zlib
 	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )"
+	fam? ( virtual/fam )
+	utils? ( >=dev-util/gdbus-codegen-${PV} )"
 DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.11
 	>=dev-util/gtk-doc-am-1.15
@@ -29,13 +32,21 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
-		~dev-util/gdbus-codegen-9999
+		sys-devel/gdb
+		=dev-lang/python-2*
+		>=dev-util/gdbus-codegen-${PV}
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND="introspection? ( dev-libs/gobject-introspection )
 	!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
 
-# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
+pkg_setup() {
+	# Needed for gio/tests/gdbus-testserver.py
+	if use test ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
 
 src_prepare() {
 	gnome2-live_src_prepare
@@ -68,11 +79,29 @@ src_prepare() {
 			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
 			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
 		fi
+
+		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
+			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
+			ewarn "not being present on your system, think on installing them to get these tests run."
+			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
+			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
+			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
+			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
+			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
+			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+			# needed to prevent gdbus-threading from asserting
+			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
+		fi
 	fi
 
 	# gdbus-codegen is a separate package
 	epatch "${FILESDIR}/external-gdbus-codegen.patch"
 
+	# Handle the G_HOME environment variable to override the passwd entry, upstream bug #142568
+	epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.patch"
+
 	# disable pyc compiling
 	ln -sfn $(type -P true) py-compile
 
@@ -87,8 +116,12 @@ src_prepare() {
 src_configure() {
 	# Avoid circular depend with dev-util/pkgconfig
 	if ! has_version dev-util/pkgconfig; then
-		export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-		export DBUS1_LIBS="-ldbus-1"
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
 	fi
 
 	local myconf
@@ -116,7 +149,13 @@ src_configure() {
 
 src_install() {
 	local f
-	emake DESTDIR="${D}" install || die "Installation failed"
+
+	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
+	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
+
+	if ! use utils; then
+		rm "${ED}usr/bin/gtester-report"
+	fi
 
 	# Do not install charset.alias even if generated, leave it to libiconv
 	rm -f "${ED}/usr/lib/charset.alias"
@@ -126,7 +165,7 @@ src_install() {
 
 	# This is there for git snapshots and the live ebuild, bug 351966
 	emake README || die "emake README failed"
-	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
+	dodoc AUTHORS ChangeLog* NEWS* README
 
 	for f in gdbus gsettings; do
 		newbashcomp "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
@@ -135,7 +174,7 @@ src_install() {
 
 	# Completely useless with or without USE static-libs, people need to use
 	# pkg-config
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${E}" -name '*.la' -exec rm -f {} +
 }
 
 src_test() {
@@ -157,19 +196,17 @@ src_test() {
 	fi
 
 	# Need X for dbus-launch session X11 initialization
-	Xemake check || die "tests failed"
+	Xemake check
 }
 
 pkg_preinst() {
 	# Only give the introspection message if:
-	# * The user has it enabled
+	# * The user has gobject-introspection
 	# * Has glib already installed
 	# * Previous version was different from new version
-	if use introspection && has_version "${CATEGORY}/${PN}"; then
-		if ! has_version "=${CATEGORY}/${PF}"; then
-			ewarn "You must rebuild gobject-introspection so that the installed"
-			ewarn "typelibs and girs are regenerated for the new APIs in glib"
-		fi
+	if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
+		ewarn "You must rebuild gobject-introspection so that the installed"
+		ewarn "typelibs and girs are regenerated for the new APIs in glib"
 	fi
 }
 
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
deleted file mode 100644
index 7c8f3a9e..00000000
--- a/dev-libs/libpeas/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD libpeas-9999-r1.ebuild 1680 RMD160 a4f085ef8fc62d299cd438beae60b39818d67048 SHA1 1a858ae1260e3108bfe32cbe755540356c83e619 SHA256 0386787370cc7731f8b4da2cb0d52ac4eaedb21576a95b68fcdd77fa71e5b397
diff --git a/dev-libs/libpeas/libpeas-9999-r1.ebuild b/dev-libs/libpeas/libpeas-9999-r1.ebuild
deleted file mode 100644
index bb4f3996..00000000
--- a/dev-libs/libpeas/libpeas-9999-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit gnome2-live python virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="doc gjs +gtk glade python seed vala"
-KEYWORDS=""
-
-RDEPEND=">=dev-libs/glib-2.23.6:2
-	>=dev-libs/gobject-introspection-0.10.1
-	gjs? ( >=dev-libs/gjs-1.29.16 )
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	gtk? ( >=x11-libs/gtk+-2.91.1:3[introspection] )
-	python? ( >=dev-python/pygobject-2.90.2:3 )
-	seed? ( >=dev-libs/seed-2.91.91 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.11 )
-	vala? ( >=dev-lang/vala-0.13.3:0.14 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable deprecated deprecation)
-		$(use_enable gjs)
-		$(use_enable glade glade-catalog)
-		$(use_enable gtk)
-		$(use_enable python)
-		$(use_enable seed)
-		$(use_enable vala)
-		VALAC=$(type -P valac-0.14)
-		--disable-deprecation
-		--disable-static
-		--disable-maintainer-mode"
-	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
-	# What do we do about gdb, valgrind, gcov, etc?
-
-	python_set_active_version 2
-}
-
-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 || die
-}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index dac86fd6..a796b441 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1 +1 @@
-EBUILD gdbus-codegen-9999-r1.ebuild 1194 RMD160 652a28b977e0c950e862bd9dd02c304ee9297929 SHA1 6fa74ead157b79d2893e80d80cb12097eaeb0a10 SHA256 08e2be5d017d42fcd9375d7518d398ab9b6b1db62959b96f58da6e9678410db1
+EBUILD gdbus-codegen-9999-r1.ebuild 1202 RMD160 738e8d6815bd2eeb883e23ae32c98e2262246aae SHA1 900a449064a324629c7e0edc0b231358e62eaedc SHA256 9edcbb8260d5f676d727e5b275d17f52001f2694f2ef72cc2bd4a6c2d7b0a22a
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999-r1.ebuild
index 0b8755a9..6dd508a5 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-9999-r1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-9999-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
-GNOME_LIVE_MODULE="glib"
+EAPI="4"
+GNOME_ORG_MODULE="glib"
 PYTHON_DEPEND="2:2.5"
 PYTHON_USE_WITH="xml"
 
@@ -17,8 +17,8 @@ KEYWORDS=""
 IUSE="doc"
 
 DEPEND=""
-RDEPEND="${DEPEND}
-	~dev-libs/glib-9999"
+RDEPEND="${DEPEND}"
+PDEPEND="~dev-libs/glib-9999"
 
 S="${WORKDIR}/glib-${PV}"