[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/

["Priit Laes" <plaes@plaes.org>]

commit:     6dd4675ffc793cb79e7ec2d5b36b60c67eedbd76
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Dec 20 15:09:11 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Dec 20 15:09:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6dd4675f

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 => 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 passwd entry
- This will allow to fix various kinds of build failures due to restricted
- build environments.
-Author: Josselin Mouette <joss@debian.org>
-Origin: vendor
-
---- a/docs/reference/glib/running.sgml
-+++ b/docs/reference/glib/running.sgml
-@@ -213,6 +213,22 @@
-   </para>
- </formalpara>
- 
-+<formalpara id="G_HOME">
-+  <title><envar>G_HOME</envar></title>
-+
-+  <para>
-+    For various reasons, GLib applications ignore the <envar>HOME</envar>
-+    environment variable on Unix systems and will use the user directory
-+    as specified by the <filename>passwd</filename> entry, which is more
-+    reliable.
-+  </para>
-+  <para>
-+    The <envar>G_HOME</envar> environment variable will override any
-+    other setting for the home directory. It is not meant for daily usage,
-+    but it is useful in testing or building environments.
-+  </para>
-+</formalpara>
-+
- </refsect2>
- 
- <refsect2 id="setlocale">
---- a/glib/gutils.c
-+++ b/glib/gutils.c
-@@ -1626,11 +1626,14 @@
-     }
- #endif	/* !G_OS_WIN32 */
-   
-+  g_home_dir = g_strdup (g_getenv ("G_HOME"));
-+  
- #ifdef G_OS_WIN32
-   /* We check $HOME first for Win32, though it is a last resort for Unix
-    * where we prefer the results of getpwuid().
-    */
--  g_home_dir = g_strdup (g_getenv ("HOME"));
-+  if (!g_home_dir)
-+    g_home_dir = g_strdup (g_getenv ("HOME"));
- 
-   /* Only believe HOME if it is an absolute path and exists */
-   if (g_home_dir)
-@@ -1926,6 +1929,11 @@
-  *      homedir = g_get_home_dir (<!-- -->);
-  * ]|
-  *
-+ * However, to allow changing this value for testing and development
-+ * purposes, the value of the <envar>G_HOME</envar> environment 
-+ * variable, if set, will override the <filename>passwd</filename>
-+ * 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.ebuild
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 $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
 # Avoid runtime dependency on python when USE=test
 
 inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -19,11 +16,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2"
 SLOT="2"
 IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
 
 RDEPEND="virtual/libiconv
 	virtual/libffi
@@ -36,6 +29,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.15
 	doc? (
 		>=dev-libs/libxslt-1.0
+		>=dev-util/gdbus-codegen-${PV}
 		>=dev-util/gtk-doc-1.15
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
@@ -56,7 +50,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
 	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
 
 	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"
 
-	if ! use test; then
+	# need to build tests if USE=doc for bug #387385
+	if ! use test && ! use doc; then
 		# don't waste time building tests
 		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.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"
 
-	# 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
 
@@ -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/"
 
-	# This is there for git snapshots and the live ebuild, bug 351966
-	emake README || die "emake README failed"
 	dodoc AUTHORS ChangeLog* NEWS* README
 
 	insinto /usr/share/bash-completion
@@ -193,7 +182,7 @@ src_install() {
 
 	# Completely useless with or without USE static-libs, people need to use
 	# pkg-config
-	find "${E}" -name '*.la' -exec rm -f {} +
+	find "${D}" -name '*.la' -exec rm -f {} +
 }
 
 src_test() {

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
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"
 
-	# 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