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

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/03/14 10:27:07

  Added:                xorg-2.eclass
  Log:
  Add new xorg-2 eclass as replacement for x-modular eclass.

Revision  Changes    Path
1.1                  eclass/xorg-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.eclass?rev=1.1&content-type=text/plain

Index: xorg-2.eclass
===================================================================
# 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 $
#
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
# x11@gentoo.org

# Author: Tomáš Chvátal <scarabeus@gentoo.org>
# Author: Donnie Berkholz <dberkholz@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.
#
# 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.

GIT_ECLASS=""
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
FONT_ECLASS=""
if [[ ${PN} == font* \
	&& ${CATEGORY} = media-fonts \
	&& ${PN} != font-alias \
	&& ${PN} != font-util ]]; then
	# Activate font code in the rest of the eclass
	FONT="yes"
	FONT_ECLASS="font"
fi

inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \
	${FONT_ECLASS} ${GIT_ECLASS}

EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
case "${EAPI:-0}" in
	3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
	*) DEPEND="EAPI-UNSUPPORTED" ;;
esac

# exports must be ALWAYS after inherit
EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}

IUSE=""
HOMEPAGE="http://xorg.freedesktop.org/"

# @ECLASS-VARIABLE: XORG_EAUTORECONF
# @DESCRIPTION:
# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
# 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: 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.
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}"
else
	SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
fi

: ${SLOT:=0}

# 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=MIT}

