From c3a2e145bbb2f95a256b772a3a17c2dce32db866 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 15 Jun 2010 23:54:10 +0530 Subject: dev-util/glib: Sync with stable glib Also remove dodoc of README since it is generated at dist time(?). --- dev-libs/glib/Manifest | 2 +- dev-libs/glib/glib-2.9999.ebuild | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index c616dfb..3eee0c5 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -2,4 +2,4 @@ AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f7731183 AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8 -EBUILD glib-2.9999.ebuild 2638 RMD160 161803a768117c20825f0d1cfe4b2d828d3b849e SHA1 ab32bf43f3ed3bfc97234194cc04f7042a3b13b7 SHA256 2098bd4c898dccdc601bb59ad559f0cb4d8bc31d7644b8d6755b77f9b3d6a13d +EBUILD glib-2.9999.ebuild 2739 RMD160 8d0363b5dd56881d87d834d3fd0c8bb78870efac SHA1 7a3e18dcf3ff836370bd52a9441dd6e617be0918 SHA256 6624a9134da2eaa923c95623cb4c09480e1bd3b6d3660b0127418f6c7157bf88 diff --git a/dev-libs/glib/glib-2.9999.ebuild b/dev-libs/glib/glib-2.9999.ebuild index 44c70d4..de3e87d 100644 --- a/dev-libs/glib/glib-2.9999.ebuild +++ b/dev-libs/glib/glib-2.9999.ebuild @@ -1,10 +1,10 @@ -# 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.2.ebuild,v 1.2 2009/05/18 21:37:06 eva Exp $ EAPI="2" -inherit libtool eutils flag-o-matic gnome2-live +inherit gnome.org libtool eutils flag-o-matic gnome2-live DESCRIPTION="The GLib library of C routines" HOMEPAGE="http://www.gtk.org/" @@ -15,8 +15,7 @@ SLOT="2" 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/libc - virtual/libiconv +RDEPEND="virtual/libiconv xattr? ( sys-apps/attr ) fam? ( virtual/fam )" DEPEND="${RDEPEND} @@ -84,10 +83,13 @@ src_install() { # Do not install charset.alias even if generated, leave it to libiconv rm -f "${D}/usr/lib/charset.alias" - dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed" + dodoc AUTHORS ChangeLog* NEWS* || die "dodoc failed" } 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" } -- cgit v1.2.3-65-gdbad