summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2011-03-08 12:35:12 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-03-08 12:35:12 +0000
commitae8c3ffe8cea960a5e274b48602f901b5c1093e9 (patch)
tree01b39e70b84419d9a46c51702a4a8e676bbf7b93 /dev-libs/glib
parentUpdate to libva shipped by freedesktop. So we do the same as debian or archli... (diff)
downloadgentoo-2-ae8c3ffe8cea960a5e274b48602f901b5c1093e9.tar.gz
gentoo-2-ae8c3ffe8cea960a5e274b48602f901b5c1093e9.tar.bz2
gentoo-2-ae8c3ffe8cea960a5e274b48602f901b5c1093e9.zip
Bump to 2.28.2, remove 2.28.0, workaround a few test failures
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/glib')
-rw-r--r--dev-libs/glib/ChangeLog8
-rw-r--r--dev-libs/glib/glib-2.28.2.ebuild (renamed from dev-libs/glib/glib-2.28.0.ebuild)11
2 files changed, 14 insertions, 5 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 8ab64050a654..aaf181fe141c 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/glib
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.447 2011/03/07 20:07:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.448 2011/03/08 12:35:12 nirbheek Exp $
+
+*glib-2.28.2 (08 Mar 2011)
+
+ 08 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -glib-2.28.0.ebuild,
+ +glib-2.28.2.ebuild:
+ Bump to 2.28.2, remove 2.28.0
07 Mar 2011; Jeroen Roovers <jer@gentoo.org> glib-2.26.1-r1.ebuild:
Stable for HPPA (bug #353436).
diff --git a/dev-libs/glib/glib-2.28.0.ebuild b/dev-libs/glib/glib-2.28.2.ebuild
index 9b69848c7a6d..ece7a1f09221 100644
--- a/dev-libs/glib/glib-2.28.0.ebuild
+++ b/dev-libs/glib/glib-2.28.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.0.ebuild,v 1.1 2011/02/08 20:57:21 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.2.ebuild,v 1.1 2011/03/08 12:35:12 nirbheek Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -68,13 +68,16 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.26.0-disable-locale-sensitive-test.patch"
epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-broken-test.patch"
+ # Disable timeout test, it fails randomly, upstream knows about it
+ sed -e 's/\(.*timeout.*\)/#\1/g' -i glib/tests/Makefile.am || die
+
if ! use test; then
# don't waste time building tests
sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
|| die "sed failed"
fi
- # Needed for the punt-python-check patch.
+ # Needed for the punt-python-check patch, disabling timeout test
# Also needed to prevent croscompile failures, see bug #267603
eautoreconf
@@ -134,8 +137,8 @@ src_test() {
unset GSETTINGS_BACKEND # bug 352451
# Related test is a bit nitpicking
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR/temp"
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR/temp"
+ mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+ chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
# Hardened: gdb needs this, bug #338891
if host-is-pax ; then