# Set up shared dependencies
if [[ ${XORG_EAUTORECONF} != no ]]; then
	DEPEND+="
		>=sys-devel/libtool-2.2.6a
		sys-devel/m4"
	# This MUST BE STABLE
	if [[ ${PN} != util-macros ]] ; then
		DEPEND+=" >=x11-misc/util-macros-1.5.0"
		# Required even by xorg-server
		[[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
	fi
	WANT_AUTOCONF="latest"
	WANT_AUTOMAKE="latest"
fi

if [[ ${FONT} == yes ]]; then
	RDEPEND+=" media-fonts/encodings
		x11-apps/mkfontscale
		x11-apps/mkfontdir"
	PDEPEND+=" media-fonts/font-alias"

	# @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.
	[[ -z ${FONT_DIR} ]] && FONT_DIR=${PN##*-}

	# Fix case of font directories
	FONT_DIR=${FONT_DIR/ttf/TTF}
	FONT_DIR=${FONT_DIR/otf/OTF}
	FONT_DIR=${FONT_DIR/type1/Type1}
	FONT_DIR=${FONT_DIR/speedo/Speedo}

	# Set up configure options, wrapped so ebuilds can override if need be
	[[ -z ${FONT_OPTIONS} ]] && FONT_OPTIONS="--with-fontdir=\"${EPREFIX}/usr/share/fonts/${FONT_DIR}\""

	[[ ${PN##*-} = misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls"
fi

# If we're a driver package, then enable DRIVER case
[[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes"

# Add static-libs useflag where usefull.
if [[ ${FONT} != yes \
		&& ${CATEGORY} != app-doc \
		&& ${CATEGORY} != x11-proto \
		&& ${CATEGORY} != x11-drivers \
		&& ${CATEGORY} != media-fonts \
		&& ${PN} != util-macros \
		&& ${PN} != xbitmaps \
		&& ${PN} != xorg-cf-files \
		&& ${PN/xcursor} = ${PN} ]]; then
	IUSE+=" static-libs"
fi

DEPEND+=" >=dev-util/pkgconfig-0.23"

# Check deps on xorg-server
has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )"
[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]"

# @FUNCTION: xorg-2_pkg_setup
# @USAGE:
# @DESCRIPTION:
# Setup prefix compat
xorg-2_pkg_setup() {
	[[ ${FONT} == yes ]] && font_pkg_setup
}

# @FUNCTION: xorg-2_src_unpack
# @USAGE:
# @DESCRIPTION:
# Simply unpack source code.
xorg-2_src_unpack() {
	if [[ -n ${GIT_ECLASS} ]]; then
		git_src_unpack
	else
		unpack ${A}
	fi

	[[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
}

# @FUNCTION: xorg-2_patch_source
# @USAGE:
# @DESCRIPTION:
# Apply all patches
xorg-2_patch_source() {
	# Use standardized names and locations with bulk patching
	# Patch directory is ${WORKDIR}/patch
	# See epatch() in eutils.eclass for more documentation
	EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}

	[[ -d "${EPATCH_SOURCE}" ]] && epatch
	base_src_prepare
	epatch_user
}

# @FUNCTION: xorg-2_reconf_source
# @USAGE:
# @DESCRIPTION:
# Run eautoreconf if necessary, and run elibtoolize.
xorg-2_reconf_source() {
	case ${CHOST} in
		*-interix* | *-aix* | *-winnt*)
			# some hosts need full eautoreconf
			[[ -e "./configure.ac" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
			;;
		*)
			# elibtoolize required for BSD
			[[ ${XORG_EAUTORECONF} != no && -e "./configure.ac" ]] && eautoreconf || elibtoolize
			;;
	esac
}

# @FUNCTION: xorg-2_src_prepare
# @USAGE:
# @DESCRIPTION:
# Prepare a package after unpacking, performing all X-related tasks.
xorg-2_src_prepare() {
	[[ -n ${GIT_ECLASS} ]] && git_src_prepare
	xorg-2_patch_source
	xorg-2_reconf_source
}

# @FUNCTION: xorg-2_font_configure
# @USAGE:
# @DESCRIPTION:
# If a font package, perform any necessary configuration steps
xorg-2_font_configure() {
	if has nls ${IUSE//+} && ! use nls; then
		FONT_OPTIONS+="
			--disable-iso8859-2
			--disable-iso8859-3
			--disable-iso8859-4
			--disable-iso8859-5
			--disable-iso8859-6
			--disable-iso8859-7
			--disable-iso8859-8
			--disable-iso8859-9
			--disable-iso8859-10
			--disable-iso8859-11
			--disable-iso8859-12
			--disable-iso8859-13
			--disable-iso8859-14
			--disable-iso8859-15
			--disable-iso8859-16
			--disable-jisx0201
			--disable-koi8-r"
	fi
}

# @FUNCTION: x-modular_flags_setup
# @USAGE:
# @DESCRIPTION:
# Set up CFLAGS for a debug build
xorg-2_flags_setup() {
	# Win32 require special define
	[[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
	# hardened ldflags
	[[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
}

# @FUNCTION: xorg-2_src_configure
# @USAGE:
# @DESCRIPTION:
# Perform any necessary pre-configuration steps, then run configure
xorg-2_src_configure() {
	local myopts=""

	xorg-2_flags_setup
	[[ -n "${FONT}" ]] && xorg-2_font_configure

# @VARIABLE: CONFIGURE_OPTIONS
# @DESCRIPTION:
# Any options to pass to configure
	CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
	if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
		if has static-libs ${IUSE//+}; then
			myopts+=" $(use_enable static-libs static)"
		fi
		econf \
			${FONT_OPTIONS} \
			${CONFIGURE_OPTIONS} \
			${myopts}
	fi
}

# @FUNCTION: xorg-2_src_compile
# @USAGE:
# @DESCRIPTION:
# Compile a package, performing all X-related tasks.
xorg-2_src_compile() {
	base_src_compile
}

# @FUNCTION: xorg-2_src_install
# @USAGE:
# @DESCRIPTION:
# Install a built package to ${D}, performing any necessary steps.
# Creates a ChangeLog from git if using live ebuilds.
xorg-2_src_install() {
	if [[ ${CATEGORY} == x11-proto ]]; then
		emake \
			${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \
			DESTDIR="${D}" \
			install || die "emake install failed"
	else
		emake \
			docdir=${EPREFIX}/usr/share/doc/${PF} \
			DESTDIR="${D}" \
			install || die "emake install failed"
	fi

	if [[ -n ${GIT_ECLASS} ]]; then
		pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
		git log ${GIT_TREE} > "${S}"/ChangeLog
		popd > /dev/null
	fi

	if [[ -e "${S}"/ChangeLog ]]; then
		dodoc "${S}"/ChangeLog
	fi
# @VARIABLE: DOCS
# @DESCRIPTION:
# Any documentation to install
	if [[ -n ${DOCS} ]]; then
		dodoc ${DOCS} || die "dodoc failed"
	fi

	# Don't install libtool archives for server modules
	if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then
		find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
			-exec rm -f {} ';'
	fi

	[[ -n ${FONT} ]] && remove_font_metadata
}

# @FUNCTION: xorg-2_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.
xorg-2_pkg_postinst() {
	[[ -n ${FONT} ]] && setup_fonts
}

# @FUNCTION: xorg-2_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.
xorg-2_pkg_postrm() {
	if [[ -n ${FONT} ]]; then
		cleanup_fonts
		font_pkg_postrm
	fi
}

# @FUNCTION: cleanup_fonts
# @USAGE:
# @DESCRIPTION:
# Get rid of font directories that only contain generated files
cleanup_fonts() {
	local allowed_files="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
	local real_dir=${EROOT}usr/share/fonts/${FONT_DIR}
	local fle allowed_file

	unset KEEP_FONTDIR

	einfo "Checking ${real_dir} for useless files"
	pushd ${real_dir} &> /dev/null
	for fle in *; do
		unset MATCH
		for allowed_file in ${allowed_files}; do
			if [[ ${fle} = ${allowed_file} ]]; then
				# If it's allowed, then move on to the next file
				MATCH="yes"
				break
			fi
		done
		# If we found a match in allowed files, move on to the next file
		[[ -n ${MATCH} ]] && continue
		# If we get this far, there wasn't a match in the allowed files
		KEEP_FONTDIR="yes"
		# We don't need to check more files if we're already keeping it
		break
	done
	popd &> /dev/null
	# If there are no files worth keeping, then get rid of the dir
	[[ -z "${KEEP_FONTDIR}" ]] && rm -rf ${real_dir}
}

# @FUNCTION: setup_fonts
# @USAGE:
# @DESCRIPTION:
# Generates needed files for fonts and fixes font permissions
setup_fonts() {
	create_fonts_scale
	create_fonts_dir
	font_pkg_postinst
}

# @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() {
	if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
		einfo "Removing font metadata"
		rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
	fi
}

# @FUNCTION: create_fonts_scale
# @USAGE:
# @DESCRIPTION:
# Create fonts.scale file, used by the old server-side fonts subsystem.
create_fonts_scale() {
	if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
		ebegin "Generating font.scale"
			mkfontscale \
				-a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
				-- "${EROOT}/usr/share/fonts/${FONT_DIR}"
		eend $?
	fi
}

# @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"
			mkfontdir \
				-e "${EROOT}"/usr/share/fonts/encodings \
				-e "${EROOT}"/usr/share/fonts/encodings/large \
				-- "${EROOT}/usr/share/fonts/${FONT_DIR}"
	eend $?
}

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/03/17 14:29:21

  Modified:             xorg-2.eclass
  Log:
  Fix eclassdoc. Add new variable to allow disabling of static-libs useflag.

Revision  Changes    Path
1.2                  eclass/xorg-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.eclass?r1=1.1&r2=1.2

Index: xorg-2.eclass
===================================================================
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áš Chvátal <scarabeus@gentoo.org>
-# Author: Donnie Berkholz <dberkholz@gentoo.org>
 # @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.
 
+# Author: Tomáš Chvátal <scarabeus@gentoo.org>
+# Author: Donnie Berkholz <dberkholz@gentoo.org>
+
 GIT_ECLASS=""
 if [[ ${PV} == *9999* ]]; then
 	GIT_ECLASS="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=MIT}
+: ${LICENSE:=MIT}
 
 # Set up shared dependencies
 if [[ ${XORG_EAUTORECONF} != no ]]; then
@@ -137,8 +137,16 @@
 # If we're a driver package, then enable DRIVER case
 [[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes"
 
+# @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:="yes"}
+
 # Add static-libs useflag where usefull.
-if [[ ${FONT} != yes \
+if [[ ${XORG_STATIC} == yes \
+		&& ${FONT} != yes \
 		&& ${CATEGORY} != app-doc \
 		&& ${CATEGORY} != x11-proto \
 		&& ${CATEGORY} != x11-drivers \

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/04/22 18:27:43

  Modified:             xorg-2.eclass
  Log:
  Drop epatch_user, already executed by base eclass. Thx to sedzimir.

Revision  Changes    Path
1.3                  eclass/xorg-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/xorg-2.eclass?r1=1.2&r2=1.3

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-2.eclass	17 Mar 2010 14:29:20 -0000	1.2
+++ xorg-2.eclass	22 Apr 2010 18:27:43 -0000	1.3
@@ -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.2 2010/03/17 14:29:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.3 2010/04/22 18:27:43 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -198,7 +198,6 @@
 
 	[[ -d "${EPATCH_SOURCE}" ]] && epatch
 	base_src_prepare
-	epatch_user
 }
 
 # @FUNCTION: xorg-2_reconf_source

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

[Remi Cardona (remi)]

remi        10/06/08 20:22:12

  Modified:             xorg-2.eclass
  Log:
  xorg-2.eclass: bump util-macros dep to 1.8.0, see bugs #320625 and #322559

Revision  Changes    Path
1.4                  eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-2.eclass	22 Apr 2010 18:27:43 -0000	1.3
+++ xorg-2.eclass	8 Jun 2010 20:22:12 -0000	1.4
@@ -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.3 2010/04/22 18:27:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.4 2010/06/08 20:22:12 remi Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -100,7 +100,7 @@
 		sys-devel/m4"
 	# This MUST BE STABLE
 	if [[ ${PN} != util-macros ]] ; then
-		DEPEND+=" >=x11-misc/util-macros-1.5.0"
+		DEPEND+=" >=x11-misc/util-macros-1.8.0"
 		# Required even by xorg-server
 		[[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
 	fi

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/07/14 08:34:28

  Modified:             xorg-2.eclass
  Log:
  Check also for configure.in, altho upstreams should name it .ac

Revision  Changes    Path
1.6                  eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-2.eclass	4 Jul 2010 20:42:22 -0000	1.5
+++ xorg-2.eclass	14 Jul 2010 08:34:27 -0000	1.6
@@ -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.5 2010/07/04 20:42:22 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.6 2010/07/14 08:34:27 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -208,7 +208,7 @@
 	case ${CHOST} in
 		*-interix* | *-aix* | *-winnt*)
 			# some hosts need full eautoreconf
-			[[ -e "./configure.ac" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
+			[[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
 			;;
 		*)
 			# elibtoolize required for BSD

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/08/06 19:09:58

  Modified:             xorg-2.eclass
  Log:
  Add case for configure.in also for non-interix case...

Revision  Changes    Path
1.7                  eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-2.eclass	14 Jul 2010 08:34:27 -0000	1.6
+++ xorg-2.eclass	6 Aug 2010 19:09:58 -0000	1.7
@@ -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.6 2010/07/14 08:34:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.7 2010/08/06 19:09:58 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -212,7 +212,7 @@
 			;;
 		*)
 			# elibtoolize required for BSD
-			[[ ${XORG_EAUTORECONF} != no && -e "./configure.ac" ]] && eautoreconf || elibtoolize
+			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e	"./configure.in" ) ]] && eautoreconf || elibtoolize
 			;;
 	esac
 }

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/08/06 20:46:08

  Modified:             xorg-2.eclass
  Log:
  Whitespace.

Revision  Changes    Path
1.8                  eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-2.eclass	6 Aug 2010 19:09:58 -0000	1.7
+++ xorg-2.eclass	6 Aug 2010 20:46:08 -0000	1.8
@@ -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.7 2010/08/06 19:09:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.8 2010/08/06 20:46:08 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -212,7 +212,7 @@
 			;;
 		*)
 			# elibtoolize required for BSD
-			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e	"./configure.in" ) ]] && eautoreconf || elibtoolize
+			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
 			;;
 	esac
 }

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/08/11 09:20:09

  Modified:             xorg-2.eclass
  Log:
  Respect docdir for proto packages too.

Revision  Changes    Path
1.9                  eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-2.eclass	6 Aug 2010 20:46:08 -0000	1.8
+++ xorg-2.eclass	11 Aug 2010 09:20:09 -0000	1.9
@@ -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.8 2010/08/06 20:46:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.9 2010/08/11 09:20:09 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -307,6 +307,7 @@
 	if [[ ${CATEGORY} == x11-proto ]]; then
 		emake \
 			${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \
+			docdir=${EPREFIX}/usr/share/doc/${PF} \
 			DESTDIR="${D}" \
 			install || die "emake install failed"
 	else

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/08/22 08:23:24

  Modified:             xorg-2.eclass
  Log:
  Cleanup eclassdoc.

Revision  Changes    Path
1.10                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-2.eclass	11 Aug 2010 09:20:09 -0000	1.9
+++ xorg-2.eclass	22 Aug 2010 08:23:24 -0000	1.10
@@ -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.9 2010/08/11 09:20:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.10 2010/08/22 08:23:24 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -165,7 +165,6 @@
 [[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]"
 
 # @FUNCTION: xorg-2_pkg_setup
-# @USAGE:
 # @DESCRIPTION:
 # Setup prefix compat
 xorg-2_pkg_setup() {
@@ -173,7 +172,6 @@
 }
 
 # @FUNCTION: xorg-2_src_unpack
-# @USAGE:
 # @DESCRIPTION:
 # Simply unpack source code.
 xorg-2_src_unpack() {
@@ -187,7 +185,6 @@
 }
 
 # @FUNCTION: xorg-2_patch_source
-# @USAGE:
 # @DESCRIPTION:
 # Apply all patches
 xorg-2_patch_source() {
@@ -201,7 +198,6 @@
 }
 
 # @FUNCTION: xorg-2_reconf_source
-# @USAGE:
 # @DESCRIPTION:
 # Run eautoreconf if necessary, and run elibtoolize.
 xorg-2_reconf_source() {
@@ -218,7 +214,6 @@
 }
 
 # @FUNCTION: xorg-2_src_prepare
-# @USAGE:
 # @DESCRIPTION:
 # Prepare a package after unpacking, performing all X-related tasks.
 xorg-2_src_prepare() {
@@ -228,7 +223,6 @@
 }
 
 # @FUNCTION: xorg-2_font_configure
-# @USAGE:
 # @DESCRIPTION:
 # If a font package, perform any necessary configuration steps
 xorg-2_font_configure() {
@@ -255,7 +249,6 @@
 }
 
 # @FUNCTION: x-modular_flags_setup
-# @USAGE:
 # @DESCRIPTION:
 # Set up CFLAGS for a debug build
 xorg-2_flags_setup() {
@@ -266,7 +259,6 @@
 }
 
 # @FUNCTION: xorg-2_src_configure
-# @USAGE:
 # @DESCRIPTION:
 # Perform any necessary pre-configuration steps, then run configure
 xorg-2_src_configure() {
@@ -275,9 +267,10 @@
 	xorg-2_flags_setup
 	[[ -n "${FONT}" ]] && xorg-2_font_configure
 
-# @VARIABLE: CONFIGURE_OPTIONS
-# @DESCRIPTION:
-# Any options to pass to configure
+	# @VARIABLE: CONFIGURE_OPTIONS
+	# @DESCRIPTION:
+	# Any options to pass to configure
+	# @DEFAULT_UNSET
 	CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
 	if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
 		if has static-libs ${IUSE//+}; then
@@ -291,7 +284,6 @@
 }
 
 # @FUNCTION: xorg-2_src_compile
-# @USAGE:
 # @DESCRIPTION:
 # Compile a package, performing all X-related tasks.
 xorg-2_src_compile() {
@@ -299,7 +291,6 @@
 }
 
 # @FUNCTION: xorg-2_src_install
-# @USAGE:
 # @DESCRIPTION:
 # Install a built package to ${D}, performing any necessary steps.
 # Creates a ChangeLog from git if using live ebuilds.
@@ -326,9 +317,10 @@
 	if [[ -e "${S}"/ChangeLog ]]; then
 		dodoc "${S}"/ChangeLog
 	fi
-# @VARIABLE: DOCS
-# @DESCRIPTION:
-# Any documentation to install
+	# @VARIABLE: DOCS
+	# @DESCRIPTION:
+	# Any documentation to install
+	# @DEFAULT_UNSET
 	if [[ -n ${DOCS} ]]; then
 		dodoc ${DOCS} || die "dodoc failed"
 	fi
@@ -343,7 +335,6 @@
 }
 
 # @FUNCTION: xorg-2_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.
@@ -352,7 +343,6 @@
 }
 
 # @FUNCTION: xorg-2_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.
@@ -363,7 +353,6 @@
 }
 
 # @FUNCTION: setup_fonts
-# @USAGE:
 # @DESCRIPTION:
 # Generates needed files for fonts and fixes font permissions
 setup_fonts() {
@@ -373,7 +362,6 @@
 }
 
 # @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().
@@ -385,7 +373,6 @@
 }
 
 # @FUNCTION: create_fonts_scale
-# @USAGE:
 # @DESCRIPTION:
 # Create fonts.scale file, used by the old server-side fonts subsystem.
 create_fonts_scale() {
@@ -399,7 +386,6 @@
 }
 
 # @FUNCTION: create_fonts_dir
-# @USAGE:
 # @DESCRIPTION:
 # Create fonts.dir file, used by the old server-side fonts subsystem.
 create_fonts_dir() {

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/08/22 08:25:26

  Modified:             xorg-2.eclass
  Log:
  x-modular -> xorg2 in eclassdoc

Revision  Changes    Path
1.11                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-2.eclass	22 Aug 2010 08:23:24 -0000	1.10
+++ xorg-2.eclass	22 Aug 2010 08:25:26 -0000	1.11
@@ -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.10 2010/08/22 08:23:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.11 2010/08/22 08:25:26 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -248,7 +248,7 @@
 	fi
 }
 
-# @FUNCTION: x-modular_flags_setup
+# @FUNCTION: xorg-2_flags_setup
 # @DESCRIPTION:
 # Set up CFLAGS for a debug build
 xorg-2_flags_setup() {

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/08/24 08:59:56

  Modified:             xorg-2.eclass
  Log:
  Fix wrong variable usage.

Revision  Changes    Path
1.12                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-2.eclass	22 Aug 2010 08:25:26 -0000	1.11
+++ xorg-2.eclass	24 Aug 2010 08:59:56 -0000	1.12
@@ -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.11 2010/08/22 08:25:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.12 2010/08/24 08:59:56 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -310,7 +310,7 @@
 
 	if [[ -n ${GIT_ECLASS} ]]; then
 		pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
-		git log ${GIT_TREE} > "${S}"/ChangeLog
+		git log ${EGIT_COMMIT} > "${S}"/ChangeLog
 		popd > /dev/null
 	fi
 

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/09/27 09:40:25

  Modified:             xorg-2.eclass
  Log:
  Die rather than introduce invalid depend atom.

Revision  Changes    Path
1.13                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-2.eclass	24 Aug 2010 08:59:56 -0000	1.12
+++ xorg-2.eclass	27 Sep 2010 09:40:25 -0000	1.13
@@ -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.12 2010/08/24 08:59:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.13 2010/09/27 09:40:25 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -44,7 +44,7 @@
 EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
 case "${EAPI:-0}" in
 	3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
-	*) DEPEND="EAPI-UNSUPPORTED" ;;
+	*) die "EAPI-UNSUPPORTED" ;;
 esac
 
 # exports must be ALWAYS after inherit

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

[Michal Gorny (mgorny)]

mgorny      10/10/23 20:53:13

  Modified:             xorg-2.eclass
  Log:
  DEPEND on font-util in fonts. That should fix bugs #338411 and #313595.

Revision  Changes    Path
1.14                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-2.eclass	27 Sep 2010 09:40:25 -0000	1.13
+++ xorg-2.eclass	23 Oct 2010 20:53:13 -0000	1.14
@@ -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.13 2010/09/27 09:40:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.14 2010/10/23 20:53:13 mgorny Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -113,6 +113,7 @@
 		x11-apps/mkfontscale
 		x11-apps/mkfontdir"
 	PDEPEND+=" media-fonts/font-alias"
+	DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
 
 	# @ECLASS-VARIABLE: FONT_DIR
 	# @DESCRIPTION:

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/10/28 11:43:33

  Modified:             xorg-2.eclass
  Log:
  Filter bdirect support in eclass rather than per package since it is broken in probably all libs (based on my small testing)

Revision  Changes    Path
1.15                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-2.eclass	23 Oct 2010 20:53:13 -0000	1.14
+++ xorg-2.eclass	28 Oct 2010 11:43:33 -0000	1.15
@@ -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.14 2010/10/23 20:53:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.15 2010/10/28 11:43:33 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -257,6 +257,11 @@
 	[[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
 	# hardened ldflags
 	[[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
+
+	# Quite few packages fail on runtime without these:
+	filter-flags -Wl,-Bdirect
+	filter-ldflags -Bdirect
+	filter-ldflags -Wl,-Bdirect
 }
 
 # @FUNCTION: xorg-2_src_configure

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/10/28 11:46:32

  Modified:             xorg-2.eclass
  Log:
  Conditional previous commit in favor of stripping it only on libs.

Revision  Changes    Path
1.16                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-2.eclass	28 Oct 2010 11:43:33 -0000	1.15
+++ xorg-2.eclass	28 Oct 2010 11:46:32 -0000	1.16
@@ -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.15 2010/10/28 11:43:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.16 2010/10/28 11:46:32 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -258,10 +258,12 @@
 	# hardened ldflags
 	[[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
 
-	# Quite few packages fail on runtime without these:
-	filter-flags -Wl,-Bdirect
-	filter-ldflags -Bdirect
-	filter-ldflags -Wl,-Bdirect
+	# Quite few libraries fail on runtime without these:
+	if has static-libs ${IUSE//+}; then
+		filter-flags -Wl,-Bdirect
+		filter-ldflags -Bdirect
+		filter-ldflags -Wl,-Bdirect
+	fi
 }
 
 # @FUNCTION: xorg-2_src_configure

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/10/31 12:06:06

  Modified:             xorg-2.eclass
  Log:
  Update dep for util-macros to latest.

Revision  Changes    Path
1.17                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-2.eclass	28 Oct 2010 11:46:32 -0000	1.16
+++ xorg-2.eclass	31 Oct 2010 12:06:06 -0000	1.17
@@ -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.16 2010/10/28 11:46:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.17 2010/10/31 12:06:06 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -100,7 +100,7 @@
 		sys-devel/m4"
 	# This MUST BE STABLE
 	if [[ ${PN} != util-macros ]] ; then
-		DEPEND+=" >=x11-misc/util-macros-1.8.0"
+		DEPEND+=" >=x11-misc/util-macros-1.11.0"
 		# Required even by xorg-server
 		[[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
 	fi

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/11/01 12:37:58

  Modified:             xorg-2.eclass
  Log:
  static-libs useflag is not required on x11-apps at all so drop it in eclass rather than per-package.

Revision  Changes    Path
1.18                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-2.eclass	31 Oct 2010 12:06:06 -0000	1.17
+++ xorg-2.eclass	1 Nov 2010 12:37:58 -0000	1.18
@@ -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.17 2010/10/31 12:06:06 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.18 2010/11/01 12:37:58 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -149,6 +149,7 @@
 if [[ ${XORG_STATIC} == yes \
 		&& ${FONT} != yes \
 		&& ${CATEGORY} != app-doc \
+		&& ${CATEGORY} != x11-apps \
 		&& ${CATEGORY} != x11-proto \
 		&& ${CATEGORY} != x11-drivers \
 		&& ${CATEGORY} != media-fonts \

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/11/05 12:11:55

  Modified:             xorg-2.eclass
  Log:
  Append eautoreconf depstring to archs where it is mandatory to run eautoreconf. (this is required for cache)

Revision  Changes    Path
1.19                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-2.eclass	1 Nov 2010 12:37:58 -0000	1.18
+++ xorg-2.eclass	5 Nov 2010 12:11:55 -0000	1.19
@@ -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.18 2010/11/01 12:37:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.19 2010/11/05 12:11:55 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -93,20 +93,26 @@
 # are under the MIT license. (This is what Red Hat does in their rpms)
 : ${LICENSE:=MIT}
 
-# Set up shared dependencies
-if [[ ${XORG_EAUTORECONF} != no ]]; then
-	DEPEND+="
-		>=sys-devel/libtool-2.2.6a
-		sys-devel/m4"
-	# This MUST BE STABLE
-	if [[ ${PN} != util-macros ]] ; then
-		DEPEND+=" >=x11-misc/util-macros-1.11.0"
-		# Required even by xorg-server
-		[[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
-	fi
-	WANT_AUTOCONF="latest"
-	WANT_AUTOMAKE="latest"
+# Set up autotools shared dependencies
+# Remember that all versions here MUST be stable
+XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
+EAUTORECONF_DEPEND+="
+	>=sys-devel/libtool-2.2.6a
+	sys-devel/m4"
+if [[ ${PN} != util-macros ]] ; then
+	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0"
+	# Required even by xorg-server
+	[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
 fi
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+for arch in ${XORG_EAUTORECONF_ARCHES}; do
+	EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
+done
+DEPEND+=" ${EAUTORECONF_DEPENDS}"
+[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
+unset EAUTORECONF_DEPENDS
+unset EAUTORECONF_DEPEND
 
 if [[ ${FONT} == yes ]]; then
 	RDEPEND+=" media-fonts/encodings

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/11/09 18:25:00

  Modified:             xorg-2.eclass
  Log:
  Add PACKAGE_NAME variable that allows specification of git checkout folder, so we dont have to respecify complete EGIT_REPO_URI.

Revision  Changes    Path
1.20                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-2.eclass	5 Nov 2010 12:11:55 -0000	1.19
+++ xorg-2.eclass	9 Nov 2010 18:25:00 -0000	1.20
@@ -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.19 2010/11/05 12:11:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.20 2010/11/09 18:25:00 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -80,8 +80,14 @@
 	esac
 fi
 
+# @ECLASS-VARIABLE: PACKAGE_NAME
+# @DESCRIPTION:
+# For git checkout git repository migth differ from package name
+# so it can be overriden via this variable.
+: ${PACKAGE_NAME:=${PN}}
+
 if [[ -n ${GIT_ECLASS} ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PACKAGE_NAME}"
 else
 	SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
 fi

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/01/06 11:02:00

  Modified:             xorg-2.eclass
  Log:
  Add debug-print sections, Fix typo in variable description, add eapi=4 as basically supported by this eclass.

Revision  Changes    Path
1.21                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-2.eclass	9 Nov 2010 18:25:00 -0000	1.20
+++ xorg-2.eclass	6 Jan 2011 11:01:59 -0000	1.21
@@ -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.20 2010/11/09 18:25:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.21 2011/01/06 11:01:59 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -43,7 +43,7 @@
 
 EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
 case "${EAPI:-0}" in
-	3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
+	3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
 	*) die "EAPI-UNSUPPORTED" ;;
 esac
 
@@ -67,7 +67,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"    ;;
@@ -77,13 +76,14 @@
 		x11-base)            MODULE="xserver" ;;
 		x11-proto)           MODULE="proto"   ;;
 		x11-libs)            MODULE="lib"     ;;
+		*)                   MODULE=""        ;;
 	esac
 fi
 
 # @ECLASS-VARIABLE: PACKAGE_NAME
 # @DESCRIPTION:
-# For git checkout git repository migth differ from package name
-# so it can be overriden via this variable.
+# For git checkout the git repository migth differ from package name.
+# This variable can be used for proper directory specification
 : ${PACKAGE_NAME:=${PN}}
 
 if [[ -n ${GIT_ECLASS} ]]; then
@@ -182,13 +182,17 @@
 # @DESCRIPTION:
 # Setup prefix compat
 xorg-2_pkg_setup() {
-	[[ ${FONT} == yes ]] && font_pkg_setup
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ ${FONT} == yes ]] && font_pkg_setup "$@"
 }
 
 # @FUNCTION: xorg-2_src_unpack
 # @DESCRIPTION:
 # Simply unpack source code.
 xorg-2_src_unpack() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	if [[ -n ${GIT_ECLASS} ]]; then
 		git_src_unpack
 	else
@@ -202,19 +206,23 @@
 # @DESCRIPTION:
 # Apply all patches
 xorg-2_patch_source() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	# Use standardized names and locations with bulk patching
 	# Patch directory is ${WORKDIR}/patch
 	# See epatch() in eutils.eclass for more documentation
 	EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
 
 	[[ -d "${EPATCH_SOURCE}" ]] && epatch
-	base_src_prepare
+	base_src_prepare "$@"
 }
 
 # @FUNCTION: xorg-2_reconf_source
 # @DESCRIPTION:
 # Run eautoreconf if necessary, and run elibtoolize.
 xorg-2_reconf_source() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	case ${CHOST} in
 		*-interix* | *-aix* | *-winnt*)
 			# some hosts need full eautoreconf
@@ -231,6 +239,8 @@
 # @DESCRIPTION:
 # Prepare a package after unpacking, performing all X-related tasks.
 xorg-2_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	[[ -n ${GIT_ECLASS} ]] && git_src_prepare
 	xorg-2_patch_source
 	xorg-2_reconf_source
@@ -240,6 +250,8 @@
 # @DESCRIPTION:
 # If a font package, perform any necessary configuration steps
 xorg-2_font_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	if has nls ${IUSE//+} && ! use nls; then
 		FONT_OPTIONS+="
 			--disable-iso8859-2
@@ -266,6 +278,8 @@
 # @DESCRIPTION:
 # Set up CFLAGS for a debug build
 xorg-2_flags_setup() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	# Win32 require special define
 	[[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
 	# hardened ldflags
@@ -283,6 +297,7 @@
 # @DESCRIPTION:
 # Perform any necessary pre-configuration steps, then run configure
 xorg-2_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
 	local myopts=""
 
 	xorg-2_flags_setup
@@ -308,7 +323,9 @@
 # @DESCRIPTION:
 # Compile a package, performing all X-related tasks.
 xorg-2_src_compile() {
-	base_src_compile
+	debug-print-function ${FUNCNAME} "$@"
+
+	base_src_compile "$@"
 }
 
 # @FUNCTION: xorg-2_src_install
@@ -316,6 +333,8 @@
 # Install a built package to ${D}, performing any necessary steps.
 # Creates a ChangeLog from git if using live ebuilds.
 xorg-2_src_install() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	if [[ ${CATEGORY} == x11-proto ]]; then
 		emake \
 			${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \
@@ -336,7 +355,7 @@
 	fi
 
 	if [[ -e "${S}"/ChangeLog ]]; then
-		dodoc "${S}"/ChangeLog
+		dodoc "${S}"/ChangeLog || die "dodoc failed"
 	fi
 	# @VARIABLE: DOCS
 	# @DESCRIPTION:
@@ -360,7 +379,9 @@
 # Run X-specific post-installation tasks on the live filesystem. The
 # only task right now is some setup for font packages.
 xorg-2_pkg_postinst() {
-	[[ -n ${FONT} ]] && setup_fonts
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ -n ${FONT} ]] && setup_fonts "$@"
 }
 
 # @FUNCTION: xorg-2_pkg_postrm
@@ -368,15 +389,17 @@
 # Run X-specific post-removal tasks on the live filesystem. The only
 # task right now is some cleanup for font packages.
 xorg-2_pkg_postrm() {
-	if [[ -n ${FONT} ]]; then
-		font_pkg_postrm
-	fi
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ -n ${FONT} ]] && font_pkg_postrm "$@"
 }
 
 # @FUNCTION: setup_fonts
 # @DESCRIPTION:
 # Generates needed files for fonts and fixes font permissions
 setup_fonts() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	create_fonts_scale
 	create_fonts_dir
 	font_pkg_postinst
@@ -387,6 +410,8 @@
 # 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() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
 		einfo "Removing font metadata"
 		rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
@@ -397,6 +422,8 @@
 # @DESCRIPTION:
 # Create fonts.scale file, used by the old server-side fonts subsystem.
 create_fonts_scale() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
 		ebegin "Generating font.scale"
 			mkfontscale \
@@ -410,6 +437,8 @@
 # @DESCRIPTION:
 # Create fonts.dir file, used by the old server-side fonts subsystem.
 create_fonts_dir() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	ebegin "Generating fonts.dir"
 			mkfontdir \
 				-e "${EROOT}"/usr/share/fonts/encodings \

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/01/15 17:55:21

  Modified:             xorg-2.eclass
  Log:
  By default disable dependency tracking, all x11 packages support this one.

Revision  Changes    Path
1.22                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-2.eclass	6 Jan 2011 11:01:59 -0000	1.21
+++ xorg-2.eclass	15 Jan 2011 17:55:21 -0000	1.22
@@ -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.21 2011/01/06 11:01:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.22 2011/01/15 17:55:21 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -313,6 +313,7 @@
 			myopts+=" $(use_enable static-libs static)"
 		fi
 		econf \
+			--disable-dependency-tracking \
 			${FONT_OPTIONS} \
 			${CONFIGURE_OPTIONS} \
 			${myopts}

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/02/15 12:13:58

  Modified:             xorg-2.eclass
  Log:
  Revert disable-dependency-tracking and stick to eapi4 for this.

Revision  Changes    Path
1.23                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-2.eclass	15 Jan 2011 17:55:21 -0000	1.22
+++ xorg-2.eclass	15 Feb 2011 12:13:58 -0000	1.23
@@ -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.22 2011/01/15 17:55:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.23 2011/02/15 12:13:58 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -313,7 +313,6 @@
 			myopts+=" $(use_enable static-libs static)"
 		fi
 		econf \
-			--disable-dependency-tracking \
 			${FONT_OPTIONS} \
 			${CONFIGURE_OPTIONS} \
 			${myopts}

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

[Michal Gorny (mgorny)]

mgorny      11/02/28 18:16:40

  Modified:             xorg-2.eclass
  Log:
  Sync eclass from the x11 overlay.
  
  Changes:
  - use of autotools-utils, with out of tree builds by default;
  - complete .la file removal,
  - common doc and video driver dependency handling,
  - simplified font encoding disable calls (with new enough util-macros).

Revision  Changes    Path
1.24                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-2.eclass	15 Feb 2011 12:13:58 -0000	1.23
+++ xorg-2.eclass	28 Feb 2011 18:16:40 -0000	1.24
@@ -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.23 2011/02/15 12:13:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.24 2011/02/28 18:16:40 mgorny Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -38,7 +38,7 @@
 	FONT_ECLASS="font"
 fi
 
-inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \
+inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic autotools \
 	${FONT_ECLASS} ${GIT_ECLASS}
 
 EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
@@ -68,28 +68,28 @@
 # inherit to override the default autoconfigured module.
 if [[ -z ${MODULE} ]]; then
 	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"     ;;
-		*)                   MODULE=""        ;;
+		app-doc)             MODULE=doc/     ;;
+		media-fonts)         MODULE=font/    ;;
+		x11-apps|x11-wm)     MODULE=app/     ;;
+		x11-misc|x11-themes) MODULE=util/    ;;
+		x11-base)            MODULE=xserver/ ;;
+		x11-drivers)         MODULE=driver/  ;;
+		x11-proto)           MODULE=proto/   ;;
+		x11-libs)            MODULE=lib/     ;;
+		*)                   MODULE=         ;;
 	esac
 fi
 
 # @ECLASS-VARIABLE: PACKAGE_NAME
 # @DESCRIPTION:
-# For git checkout the git repository migth differ from package name.
+# For git checkout the git repository might differ from package name.
 # This variable can be used for proper directory specification
 : ${PACKAGE_NAME:=${PN}}
 
 if [[ -n ${GIT_ECLASS} ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PACKAGE_NAME}"
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}${PACKAGE_NAME}"
 else
-	SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
+	SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}${P}.tar.bz2"
 fi
 
 : ${SLOT:=0}
@@ -174,9 +174,54 @@
 
 DEPEND+=" >=dev-util/pkgconfig-0.23"
 
-# Check deps on xorg-server
-has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )"
-[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]"
+# Check deps on drivers
+if has dri ${IUSE//+}; then
+	COMMON_DEPEND+=" dri? (
+		x11-base/xorg-server[-minimal]
+		x11-libs/libdrm
+	)"
+	DEPEND+=" dri? (
+		x11-proto/xf86driproto
+		x11-proto/glproto
+		x11-proto/dri2proto
+	)"
+fi
+if [[ -n "${DRIVER}" ]]; then
+	COMMON_DEPEND+="
+		x11-base/xorg-server[xorg]
+		x11-libs/libpciaccess
+	"
+	# we also needs some protos and libs in all cases
+	DEPEND+="
+		x11-proto/fontsproto
+		x11-proto/randrproto
+		x11-proto/renderproto
+		x11-proto/videoproto
+		x11-proto/xextproto
+		x11-proto/xineramaproto
+		x11-proto/xproto
+	"
+fi
+
+# Add deps on documentation
+# Most docbooks use dtd version 4.2 and 4.3 add more when found
+if has doc ${IUSE//+}; then
+	DEPEND+="
+		doc? (
+			app-text/xmlto
+			app-doc/doxygen
+			app-text/docbook-xml-dtd:4.2
+			app-text/docbook-xml-dtd:4.3
+		)
+	"
+fi
+
+DEPEND+=" ${COMMON_DEPEND}"
+RDEPEND+=" ${COMMON_DEPEND}"
+unset COMMON_DEPEND
+
+debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
+debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
 
 # @FUNCTION: xorg-2_pkg_setup
 # @DESCRIPTION:
@@ -214,7 +259,7 @@
 	EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
 
 	[[ -d "${EPATCH_SOURCE}" ]] && epatch
-	base_src_prepare "$@"
+	autotools-utils_src_prepare "$@"
 }
 
 # @FUNCTION: xorg-2_reconf_source
@@ -253,24 +298,29 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	if has nls ${IUSE//+} && ! use nls; then
-		FONT_OPTIONS+="
-			--disable-iso8859-2
-			--disable-iso8859-3
-			--disable-iso8859-4
-			--disable-iso8859-5
-			--disable-iso8859-6
-			--disable-iso8859-7
-			--disable-iso8859-8
-			--disable-iso8859-9
-			--disable-iso8859-10
-			--disable-iso8859-11
-			--disable-iso8859-12
-			--disable-iso8859-13
-			--disable-iso8859-14
-			--disable-iso8859-15
-			--disable-iso8859-16
-			--disable-jisx0201
-			--disable-koi8-r"
+		if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
+			FONT_OPTIONS+="
+				--disable-all-encodings"
+		else
+			FONT_OPTIONS+="
+				--disable-iso8859-2
+				--disable-iso8859-3
+				--disable-iso8859-4
+				--disable-iso8859-5
+				--disable-iso8859-6
+				--disable-iso8859-7
+				--disable-iso8859-8
+				--disable-iso8859-9
+				--disable-iso8859-10
+				--disable-iso8859-11
+				--disable-iso8859-12
+				--disable-iso8859-13
+				--disable-iso8859-14
+				--disable-iso8859-15
+				--disable-iso8859-16
+				--disable-jisx0201
+				--disable-koi8-r"
+		fi
 	fi
 }
 
@@ -298,25 +348,23 @@
 # Perform any necessary pre-configuration steps, then run configure
 xorg-2_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
-	local myopts=""
 
 	xorg-2_flags_setup
-	[[ -n "${FONT}" ]] && xorg-2_font_configure
 
 	# @VARIABLE: CONFIGURE_OPTIONS
 	# @DESCRIPTION:
 	# Any options to pass to configure
 	# @DEFAULT_UNSET
 	CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
-	if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
-		if has static-libs ${IUSE//+}; then
-			myopts+=" $(use_enable static-libs static)"
-		fi
-		econf \
-			${FONT_OPTIONS} \
-			${CONFIGURE_OPTIONS} \
-			${myopts}
-	fi
+
+	[[ -n "${FONT}" ]] && xorg-2_font_configure
+	local myeconfargs=(
+		--disable-dependency-tracking
+		${CONFIGURE_OPTIONS}
+		${FONT_OPTIONS}
+	)
+
+	autotools-utils_src_configure "$@"
 }
 
 # @FUNCTION: xorg-2_src_compile
@@ -325,7 +373,7 @@
 xorg-2_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	base_src_compile "$@"
+	autotools-utils_src_compile "$@"
 }
 
 # @FUNCTION: xorg-2_src_install
@@ -336,16 +384,12 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ ${CATEGORY} == x11-proto ]]; then
-		emake \
-			${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \
-			docdir=${EPREFIX}/usr/share/doc/${PF} \
-			DESTDIR="${D}" \
-			install || die "emake install failed"
+		autotools-utils_src_install \
+			${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
+			docdir="${EPREFIX}/usr/share/doc/${PF}"
 	else
-		emake \
-			docdir=${EPREFIX}/usr/share/doc/${PF} \
-			DESTDIR="${D}" \
-			install || die "emake install failed"
+		autotools-utils_src_install \
+			docdir="${EPREFIX}/usr/share/doc/${PF}"
 	fi
 
 	if [[ -n ${GIT_ECLASS} ]]; then
@@ -357,19 +401,9 @@
 	if [[ -e "${S}"/ChangeLog ]]; then
 		dodoc "${S}"/ChangeLog || die "dodoc failed"
 	fi
-	# @VARIABLE: DOCS
-	# @DESCRIPTION:
-	# Any documentation to install
-	# @DEFAULT_UNSET
-	if [[ -n ${DOCS} ]]; then
-		dodoc ${DOCS} || die "dodoc failed"
-	fi
 
-	# Don't install libtool archives for server modules
-	if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then
-		find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
-			-exec rm -f {} ';'
-	fi
+	# Don't install libtool archives (even with static-libs)
+	remove_libtool_files all
 
 	[[ -n ${FONT} ]] && remove_font_metadata
 }

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/01 18:56:58

  Modified:             xorg-2.eclass
  Log:
  Alter the deps only for video drivers this way.

Revision  Changes    Path
1.25                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-2.eclass	28 Feb 2011 18:16:40 -0000	1.24
+++ xorg-2.eclass	1 Mar 2011 18:56:58 -0000	1.25
@@ -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.24 2011/02/28 18:16:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.25 2011/03/01 18:56:58 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -186,7 +186,7 @@
 		x11-proto/dri2proto
 	)"
 fi
