public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Tomas Chvatal" <scarabeus@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/x11:master commit in: eclass/
Date: Tue,  1 Mar 2011 18:57:25 +0000 (UTC)	[thread overview]
Message-ID: <9c91c3de17649fae9e77fbc74dd5924860eda5a1.scarabeus@gentoo> (raw)

commit:     9c91c3de17649fae9e77fbc74dd5924860eda5a1
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 18:57:18 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 18:57:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9c91c3de

[eclass] xorg-2 eclass moved to main tree.

---
 eclass/xorg-2.eclass |  482 --------------------------------------------------
 1 files changed, 0 insertions(+), 482 deletions(-)

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
deleted file mode 100644
index 103979b..0000000
--- a/eclass/xorg-2.eclass
+++ /dev/null
@@ -1,482 +0,0 @@
-# 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 $
-#
-# @ECLASS: xorg-2.eclass
-# @MAINTAINER:
-# x11@gentoo.org
-# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
-# @DESCRIPTION:
-# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
-# and more. Many things that would normally be done in various functions
-# can be accessed by setting variables instead, such as patching,
-# running eautoreconf, passing options to configure and installing docs.
-#
-# 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.
-
-# Author: Tomáš Chvátal <scarabeus@gentoo.org>
-# Author: Donnie Berkholz <dberkholz@gentoo.org>
-
-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 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"
-case "${EAPI:-0}" in
-	3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
-	*) die "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
-	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=         ;;
-	esac
-fi
-
-# @ECLASS-VARIABLE: 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}}
-
-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"
-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 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
-		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:
-	# 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"
-
-# @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 [[ ${XORG_STATIC} == yes \
-		&& ${FONT} != yes \
-		&& ${CATEGORY} != app-doc \
-		&& ${CATEGORY} != x11-apps \
-		&& ${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 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:
-# Setup prefix compat
-xorg-2_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
-		unpack ${A}
-	fi
-
-	[[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
-}
-
-# @FUNCTION: xorg-2_patch_source
-# @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
-	autotools-utils_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
-			[[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
-			;;
-		*)
-			# elibtoolize required for BSD
-			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
-			;;
-	esac
-}
-
-# @FUNCTION: xorg-2_src_prepare
-# @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
-}
-
-# @FUNCTION: xorg-2_font_configure
-# @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
-		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
-}
-
-# @FUNCTION: xorg-2_flags_setup
-# @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
-	[[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
-
-	# 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
-# @DESCRIPTION:
-# Perform any necessary pre-configuration steps, then run configure
-xorg-2_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	xorg-2_flags_setup
-
-	# @VARIABLE: CONFIGURE_OPTIONS
-	# @DESCRIPTION:
-	# Any options to pass to configure
-	# @DEFAULT_UNSET
-	CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
-
-	[[ -n "${FONT}" ]] && xorg-2_font_configure
-	local myeconfargs=(
-		--disable-dependency-tracking
-		${CONFIGURE_OPTIONS}
-		${FONT_OPTIONS}
-	)
-
-	autotools-utils_src_configure "$@"
-}
-
-# @FUNCTION: xorg-2_src_compile
-# @DESCRIPTION:
-# Compile a package, performing all X-related tasks.
-xorg-2_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	autotools-utils_src_compile "$@"
-}
-
-# @FUNCTION: xorg-2_src_install
-# @DESCRIPTION:
-# 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
-		autotools-utils_src_install \
-			${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
-			docdir="${EPREFIX}/usr/share/doc/${PF}"
-	else
-		autotools-utils_src_install \
-			docdir="${EPREFIX}/usr/share/doc/${PF}"
-	fi
-
-	if [[ -n ${GIT_ECLASS} ]]; then
-		pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
-		git log ${EGIT_COMMIT} > "${S}"/ChangeLog
-		popd > /dev/null
-	fi
-
-	if [[ -e "${S}"/ChangeLog ]]; then
-		dodoc "${S}"/ChangeLog || die "dodoc failed"
-	fi
-
-	# Don't install libtool archives (even with static-libs)
-	remove_libtool_files all
-
-	[[ -n ${FONT} ]] && remove_font_metadata
-}
-
-# @FUNCTION: xorg-2_pkg_postinst
-# @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() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ -n ${FONT} ]] && setup_fonts "$@"
-}
-
-# @FUNCTION: xorg-2_pkg_postrm
-# @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() {
-	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
-}
-
-# @FUNCTION: remove_font_metadata
-# @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() {
-	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}
-	fi
-}
-
-# @FUNCTION: create_fonts_scale
-# @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 \
-				-a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
-				-- "${EROOT}/usr/share/fonts/${FONT_DIR}"
-		eend $?
-	fi
-}
-
-# @FUNCTION: create_fonts_dir
-# @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 \
-				-e "${EROOT}"/usr/share/fonts/encodings/large \
-				-- "${EROOT}/usr/share/fonts/${FONT_DIR}"
-	eend $?
-}



             reply	other threads:[~2011-03-01 18:57 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-01 18:57 Tomas Chvatal [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-04-20 12:49 [gentoo-commits] proj/x11:master commit in: eclass/ Michał Górny
2011-04-20 11:06 Tomas Chvatal
2011-04-17 20:47 Tomas Chvatal
2011-04-15 19:05 Michał Górny
2011-04-15 17:21 Michał Górny
2011-04-15 17:21 Michał Górny
2011-04-15 17:21 Michał Górny
2011-03-09 13:52 Tomas Chvatal
2011-02-24 14:31 Tomas Chvatal
2011-02-22 13:28 Tomas Chvatal
2011-02-21 19:48 Tomas Chvatal
2011-02-21 19:39 Tomas Chvatal
2011-02-21 19:07 Tomas Chvatal
2011-02-21 18:30 Tomas Chvatal
2011-02-21 18:22 Tomas Chvatal
2011-02-21 18:20 Tomas Chvatal
2011-02-19 13:50 Tomas Chvatal
2011-02-18 14:48 Tomas Chvatal
2011-02-18 13:26 Tomas Chvatal
2011-02-18 13:19 Tomas Chvatal
2011-02-18 13:19 Tomas Chvatal
2011-02-06 15:49 Michał Górny
2011-02-06 15:49 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9c91c3de17649fae9e77fbc74dd5924860eda5a1.scarabeus@gentoo \
    --to=scarabeus@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox