[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[Alexandre Restovtsev]

commit:     50480472b3beaf7a6a3b103f664321c6d6f7a7ff
Author:     Arun Raghavan <ford_prefect <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 06:49:06 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Aug 24 16:32:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=50480472

eclass/gnome2.eclass: Move GST_REGISTRY export to src_prepare

We might end up calling gst functions anywhere (gupnp-dlna calls it in
documentation generation, for example).

---
 eclass/gnome2.eclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 49a0556..c177b4f 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -108,6 +108,9 @@ gnome2_src_prepare() {
 	# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 	chmod 0700 "${XDG_RUNTIME_DIR}"
 
+	# GST_REGISTRY is to work around gst utilities trying to read/write /root
+	export GST_REGISTRY="${S}/registry.xml"
+
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
 
@@ -140,8 +143,7 @@ gnome2_src_configure() {
 	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
 	addwrite "$(unset HOME; echo ~)/.gnome2"
 
-	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
-	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}
+	econf "$@" ${G2CONF}
 }
 
 # @FUNCTION: gnome2_src_compile

[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[Gilles Dartiguelongue]

commit:     6c78996f304e08989e4b56c8580ad6096f94d955
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  1 22:49:56 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 22:49:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6c78996f

eclass/gnome2.eclass: update ewarn for this branch

---
 eclass/gnome2.eclass |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index c4f42fc..78953b1 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -296,23 +296,13 @@ gnome2_pkg_postinst() {
 	gnome2_scrollkeeper_update
 
 	# This should only be in the overlay
-#	ewarn "**************************************************************"
-#	ewarn "This is the *experimental* Gentoo GNOME Overlay"
-#	ewarn "Please report bugs at #gentoo-desktop @ FreeNode"
-#	ewarn "Do NOT go to upstream with bugs without checking with us first"
-#	ewarn "**************************************************************"
 	ewarn "**************************************************************"
 	ewarn "This is the gnome-next branch of the *experimental* Gentoo"
 	ewarn "GNOME Overlay."
-	ewarn
-	ewarn "This branch is currently on hiatus and is not being updated."
-	ewarn
-	ewarn "GNOME 3.2 is in the master branch since Oct. 1 2011"
-	ewarn
-	ewarn "If you want to try out GNOME 3.2, please use the master branch"
-	ewarn "of the overlay instead."
+	ewarn ""
+	ewarn "Please report bugs at #gentoo-desktop @ FreeNode"
+	ewarn "Do NOT go to upstream with bugs without checking with us first"
 	ewarn "**************************************************************"
-
 }
 
 # # FIXME Handle GConf schemas removal

[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[Nirbheek Chauhan]

commit:     852868e31eabe68685697845c2de91db5ad942b6
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 13:29:22 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 13:29:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=852868e3

gnome2-live.eclass: use GNOME_ORG_MODULE for git URI, port to use eclass doc

---
 eclass/gnome2-live.eclass |   55 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 3a4dd6a..0d15887 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -3,14 +3,16 @@
 # $Header: $
 
 #
-# gnome2-live.eclass
-#
+# @ECLASS: gnome2-live.eclass
+# @MAINTAINER:
+# gnome@gentoo.org
+# @AUTHOR:
+# Nirbheek Chauhan <nirbheek@gentoo.org>
+# @BLURB: Live ebuild phases for GNOME packages
+# @DESCRIPTION:
 # Exports additional functions used by live ebuilds written for GNOME packages
 # Always to be imported *AFTER* gnome2.eclass
 #
-# Author: Nirbheek Chauhan <nirbheek@gentoo.org>
-#
-
 
 inherit autotools gnome2 gnome2-utils libtool git-2
 
@@ -38,15 +40,28 @@ DEPEND="${DEPEND}
 # Extra options passed to elibtoolize
 ELTCONF=${ELTCONF:-}
 
-# Default git module name
-GNOME_LIVE_MODULE=${GNOME_LIVE_MODULE:-"${PN}"}
+# @ECLASS-VARIABLE: GNOME_LIVE_MODULE
+# @DESCRIPTION:
+# Default git module name is assumed to be the same as the gnome.org module name
+# used on ftp.gnome.org. We have GNOME_ORG_MODULE because we inherit gnome.org
+: ${GNOME_LIVE_MODULE:="${GNOME_ORG_MODULE}"}
 
-# GIT URI for the project
-EGIT_REPO_URI="${EGIT_REPO_URI:-"git://git.gnome.org/${GNOME_LIVE_MODULE}"}"
+# @ECLASS-VARIABLE: EGIT_REPO_URI
+# @DESCRIPTION:
+# git URI for the project, uses GNOME_LIVE_MODULE by default
+: "${EGIT_REPO_URI:="git://git.gnome.org/${GNOME_LIVE_MODULE}"}"
+
+# @ECLASS-VARIABLE: PATCHES
+# @DESCRIPTION:
+# Whitespace-separated list of patches to apply after cloning
+: ${PATCHES:=""}
 
 # Unset SRC_URI auto-set by gnome2.eclass
 SRC_URI=""
 
+# @FUNCTION: gnome2-live_get_var
+# @DESCRIPTION:
+# Get macro variable values from configure.ac, etc
 gnome2-live_get_var() {
 	local var f
 	var="$1"
@@ -54,6 +69,10 @@ gnome2-live_get_var() {
 	echo $(sed -ne "s/${var}(\(.*\))/\1/p" "${f}" | tr -d '[]')
 }
 
+# @FUNCTION: gnome2-live_get_var
+# @DESCRIPTION:
+# Calls git-2_src_unpack, and unpacks ${A} if required.
+# Also calls gnome2-live_src_prepare for older EAPI.
 gnome2-live_src_unpack() {
 	if test -n "${A}"; then
 		unpack ${A}
@@ -62,9 +81,15 @@ gnome2-live_src_unpack() {
 	has src_prepare ${EXPORTED_FUNCTIONS} || gnome2-live_src_prepare
 }
 
+# @FUNCTION: gnome2-live_src_prepare
+# @DESCRIPTION:
+# Lots of magic to workaround autogen.sh quirks in various packages
+# Creates blank ChangeLog and necessary macro dirs. Runs various autotools
+# programs if required, and finally runs eautoreconf.
 gnome2-live_src_prepare() {
 	# Blame git.eclass
 	cd "${S}"
+
 	for i in ${PATCHES}; do
 		epatch "${i}"
 	done
@@ -141,17 +166,23 @@ gnome2-live_src_prepare() {
 	elibtoolize ${ELTCONF}
 }
 
-# So that it replaces gnome2_src_unpack in ebuilds that call it
+# @FUNCTION: gnome2_src_unpack
+# @DESCRIPTION:
+# Defined so that it replaces gnome2_src_unpack in ebuilds that call it
 gnome2_src_unpack() {
 	gnome2-live_src_unpack
 }
 
-# So that it replaces gnome2_src_prepare in ebuilds that call it
+# @FUNCTION: gnome2_src_prepare
+# @DESCRIPTION:
+# Defined so that it replaces gnome2_src_prepare in ebuilds that call it
 gnome2_src_prepare() {
 	gnome2-live_src_prepare
 }
 
-# Run manually for ebuilds that have a custom pkg_postinst
+# @FUNCTION: gnome2-live_pkg_postinst
+# @DESCRIPTION:
+# Must be run manually for ebuilds that have a custom pkg_postinst
 gnome2-live_pkg_postinst() {
 	ewarn "This is a live ebuild, upstream trunks will mostly be UNstable"
 	ewarn "Do NOT report bugs about this package to Gentoo"

[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[Alexandre Restovtsev]

commit:     75ab5a00e1fa351d8e1eef9a13e3524b499d8a80
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 04:00:41 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 04:00:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=75ab5a00

eclass/gnome2.eclass: sync with gx86 for --disable-maintainer-mode

Add the following change from gx86:

 Sun Sep 25 15:15:21 2011 UTC by pacho

 Pass --disable-maintainer-mode when needed, thanks to Nirbheek for his help.

---
 eclass/gnome2.eclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 5803826..cc3f8ac 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -140,6 +140,11 @@ gnome2_src_configure() {
 		G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
 	fi
 
+	# Pass --disable-maintainer-mode when needed
+	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then
+		G2CONF="${G2CONF} --disable-maintainer-mode"
+	fi
+
 	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
 	addwrite "$(unset HOME; echo ~)/.gnome2"
 

[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[Alexandre Restovtsev]

commit:     1b4f01e680929bdf55e2258e5f2f823171219a51
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Sep 25 20:31:19 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Sep 25 20:31:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b4f01e6

eclass/gnome2-live.eclass: switch to git-2.eclass

Now that bug #383761 has been fixed, we can switch to git-2 without
forcing live users to reclone all their repositories. Acked by Nirbheek
on IRC.

---
 eclass/gnome2-live.eclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 638cdc9..3a4dd6a 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -12,7 +12,7 @@
 #
 
 
-inherit autotools gnome2 gnome2-utils libtool git
+inherit autotools gnome2 gnome2-utils libtool git-2
 
 # Stolen from git.eclass
 EXPORTED_FUNCTIONS="src_unpack pkg_postinst"
@@ -58,7 +58,7 @@ gnome2-live_src_unpack() {
 	if test -n "${A}"; then
 		unpack ${A}
 	fi
-	git_src_unpack
+	git-2_src_unpack
 	has src_prepare ${EXPORTED_FUNCTIONS} || gnome2-live_src_prepare
 }
 

[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[Alexandre Restovtsev]

commit:     765007b63d0c4e9c9e81eabaf79ce87f87da1720
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Sep 20 02:12:30 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Sep 20 02:12:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=765007b6

eclass/gnome2-live.eclass: fix autopoint logic

Borrow the logic from gnome-autogen.sh to only run autopoint for
packages that use AM_GNU_GETTEXT_VERSION and do not use
AM_GLIB_GNU_GETTEXT. Otherwise, running autopoint will result in
failures such as

autopoint: *** Missing version: please specify in configure.in through a
line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package
is using

Thanks to Steev Klimaszewski for pointing out such a failure on IRC.

The eclass now appears to work both for packages that require autopoint
(e.g. cogl) and those that cannot use it (e.g. mutter).

---
 eclass/gnome2-live.eclass |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 6c4aefd..638cdc9 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -81,13 +81,16 @@ gnome2-live_src_prepare() {
 		mkdir -p "$i"
 	done
 
-	# Generate po/Makefile.in.in if it doesn't exist
-	if [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then
-		eautopoint --force
-	fi
-
 	# We don't run gettextize because that does too much stuff
 	if grep -qe 'GETTEXT' configure.*; then
+		# Generate po/Makefile.in.in if it doesn't exist for packages that use
+		# AM_GNU_GETTEXT and AM_GNU_GETTEXT_VERSION (e.g. media-libs/cogl).
+		# Logic is inspired by gnome-autogen.sh
+		if ! grep -qe '^AM_GLIB_GNU_GETTEXT' configure.* &&
+		   grep -qe '^AM_GNU_GETTEXT_VERSION' configure.* &&
+		   [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then
+			eautopoint --force
+		fi
 		local aux_dir=${S}/$(gnome2-live_get_var AC_CONFIG_AUX_DIR configure.*)
 		mkdir -p "${aux_dir}"
 		test -e "${aux_dir}/config.rpath" || :> "${aux_dir}/config.rpath"

[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[Alexandre Restovtsev]

commit:     fbd5002a970eecef6b98bafb2de489b9dd35722b
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 19 23:20:03 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 19 23:20:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fbd5002a

eclass/gnome2-live.eclass: add eautopoint

Packages like media-libs/cogl require eautopoint to be run in addition
to eautoreconf. Thanks to Steev Klimaszewski (steev_) for reporting on
IRC.

---
 eclass/gnome2-live.eclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 3b4ea78..6c4aefd 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -81,6 +81,11 @@ gnome2-live_src_prepare() {
 		mkdir -p "$i"
 	done
 
+	# Generate po/Makefile.in.in if it doesn't exist
+	if [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then
+		eautopoint --force
+	fi
+
 	# We don't run gettextize because that does too much stuff
 	if grep -qe 'GETTEXT' configure.*; then
 		local aux_dir=${S}/$(gnome2-live_get_var AC_CONFIG_AUX_DIR configure.*)

[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[Alexandre Restovtsev]

commit:     3237149b1fde3de7177d85d1e4ca7d3e5235b480
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 28 18:06:22 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 28 18:06:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3237149b

eclass/gnome2.eclass: sync with gx86 (${T} instead of ${S})

Add the following change from gx86:

 Thu Aug 25 18:08:59 2011 UTC by nirbheek

 Use ${T} instead of ${S} for the gstreamer registry

---
 eclass/gnome2.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index c177b4f..5803826 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -109,7 +109,7 @@ gnome2_src_prepare() {
 	chmod 0700 "${XDG_RUNTIME_DIR}"
 
 	# GST_REGISTRY is to work around gst utilities trying to read/write /root
-	export GST_REGISTRY="${S}/registry.xml"
+	export GST_REGISTRY="${T}/registry.xml"
 
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix

[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[Alexandre Restovtsev]

commit:     4796989ee09cce6627c53a3dcff657974625d88e
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 06:51:58 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 21 07:05:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4796989e

eclass/gnome2.eclass: sync with gx86

Add the following change from gx86:

 Revision 1.99
 Sun Aug 14 03:46:33 2011 UTC by nirbheek

 For ebuilds with USE=static-libs, remove .la files conditionally for
 GNOME2_LA_PUNT

---
 eclass/gnome2.eclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index c655269..49a0556 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -196,7 +196,9 @@ gnome2_src_install() {
 	# Delete all .la files
 	if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
 		ebegin "Removing .la files"
-		find "${D}" -name '*.la' -exec rm -f {} + || die
+		if ! { has static-libs ${IUSE//+} && use static-libs; }; then
+			find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+		fi
 		eend
 	fi
 }

[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

[Alexandre Restovtsev]

commit:     83468ac161a06721b19ba47bd4e8556bfcf9c120
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 19 00:13:33 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 19 00:21:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=83468ac1

eclass/gnome2.eclass: fixes from gx86 for hasq, ~/.gnome2

Add the following changes from gentoo-x86 CVS:

 Revision 1.97 Fri Jul 8 11:35:01 2011 UTC by ssuominen

 Convert every instance of hasq to has.

 Revision 1.98 Fri Jul 15 17:31:37 2011 UTC by zmedico

 Bug #345659 - fix hardcoded /root/.gnome2

 This uses a special $(unset HOME; echo ~) trick to query the home
 directory that gnome-vfs uses from the password database, as suggested
 by Jonathan Callen <abcd <AT> gentoo.org> in bug 345659, comment #24.

---
 eclass/gnome2.eclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index c127655..c655269 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -133,12 +133,12 @@ gnome2_src_configure() {
 	fi
 
 	# Prevent a QA warning
-	if hasq doc ${IUSE} ; then
+	if has doc ${IUSE} ; then
 		G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
 	fi
 
-	# Avoid sandbox violations caused by misbehaving packages (bug #128289)
-	addwrite "/root/.gnome2"
+	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
+	addwrite "$(unset HOME; echo ~)/.gnome2"
 
 	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
 	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}