-if [[ -n "${DRIVER}" ]]; then
+if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
 	COMMON_DEPEND+="
 		x11-base/xorg-server[xorg]
 		x11-libs/libpciaccess

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/02 15:40:38

  Modified:             xorg-2.eclass
  Log:
  Depend on proper xorg-server for all drivers.

Revision  Changes    Path
1.26                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-2.eclass	1 Mar 2011 18:56:58 -0000	1.25
+++ xorg-2.eclass	2 Mar 2011 15:40:38 -0000	1.26
@@ -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.25 2011/03/01 18:56:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.26 2011/03/02 15:40:38 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -186,9 +186,13 @@
 		x11-proto/dri2proto
 	)"
 fi
-if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
+if [[ -n "${DRIVER}" ]]; then
 	COMMON_DEPEND+="
 		x11-base/xorg-server[xorg]
+	"
+fi
+if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
+	COMMON_DEPEND+="
 		x11-libs/libpciaccess
 	"
 	# we also needs some protos and libs in all cases

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/08 11:31:42

  Modified:             xorg-2.eclass
  Log:
  Some docs are still in dtd:4.1.

Revision  Changes    Path
1.27                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-2.eclass	2 Mar 2011 15:40:38 -0000	1.26
+++ xorg-2.eclass	8 Mar 2011 11:31:42 -0000	1.27
@@ -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.26 2011/03/02 15:40:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.27 2011/03/08 11:31:42 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -214,6 +214,7 @@
 		doc? (
 			app-text/xmlto
 			app-doc/doxygen
+			app-text/docbook-xml-dtd:4.1
 			app-text/docbook-xml-dtd:4.2
 			app-text/docbook-xml-dtd:4.3
 		)

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

