[gentoo-commits] gentoo-x86 commit in eclass: xorg-2.eclass

["Diego Petteno (flameeyes)" <flameeyes@gentoo.org>]

flameeyes    11/03/14 17:09:41

  Modified:             xorg-2.eclass
  Log:
  Make BASE_INDIVIDUAL_URI a tweakable value.
  
  When setting it to an explicit empty string, it will signal the eclass
  not to provide a SRC_URI at all. This is useful both for software
  using the xorg interface but not the freedesktop source uri, and for
  writing custom git-based ebuilds.

Revision  Changes    Path
1.28                 eclass/xorg-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.27&r2=1.28

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-2.eclass	8 Mar 2011 11:31:42 -0000	1.27
+++ xorg-2.eclass	14 Mar 2011 17:09:41 -0000	1.28
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.27 2011/03/08 11:31:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.28 2011/03/14 17:09:41 flameeyes Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -24,7 +24,6 @@
 if [[ ${PV} == *9999* ]]; then
 	GIT_ECLASS="git"
 	XORG_EAUTORECONF="yes"
-	SRC_URI=""
 fi
 
 # If we're a font package, but not the font.alias one
@@ -59,8 +58,12 @@
 # before inheriting this eclass.
 : ${XORG_EAUTORECONF:="no"}
 
-# Set up SRC_URI for individual modular releases
-BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
+# @ECLASS-VARIABLE: BASE_INDIVIDUAL_URI
+# @DESCRIPTION:
+# Set up SRC_URI for individual modular releases. If set to an empty
+# string, no SRC_URI will be provided by the eclass.
+: ${BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"}
+
 # @ECLASS-VARIABLE: MODULE
 # @DESCRIPTION:
 # The subdirectory to download source from. Possible settings are app,
@@ -88,8 +91,8 @@
 
 if [[ -n ${GIT_ECLASS} ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}${PACKAGE_NAME}"
-else
-	SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}${P}.tar.bz2"
+elif [[ -n ${BASE_INDIVIDUAL_URI} ]]; then
+	SRC_URI="${BASE_INDIVIDUAL_URI}/${MODULE}${P}.tar.bz2"
 fi
 
 : ${SLOT:=0}