[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    07/09/24 08:20:00

  Modified:             x-modular.eclass
  Log:
  Update URL for driver patch to mirror://gentoo instead of Josh_B's dev space (Mark Kowarsky).

Revision  Changes    Path
1.86                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.85&r2=1.86

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- x-modular.eclass	2 Aug 2007 01:21:56 -0000	1.85
+++ x-modular.eclass	24 Sep 2007 08:20:00 -0000	1.86
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.85 2007/08/02 01:21:56 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.86 2007/09/24 08:20:00 dberkholz Exp $
 #
 # Author: Donnie Berkholz <dberkholz@gentoo.org>
 #
@@ -144,7 +144,7 @@
 	if [[ ${XDPVER} != -1 ]]; then
 		# Add driver patchset to SRC_URI
 		SRC_URI="${SRC_URI}
-			http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
+			mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
 	fi
 fi
 



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    07/10/14 10:12:25

  Modified:             x-modular.eclass
  Log:
  Integrate with git.eclass, so live git ebuilds are trivially easy. Just copy an ebuild to -9999.ebuild, and it automatically does everything else: inherits git.eclass, sets up the repo, sets a blank SRC_URI, unpacks properly, and creates a ChangeLog.

Revision  Changes    Path
1.87                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.86&r2=1.87

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- x-modular.eclass	24 Sep 2007 08:20:00 -0000	1.86
+++ x-modular.eclass	14 Oct 2007 10:12:24 -0000	1.87
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.86 2007/09/24 08:20:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.87 2007/10/14 10:12:24 dberkholz Exp $
 #
 # Author: Donnie Berkholz <dberkholz@gentoo.org>
 #
@@ -46,34 +46,41 @@
 IUSE=""
 HOMEPAGE="http://xorg.freedesktop.org/"
 
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git"
+	SNAPSHOT="yes"
+	SRC_URI=""
+fi
+
 # Set up SRC_URI for individual modular releases
 BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
 if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
-	SRC_URI="${SRC_URI}
-		${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
+	MODULE="app"
 elif [[ ${CATEGORY} = app-doc ]]; then
-	SRC_URI="${SRC_URI}
-		${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
+	MODULE="doc"
 # x11-misc contains data and util, x11-themes contains data
 elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
-	SRC_URI="${SRC_URI}
-		${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2
-		${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2"
+	if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
+		MODULE="data"
+	else
+		MODULE="data"
+	fi
 elif [[ ${CATEGORY} = x11-drivers ]]; then
-	SRC_URI="${SRC_URI}
-		${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
+	MODULE="driver"
 elif [[ ${CATEGORY} = media-fonts ]]; then
-	SRC_URI="${SRC_URI}
-		${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
+	MODULE="font"
 elif [[ ${CATEGORY} = x11-libs ]]; then
-	SRC_URI="${SRC_URI}
-		${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
+	MODULE="lib"
 elif [[ ${CATEGORY} = x11-proto ]]; then
-	SRC_URI="${SRC_URI}
-		${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
+	MODULE="proto"
 elif [[ ${CATEGORY} = x11-base ]]; then
-	SRC_URI="${SRC_URI}
-		${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
+	MODULE="xserver"
+fi
+
+if [[ -n ${GIT_ECLASS} ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
+else
+	SRC_URI="${SRC_URI} ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
 fi
 
 SLOT="0"
@@ -177,7 +184,8 @@
 # Provides virtual/x11 for temporary use until packages are ported
 #	x11-base/x11-env"
 
-inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
+inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
+	${FONT_ECLASS} ${GIT_ECLASS}
 
 x-modular_specs_check() {
 	if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
@@ -214,7 +222,11 @@
 }
 
 x-modular_unpack_source() {
-	unpack ${A}
+	if [[ -n ${GIT_ECLASS} ]]; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
 	cd ${S}
 
 	if [[ -n ${FONT_OPTIONS} ]]; then
@@ -347,6 +359,12 @@
 #		datadir=${XDIR}/share \
 #		mandir=${XDIR}/share/man \
 
+	if [[ -n ${GIT_ECLASS} ]]; then
+		pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
+		git log ${GIT_TREE} > "${S}"/ChangeLog
+		popd
+	fi
+
 	if [[ -e ${S}/ChangeLog ]]; then
 		dodoc ${S}/ChangeLog
 	fi



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Steve Dibb (beandog)]

beandog     07/10/15 23:57:37

  Modified:             x-modular.eclass
  Log:
  Remove old build dependency upon man / man-db for building X

Revision  Changes    Path
1.88                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.87&r2=1.88

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- x-modular.eclass	14 Oct 2007 10:12:24 -0000	1.87
+++ x-modular.eclass	15 Oct 2007 23:57:37 -0000	1.88
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.87 2007/10/14 10:12:24 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.88 2007/10/15 23:57:37 beandog Exp $
 #
 # Author: Donnie Berkholz <dberkholz@gentoo.org>
 #
@@ -179,7 +179,6 @@
 fi
 
 RDEPEND="${RDEPEND}
-	|| ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
 	!<=x11-base/xorg-x11-6.9"
 # Provides virtual/x11 for temporary use until packages are ported
 #	x11-base/x11-env"



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    07/11/13 22:50:04

  Modified:             x-modular.eclass
  Log:
  (#199062) Fix which packages show debug USE flag (John W Eckhart).

Revision  Changes    Path
1.89                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.88&r2=1.89

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- x-modular.eclass	15 Oct 2007 23:57:37 -0000	1.88
+++ x-modular.eclass	13 Nov 2007 22:50:04 -0000	1.89
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.88 2007/10/15 23:57:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.89 2007/11/13 22:50:04 dberkholz Exp $
 #
 # Author: Donnie Berkholz <dberkholz@gentoo.org>
 #
@@ -157,13 +157,13 @@
 
 # Debugging -- ignore packages that can't be built with debugging
 if [[ -z "${FONT}" ]] \
-	|| [[ "${PN/app-doc}" != "${PN}" ]] \
-	|| [[ "${PN/x11-proto}" != "${PN}" ]] \
-	|| [[ "${PN/util-macros}" != "${PN}" ]] \
-	|| [[ "${PN/xbitmaps}" != "${PN}" ]] \
-	|| [[ "${PN/xkbdata}" != "${PN}" ]] \
-	|| [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
-	|| [[ "${PN/xcursor}" != "${PN}" ]] \
+	&& [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
+	&& [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
+	&& [[ "${PN/util-macros}" = "${PN}" ]] \
+	&& [[ "${PN/xbitmaps}" = "${PN}" ]] \
+	&& [[ "${PN/xkbdata}" = "${PN}" ]] \
+	&& [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
+	&& [[ "${PN/xcursor}" = "${PN}" ]] \
 	; then
 	DEBUGGABLE="yes"
 	IUSE="${IUSE} debug"



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Doug Klima (cardoe)]

cardoe      08/02/21 22:50:51

  Modified:             x-modular.eclass
  Log:
  add $DOCS variable for src_install phase

Revision  Changes    Path
1.90                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.89&r2=1.90

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- x-modular.eclass	13 Nov 2007 22:50:04 -0000	1.89
+++ x-modular.eclass	21 Feb 2008 22:50:51 -0000	1.90
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.89 2007/11/13 22:50:04 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.90 2008/02/21 22:50:51 cardoe Exp $
 #
 # Author: Donnie Berkholz <dberkholz@gentoo.org>
 #
@@ -367,6 +367,7 @@
 	if [[ -e ${S}/ChangeLog ]]; then
 		dodoc ${S}/ChangeLog
 	fi
+	[[ -n $DOCS ]] && dodoc $DOCS
 
 	# Make sure docs get compressed
 	prepalldocs



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/02/22 05:09:31

  Modified:             x-modular.eclass
  Log:
  Move to new documentation style used by app-portage/eclass-manpages.

Revision  Changes    Path
1.91                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.90&r2=1.91

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- x-modular.eclass	21 Feb 2008 22:50:51 -0000	1.90
+++ x-modular.eclass	22 Feb 2008 05:09:31 -0000	1.91
@@ -1,51 +1,51 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.90 2008/02/21 22:50:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.91 2008/02/22 05:09:31 dberkholz Exp $
 #
-# Author: Donnie Berkholz <dberkholz@gentoo.org>
+# @ECLASS: x-modular.eclass
+# @MAINTAINER:
+# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
+# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
+# @DESCRIPTION:
+# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
+# and more. Many things that would normally be done in various functions
+# can be accessed by setting variables instead, such as patching,
+# running eautoreconf, passing options to configure and installing docs.
 #
-# This eclass is designed to reduce code duplication in the modularized X11
-# ebuilds.
-#
-# Using this eclass:
-#
-# Inherit it. If you need to run autoreconf for any reason (e.g., your patches
-# apply to the autotools files rather than configure), set SNAPSHOT="yes". Set
-# CONFIGURE_OPTIONS to everything you want to pass to the configure script.
-#
-# If you have any patches to apply, set PATCHES to their locations and epatch
-# will apply them. It also handles epatch-style bulk patches, if you know how to
-# use them and set the correct variables. If you don't, read eutils.eclass.
-#
-# If you're creating a font package and the suffix of PN is not equal to the
-# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
-# directory or directories.
-#
-# If you want to change the auto-application of the driver patchset or prevent
-# it from applying, edit XDPVER in the ebuild. Set it to -1 to prevent patch
-# application or positive integers for that patch version.
-#
-# IMPORTANT: SNAPSHOT, FONT_DIR and XDPVER must be set _before_ the inherit.
-#
-# If you want to install to a non-default prefix (e.g., /opt/xorg), change
-# XDIR. This has not been recently tested. You may need to uncomment the
-# setting of datadir and mandir in x-modular_src_install() or add it back in if
-# it's no longer there. You may also want to change the SLOT.
-#
-# Pretty much everything else should be automatic.
-
-# Directory prefix to use for everything
+# All you need to do in a basic ebuild is inherit this eclass and set
+# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
+# with the other X packages, you don't need to set SRC_URI. Pretty much
+# everything else should be automatic.
+
+# @ECLASS-VARIABLE: XDIR
+# @DESCRIPTION:
+# Directory prefix to use for everything. If you want to install to a
+# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been
+# recently tested. You may need to uncomment the setting of datadir and
+# mandir in x-modular_src_install() or add it back in if it's no longer
+# there. You may also want to change the SLOT.
 XDIR="/usr"
 
-# Set up default patchset version(s) if necessary
-# x11-driver-patches
 if [[ -z "${XDPVER}" ]]; then
+# @ECLASS-VARIABLE: XDPVER
+# @DESCRIPTION:
+# Set up default patchset version(s) if necessary for driver patches. If
+# you want to change the auto-application of the driver patchset or
+# prevent it from applying, edit XDPVER in the ebuild. Set it to -1 to
+# prevent patch application or positive integers for that patch version.
+# Set before inheriting this eclass.
 	XDPVER="1"
 fi
 
 IUSE=""
 HOMEPAGE="http://xorg.freedesktop.org/"
 
+# @ECLASS-VARIABLE: SNAPSHOT
+# @DESCRIPTION:
+# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
+# before inheriting this eclass.
+SNAPSHOT="no"
+
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git"
 	SNAPSHOT="yes"
@@ -123,6 +123,12 @@
 
 	# Wrap in `if` so ebuilds can set it too
 	if [[ -z ${FONT_DIR} ]]; then
+# @ECLASS-VARIABLE: FONT_DIR
+# @DESCRIPTION:
+# If you're creating a font package and the suffix of PN is not equal to
+# the subdirectory of /usr/share/fonts/ it should install into, set
+# FONT_DIR to that directory or directories. Set before inheriting this
+# eclass.
 		FONT_DIR=${PN##*-}
 
 	fi
@@ -186,6 +192,10 @@
 inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
 	${FONT_ECLASS} ${GIT_ECLASS}
 
+# @FUNCTION: x-modular_specs_check
+# @USAGE:
+# @DESCRIPTION:
+# Make any necessary changes related to gcc specs (generally hardened)
 x-modular_specs_check() {
 	if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
 		append-ldflags -Wl,-z,lazy
@@ -194,6 +204,10 @@
 	fi
 }
 
+# @FUNCTION: x-modular_dri_check
+# @USAGE:
+# @DESCRIPTION:
+# Ensures the server supports DRI if building a driver with DRI support
 x-modular_dri_check() {
 	# (#120057) Enabling DRI in drivers requires that the server was built with
 	# support for it
@@ -207,6 +221,10 @@
 	fi
 }
 
+# @FUNCTION: x-modular_server_supports_drivers_check
+# @USAGE:
+# @DESCRIPTION:
+# Ensures the server SDK is installed if a driver is being built
 x-modular_server_supports_drivers_check() {
 	# (#135873) Only certain servers will actually use or be capable of
 	# building external drivers, including binary drivers.
@@ -220,6 +238,10 @@
 	fi
 }
 
+# @FUNCTION: x-modular_unpack_source
+# @USAGE:
+# @DESCRIPTION:
+# Simply unpack source code. Nothing else.
 x-modular_unpack_source() {
 	if [[ -n ${GIT_ECLASS} ]]; then
 		git_src_unpack
@@ -233,6 +255,10 @@
 	fi
 }
 
+# @FUNCTION: x-modular_patch_source
+# @USAGE:
+# @DESCRIPTION:
+# Apply all patches
 x-modular_patch_source() {
 	# Use standardized names and locations with bulk patching
 	# Patch directory is ${WORKDIR}/patch
@@ -249,7 +275,11 @@
 		PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
 	fi
 
-	# For specific list of patches
+# @VARIABLE: PATCHES
+# @DESCRIPTION:
+# If you have any patches to apply, set PATCHES to their locations and epatch
+# will apply them. It also handles epatch-style bulk patches, if you know how to
+# use them and set the correct variables. If you don't, read eutils.eclass.
 	if [[ -n "${PATCHES}" ]] ; then
 		for PATCH in ${PATCHES}
 		do
@@ -264,8 +294,11 @@
 	fi
 }
 
+# @FUNCTION: x-modular_reconf_source
+# @USAGE:
+# @DESCRIPTION:
+# Run eautoreconf if necessary, and run elibtoolize.
 x-modular_reconf_source() {
-	# Run autoreconf for CVS snapshots only
 	if [[ "${SNAPSHOT}" = "yes" ]]
 	then
 		# If possible, generate configure if it doesn't exist
@@ -280,6 +313,10 @@
 	elibtoolize
 }
 
+# @FUNCTION: x-modular_src_unpack
+# @USAGE:
+# @DESCRIPTION:
+# Unpack a package, performing all X-related tasks.
 x-modular_src_unpack() {
 	x-modular_specs_check
 	x-modular_server_supports_drivers_check
@@ -289,6 +326,10 @@
 	x-modular_reconf_source
 }
 
+# @FUNCTION: x-modular_font_configure
+# @USAGE:
+# @DESCRIPTION:
+# If a font package, perform any necessary configuration steps
 x-modular_font_configure() {
 	if [[ -n "${FONT}" ]]; then
 		# Might be worth adding an option to configure your desired font
@@ -316,6 +357,10 @@
 	fi
 }
 
+# @FUNCTION: x-modular_debug_setup
+# @USAGE:
+# @DESCRIPTION:
+# Set up CFLAGS for a debug build
 x-modular_debug_setup() {
 	if [[ -n "${DEBUGGABLE}" ]]; then
 		if use debug; then
@@ -325,10 +370,19 @@
 	fi
 }
 
+# @FUNCTION: x-modular_src_configure
+# @USAGE:
+# @DESCRIPTION:
+# Perform any necessary pre-configuration steps, then run configure
 x-modular_src_configure() {
 	x-modular_font_configure
 	x-modular_debug_setup
 
+# @VARIABLE: CONFIGURE_OPTIONS
+# @DESCRIPTION:
+# Any options to pass to configure
+[[ -n ${CONFIGURE_OPTIONTS} ]]
+
 	# If prefix isn't set here, .pc files cause problems
 	if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
 		econf --prefix=${XDIR} \
@@ -339,15 +393,28 @@
 	fi
 }
 
+# @FUNCTION: x-modular_src_make
+# @USAGE:
+# @DESCRIPTION:
+# Run make.
 x-modular_src_make() {
 	emake || die "emake failed"
 }
 
+# @FUNCTION: x-modular_src_configure
+# @USAGE:
+# @DESCRIPTION:
+# Compile a package, performing all X-related tasks.
 x-modular_src_compile() {
 	x-modular_src_configure
 	x-modular_src_make
 }
 
+# @FUNCTION: x-modular_src_install
+# @USAGE:
+# @DESCRIPTION:
+# Install a built package to ${D}, performing any necessary steps.
+# Creates a ChangeLog from git if using live ebuilds.
 x-modular_src_install() {
 	# Install everything to ${XDIR}
 	make \
@@ -367,6 +434,9 @@
 	if [[ -e ${S}/ChangeLog ]]; then
 		dodoc ${S}/ChangeLog
 	fi
+# @VARIABLE: DOCS
+# @DESCRIPTION:
+# Any documentation to install
 	[[ -n $DOCS ]] && dodoc $DOCS
 
 	# Make sure docs get compressed
@@ -378,8 +448,6 @@
 			| xargs rm -f
 	fi
 
-	# Don't install overlapping fonts.* files
-	# Generate them instead when possible
 	if [[ -n "${FONT}" ]]; then
 		remove_font_metadata
 	fi
@@ -389,17 +457,31 @@
 	fi
 }
 
+# @FUNCTION: x-modular_pkg_preinst
+# @USAGE:
+# @DESCRIPTION:
+# This function doesn't do anything right now, but it may in the future.
 x-modular_pkg_preinst() {
 	# We no longer do anything here, but we can't remove it from the API
 	:
 }
 
+# @FUNCTION: x-modular_pkg_postinst
+# @USAGE:
+# @DESCRIPTION:
+# Run X-specific post-installation tasks on the live filesystem. The
+# only task right now is some setup for font packages.
 x-modular_pkg_postinst() {
 	if [[ -n "${FONT}" ]]; then
 		setup_fonts
 	fi
 }
 
+# @FUNCTION: x-modular_pkg_postrm
+# @USAGE:
+# @DESCRIPTION:
+# Run X-specific post-removal tasks on the live filesystem. The only
+# task right now is some cleanup for font packages.
 x-modular_pkg_postrm() {
 	if [[ -n "${FONT}" ]]; then
 		cleanup_fonts
@@ -407,6 +489,10 @@
 	fi
 }
 
+# @FUNCTION: cleanup_fonts
+# @USAGE:
+# @DESCRIPTION:
+# Get rid of font directories that only contain generated files
 cleanup_fonts() {
 	local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
 	for DIR in ${FONT_DIR}; do
@@ -442,6 +528,10 @@
 	done
 }
 
+# @FUNCTION: setup_fonts
+# @USAGE:
+# @DESCRIPTION:
+# Generates needed files for fonts and fixes font permissions
 setup_fonts() {
 	if [[ ! -n "${FONT_DIR}" ]]; then
 		msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
@@ -455,6 +545,11 @@
 	create_font_cache
 }
 
+# @FUNCTION: remove_font_metadata
+# @USAGE:
+# @DESCRIPTION:
+# Don't let the package install generated font files that may overlap
+# with other packages. Instead, they're generated in pkg_postinst().
 remove_font_metadata() {
 	local DIR
 	for DIR in ${FONT_DIR}; do
@@ -467,8 +562,11 @@
 	done
 }
 
-# Installs device-to-driver mappings for system-config-display
-# and anything else that uses hwdata
+# @FUNCTION: install_driver_hwdata
+# @USAGE:
+# @DESCRIPTION:
+# Installs device-to-driver mappings for system-config-display and 
+# anything else that uses hwdata.
 install_driver_hwdata() {
 	insinto /usr/share/hwdata/videoaliases
 	for i in "${FILESDIR}"/*.xinf; do
@@ -480,10 +578,18 @@
 	done
 }
 
+# @FUNCTION: discover_font_dirs
+# @USAGE:
+# @DESCRIPTION:
+# Deprecated. Sets up the now-unused FONT_DIRS variable.
 discover_font_dirs() {
 	FONT_DIRS="${FONT_DIR}"
 }
 
+# @FUNCTION: create_fonts_scale
+# @USAGE:
+# @DESCRIPTION:
+# Create fonts.scale file, used by the old server-side fonts subsystem.
 create_fonts_scale() {
 	ebegin "Creating fonts.scale files"
 		local x
@@ -507,6 +613,10 @@
 	eend 0
 }
 
+# @FUNCTION: create_fonts_dir
+# @USAGE:
+# @DESCRIPTION:
+# Create fonts.dir file, used by the old server-side fonts subsystem.
 create_fonts_dir() {
 	ebegin "Generating fonts.dir files"
 		for DIR in ${FONT_DIR}; do
@@ -524,6 +634,10 @@
 	eend 0
 }
 
+# @FUNCTION: fix_font_permissions
+# @USAGE:
+# @DESCRIPTION:
+# Font files should have 644 permissions. Ensure this is the case.
 fix_font_permissions() {
 	ebegin "Fixing permissions"
 		for DIR in ${FONT_DIR}; do
@@ -533,6 +647,11 @@
 	eend 0
 }
 
+# @FUNCTION: create_font_cache
+# @USAGE:
+# @DESCRIPTION:
+# Create fonts.cache-1 files, used by the new client-side fonts
+# subsystem.
 create_font_cache() {
 	font_pkg_postinst
 }



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/02/22 05:10:04

  Modified:             x-modular.eclass
  Log:
  Use braces around variables.

Revision  Changes    Path
1.92                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.91&r2=1.92

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- x-modular.eclass	22 Feb 2008 05:09:31 -0000	1.91
+++ x-modular.eclass	22 Feb 2008 05:10:03 -0000	1.92
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.91 2008/02/22 05:09:31 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.92 2008/02/22 05:10:03 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -437,7 +437,7 @@
 # @VARIABLE: DOCS
 # @DESCRIPTION:
 # Any documentation to install
-	[[ -n $DOCS ]] && dodoc $DOCS
+	[[ -n ${DOCS} ]] && dodoc ${DOCS}
 
 	# Make sure docs get compressed
 	prepalldocs



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/03/06 04:42:27

  Modified:             x-modular.eclass
  Log:
  Make sure that packages needing eautoreconf run get it run. This fixes a bug accidentally introduced when setting default values so this eclass could be documented properly.

Revision  Changes    Path
1.93                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.92&r2=1.93

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- x-modular.eclass	22 Feb 2008 05:10:03 -0000	1.92
+++ x-modular.eclass	6 Mar 2008 04:42:26 -0000	1.93
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.92 2008/02/22 05:10:03 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.93 2008/03/06 04:42:26 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -40,11 +40,13 @@
 IUSE=""
 HOMEPAGE="http://xorg.freedesktop.org/"
 
+if [[ -z ${SNAPSHOT} ]]; then
 # @ECLASS-VARIABLE: SNAPSHOT
 # @DESCRIPTION:
 # If set to 'yes' and configure.ac exists, eautoreconf will run. Set
 # before inheriting this eclass.
-SNAPSHOT="no"
+	SNAPSHOT="no"
+fi
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git"



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/03/09 05:20:31

  Modified:             x-modular.eclass
  Log:
  Download things in the 'util' module from the right place.

Revision  Changes    Path
1.94                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.93&r2=1.94

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- x-modular.eclass	6 Mar 2008 04:42:26 -0000	1.93
+++ x-modular.eclass	9 Mar 2008 05:20:30 -0000	1.94
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.93 2008/03/06 04:42:26 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.94 2008/03/09 05:20:30 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -65,7 +65,7 @@
 	if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
 		MODULE="data"
 	else
-		MODULE="data"
+		MODULE="util"
 	fi
 elif [[ ${CATEGORY} = x11-drivers ]]; then
 	MODULE="driver"



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/04/13 04:44:16

  Modified:             x-modular.eclass
  Log:
  Allow PATCHES to be an array. Based on change in ruby-gnome2.eclass.

Revision  Changes    Path
1.95                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.94&r2=1.95

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- x-modular.eclass	9 Mar 2008 05:20:30 -0000	1.94
+++ x-modular.eclass	13 Apr 2008 04:44:16 -0000	1.95
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.94 2008/03/09 05:20:30 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.95 2008/04/13 04:44:16 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -282,10 +282,13 @@
 # If you have any patches to apply, set PATCHES to their locations and epatch
 # will apply them. It also handles epatch-style bulk patches, if you know how to
 # use them and set the correct variables. If you don't, read eutils.eclass.
-	if [[ -n "${PATCHES}" ]] ; then
-		for PATCH in ${PATCHES}
-		do
-			epatch ${PATCH}
+	if [[ ${#PATCHES[@]} -gt 1 ]]; then
+		for x in "${PATCHES[@]}"; do
+			epatch "${x}"
+		done
+	elif [[ -n "${PATCHES}" ]]; then
+		for x in ${PATCHES}; do
+			epatch "${x}"
 		done
 	# For non-default directory bulk patching
 	elif [[ -n "${PATCH_LOC}" ]] ; then



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/04/30 17:37:43

  Modified:             x-modular.eclass
  Log:
  (#214531) Add nls to IUSE for fonts with PN ending in -cyrillic.

Revision  Changes    Path
1.96                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.95&r2=1.96

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- x-modular.eclass	13 Apr 2008 04:44:16 -0000	1.95
+++ x-modular.eclass	30 Apr 2008 17:37:42 -0000	1.96
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.95 2008/04/13 04:44:16 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.96 2008/04/30 17:37:42 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -145,7 +145,7 @@
 	FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
 
 	if [[ -n "${FONT}" ]]; then
-		if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then
+		if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
 			IUSE="${IUSE} nls"
 		fi
 	fi



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/05/09 07:18:19

  Modified:             x-modular.eclass
  Log:
  (#219581) Stop applying driver patch to install manpages to 4x.

Revision  Changes    Path
1.97                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.96&r2=1.97

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- x-modular.eclass	30 Apr 2008 17:37:42 -0000	1.96
+++ x-modular.eclass	9 May 2008 07:18:19 -0000	1.97
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.96 2008/04/30 17:37:42 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.97 2008/05/09 07:18:19 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -26,17 +26,6 @@
 # there. You may also want to change the SLOT.
 XDIR="/usr"
 
-if [[ -z "${XDPVER}" ]]; then
-# @ECLASS-VARIABLE: XDPVER
-# @DESCRIPTION:
-# Set up default patchset version(s) if necessary for driver patches. If
-# you want to change the auto-application of the driver patchset or
-# prevent it from applying, edit XDPVER in the ebuild. Set it to -1 to
-# prevent patch application or positive integers for that patch version.
-# Set before inheriting this eclass.
-	XDPVER="1"
-fi
-
 IUSE=""
 HOMEPAGE="http://xorg.freedesktop.org/"
 
@@ -155,12 +144,6 @@
 if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
 	# Enable driver code in the rest of the eclass
 	DRIVER="yes"
-
-	if [[ ${XDPVER} != -1 ]]; then
-		# Add driver patchset to SRC_URI
-		SRC_URI="${SRC_URI}
-			mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
-	fi
 fi
 
 # Debugging -- ignore packages that can't be built with debugging
@@ -269,14 +252,6 @@
 		EPATCH_SUFFIX="patch"
 	fi
 
-	# If this is a driver package we need to fix man page install location.
-	# Running autoreconf will use the patched util-macros to make the
-	# change for us, so we only need to patch if it is not going to run.
-	if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
-		&& [[ ${XDPVER} != -1 ]]; then
-		PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
-	fi
-
 # @VARIABLE: PATCHES
 # @DESCRIPTION:
 # If you have any patches to apply, set PATCHES to their locations and epatch



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/05/27 18:40:19

  Modified:             x-modular.eclass
  Log:
  Typo: CONFIGURE_OPTIONS, not CONFIGURE_OPTIONTS. Custom configure options weren't getting through before, and now they will.

Revision  Changes    Path
1.98                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.97&r2=1.98

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- x-modular.eclass	9 May 2008 07:18:19 -0000	1.97
+++ x-modular.eclass	27 May 2008 18:40:19 -0000	1.98
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.97 2008/05/09 07:18:19 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.98 2008/05/27 18:40:19 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -361,7 +361,7 @@
 # @VARIABLE: CONFIGURE_OPTIONS
 # @DESCRIPTION:
 # Any options to pass to configure
-[[ -n ${CONFIGURE_OPTIONTS} ]]
+[[ -n ${CONFIGURE_OPTIONS} ]]
 
 	# If prefix isn't set here, .pc files cause problems
 	if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/05/27 18:42:33

  Modified:             x-modular.eclass
  Log:
  Allow ebuilds to override the module they download from, so we need less special-casing in here.

Revision  Changes    Path
1.99                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.98&r2=1.99

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- x-modular.eclass	27 May 2008 18:40:19 -0000	1.98
+++ x-modular.eclass	27 May 2008 18:42:33 -0000	1.99
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.98 2008/05/27 18:40:19 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.99 2008/05/27 18:42:33 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -45,27 +45,35 @@
 
 # Set up SRC_URI for individual modular releases
 BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
-if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
-	MODULE="app"
-elif [[ ${CATEGORY} = app-doc ]]; then
-	MODULE="doc"
-# x11-misc contains data and util, x11-themes contains data
-elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
-	if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
-		MODULE="data"
-	else
-		MODULE="util"
+if [[ -z ${MODULE} ]]; then
+# @ECLASS-VARIABLE: MODULE
+# @DESCRIPTION:
+# The subdirectory to download source from. Possible settings are app,
+# doc, data, util, driver, font, lib, proto, xserver. Set above the
+# inherit to override the default autoconfigured module.
+	MODULE=""
+	if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
+		MODULE="app"
+	elif [[ ${CATEGORY} = app-doc ]]; then
+		MODULE="doc"
+	# x11-misc contains data and util, x11-themes contains data
+	elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
+		if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
+			MODULE="data"
+		else
+			MODULE="util"
+		fi
+	elif [[ ${CATEGORY} = x11-drivers ]]; then
+		MODULE="driver"
+	elif [[ ${CATEGORY} = media-fonts ]]; then
+		MODULE="font"
+	elif [[ ${CATEGORY} = x11-libs ]]; then
+		MODULE="lib"
+	elif [[ ${CATEGORY} = x11-proto ]]; then
+		MODULE="proto"
+	elif [[ ${CATEGORY} = x11-base ]]; then
+		MODULE="xserver"
 	fi
-elif [[ ${CATEGORY} = x11-drivers ]]; then
-	MODULE="driver"
-elif [[ ${CATEGORY} = media-fonts ]]; then
-	MODULE="font"
-elif [[ ${CATEGORY} = x11-libs ]]; then
-	MODULE="lib"
-elif [[ ${CATEGORY} = x11-proto ]]; then
-	MODULE="proto"
-elif [[ ${CATEGORY} = x11-base ]]; then
-	MODULE="xserver"
 fi
 
 if [[ -n ${GIT_ECLASS} ]]; then



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/05/28 01:48:11

  Modified:             x-modular.eclass
  Log:
  Change the MODULE setup to a case statement. Thanks to Bo Ørsted Andresen, who finally got me to do it.

Revision  Changes    Path
1.100                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.99&r2=1.100

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- x-modular.eclass	27 May 2008 18:42:33 -0000	1.99
+++ x-modular.eclass	28 May 2008 01:48:10 -0000	1.100
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.99 2008/05/27 18:42:33 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.100 2008/05/28 01:48:10 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -45,36 +45,22 @@
 
 # Set up SRC_URI for individual modular releases
 BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
-if [[ -z ${MODULE} ]]; then
 # @ECLASS-VARIABLE: MODULE
 # @DESCRIPTION:
 # The subdirectory to download source from. Possible settings are app,
 # doc, data, util, driver, font, lib, proto, xserver. Set above the
 # inherit to override the default autoconfigured module.
-	MODULE=""
-	if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
-		MODULE="app"
-	elif [[ ${CATEGORY} = app-doc ]]; then
-		MODULE="doc"
-	# x11-misc contains data and util, x11-themes contains data
-	elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
-		if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
-			MODULE="data"
-		else
-			MODULE="util"
-		fi
-	elif [[ ${CATEGORY} = x11-drivers ]]; then
-		MODULE="driver"
-	elif [[ ${CATEGORY} = media-fonts ]]; then
-		MODULE="font"
-	elif [[ ${CATEGORY} = x11-libs ]]; then
-		MODULE="lib"
-	elif [[ ${CATEGORY} = x11-proto ]]; then
-		MODULE="proto"
-	elif [[ ${CATEGORY} = x11-base ]]; then
-		MODULE="xserver"
-	fi
-fi
+[[ -z ${MODULE} ]] && MODULE=""
+case ${CATEGORY} in
+	app-doc)             MODULE="doc"     ;;
+	media-fonts)         MODULE="font"    ;;
+	x11-apps|x11-wm)     MODULE="app"     ;;
+	x11-misc|x11-themes) MODULE="util"    ;;
+	x11-drivers)         MODULE="driver"  ;;
+	x11-base)            MODULE="xserver" ;;
+	x11-proto)           MODULE="proto"   ;;
+	x11-libs)            MODULE="lib"     ;;
+esac
 
 if [[ -n ${GIT_ECLASS} ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/06/13 16:40:22

  Modified:             x-modular.eclass
  Log:
  (#226187) The MODULE override wasn't working correctly because of a logic error made when refactoring.

Revision  Changes    Path
1.101                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.100&r2=1.101

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- x-modular.eclass	28 May 2008 01:48:10 -0000	1.100
+++ x-modular.eclass	13 Jun 2008 16:40:21 -0000	1.101
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.100 2008/05/28 01:48:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.101 2008/06/13 16:40:21 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -50,17 +50,19 @@
 # The subdirectory to download source from. Possible settings are app,
 # doc, data, util, driver, font, lib, proto, xserver. Set above the
 # inherit to override the default autoconfigured module.
-[[ -z ${MODULE} ]] && MODULE=""
-case ${CATEGORY} in
-	app-doc)             MODULE="doc"     ;;
-	media-fonts)         MODULE="font"    ;;
-	x11-apps|x11-wm)     MODULE="app"     ;;
-	x11-misc|x11-themes) MODULE="util"    ;;
-	x11-drivers)         MODULE="driver"  ;;
-	x11-base)            MODULE="xserver" ;;
-	x11-proto)           MODULE="proto"   ;;
-	x11-libs)            MODULE="lib"     ;;
-esac
+if [[ -z ${MODULE} ]]; then
+	MODULE=""
+	case ${CATEGORY} in
+		app-doc)             MODULE="doc"     ;;
+		media-fonts)         MODULE="font"    ;;
+		x11-apps|x11-wm)     MODULE="app"     ;;
+		x11-misc|x11-themes) MODULE="util"    ;;
+		x11-drivers)         MODULE="driver"  ;;
+		x11-base)            MODULE="xserver" ;;
+		x11-proto)           MODULE="proto"   ;;
+		x11-libs)            MODULE="lib"     ;;
+	esac
+fi
 
 if [[ -n ${GIT_ECLASS} ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/08/25 17:10:37

  Modified:             x-modular.eclass
  Log:
  (#235629) Die if build succeeds but install fails.

Revision  Changes    Path
1.102                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.101&r2=1.102

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- x-modular.eclass	13 Jun 2008 16:40:21 -0000	1.101
+++ x-modular.eclass	25 Aug 2008 17:10:36 -0000	1.102
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.101 2008/06/13 16:40:21 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.102 2008/08/25 17:10:36 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -395,7 +395,8 @@
 	# Install everything to ${XDIR}
 	make \
 		DESTDIR="${D}" \
-		install
+		install \
+		|| die
 # Shouldn't be necessary in XDIR=/usr
 # einstall forces datadir, so we need to re-force it
 #		datadir=${XDIR}/share \

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/11/26 23:13:24

  Modified:             x-modular.eclass
  Log:
  x-modular_dri_check(): Keep working when xorg-server doesn't support USE=dri.

Revision  Changes    Path
1.103                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.102&r2=1.103

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- x-modular.eclass	25 Aug 2008 17:10:36 -0000	1.102
+++ x-modular.eclass	26 Nov 2008 23:13:24 -0000	1.103
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.102 2008/08/25 17:10:36 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.103 2008/11/26 23:13:24 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -195,7 +195,7 @@
 	if [[ -n "${DRIVER}" ]]; then
 		if has dri ${IUSE} && use dri; then
 			einfo "Checking for direct rendering capabilities ..."
-			if ! built_with_use x11-base/xorg-server dri; then
+			if ! built_with_use --missing true x11-base/xorg-server dri; then
 				die "You must build x11-base/xorg-server with USE=dri."
 			fi
 		fi

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Markus Meier (maekke)]

maekke      09/02/14 18:37:34

  Modified:             x-modular.eclass
  Log:
  quote variables wrt bug #258232

Revision  Changes    Path
1.104                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.103&r2=1.104

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- x-modular.eclass	26 Nov 2008 23:13:24 -0000	1.103
+++ x-modular.eclass	14 Feb 2009 18:37:34 -0000	1.104
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.103 2008/11/26 23:13:24 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.104 2009/02/14 18:37:34 maekke Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -229,7 +229,7 @@
 	else
 		unpack ${A}
 	fi
-	cd ${S}
+	cd "${S}"
 
 	if [[ -n ${FONT_OPTIONS} ]]; then
 		einfo "Detected font directory: ${FONT_DIR}"
@@ -409,7 +409,7 @@
 	fi
 
 	if [[ -e ${S}/ChangeLog ]]; then
-		dodoc ${S}/ChangeLog
+		dodoc "${S}"/ChangeLog
 	fi
 # @VARIABLE: DOCS
 # @DESCRIPTION:
@@ -421,7 +421,7 @@
 
 	# Don't install libtool archives for server modules
 	if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
-		find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
+		find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
 			| xargs rm -f
 	fi
 
@@ -534,7 +534,7 @@
 			[[ "${DIR}" != "CID" ]] ; then
 			# Delete font metadata files
 			# fonts.scale, fonts.dir, fonts.cache-1
-			rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
+			rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
 		fi
 	done
 }
@@ -583,7 +583,7 @@
 			if [[ "${x/encodings}" = "${x}" ]] \
 				&& [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
 				mkfontscale \
-					-a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
+					-a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
 					-- ${x}
 			fi
 		done
@@ -603,8 +603,8 @@
 
 			if [[ "${x/encodings}" = "${x}" ]]; then
 				mkfontdir \
-					-e ${ROOT}/usr/share/fonts/encodings \
-					-e ${ROOT}/usr/share/fonts/encodings/large \
+					-e "${ROOT}"/usr/share/fonts/encodings \
+					-e "${ROOT}"/usr/share/fonts/encodings/large \
 					-- ${x}
 			fi
 		done
@@ -618,7 +618,7 @@
 fix_font_permissions() {
 	ebegin "Fixing permissions"
 		for DIR in ${FONT_DIR}; do
-			find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
+			find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
 				-exec chmod 0644 {} \;
 		done
 	eend 0

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    09/02/18 18:40:52

  Modified:             x-modular.eclass
  Log:
  (#259491) Stop using prepalldocs, stuff is breaking because of the eutils.eclass change.

Revision  Changes    Path
1.105                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.104&r2=1.105

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- x-modular.eclass	14 Feb 2009 18:37:34 -0000	1.104
+++ x-modular.eclass	18 Feb 2009 18:40:52 -0000	1.105
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.104 2009/02/14 18:37:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.105 2009/02/18 18:40:52 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -416,9 +416,6 @@
 # Any documentation to install
 	[[ -n ${DOCS} ]] && dodoc ${DOCS}
 
-	# Make sure docs get compressed
-	prepalldocs
-
 	# Don't install libtool archives for server modules
 	if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
 		find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Remi Cardona (remi)]

remi        09/03/03 16:26:20

  Modified:             x-modular.eclass
  Log:
  install proto docs in /usr/share/doc/${PF} (fixes bug #164917)

Revision  Changes    Path
1.106                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.105&r2=1.106

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- x-modular.eclass	18 Feb 2009 18:40:52 -0000	1.105
+++ x-modular.eclass	3 Mar 2009 16:26:20 -0000	1.106
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.105 2009/02/18 18:40:52 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.106 2009/03/03 16:26:20 remi Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -393,10 +393,18 @@
 # Creates a ChangeLog from git if using live ebuilds.
 x-modular_src_install() {
 	# Install everything to ${XDIR}
-	make \
-		DESTDIR="${D}" \
-		install \
-		|| die
+	if [[ ${CATEGORY} = x11-proto ]]; then
+		make \
+			${PN/proto/}docdir=/usr/share/doc/${PF} \
+			DESTDIR="${D}" \
+			install \
+			|| die
+	else
+		make \
+			DESTDIR="${D}" \
+			install \
+			|| die
+	fi
 # Shouldn't be necessary in XDIR=/usr
 # einstall forces datadir, so we need to re-force it
 #		datadir=${XDIR}/share \

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Remi Cardona (remi)]

remi        09/03/03 16:28:32

  Modified:             x-modular.eclass
  Log:
  update the DRI checking code to new USE flags in xorg-server 1.5.3 (fixes bug #252084)

Revision  Changes    Path
1.107                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.106&r2=1.107

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- x-modular.eclass	3 Mar 2009 16:26:20 -0000	1.106
+++ x-modular.eclass	3 Mar 2009 16:28:32 -0000	1.107
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.106 2009/03/03 16:26:20 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.107 2009/03/03 16:28:32 remi Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -192,11 +192,19 @@
 x-modular_dri_check() {
 	# (#120057) Enabling DRI in drivers requires that the server was built with
 	# support for it
+	# Starting with xorg-server 1.5.3, DRI support is always enabled unless
+	# USE=minimal is set (see bug #252084)
 	if [[ -n "${DRIVER}" ]]; then
 		if has dri ${IUSE} && use dri; then
 			einfo "Checking for direct rendering capabilities ..."
-			if ! built_with_use --missing true x11-base/xorg-server dri; then
-				die "You must build x11-base/xorg-server with USE=dri."
+			if has_version '>=x11-base/xorg-server-1.5.3'; then
+				if built_with_use x11-base/xorg-server minimal; then
+					die "You must build x11-base/xorg-server with USE=-minimal."
+				fi
+			else
+				if ! built_with_use x11-base/xorg-server dri; then
+					die "You must build x11-base/xorg-server with USE=dri."
+				fi
 			fi
 		fi
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    09/03/06 21:00:01

  Modified:             x-modular.eclass
  Log:
  Fix typo in eclass-doc. x-modular_src_configure->x-modular_src_compile.

Revision  Changes    Path
1.108                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.107&r2=1.108

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- x-modular.eclass	3 Mar 2009 16:28:32 -0000	1.107
+++ x-modular.eclass	6 Mar 2009 21:00:00 -0000	1.108
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.107 2009/03/03 16:28:32 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.108 2009/03/06 21:00:00 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -385,7 +385,7 @@
 	emake || die "emake failed"
 }
 
-# @FUNCTION: x-modular_src_configure
+# @FUNCTION: x-modular_src_compile
 # @USAGE:
 # @DESCRIPTION:
 # Compile a package, performing all X-related tasks.

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Remi Cardona (remi)]

remi        09/05/14 12:40:56

  Modified:             x-modular.eclass
  Log:
  update the x-modular eclass to what was in the X11 overlay :
   - EAPI=2 support
   - regroup all the "inherit" logic near the top
   - improved live git ebuild support

Revision  Changes    Path
1.109                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.109&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.109&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.108&r2=1.109

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- x-modular.eclass	6 Mar 2009 21:00:00 -0000	1.108
+++ x-modular.eclass	14 May 2009 12:40:55 -0000	1.109
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.108 2009/03/06 21:00:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.109 2009/05/14 12:40:55 remi Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -17,6 +17,44 @@
 # with the other X packages, you don't need to set SRC_URI. Pretty much
 # everything else should be automatic.
 
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git"
+	SNAPSHOT="yes"
+	SRC_URI=""
+fi
+
+# If we're a font package, but not the font.alias one
+FONT_ECLASS=""
+if [[ "${PN/#font-}" != "${PN}" ]] \
+	&& [[ "${CATEGORY}" = "media-fonts" ]] \
+	&& [[ "${PN}" != "font-alias" ]] \
+	&& [[ "${PN}" != "font-util" ]]; then
+	# Activate font code in the rest of the eclass
+	FONT="yes"
+
+	# Whether to inherit the font eclass
+	FONT_ECLASS="font"
+fi
+
+inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
+	${FONT_ECLASS} ${GIT_ECLASS}
+
+EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
+
+case "${EAPI:-0}" in
+	0|1)
+		;;
+	2)
+		EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure"
+		;;
+	*)
+		die "Unknown EAPI ${EAPI}"
+		;;
+esac
+
+# exports must be ALWAYS after inherit
+EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
+
 # @ECLASS-VARIABLE: XDIR
 # @DESCRIPTION:
 # Directory prefix to use for everything. If you want to install to a
@@ -37,12 +75,6 @@
 	SNAPSHOT="no"
 fi
 
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git"
-	SNAPSHOT="yes"
-	SRC_URI=""
-fi
-
 # Set up SRC_URI for individual modular releases
 BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
 # @ECLASS-VARIABLE: MODULE
@@ -86,18 +118,7 @@
 	WANT_AUTOMAKE="latest"
 fi
 
-# If we're a font package, but not the font.alias one
-FONT_ECLASS=""
-if [[ "${PN/#font-}" != "${PN}" ]] \
-	&& [[ "${CATEGORY}" = "media-fonts" ]] \
-	&& [[ "${PN}" != "font-alias" ]] \
-	&& [[ "${PN}" != "font-util" ]]; then
-	# Activate font code in the rest of the eclass
-	FONT="yes"
-
-	# Whether to inherit the font eclass
-	FONT_ECLASS="font"
-
+if [[ -n "${FONT}" ]]; then
 	RDEPEND="${RDEPEND}
 		media-fonts/encodings
 		x11-apps/mkfontscale
@@ -170,9 +191,6 @@
 # Provides virtual/x11 for temporary use until packages are ported
 #	x11-base/x11-env"
 
-inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
-	${FONT_ECLASS} ${GIT_ECLASS}
-
 # @FUNCTION: x-modular_specs_check
 # @USAGE:
 # @DESCRIPTION:
@@ -297,6 +315,17 @@
 	elibtoolize
 }
 
+# @FUNCTION: x-modular_src_prepare
+# @USAGE:
+# @DESCRIPTION:
+# Prepare a package after unpacking, performing all X-related tasks.
+x-modular_src_prepare() {
+	[[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
+		&& git_src_prepare
+	x-modular_patch_source
+	x-modular_reconf_source
+}
+
 # @FUNCTION: x-modular_src_unpack
 # @USAGE:
 # @DESCRIPTION:
@@ -306,8 +335,7 @@
 	x-modular_server_supports_drivers_check
 	x-modular_dri_check
 	x-modular_unpack_source
-	x-modular_patch_source
-	x-modular_reconf_source
+	has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
 }
 
 # @FUNCTION: x-modular_font_configure
@@ -390,7 +418,7 @@
 # @DESCRIPTION:
 # Compile a package, performing all X-related tasks.
 x-modular_src_compile() {
-	x-modular_src_configure
+	has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
 	x-modular_src_make
 }
 
@@ -645,5 +673,3 @@
 create_font_cache() {
 	font_pkg_postinst
 }
-
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Peter Volkov (pva)]

pva         09/07/24 13:32:44

  Modified:             x-modular.eclass
  Log:
  x-modular.eclass: Added workaround for bug #278221: fc-cache in fontconfig 2.7.0 do chmod. Should be dropped after X fonts will be patched to avoid fc-cache run during make install.

Revision  Changes    Path
1.110                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.109&r2=1.110

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- x-modular.eclass	14 May 2009 12:40:55 -0000	1.109
+++ x-modular.eclass	24 Jul 2009 13:32:44 -0000	1.110
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.109 2009/05/14 12:40:55 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.110 2009/07/24 13:32:44 pva Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -436,6 +436,8 @@
 			install \
 			|| die
 	else
+		# FIXME: Drop after X fonts stop running fc-cache during install, bug #278221
+		[[ -n ${FONT} ]] && addpredict /var/cache/fontconfig
 		make \
 			DESTDIR="${D}" \
 			install \

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Ryan Hill (dirtyepic)]

dirtyepic    09/08/22 20:12:43

  Modified:             x-modular.eclass
  Log:
  Allow fonts to override --with-fontdir, for fonts installing more than one typeface.  Drop fix_font_permissions as it doesn't do anything and is handled by font.eclass already.

Revision  Changes    Path
1.111                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.110&r2=1.111

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- x-modular.eclass	24 Jul 2009 13:32:44 -0000	1.110
+++ x-modular.eclass	22 Aug 2009 20:12:42 -0000	1.111
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.110 2009/07/24 13:32:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.111 2009/08/22 20:12:42 dirtyepic Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -147,8 +147,10 @@
 	FONT_DIR=${FONT_DIR/type1/Type1}
 	FONT_DIR=${FONT_DIR/speedo/Speedo}
 
-	# Set up configure option
-	FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
+	# Set up configure options, wrapped so ebuilds can override if need be
+	if [[ -z ${FONT_OPTIONS} ]]; then
+		FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
+	fi
 
 	if [[ -n "${FONT}" ]]; then
 		if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
@@ -561,7 +563,6 @@
 
 	create_fonts_scale
 	create_fonts_dir
-	fix_font_permissions
 	create_font_cache
 }
 
@@ -654,19 +655,6 @@
 	eend 0
 }
 
-# @FUNCTION: fix_font_permissions
-# @USAGE:
-# @DESCRIPTION:
-# Font files should have 644 permissions. Ensure this is the case.
-fix_font_permissions() {
-	ebegin "Fixing permissions"
-		for DIR in ${FONT_DIR}; do
-			find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
-				-exec chmod 0644 {} \;
-		done
-	eend 0
-}
-
 # @FUNCTION: create_font_cache
 # @USAGE:
 # @DESCRIPTION:

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    09/08/27 15:16:09

  Modified:             x-modular.eclass
  Log:
  Fix "undefined nls useflag" warning for some fonts packages. Per bug #263142.

Revision  Changes    Path
1.112                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.111&r2=1.112

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- x-modular.eclass	22 Aug 2009 20:12:42 -0000	1.111
+++ x-modular.eclass	27 Aug 2009 15:16:09 -0000	1.112
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.111 2009/08/22 20:12:42 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.112 2009/08/27 15:16:09 scarabeus Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -348,7 +348,7 @@
 	if [[ -n "${FONT}" ]]; then
 		# Might be worth adding an option to configure your desired font
 		# and exclude all others. Also, should this USE be nls or minimal?
-		if ! use nls; then
+		if has nls ${IUSE//+} && ! use nls; then
 			FONT_OPTIONS="${FONT_OPTIONS}
 				--disable-iso8859-2
 				--disable-iso8859-3

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Remi Cardona (remi)]

remi        09/09/19 21:19:30

  Modified:             x-modular.eclass
  Log:
  set MIT as the default license for x-modular ebuilds

Revision  Changes    Path
1.113                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.112&r2=1.113

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- x-modular.eclass	27 Aug 2009 15:16:09 -0000	1.112
+++ x-modular.eclass	19 Sep 2009 21:19:29 -0000	1.113
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.112 2009/08/27 15:16:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.113 2009/09/19 21:19:29 remi Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -105,8 +105,9 @@
 SLOT="0"
 
 # Set the license for the package. This can be overridden by setting
-# LICENSE after the inherit.
-LICENSE=${PN}
+# 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="MIT"
 
 # Set up shared dependencies
 if [[ -n "${SNAPSHOT}" ]]; then

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Peter Volkov (pva)]

pva         09/10/11 07:41:36

  Modified:             x-modular.eclass
  Log:
  Dropped workaround for bug #278221: nothing was broken with stable fontconfig version and all unstable fontconfig versions now have the sandbox.d file.

Revision  Changes    Path
1.114                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.114&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.114&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.113&r2=1.114

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- x-modular.eclass	19 Sep 2009 21:19:29 -0000	1.113
+++ x-modular.eclass	11 Oct 2009 07:41:36 -0000	1.114
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.113 2009/09/19 21:19:29 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.114 2009/10/11 07:41:36 pva Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -439,8 +439,6 @@
 			install \
 			|| die
 	else
-		# FIXME: Drop after X fonts stop running fc-cache during install, bug #278221
-		[[ -n ${FONT} ]] && addpredict /var/cache/fontconfig
 		make \
 			DESTDIR="${D}" \
 			install \

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    09/10/27 15:16:18

  Modified:             x-modular.eclass
  Log:
  Use correct docdir placement. Per bug #290622.

Revision  Changes    Path
1.115                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.114&r2=1.115

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- x-modular.eclass	11 Oct 2009 07:41:36 -0000	1.114
+++ x-modular.eclass	27 Oct 2009 15:16:17 -0000	1.115
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.114 2009/10/11 07:41:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.115 2009/10/27 15:16:17 scarabeus Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -440,6 +440,7 @@
 			|| die
 	else
 		make \
+			docdir=/usr/share/doc/${PF} \
 			DESTDIR="${D}" \
 			install \
 			|| die

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Ryan Hill (dirtyepic)]

dirtyepic    09/10/31 23:08:25

  Modified:             x-modular.eclass
  Log:
  Existence of fonts.alias files prevented removal of otherwise empty font directories.  Bug #249190 by Martin Väth.

Revision  Changes    Path
1.116                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.115&r2=1.116

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- x-modular.eclass	27 Oct 2009 15:16:17 -0000	1.115
+++ x-modular.eclass	31 Oct 2009 23:08:25 -0000	1.116
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.115 2009/10/27 15:16:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.116 2009/10/31 23:08:25 dirtyepic Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -516,7 +516,7 @@
 # @DESCRIPTION:
 # Get rid of font directories that only contain generated files
 cleanup_fonts() {
-	local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
+	local ALLOWED_FILES="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
 	for DIR in ${FONT_DIR}; do
 		unset KEEP_FONTDIR
 		REAL_DIR=${ROOT}usr/share/fonts/${DIR}

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    09/11/28 10:25:37

  Modified:             x-modular.eclass
  Log:
  Update eclass to depend on correct util-macros version.

Revision  Changes    Path
1.117                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.117&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.117&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.116&r2=1.117

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- x-modular.eclass	31 Oct 2009 23:08:25 -0000	1.116
+++ x-modular.eclass	28 Nov 2009 10:25:37 -0000	1.117
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.116 2009/10/31 23:08:25 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.117 2009/11/28 10:25:37 scarabeus Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -185,8 +185,8 @@
 
 if [[ "${PN/util-macros}" = "${PN}" ]]; then
 	DEPEND="${DEPEND}
-		>=x11-misc/util-macros-0.99.2
-		>=sys-devel/binutils-2.16.1-r3"
+		>=x11-misc/util-macros-1.3.0
+		sys-devel/binutils"
 fi
 
 RDEPEND="${RDEPEND}

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Mike Frysinger (vapier)]

vapier      09/12/09 10:21:49

  Modified:             x-modular.eclass
  Log:
  tweak handling of default vars so that eclass-manpages can better pick things out

Revision  Changes    Path
1.118                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.118&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.118&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.117&r2=1.118

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- x-modular.eclass	28 Nov 2009 10:25:37 -0000	1.117
+++ x-modular.eclass	9 Dec 2009 10:21:49 -0000	1.118
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.117 2009/11/28 10:25:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.118 2009/12/09 10:21:49 vapier Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -67,13 +67,11 @@
 IUSE=""
 HOMEPAGE="http://xorg.freedesktop.org/"
 
-if [[ -z ${SNAPSHOT} ]]; then
 # @ECLASS-VARIABLE: SNAPSHOT
 # @DESCRIPTION:
 # If set to 'yes' and configure.ac exists, eautoreconf will run. Set
 # before inheriting this eclass.
-	SNAPSHOT="no"
-fi
+: ${SNAPSHOT:=no}
 
 # Set up SRC_URI for individual modular releases
 BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
@@ -83,7 +81,6 @@
 # doc, data, util, driver, font, lib, proto, xserver. Set above the
 # inherit to override the default autoconfigured module.
 if [[ -z ${MODULE} ]]; then
-	MODULE=""
 	case ${CATEGORY} in
 		app-doc)             MODULE="doc"     ;;
 		media-fonts)         MODULE="font"    ;;
@@ -130,17 +127,13 @@
 	# Starting with 7.0RC3, we can specify the font directory
 	# But oddly, we can't do the same for encodings or font-alias
 
-	# Wrap in `if` so ebuilds can set it too
-	if [[ -z ${FONT_DIR} ]]; then
 # @ECLASS-VARIABLE: FONT_DIR
 # @DESCRIPTION:
 # If you're creating a font package and the suffix of PN is not equal to
 # the subdirectory of /usr/share/fonts/ it should install into, set
 # FONT_DIR to that directory or directories. Set before inheriting this
 # eclass.
-		FONT_DIR=${PN##*-}
-
-	fi
+	: ${FONT_DIR:=${PN##*-}}
 
 	# Fix case of font directories
 	FONT_DIR=${FONT_DIR/ttf/TTF}
@@ -395,8 +388,7 @@
 
 # @VARIABLE: CONFIGURE_OPTIONS
 # @DESCRIPTION:
-# Any options to pass to configure
-[[ -n ${CONFIGURE_OPTIONS} ]]
+# Any extra options to pass to configure
 
 	# If prefix isn't set here, .pc files cause problems
 	if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
@@ -461,7 +453,7 @@
 	fi
 # @VARIABLE: DOCS
 # @DESCRIPTION:
-# Any documentation to install
+# Any documentation to install via dodoc
 	[[ -n ${DOCS} ]] && dodoc ${DOCS}
 
 	# Don't install libtool archives for server modules

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    10/09/09 11:19:51

  Modified:             x-modular.eclass
  Log:
  Add deprecation information.

Revision  Changes    Path
1.120                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/x-modular.eclass?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/x-modular.eclass?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/x-modular.eclass?r1=1.119&r2=1.120

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- x-modular.eclass	4 Jul 2010 20:42:22 -0000	1.119
+++ x-modular.eclass	9 Sep 2010 11:19:51 -0000	1.120
@@ -1,6 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.119 2010/07/04 20:42:22 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.120 2010/09/09 11:19:51 scarabeus Exp $
+#
+# @DEPRECATED
+# This eclass has been superseded by xorg-2
+# Please modify your ebuilds to use that instead
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:

[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Chi-Thanh Christopher Nguyen (chithanh)]

chithanh    11/10/04 21:23:46

  Modified:             x-modular.eclass
  Log:
  Drop binutils depend from x-modular.eclass, bug #385659.

Revision  Changes    Path
1.122                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/x-modular.eclass?rev=1.122&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/x-modular.eclass?rev=1.122&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/x-modular.eclass?r1=1.121&r2=1.122

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- x-modular.eclass	29 Aug 2011 01:28:10 -0000	1.121
+++ x-modular.eclass	4 Oct 2011 21:23:46 -0000	1.122
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.121 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.122 2011/10/04 21:23:46 chithanh Exp $
 #
 # @DEPRECATED
 # This eclass has been superseded by xorg-2
@@ -182,8 +182,7 @@
 
 if [[ "${PN/util-macros}" = "${PN}" ]]; then
 	DEPEND="${DEPEND}
-		>=x11-misc/util-macros-1.3.0
-		sys-devel/binutils"
+		>=x11-misc/util-macros-1.3.0"
 fi
 
 RDEPEND="${RDEPEND}