[Diego Petteno (flameeyes)]

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}

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/15 12:32:14

  Modified:             xorg-2.eclass
  Log:
  update util-macros depenency to latest stable.

Revision  Changes    Path
1.29                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-2.eclass	14 Mar 2011 17:09:41 -0000	1.28
+++ xorg-2.eclass	15 Mar 2011 12:32:14 -0000	1.29
@@ -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.28 2011/03/14 17:09:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.29 2011/03/15 12:32:14 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -109,7 +109,7 @@
 	>=sys-devel/libtool-2.2.6a
 	sys-devel/m4"
 if [[ ${PN} != util-macros ]] ; then
-	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0"
+	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.12.0"
 	# Required even by xorg-server
 	[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
 fi

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/16 09:29:42

  Modified:             xorg-2.eclass
  Log:
  Add missed asciidoc to the documentation list.

Revision  Changes    Path
1.30                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xorg-2.eclass	15 Mar 2011 12:32:14 -0000	1.29
+++ xorg-2.eclass	16 Mar 2011 09:29:42 -0000	1.30
@@ -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.29 2011/03/15 12:32:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.30 2011/03/16 09:29:42 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -215,6 +215,7 @@
 if has doc ${IUSE//+}; then
 	DEPEND+="
 		doc? (
+			app-text/asciidoc
 			app-text/xmlto
 			app-doc/doxygen
 			app-text/docbook-xml-dtd:4.1

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/16 16:10:21

  Modified:             xorg-2.eclass
  Log:
  Fix IUSE handling for both dri and doc useflag. Current logic was not working at all. Preserve namespace for all eclass variables that are to be set in ebuilds.

Revision  Changes    Path
1.31                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-2.eclass	16 Mar 2011 09:29:42 -0000	1.30
+++ xorg-2.eclass	16 Mar 2011 16:10:21 -0000	1.31
@@ -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.30 2011/03/16 09:29:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.31 2011/03/16 16:10:21 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -58,41 +58,44 @@
 # before inheriting this eclass.
 : ${XORG_EAUTORECONF:="no"}
 
-# @ECLASS-VARIABLE: BASE_INDIVIDUAL_URI
+# @ECLASS-VARIABLE: XORG_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"}
+: ${XORG_BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"}
 
-# @ECLASS-VARIABLE: MODULE
+# @ECLASS-VARIABLE: XORG_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.
-if [[ -z ${MODULE} ]]; then
+if [[ -z ${XORG_MODULE} ]]; then
 	case ${CATEGORY} in
-		app-doc)             MODULE=doc/     ;;
-		media-fonts)         MODULE=font/    ;;
-		x11-apps|x11-wm)     MODULE=app/     ;;
-		x11-misc|x11-themes) MODULE=util/    ;;
-		x11-base)            MODULE=xserver/ ;;
-		x11-drivers)         MODULE=driver/  ;;
-		x11-proto)           MODULE=proto/   ;;
-		x11-libs)            MODULE=lib/     ;;
-		*)                   MODULE=         ;;
+		app-doc)             XORG_MODULE=doc/     ;;
+		media-fonts)         XORG_MODULE=font/    ;;
+		x11-apps|x11-wm)     XORG_MODULE=app/     ;;
+		x11-misc|x11-themes) XORG_MODULE=util/    ;;
+		x11-base)            XORG_MODULE=xserver/ ;;
+		x11-drivers)         XORG_MODULE=driver/  ;;
+		x11-proto)           XORG_MODULE=proto/   ;;
+		x11-libs)            XORG_MODULE=lib/     ;;
+		*)                   XORG_MODULE=         ;;
 	esac
 fi
 
