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 1QCVFN-0001Tr-M7 for garchives@archives.gentoo.org; Wed, 20 Apr 2011 11:07:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 161D21C034; Wed, 20 Apr 2011 11:06:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D565A1C034 for ; Wed, 20 Apr 2011 11:06:53 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 426111B405C for ; Wed, 20 Apr 2011 11:06:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5114680226 for ; Wed, 20 Apr 2011 11:06:52 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: Subject: [gentoo-commits] proj/x11:master commit in: eclass/ X-VCS-Repository: proj/x11 X-VCS-Files: eclass/xorg-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: e3bcdfa8270c9f8c25a6d348b5bede386c4e2e3f Date: Wed, 20 Apr 2011 11:06:52 +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: 8a75357a78c437c9b453ccc4033fc843 commit: e3bcdfa8270c9f8c25a6d348b5bede386c4e2e3f Author: Tomas Chvatal gentoo org> AuthorDate: Wed Apr 20 11:06:47 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Wed Apr 20 11:06:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3De3bcdfa8 [eclass] migrate to use git-2 eclass. Update deprecated warnings. --- eclass/xorg-2.eclass | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 6ff0d37..ac0f166 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -22,7 +22,7 @@ =20 GIT_ECLASS=3D"" if [[ ${PV} =3D=3D *9999* ]]; then - GIT_ECLASS=3D"git" + GIT_ECLASS=3D"git-2" XORG_EAUTORECONF=3D"yes" fi =20 @@ -83,9 +83,6 @@ if [[ -z ${XORG_MODULE} ]]; then esac fi =20 -# backcompat, remove when everything in main tree fixed -[[ -n ${MODULE} ]] && XORG_MODULE=3D${MODULE} && ewarn "$CATEGORY/$P is = using MODULE variable, please migrate to XORG_MODULE to preserve namespac= e." - # @ECLASS-VARIABLE: XORG_PACKAGE_NAME # @DESCRIPTION: # For git checkout the git repository might differ from package name. @@ -289,7 +286,7 @@ xorg-2_src_unpack() { debug-print-function ${FUNCNAME} "$@" =20 if [[ -n ${GIT_ECLASS} ]]; then - git_src_unpack + git-2_src_unpack else unpack ${A} fi @@ -336,7 +333,6 @@ xorg-2_reconf_source() { xorg-2_src_prepare() { debug-print-function ${FUNCNAME} "$@" =20 - [[ -n ${GIT_ECLASS} ]] && git_src_prepare xorg-2_patch_source xorg-2_reconf_source } @@ -408,7 +404,7 @@ xorg-2_src_configure() { if [[ $(declare -p XORG_CONFIGURE_OPTIONS 2>&-) !=3D "declare -a"* ]]; = then # fallback to CONFIGURE_OPTIONS, deprecated. [[ -n "${CONFIGURE_OPTIONS}" ]] && \ - ewarn "QA: CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_C= ONFIGURE_OPTIONS." + ewarn "QA: CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_C= ONFIGURE_OPTIONS to preserve namespace." local xorgconfadd=3D(${CONFIGURE_OPTIONS}) else local xorgconfadd=3D("${XORG_CONFIGURE_OPTIONS[@]}")