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 1R8Xpz-0005OB-Qp for garchives@archives.gentoo.org; Tue, 27 Sep 2011 13:36:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C54BE21C088; Tue, 27 Sep 2011 13:36:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 89A6721C088 for ; Tue, 27 Sep 2011 13:36:21 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1AD891B401C for ; Tue, 27 Sep 2011 13:36:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 21B3A80052 for ; Tue, 27 Sep 2011 13:36:20 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <0d8ef45b03e593a01d209ce44407b2a0fec40e36.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2-live.eclass X-VCS-Directories: eclass/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 0d8ef45b03e593a01d209ce44407b2a0fec40e36 Date: Tue, 27 Sep 2011 13:36:20 +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: X-Archives-Hash: 80801e8d753f805edb0b564abeb848d4 commit: 0d8ef45b03e593a01d209ce44407b2a0fec40e36 Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Sep 27 13:29:22 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue Sep 27 13:35:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D0d8ef45b 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: $ =20 # -# gnome2-live.eclass -# +# @ECLASS: gnome2-live.eclass +# @MAINTAINER: +# gnome@gentoo.org +# @AUTHOR: +# Nirbheek Chauhan +# @BLURB: Live ebuild phases for GNOME packages +# @DESCRIPTION: # Exports additional functions used by live ebuilds written for GNOME pa= ckages # Always to be imported *AFTER* gnome2.eclass # -# Author: Nirbheek Chauhan -# - =20 inherit autotools gnome2 gnome2-utils libtool git-2 =20 @@ -38,15 +40,28 @@ DEPEND=3D"${DEPEND} # Extra options passed to elibtoolize ELTCONF=3D${ELTCONF:-} =20 -# Default git module name -GNOME_LIVE_MODULE=3D${GNOME_LIVE_MODULE:-"${PN}"} +# @ECLASS-VARIABLE: GNOME_LIVE_MODULE +# @DESCRIPTION: +# Default git module name is assumed to be the same as the gnome.org mod= ule name +# used on ftp.gnome.org. We have GNOME_ORG_MODULE because we inherit gno= me.org +: ${GNOME_LIVE_MODULE:=3D"${GNOME_ORG_MODULE}"} =20 -# GIT URI for the project -EGIT_REPO_URI=3D"${EGIT_REPO_URI:-"git://git.gnome.org/${GNOME_LIVE_MODU= LE}"}" +# @ECLASS-VARIABLE: EGIT_REPO_URI +# @DESCRIPTION: +# git URI for the project, uses GNOME_LIVE_MODULE by default +: "${EGIT_REPO_URI:=3D"git://git.gnome.org/${GNOME_LIVE_MODULE}"}" + +# @ECLASS-VARIABLE: PATCHES +# @DESCRIPTION: +# Whitespace-separated list of patches to apply after cloning +: ${PATCHES:=3D""} =20 # Unset SRC_URI auto-set by gnome2.eclass SRC_URI=3D"" =20 +# @FUNCTION: gnome2-live_get_var +# @DESCRIPTION: +# Get macro variable values from configure.ac, etc gnome2-live_get_var() { local var f var=3D"$1" @@ -54,6 +69,10 @@ gnome2-live_get_var() { echo $(sed -ne "s/${var}(\(.*\))/\1/p" "${f}" | tr -d '[]') } =20 +# @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 } =20 +# @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 autotoo= ls +# 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} } =20 -# 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 } =20 -# 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 } =20 -# 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"