-# @ECLASS-VARIABLE: PACKAGE_NAME
+# backcompat, remove when everything in main tree fixed
+[[ -n ${MODULE} ]] && XORG_MODULE=${MODULE} && ewarn "Your ebuild is using MODULE variable, please migrate to XORG_MODULE to preserve namespace."
+
+# @ECLASS-VARIABLE: XORG_PACKAGE_NAME
 # @DESCRIPTION:
 # For git checkout the git repository might differ from package name.
 # This variable can be used for proper directory specification
-: ${PACKAGE_NAME:=${PN}}
+: ${XORG_PACKAGE_NAME:=${PN}}
 
 if [[ -n ${GIT_ECLASS} ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}${PACKAGE_NAME}"
-elif [[ -n ${BASE_INDIVIDUAL_URI} ]]; then
-	SRC_URI="${BASE_INDIVIDUAL_URI}/${MODULE}${P}.tar.bz2"
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${PACKAGE_NAME}"
+elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
+	SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
 fi
 
 : ${SLOT:=0}
@@ -177,18 +180,39 @@
 
 DEPEND+=" >=dev-util/pkgconfig-0.23"
 
-# Check deps on drivers
-if has dri ${IUSE//+}; then
-	COMMON_DEPEND+=" dri? (
-		x11-base/xorg-server[-minimal]
-		x11-libs/libdrm
-	)"
-	DEPEND+=" dri? (
-		x11-proto/xf86driproto
-		x11-proto/glproto
-		x11-proto/dri2proto
-	)"
-fi
+# @ECLASS-VARIABLE: XORG_DRI
+# @DESCRIPTION:
+# Possible values are "always" or the value of the useflag DRI capabilities
+# are required for. Default value is "no"
+#
+# Eg. XORG_DRI="opengl" will pull all dri dependant deps for opengl useflag
+: ${XORG_DRI:="no"}
+
+DRI_COMMON_DEPEND="
+	x11-base/xorg-server[-minimal]
+	x11-libs/libdrm
+"
+DRI_DEPEND="
+	x11-proto/xf86driproto
+	x11-proto/glproto
+	x11-proto/dri2proto
+"
+case ${XORG_DRI} in
+	no)
+		;;
+	always)
+		COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}"
+		DEPEND+=" ${DRI_DEPEND}"
+		;;
+	*)
+		COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )"
+		DEPEND+=" ${XORG_DRI}? ( ${DRI_DEPEND} )"
+		IUSE="${XORG_DRI}"
+		;;
+esac
+unset DRI_DEPEND
+unset DRI_COMMONDEPEND
+
 if [[ -n "${DRIVER}" ]]; then
 	COMMON_DEPEND+="
 		x11-base/xorg-server[xorg]
