summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-01-28 23:54:51 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-01-28 23:54:51 +0000
commite5aa0490db2d5bfa144f562135f8436a95523c21 (patch)
tree1d6bd3ab4e6065c2718fb53740c266d564d0b723 /dev-libs
parentInitial import of abstract, not to be confused with the copy previously in th... (diff)
downloadgentoo-2-e5aa0490db2d5bfa144f562135f8436a95523c21.tar.gz
gentoo-2-e5aa0490db2d5bfa144f562135f8436a95523c21.tar.bz2
gentoo-2-e5aa0490db2d5bfa144f562135f8436a95523c21.zip
Version bump. Bug fixes, and notably bug #297483. Disable test affecting live filesystem, bug #297684.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/glib/ChangeLog9
-rw-r--r--dev-libs/glib/glib-2.22.4.ebuild (renamed from dev-libs/glib/glib-2.20.5.ebuild)11
2 files changed, 16 insertions, 4 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 68c478d053c3..2304e8220912 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/glib
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.397 2010/01/19 17:17:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.398 2010/01/28 23:54:51 eva Exp $
+
+*glib-2.22.4 (28 Jan 2010)
+
+ 28 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org> -glib-2.20.5.ebuild,
+ +glib-2.22.4.ebuild:
+ Version bump. Bug fixes, and notably bug #297483. Disable test affecting
+ live filesystem, bug #297684.
19 Jan 2010; Raúl Porcel <armin76@gentoo.org> glib-2.22.2.ebuild:
arm stable
diff --git a/dev-libs/glib/glib-2.20.5.ebuild b/dev-libs/glib/glib-2.22.4.ebuild
index 3b93a4acdd3a..5566cd7435b7 100644
--- a/dev-libs/glib/glib-2.20.5.ebuild
+++ b/dev-libs/glib/glib-2.22.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.20.5.ebuild,v 1.10 2009/10/26 18:04:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.22.4.ebuild,v 1.1 2010/01/28 23:54:51 eva Exp $
EAPI="2"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="debug doc fam hardened selinux xattr"
RDEPEND="virtual/libiconv
@@ -47,6 +47,10 @@ src_prepare() {
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
+ # Do not try to remove files on live filesystem, bug #XXX ?
+ sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
+ -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
+
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
}
@@ -88,5 +92,6 @@ src_test() {
unset DBUS_SESSION_BUS_ADDRESS
export XDG_CONFIG_DIRS=/etc/xdg
export XDG_DATA_DIRS=/usr/local/share:/usr/share
+ export XDG_DATA_HOME="${T}"
emake check || die "tests failed"
}