[gentoo-commits] gentoo-x86 commit in gnome-base/libbonobo: ChangeLog libbonobo-2.32.0.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-base/libbonobo: ChangeLog libbonobo-2.32.0.ebuild

[Gilles Dartiguelongue (eva)]

eva         10/12/20 22:07:13

  Modified:             ChangeLog libbonobo-2.32.0.ebuild
  Log:
  Sync ebuild with overlay.
  
  (Portage version: 2.2.0_alpha9/cvs/Linux x86_64)

Revision  Changes    Path
1.195                gnome-base/libbonobo/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libbonobo/ChangeLog?rev=1.195&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libbonobo/ChangeLog?rev=1.195&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libbonobo/ChangeLog?r1=1.194&r2=1.195

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- ChangeLog	12 Oct 2010 18:20:37 -0000	1.194
+++ ChangeLog	20 Dec 2010 22:07:13 -0000	1.195
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/libbonobo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.194 2010/10/12 18:20:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.195 2010/12/20 22:07:13 eva Exp $
+
+  20 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> libbonobo-2.32.0.ebuild:
+  Sync ebuild with overlay.
 
 *libbonobo-2.32.0 (12 Oct 2010)
 



1.2                  gnome-base/libbonobo/libbonobo-2.32.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libbonobo/libbonobo-2.32.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libbonobo/libbonobo-2.32.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libbonobo/libbonobo-2.32.0.ebuild?r1=1.1&r2=1.2

Index: libbonobo-2.32.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.32.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libbonobo-2.32.0.ebuild	12 Oct 2010 18:20:37 -0000	1.1
+++ libbonobo-2.32.0.ebuild	20 Dec 2010 22:07:13 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.32.0.ebuild,v 1.1 2010/10/12 18:20:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.32.0.ebuild,v 1.2 2010/12/20 22:07:13 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -15,12 +15,13 @@
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="debug doc examples test"
 
-RDEPEND=">=dev-libs/glib-2.25.7
-	>=gnome-base/orbit-2.14.0
+RDEPEND=">=dev-libs/glib-2.25.7:2
+	>=gnome-base/orbit-2.14
 	>=dev-libs/libxml2-2.4.20
 	>=dev-libs/popt-1.5
 	!gnome-base/bonobo-activation"
 DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
 	sys-devel/flex
 	x11-apps/xrdb
 	>=dev-util/pkgconfig-0.9
@@ -41,10 +42,16 @@
 
 	if ! use test; then
 		# don't waste time building tests, bug #226223
-		sed 's/tests//' -i Makefile.am Makefile.in || die
+		sed 's/tests//' -i Makefile.am Makefile.in || die "sed 1 failed"
 	fi
 
 	if ! use examples; then
-		sed 's/samples//' -i Makefile.am Makefile.in || die
+		sed 's/samples//' -i Makefile.am Makefile.in || die "sed 2 failed"
 	fi
 }
+
+src_test() {
+	# Pass tests with FEATURES userpriv, see bug #288689
+	unset ORBIT_SOCKETDIR
+	emake check || die "emake check failed"
+}