@@ -210,20 +234,36 @@
 	"
 fi
 
-# Add deps on documentation
-# Most docbooks use dtd version 4.2 and 4.3 add more when found
-if has doc ${IUSE//+}; then
-	DEPEND+="
-		doc? (
-			app-text/asciidoc
-			app-text/xmlto
-			app-doc/doxygen
-			app-text/docbook-xml-dtd:4.1
-			app-text/docbook-xml-dtd:4.2
-			app-text/docbook-xml-dtd:4.3
-		)
-	"
-fi
+# @ECLASS-VARIABLE: XORG_DOC
+# @DESCRIPTION:
+# Possible values are "always" or the value of the useflag doc packages
+# are required for. Default value is "no"
+#
+# Eg. XORG_DOC="manual" will pull all doc dependant deps for manual useflag
+: ${XORG_DOC:="no"}
+
+DOC_DEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		app-doc/doxygen
+		app-text/docbook-xml-dtd:4.1
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.3
+	)
+"
+case ${XORG_DOC} in
+	no)
+		;;
+	always)
+		DEPEND+="${DOC_DEPEND}"
+		;;
+	*)
+		DEPEND+="${XORG_DOC}? ( ${DOC_DEPEND} )"
+		IUSE="${XORG_DOC}"
+		;;
+esac
+unset DOC_DEPEND
 
 DEPEND+=" ${COMMON_DEPEND}"
 RDEPEND+=" ${COMMON_DEPEND}"
@@ -231,6 +271,7 @@
 
 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
+debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
 
 # @FUNCTION: xorg-2_pkg_setup
 # @DESCRIPTION:

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/16 16:12:32

  Modified:             xorg-2.eclass
  Log:
  Fix whitespace typo.

