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 1Pm6rp-0007iy-AW for garchives@archives.gentoo.org; Sun, 06 Feb 2011 15:49:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0E52E0AEC; Sun, 6 Feb 2011 15:49:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 94460E0AEC for ; Sun, 6 Feb 2011 15:49:29 +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 EEC951B4080 for ; Sun, 6 Feb 2011 15:49:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1D2E48006A for ; Sun, 6 Feb 2011 15:49:28 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <8504220bd56d70e8e3780a8b33366c063acd08cc.mgorny@gentoo> 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: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8504220bd56d70e8e3780a8b33366c063acd08cc Date: Sun, 6 Feb 2011 15:49:28 +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: a49860d7a7d1db491a323a4026bc0c02 commit: 8504220bd56d70e8e3780a8b33366c063acd08cc Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sun Feb 6 15:13:05 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sun Feb 6 15:48:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D8504220b [eclass] Simplify -- put the slash in MODULE instead of PACKAGE. --- eclass/xorg-2.eclass | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index b160be8..f9a267e 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -68,30 +68,28 @@ BASE_INDIVIDUAL_URI=3D"http://xorg.freedesktop.org/re= leases/individual" # inherit to override the default autoconfigured module. if [[ -z ${MODULE} ]]; then case ${CATEGORY} in - app-doc) MODULE=3D"doc" ;; - media-fonts) MODULE=3D"font" ;; - x11-apps|x11-wm) MODULE=3D"app" ;; - x11-misc|x11-themes) MODULE=3D"util" ;; - x11-drivers) MODULE=3D"driver" ;; - x11-base) MODULE=3D"xserver" ;; - x11-proto) MODULE=3D"proto" ;; - x11-libs) MODULE=3D"lib" ;; - *) MODULE=3D"" ;; + app-doc) MODULE=3Ddoc/ ;; + media-fonts) MODULE=3Dfont/ ;; + x11-apps|x11-wm) MODULE=3Dapp/ ;; + x11-misc|x11-themes) MODULE=3Dutil/ ;; + x11-drivers) MODULE=3Ddriver/ ;; + x11-base) MODULE=3Dxserver/ ;; + x11-proto) MODULE=3Dproto/ ;; + x11-libs) MODULE=3Dlib/ ;; + *) MODULE=3D ;; esac fi =20 # @ECLASS-VARIABLE: PACKAGE_NAME # @DESCRIPTION: -# For git checkout the git repository migth differ from package name. +# For git checkout the git repository might differ from package name. # This variable can be used for proper directory specification : ${PACKAGE_NAME:=3D${PN}} -# PACKAGE_NAME can be empty value -[[ -n ${PACKAGE_NAME} ]] && PACKAGE_NAME=3D"/${PACKAGE_NAME}" =20 if [[ -n ${GIT_ECLASS} ]]; then EGIT_REPO_URI=3D"git://anongit.freedesktop.org/git/xorg/${MODULE}${PACK= AGE_NAME}" else - SRC_URI+=3D" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2" + SRC_URI+=3D" ${BASE_INDIVIDUAL_URI}/${MODULE}${P}.tar.bz2" fi =20 : ${SLOT:=3D0}