From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rd1dS-0002jm-1s for garchives@archives.gentoo.org; Tue, 20 Dec 2011 15:29:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3B2A21C196; Tue, 20 Dec 2011 15:29:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 975EE21C196 for ; Tue, 20 Dec 2011 15:29:36 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B4D81B4024 for ; Tue, 20 Dec 2011 15:29:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C233880042 for ; Tue, 20 Dec 2011 15:29:35 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <6dd4675ffc793cb79e7ec2d5b36b60c67eedbd76.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/glib/files/glib-2.30.1-homedir-env.patch dev-libs/glib/glib-2.31.6.ebuild dev-libs/glib/glib-9999.ebuild X-VCS-Directories: dev-libs/glib/files/ dev-libs/glib/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 6dd4675ffc793cb79e7ec2d5b36b60c67eedbd76 Date: Tue, 20 Dec 2011 15:29:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d2400e99-f73d-4b3a-aff9-aa1effb3db78 X-Archives-Hash: 1b86d376d34d1e0f5a2ba032fae36768 commit: 6dd4675ffc793cb79e7ec2d5b36b60c67eedbd76 Author: Priit Laes plaes org> AuthorDate: Tue Dec 20 15:09:11 2011 +0000 Commit: Priit Laes plaes org> CommitDate: Tue Dec 20 15:09:11 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D6dd4675f dev-libs/glib: Added 2.31.6 to overlay --- dev-libs/glib/files/glib-2.30.1-homedir-env.patch | 61 --------------= ------ .../glib/{glib-9999.ebuild =3D> glib-2.31.6.ebuild} | 23 ++------ dev-libs/glib/glib-9999.ebuild | 3 - 3 files changed, 6 insertions(+), 81 deletions(-) diff --git a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch b/dev-libs= /glib/files/glib-2.30.1-homedir-env.patch deleted file mode 100644 index 30d4499..0000000 --- a/dev-libs/glib/files/glib-2.30.1-homedir-env.patch +++ /dev/null @@ -1,61 +0,0 @@ -Description: Handle the G_HOME environment variable to override the pass= wd entry - This will allow to fix various kinds of build failures due to restricte= d - build environments. -Author: Josselin Mouette -Origin: vendor - ---- a/docs/reference/glib/running.sgml -+++ b/docs/reference/glib/running.sgml -@@ -213,6 +213,22 @@ - - -=20 -+ -+ <envar>G_HOME</envar> -+ -+ -+ For various reasons, GLib applications ignore the HOME -+ environment variable on Unix systems and will use the user director= y -+ as specified by the passwd entry, which is mor= e -+ reliable. -+ -+ -+ The G_HOME environment variable will override any -+ other setting for the home directory. It is not meant for daily usa= ge, -+ but it is useful in testing or building environments. -+ -+ -+ - -=20 - ---- a/glib/gutils.c -+++ b/glib/gutils.c -@@ -1626,11 +1626,14 @@ - } - #endif /* !G_OS_WIN32 */ - =20 -+ g_home_dir =3D g_strdup (g_getenv ("G_HOME")); -+ =20 - #ifdef G_OS_WIN32 - /* We check $HOME first for Win32, though it is a last resort for Uni= x - * where we prefer the results of getpwuid(). - */ -- g_home_dir =3D g_strdup (g_getenv ("HOME")); -+ if (!g_home_dir) -+ g_home_dir =3D g_strdup (g_getenv ("HOME")); -=20 - /* Only believe HOME if it is an absolute path and exists */ - if (g_home_dir) -@@ -1926,6 +1929,11 @@ - * homedir =3D g_get_home_dir (); - * ]| - * -+ * However, to allow changing this value for testing and development -+ * purposes, the value of the G_HOME environment=20 -+ * variable, if set, will override the passwd -+ * entry. -+ * - * Returns: the current user's home directory - */ - G_CONST_RETURN gchar* diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-2.31.6.e= build similarity index 92% copy from dev-libs/glib/glib-9999.ebuild copy to dev-libs/glib/glib-2.31.6.ebuild index 28ffe51..9955567 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-2.31.6.ebuild @@ -1,15 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.= 2 2011/11/14 19:06:22 tetromino Exp $ =20 EAPI=3D"4" PYTHON_DEPEND=3D"utils? 2" # Avoid runtime dependency on python when USE=3Dtest =20 inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-uti= ls python virtualx -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi =20 DESCRIPTION=3D"The GLib library of C routines" HOMEPAGE=3D"http://www.gtk.org/" @@ -19,11 +16,7 @@ SRC_URI=3D"${SRC_URI} LICENSE=3D"LGPL-2" SLOT=3D"2" IUSE=3D"debug doc fam selinux +static-libs systemtap test utils xattr" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s39= 0 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" -fi +KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390= ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" =20 RDEPEND=3D"virtual/libiconv virtual/libffi @@ -36,6 +29,7 @@ DEPEND=3D"${RDEPEND} >=3Ddev-util/gtk-doc-am-1.15 doc? ( >=3Ddev-libs/libxslt-1.0 + >=3Ddev-util/gdbus-codegen-${PV} >=3Ddev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=3Ddev-util/systemtap-1.3 ) @@ -56,7 +50,6 @@ pkg_setup() { } =20 src_prepare() { - [[ ${PV} =3D 9999 ]] && gnome2-live_src_prepare mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die =20 if use ia64 ; then @@ -82,7 +75,8 @@ src_prepare() { sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \ -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed" =20 - if ! use test; then + # need to build tests if USE=3Ddoc for bug #387385 + if ! use test && ! use doc; then # don't waste time building tests sed 's/^\(.*\SUBDIRS .*\=3D.*\)tests\(.*\)$/\1\2/' -i $(find . -name M= akefile.am -o -name Makefile.in) || die else @@ -115,9 +109,6 @@ src_prepare() { # gdbus-codegen is a separate package epatch "${FILESDIR}/${PN}-2.30.1-external-gdbus-codegen.patch" =20 - # Handle the G_HOME environment variable to override the passwd entry, = upstream bug #142568 - epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.patch" - # disable pyc compiling ln -sfn $(type -P true) py-compile =20 @@ -181,8 +172,6 @@ src_install() { # Don't install gdb python macros, bug 291328 rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" =20 - # This is there for git snapshots and the live ebuild, bug 351966 - emake README || die "emake README failed" dodoc AUTHORS ChangeLog* NEWS* README =20 insinto /usr/share/bash-completion @@ -193,7 +182,7 @@ src_install() { =20 # Completely useless with or without USE static-libs, people need to us= e # pkg-config - find "${E}" -name '*.la' -exec rm -f {} + + find "${D}" -name '*.la' -exec rm -f {} + } =20 src_test() { diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebu= ild index 28ffe51..6e2b02b 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-9999.ebuild @@ -115,9 +115,6 @@ src_prepare() { # gdbus-codegen is a separate package epatch "${FILESDIR}/${PN}-2.30.1-external-gdbus-codegen.patch" =20 - # Handle the G_HOME environment variable to override the passwd entry, = upstream bug #142568 - epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.patch" - # disable pyc compiling ln -sfn $(type -P true) py-compile =20