Revision  Changes    Path
1.32                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xorg-2.eclass	16 Mar 2011 16:10:21 -0000	1.31
+++ xorg-2.eclass	16 Mar 2011 16:12:32 -0000	1.32
@@ -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.31 2011/03/16 16:10:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.32 2011/03/16 16:12:32 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -256,10 +256,10 @@
 	no)
 		;;
 	always)
-		DEPEND+="${DOC_DEPEND}"
+		DEPEND+=" ${DOC_DEPEND}"
 		;;
 	*)
-		DEPEND+="${XORG_DOC}? ( ${DOC_DEPEND} )"
+		DEPEND+=" ${XORG_DOC}? ( ${DOC_DEPEND} )"
 		IUSE="${XORG_DOC}"
 		;;
 esac

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/16 16:13:51

  Modified:             xorg-2.eclass
  Log:
  Fix dtd dependency to depend on existing version.

Revision  Changes    Path
1.33                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-2.eclass	16 Mar 2011 16:12:32 -0000	1.32
+++ xorg-2.eclass	16 Mar 2011 16:13:51 -0000	1.33
@@ -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.32 2011/03/16 16:12:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.33 2011/03/16 16:13:51 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -247,7 +247,7 @@
 		app-text/asciidoc
 		app-text/xmlto
 		app-doc/doxygen
-		app-text/docbook-xml-dtd:4.1
+		app-text/docbook-xml-dtd:4.1.2
 		app-text/docbook-xml-dtd:4.2
 		app-text/docbook-xml-dtd:4.3
 	)

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

[Michal Gorny (mgorny)]

mgorny      11/03/16 20:57:43

  Modified:             xorg-2.eclass
  Log:
  Fix variable ref in EGIT_REPO_URI.

Revision  Changes    Path
1.34                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-2.eclass	16 Mar 2011 16:13:51 -0000	1.33
+++ xorg-2.eclass	16 Mar 2011 20:57:43 -0000	1.34
@@ -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.33 2011/03/16 16:13:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.34 2011/03/16 20:57:43 mgorny Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -93,7 +93,7 @@
 : ${XORG_PACKAGE_NAME:=${PN}}
 
 if [[ -n ${GIT_ECLASS} ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${PACKAGE_NAME}"
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"
 elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
 	SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
 fi

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/17 22:40:20

  Modified:             xorg-2.eclass
  Log:
  Bump version for font-util so we enforce upgrade.

Revision  Changes    Path
1.35                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-2.eclass	16 Mar 2011 20:57:43 -0000	1.34
+++ xorg-2.eclass	17 Mar 2011 22:40:20 -0000	1.35
@@ -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.34 2011/03/16 20:57:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.35 2011/03/17 22:40:20 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -114,7 +114,7 @@
 if [[ ${PN} != util-macros ]] ; then
 	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.12.0"
 	# Required even by xorg-server
-	[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
+	[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
 fi
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -131,7 +131,7 @@
 		x11-apps/mkfontscale
 		x11-apps/mkfontdir"
 	PDEPEND+=" media-fonts/font-alias"
-	DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
+	DEPEND+=" >=media-fonts/font-util-1.2.0"
 
 	# @ECLASS-VARIABLE: FONT_DIR
 	# @DESCRIPTION:

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

[Diego Petteno (flameeyes)]

flameeyes    11/03/17 22:43:22

  Modified:             xorg-2.eclass
  Log:
  Allow pre-setting the GIT repository path in the ebuild as well.

Revision  Changes    Path
1.36                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-2.eclass	17 Mar 2011 22:40:20 -0000	1.35
+++ xorg-2.eclass	17 Mar 2011 22:43:22 -0000	1.36
@@ -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.35 2011/03/17 22:40:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.36 2011/03/17 22:43:22 flameeyes Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -93,7 +93,7 @@
 : ${XORG_PACKAGE_NAME:=${PN}}
 
 if [[ -n ${GIT_ECLASS} ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"
+	: ${EGIT_REPO_URI:="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"}
 elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
 	SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
 fi

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/18 18:31:23

  Modified:             xorg-2.eclass
  Log:
  Update ewarn to explicitly state what ebuild is broken

Revision  Changes    Path
1.37                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-2.eclass	17 Mar 2011 22:43:22 -0000	1.36
+++ xorg-2.eclass	18 Mar 2011 18:31:23 -0000	1.37
@@ -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.36 2011/03/17 22:43:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.37 2011/03/18 18:31:23 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -84,7 +84,7 @@
 fi
 
 # backcompat, remove when everything in main tree fixed
-[[ -n ${MODULE} ]] && XORG_MODULE=${MODULE} && ewarn "Your ebuild is using MODULE variable, please migrate to XORG_MODULE to preserve namespace."
+[[ -n ${MODULE} ]] && XORG_MODULE=${MODULE} && ewarn "$CATEGORY/$P is using MODULE variable, please migrate to XORG_MODULE to preserve namespace."
 
 # @ECLASS-VARIABLE: XORG_PACKAGE_NAME
 # @DESCRIPTION:

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/03/19 10:30:23

  Modified:             xorg-2.eclass
  Log:
  Append to IUSE, do not override it.

Revision  Changes    Path
1.38                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xorg-2.eclass	18 Mar 2011 18:31:23 -0000	1.37
+++ xorg-2.eclass	19 Mar 2011 10:30:23 -0000	1.38
@@ -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.37 2011/03/18 18:31:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.38 2011/03/19 10:30:23 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -207,7 +207,7 @@
 	*)
 		COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )"
 		DEPEND+=" ${XORG_DRI}? ( ${DRI_DEPEND} )"
-		IUSE="${XORG_DRI}"
+		IUSE+=" ${XORG_DRI}"
 		;;
 esac
 unset DRI_DEPEND
@@ -260,7 +260,7 @@
 		;;
 	*)
 		DEPEND+=" ${XORG_DOC}? ( ${DOC_DEPEND} )"
-		IUSE="${XORG_DOC}"
+		IUSE+=" ${XORG_DOC}"
 		;;
 esac
 unset DOC_DEPEND

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/04/17 20:46:05

  Modified:             xorg-2.eclass
  Log:
  Update util-macros dependency.

Revision  Changes    Path
1.40                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-2.eclass	19 Mar 2011 15:02:47 -0000	1.39
+++ xorg-2.eclass	17 Apr 2011 20:46:05 -0000	1.40
@@ -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.39 2011/03/19 15:02:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.40 2011/04/17 20:46:05 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -112,7 +112,7 @@
 	>=sys-devel/libtool-2.2.6a
 	sys-devel/m4"
 if [[ ${PN} != util-macros ]] ; then
-	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.12.0"
+	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.13.0"
 	# Required even by xorg-server
 	[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
 fi

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

[Michal Gorny (mgorny)]

mgorny      11/04/20 12:48:39

  Modified:             xorg-2.eclass
  Log:
  Replace CONFIGURE_OPTIONS with XORG_CONFIGURE_OPTIONS array. Use git-2 eclass.

Revision  Changes    Path
1.41                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xorg-2.eclass	17 Apr 2011 20:46:05 -0000	1.40
+++ xorg-2.eclass	20 Apr 2011 12:48:38 -0000	1.41
@@ -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.40 2011/04/17 20:46:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.41 2011/04/20 12:48:38 mgorny Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -22,7 +22,7 @@
 
 GIT_ECLASS=""
 if [[ ${PV} == *9999* ]]; then
-	GIT_ECLASS="git"
+	GIT_ECLASS="git-2"
 	XORG_EAUTORECONF="yes"
 fi
 
@@ -83,9 +83,6 @@
 	esac
 fi
 
-# backcompat, remove when everything in main tree fixed
-[[ -n ${MODULE} ]] && XORG_MODULE=${MODULE} && ewarn "$CATEGORY/$P is using MODULE variable, please migrate to XORG_MODULE to preserve namespace."
-
 # @ECLASS-VARIABLE: XORG_PACKAGE_NAME
 # @DESCRIPTION:
 # For git checkout the git repository might differ from package name.
@@ -289,7 +286,7 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ -n ${GIT_ECLASS} ]]; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${A}
 	fi
@@ -336,7 +333,6 @@
 xorg-2_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ -n ${GIT_ECLASS} ]] && git_src_prepare
 	xorg-2_patch_source
 	xorg-2_reconf_source
 }
@@ -401,17 +397,24 @@
 
 	xorg-2_flags_setup
 
-	# @VARIABLE: CONFIGURE_OPTIONS
+	# @VARIABLE: XORG_CONFIGURE_OPTIONS
 	# @DESCRIPTION:
-	# Any options to pass to configure
+	# Array of an additional options to pass to configure.
 	# @DEFAULT_UNSET
-	CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
+	if [[ $(declare -p XORG_CONFIGURE_OPTIONS 2>&-) != "declare -a"* ]]; then
+		# fallback to CONFIGURE_OPTIONS, deprecated.
+		[[ -n "${CONFIGURE_OPTIONS}" ]] && \
+			ewarn "QA: CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS to preserve namespace."
+		local xorgconfadd=(${CONFIGURE_OPTIONS})
+	else
+		local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
+	fi
 
 	[[ -n "${FONT}" ]] && xorg-2_font_configure
 	local myeconfargs=(
 		--disable-dependency-tracking
-		${CONFIGURE_OPTIONS}
 		${FONT_OPTIONS}
+		"${xorgconfadd[@]}"
 	)
 
 	autotools-utils_src_configure "$@"

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/05/08 12:20:46

  Modified:             xorg-2.eclass
  Log:
  All input drivers require inputproto so just handle it in eclass.

