summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-03-29 11:05:47 +0000
committerPacho Ramos <pacho@gentoo.org>2013-03-29 11:05:47 +0000
commit9f78bfb84977bbdc3241e2712cc8491af1684d40 (patch)
treed1119d415bf6499034ae9c0f63e16056e2a28493
parentFix bug #462952 - cyclic dependency for unconfined (diff)
downloadgentoo-2-9f78bfb84977bbdc3241e2712cc8491af1684d40.tar.gz
gentoo-2-9f78bfb84977bbdc3241e2712cc8491af1684d40.tar.bz2
gentoo-2-9f78bfb84977bbdc3241e2712cc8491af1684d40.zip
tests configure options were dropped by upstream, thanks to plaes for noticing
(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
-rw-r--r--dev-libs/gobject-introspection/ChangeLog6
-rw-r--r--dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild15
2 files changed, 7 insertions, 14 deletions
diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index aca8bbb6e9da..68db609ad973 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/gobject-introspection
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.89 2013/03/28 16:43:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.90 2013/03/29 11:05:47 pacho Exp $
+
+ 29 Mar 2013; Pacho Ramos <pacho@gentoo.org>
+ gobject-introspection-1.36.0.ebuild:
+ tests configure options were dropped by upstream, thanks to plaes for noticing
*gobject-introspection-1.36.0 (28 Mar 2013)
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild
index dc00123a4042..46d9df605d76 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild,v 1.1 2013/03/28 16:43:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild,v 1.2 2013/03/29 11:05:47 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -48,18 +48,11 @@ src_prepare() {
# avoid GNU-isms
sed -i -e 's/\(if test .* \)==/\1=/' configure || die
- gi_skip_tests=
if ! has_version "x11-libs/cairo[glib]"; then
# Bug #391213: enable cairo-gobject support even if it's not installed
# We only PDEPEND on cairo to avoid circular dependencies
export CAIRO_LIBS="-lcairo -lcairo-gobject"
export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
- if use test; then
- G2CONF="${G2CONF} --disable-tests"
- gi_skip_tests=yes
- ewarn "Tests will be skipped because x11-libs/cairo[glib] is not present"
- ewarn "on your system. Consider installing it to get tests to run."
- fi
fi
}
src_configure(){
@@ -67,11 +60,7 @@ src_configure(){
--disable-static \
YACC=$(type -p yacc) \
$(use_with cairo) \
- $(use_enable doctool) \
- $(use_enable test tests)
-}
-src_test() {
- [[ -z ${gi_skip_tests} ]] && default
+ $(use_enable doctool)
}
src_install() {