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 1NruFP-0004rc-SF for garchives@archives.gentoo.org; Wed, 17 Mar 2010 14:29:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DE39E0BFF; Wed, 17 Mar 2010 14:29:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 124CAE0BFF for ; Wed, 17 Mar 2010 14:29:22 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 9F9EA1B4112 for ; Wed, 17 Mar 2010 14:29:21 +0000 (UTC) Received: from scarabeus by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NruFN-0007mE-8R for gentoo-commits@lists.gentoo.org; Wed, 17 Mar 2010 14:29:21 +0000 From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: xorg-2.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: xorg-2.eclass X-VCS-Directories: eclass X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: Sender: Tomas Chvatal Date: Wed, 17 Mar 2010 14:29:21 +0000 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: 590b8c42-4682-47bc-9c1f-37b66d530826 X-Archives-Hash: bad1b4907d2fd5f7684361bbf8e37e98 scarabeus 10/03/17 14:29:21 Modified: xorg-2.eclass Log: Fix eclassdoc. Add new variable to allow disabling of static-libs usefl= ag. Revision Changes Path 1.2 eclass/xorg-2.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.ecla= ss?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.ecla= ss?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.ecla= ss?r1=3D1.1&r2=3D1.2 Index: xorg-2.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xorg-2.eclass 14 Mar 2010 10:27:07 -0000 1.1 +++ xorg-2.eclass 17 Mar 2010 14:29:20 -0000 1.2 @@ -1,13 +1,10 @@ # 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.1 2010/03/14= 10:27:07 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.2 2010/03/17= 14:29:20 scarabeus Exp $ # # @ECLASS: xorg-2.eclass # @MAINTAINER: # x11@gentoo.org - -# Author: Tom=C3=A1=C5=A1 Chv=C3=A1tal -# Author: Donnie Berkholz # @BLURB: Reduces code duplication in the modularized X11 ebuilds. # @DESCRIPTION: # This eclass makes trivial X ebuilds possible for apps, fonts, drivers, @@ -20,6 +17,9 @@ # with the other X packages, you don't need to set SRC_URI. Pretty much # everything else should be automatic. =20 +# Author: Tom=C3=A1=C5=A1 Chv=C3=A1tal +# Author: Donnie Berkholz + GIT_ECLASS=3D"" if [[ ${PV} =3D=3D *9999* ]]; then GIT_ECLASS=3D"git" @@ -91,7 +91,7 @@ # Set the license for the package. This can be overridden by setting # LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages # are under the MIT license. (This is what Red Hat does in their rpms) -: ${LICENSE=3DMIT} +: ${LICENSE:=3DMIT} =20 # Set up shared dependencies if [[ ${XORG_EAUTORECONF} !=3D no ]]; then @@ -137,8 +137,16 @@ # If we're a driver package, then enable DRIVER case [[ ${PN} =3D=3D xf86-video-* || ${PN} =3D=3D xf86-input-* ]] && DRIVER=3D= "yes" =20 +# @ECLASS-VARIABLE: XORG_STATIC +# @DESCRIPTION: +# Enables static-libs useflag. Set to no, if your package gets: +# +# QA: configure: WARNING: unrecognized options: --disable-static +: ${XORG_STATIC:=3D"yes"} + # Add static-libs useflag where usefull. -if [[ ${FONT} !=3D yes \ +if [[ ${XORG_STATIC} =3D=3D yes \ + && ${FONT} !=3D yes \ && ${CATEGORY} !=3D app-doc \ && ${CATEGORY} !=3D x11-proto \ && ${CATEGORY} !=3D x11-drivers \