Revision  Changes    Path
1.42                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-2.eclass	20 Apr 2011 12:48:38 -0000	1.41
+++ xorg-2.eclass	8 May 2011 12:20:46 -0000	1.42
@@ -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.41 2011/04/20 12:48:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.42 2011/05/08 12:20:46 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -216,6 +216,11 @@
 	"
 fi
 if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
+	DEPEND+="
+		x11-proto/inputproto
+	"
+fi
+if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
 	COMMON_DEPEND+="
 		x11-libs/libpciaccess
 	"

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/05/08 12:27:09

  Modified:             xorg-2.eclass
  Log:
  Add more common protos.

Revision  Changes    Path
1.43                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xorg-2.eclass	8 May 2011 12:20:46 -0000	1.42
+++ xorg-2.eclass	8 May 2011 12:27:09 -0000	1.43
@@ -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.42 2011/05/08 12:20:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.43 2011/05/08 12:27:09 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -218,6 +218,8 @@
 if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
 	DEPEND+="
 		x11-proto/inputproto
+		x11-proto/kbproto
+		x11-proto/xproto
 	"
 fi
 if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/05/14 16:27:50

  Modified:             xorg-2.eclass
  Log:
  Fix typo video -> input

Revision  Changes    Path
1.44                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xorg-2.eclass	8 May 2011 12:27:09 -0000	1.43
+++ xorg-2.eclass	14 May 2011 16:27:50 -0000	1.44
@@ -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.43 2011/05/08 12:27:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.44 2011/05/14 16:27:50 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -215,7 +215,7 @@
 		x11-base/xorg-server[xorg]
 	"
 fi
-if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
+if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then
 	DEPEND+="
 		x11-proto/inputproto
 		x11-proto/kbproto

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

[Michal Gorny (mgorny)]

mgorny      11/05/17 07:59:03

  Modified:             xorg-2.eclass
  Log:
  Add a http fallback URI for git.

Revision  Changes    Path
1.45                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xorg-2.eclass	14 May 2011 16:27:50 -0000	1.44
+++ xorg-2.eclass	17 May 2011 07:59:02 -0000	1.45
@@ -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.44 2011/05/14 16:27:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.45 2011/05/17 07:59:02 mgorny Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -90,7 +90,7 @@
 : ${XORG_PACKAGE_NAME:=${PN}}
 
 if [[ -n ${GIT_ECLASS} ]]; then
-	: ${EGIT_REPO_URI:="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"}
+	: ${EGIT_REPO_URI:="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME} http://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"}
 elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
 	SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
 fi

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

[Chi-Thanh Christopher Nguyen (chithanh)]

chithanh    11/06/20 22:22:57

  Modified:             xorg-2.eclass
  Log:
  Raise dependency on util-macros

Revision  Changes    Path
1.46                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xorg-2.eclass	17 May 2011 07:59:02 -0000	1.45
+++ xorg-2.eclass	20 Jun 2011 22:22:57 -0000	1.46
@@ -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.45 2011/05/17 07:59:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.46 2011/06/20 22:22:57 chithanh Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -109,7 +109,7 @@
 	>=sys-devel/libtool-2.2.6a
 	sys-devel/m4"
 if [[ ${PN} != util-macros ]] ; then
-	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.13.0"
+	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.14.0"
 	# Required even by xorg-server
 	[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
 fi

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

[Michal Gorny (mgorny)]

mgorny      11/09/12 13:50:57

  Modified:             xorg-2.eclass
  Log:
  ewarn -> eqawarn to not stress users with our mistakes.

Revision  Changes    Path
1.48                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xorg-2.eclass	22 Aug 2011 04:46:32 -0000	1.47
+++ xorg-2.eclass	12 Sep 2011 13:50:57 -0000	1.48
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.47 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.48 2011/09/12 13:50:57 mgorny Exp $
 
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -410,8 +410,11 @@
 	# @DEFAULT_UNSET
 	if [[ $(declare -p XORG_CONFIGURE_OPTIONS 2>&-) != "declare -a"* ]]; then
 		# fallback to CONFIGURE_OPTIONS, deprecated.
-		[[ -n "${CONFIGURE_OPTIONS}" ]] && \
-			ewarn "QA: CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS to preserve namespace."
+		if [[ -n "${CONFIGURE_OPTIONS}" ]]; then
+			eqawarn "CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS"
+			eqawarn "to preserve namespace."
+		fi
+
 		local xorgconfadd=(${CONFIGURE_OPTIONS})
 	else
 		local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")

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

[Michal Gorny (mgorny)]

mgorny      11/10/09 07:45:53

  Modified:             xorg-2.eclass
  Log:
  Fix typo in fonts.scale filename.

Revision  Changes    Path
1.49                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xorg-2.eclass	12 Sep 2011 13:50:57 -0000	1.48
+++ xorg-2.eclass	9 Oct 2011 07:45:53 -0000	1.49
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.48 2011/09/12 13:50:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.49 2011/10/09 07:45:53 mgorny Exp $
 
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -522,7 +522,7 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
-		ebegin "Generating font.scale"
+		ebegin "Generating fonts.scale"
 			mkfontscale \
 				-a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
 				-- "${EROOT}/usr/share/fonts/${FONT_DIR}"

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

[Michal Gorny (mgorny)]

mgorny      11/10/14 20:27:11

  Modified:             xorg-2.eclass
  Log:
  Update fonts.scale & fonts.dir on font removal.
  
  This way, user won't end up with invalid fonts in the listings (and thus
  segfaulting xfontsel).
  
  Fixes: https://bugs.gentoo.org/show_bug.cgi?id=384649

Revision  Changes    Path
1.50                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xorg-2.eclass	9 Oct 2011 07:45:53 -0000	1.49
+++ xorg-2.eclass	14 Oct 2011 20:27:11 -0000	1.50
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.49 2011/10/09 07:45:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.50 2011/10/14 20:27:11 mgorny Exp $
 
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -478,7 +478,11 @@
 xorg-2_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ -n ${FONT} ]] && setup_fonts "$@"
+	if [[ -n ${FONT} ]]; then
+		create_fonts_scale
+		create_fonts_dir
+		font_pkg_postinst "$@"
+	fi
 }
 
 # @FUNCTION: xorg-2_pkg_postrm
@@ -488,18 +492,14 @@
 xorg-2_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ -n ${FONT} ]] && font_pkg_postrm "$@"
-}
-
-# @FUNCTION: setup_fonts
-# @DESCRIPTION:
-# Generates needed files for fonts and fixes font permissions
-setup_fonts() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	create_fonts_scale
-	create_fonts_dir
-	font_pkg_postinst
+	if [[ -n ${FONT} ]]; then
+		# if we're doing an upgrade, postinst will do
+		if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then
+			create_fonts_scale
+			create_fonts_dir
+			font_pkg_postrm "$@"
+		fi
+	fi
 }
 
 # @FUNCTION: remove_font_metadata

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

[Chi-Thanh Christopher Nguyen (chithanh)]

chithanh    11/11/01 13:51:05

  Modified:             xorg-2.eclass
  Log:
  xorg-2.eclass: bump util-macros dependency

Revision  Changes    Path
1.51                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xorg-2.eclass	14 Oct 2011 20:27:11 -0000	1.50
+++ xorg-2.eclass	1 Nov 2011 13:51:05 -0000	1.51
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.50 2011/10/14 20:27:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.51 2011/11/01 13:51:05 chithanh Exp $
 
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -109,7 +109,7 @@
 	>=sys-devel/libtool-2.2.6a
 	sys-devel/m4"
 if [[ ${PN} != util-macros ]] ; then
-	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.14.0"
+	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.15.0"
 	# Required even by xorg-server
 	[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
 fi

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

[Michal Gorny (mgorny)]

mgorny      12/03/22 06:57:46

  Modified:             xorg-2.eclass
  Log:
  Use autotools-utils to reconfigure.

Revision  Changes    Path
1.52                 eclass/xorg-2.eclass

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

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xorg-2.eclass	1 Nov 2011 13:51:05 -0000	1.51
+++ xorg-2.eclass	22 Mar 2012 06:57:46 -0000	1.52
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.51 2011/11/01 13:51:05 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.52 2012/03/22 06:57:46 mgorny Exp $
 
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -37,8 +37,9 @@
 	FONT_ECLASS="font"
 fi
 
-inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic autotools \
-	${FONT_ECLASS} ${GIT_ECLASS}
+# we need to inherit autotools first to get the deps
+inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \
+	flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS}
 
 EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
 case "${EAPI:-0}" in
@@ -313,7 +314,6 @@
 	EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
 
 	[[ -d "${EPATCH_SOURCE}" ]] && epatch
-	autotools-utils_src_prepare "$@"
 }
 
 # @FUNCTION: xorg-2_reconf_source
@@ -325,11 +325,13 @@
 	case ${CHOST} in
 		*-interix* | *-aix* | *-winnt*)
 			# some hosts need full eautoreconf
-			[[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
+			[[ -e "./configure.ac" || -e "./configure.in" ]] \
+				&& AUTOTOOLS_AUTORECONF=1
 			;;
 		*)
 			# elibtoolize required for BSD
-			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
+			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \
+				&& AUTOTOOLS_AUTORECONF=1
 			;;
 	esac
 }
@@ -342,6 +344,7 @@
 
 	xorg-2_patch_source
 	xorg-2_reconf_source
+	autotools-utils_src_prepare "$@"
 }
 
 # @FUNCTION: xorg-2_font_configure