diff --git a/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass index 4adef33355..98882c4af8 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/xorg-2.eclass @@ -1,10 +1,13 @@ -# Copyright 1999-2010 Gentoo Foundation +# 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.28 2011/03/14 17:09:41 flameeyes 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: # x11@gentoo.org +# @AUTHOR: +# Author: Tomáš Chvátal +# Author: Donnie Berkholz # @BLURB: Reduces code duplication in the modularized X11 ebuilds. # @DESCRIPTION: # This eclass makes trivial X ebuilds possible for apps, fonts, drivers, @@ -17,12 +20,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 -# Author: Donnie Berkholz - GIT_ECLASS="" if [[ ${PV} == *9999* ]]; then - GIT_ECLASS="git" + GIT_ECLASS="git-2" XORG_EAUTORECONF="yes" fi @@ -43,7 +43,7 @@ inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic aut 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" ;; + *) die "EAPI=${EAPI} is not supported" ;; esac # exports must be ALWAYS after inherit @@ -58,41 +58,41 @@ HOMEPAGE="http://xorg.freedesktop.org/" # 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 +# @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}${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 : ${SLOT:=0} @@ -109,9 +109,9 @@ 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" + EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.14.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" @@ -128,7 +128,7 @@ if [[ ${FONT} == yes ]]; then 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: @@ -177,23 +177,51 @@ 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 +# @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] " fi +if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then + DEPEND+=" + x11-proto/inputproto + x11-proto/kbproto + x11-proto/xproto + " +fi if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then COMMON_DEPEND+=" x11-libs/libpciaccess @@ -210,19 +238,36 @@ if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then " 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.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.2 + 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}" @@ -230,6 +275,7 @@ unset COMMON_DEPEND 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: @@ -247,7 +293,7 @@ xorg-2_src_unpack() { debug-print-function ${FUNCNAME} "$@" if [[ -n ${GIT_ECLASS} ]]; then - git_src_unpack + git-2_src_unpack else unpack ${A} fi @@ -294,7 +340,6 @@ xorg-2_reconf_source() { xorg-2_src_prepare() { debug-print-function ${FUNCNAME} "$@" - [[ -n ${GIT_ECLASS} ]] && git_src_prepare xorg-2_patch_source xorg-2_reconf_source } @@ -359,17 +404,27 @@ xorg-2_src_configure() { 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. + 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[@]}") + fi [[ -n "${FONT}" ]] && xorg-2_font_configure local myeconfargs=( --disable-dependency-tracking - ${CONFIGURE_OPTIONS} ${FONT_OPTIONS} + "${xorgconfadd[@]}" ) autotools-utils_src_configure "$@" diff --git a/sdk_container/src/third_party/portage-stable/media-fonts/font-util/font-util-1.1.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/media-fonts/font-util/font-util-1.2.0.ebuild similarity index 86% rename from sdk_container/src/third_party/portage-stable/media-fonts/font-util/font-util-1.1.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/media-fonts/font-util/font-util-1.2.0.ebuild index 8f86edc277..95475df506 100644 --- a/sdk_container/src/third_party/portage-stable/media-fonts/font-util/font-util-1.1.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/media-fonts/font-util/font-util-1.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/font-util-1.1.1-r1.ebuild,v 1.12 2010/10/21 01:05:07 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/font-util-1.2.0.ebuild,v 1.8 2011/02/14 13:38:54 xarthisius Exp $ EAPI=3 inherit xorg-2 diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/iceauth/iceauth-1.0.4.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/iceauth/iceauth-1.0.5.ebuild similarity index 56% rename from sdk_container/src/third_party/portage-stable/x11-apps/iceauth/iceauth-1.0.4.ebuild rename to sdk_container/src/third_party/portage-stable/x11-apps/iceauth/iceauth-1.0.5.ebuild index 26cc95c244..a9aeafaf51 100644 --- a/sdk_container/src/third_party/portage-stable/x11-apps/iceauth/iceauth-1.0.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-apps/iceauth/iceauth-1.0.5.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/iceauth-1.0.4.ebuild,v 1.9 2011/02/14 14:52:25 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/iceauth-1.0.5.ebuild,v 1.7 2011/07/30 10:33:03 armin76 Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 DESCRIPTION="ICE authority file utility" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt" IUSE="" RDEPEND="x11-libs/libICE" diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.5.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.6.ebuild similarity index 73% rename from sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.5.ebuild rename to sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.6.ebuild index 2f20bc2f00..6bd2474341 100644 --- a/sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.6.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.5.ebuild,v 1.9 2011/02/14 23:41:01 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.6.ebuild,v 1.8 2011/08/20 15:45:11 jer Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 @@ -18,5 +18,8 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND}" pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable ipv6)" + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + ) + xorg-2_pkg_setup } diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/00-xhost b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/00-xhost new file mode 100644 index 0000000000..82cf10381e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/00-xhost @@ -0,0 +1,7 @@ +#!/bin/sh +# Allow all local connections from the current UID +# This fixes issues with hostname changes (usually by dhcp clients) +# see bug 287498 for more info + +[ -x /usr/bin/xhost ] && [ -x /usr/bin/id ] && + xhost +si:localuser:`id -un` > /dev/null 2>&1 diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/0001-Gentoo-customizations.patch b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/0001-Gentoo-customizations.patch new file mode 100644 index 0000000000..a25ef4ba2a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/0001-Gentoo-customizations.patch @@ -0,0 +1,61 @@ +From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001 +From: Tomas Chvatal +Date: Mon, 1 Nov 2010 16:46:36 +0100 +Subject: [PATCH] Gentoo customizations. + + +Signed-off-by: Tomas Chvatal +--- + xinitrc.cpp | 26 ++++++++++++++++++-------- + 1 files changed, 18 insertions(+), 8 deletions(-) + +diff --git a/xinitrc.cpp b/xinitrc.cpp +index 049a8e4..80c3ad9 100644 +--- a/xinitrc.cpp ++++ b/xinitrc.cpp +@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD + + userresources=$HOME/.Xresources + usermodmap=$HOME/.Xmodmap +-sysresources=XINITDIR/.Xresources +-sysmodmap=XINITDIR/.Xmodmap ++sysresources=XINITDIR/Xresources ++sysmodmap=XINITDIR/Xmodmap + + XCOMM merge in defaults and keymaps + +@@ -84,15 +84,25 @@ fi + XCOMM This is the fallback case if nothing else is executed above + #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ + ++if [ -n "`/etc/X11/chooser.sh`" ]; then ++ command="`/etc/X11/chooser.sh`" ++else ++ failsafe="yes" ++fi ++ + if [ -d XINITDIR/xinitrc.d ] ; then +- for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do ++ for f in XINITDIR/xinitrc.dXSLASHGLOB ; do + [ -x "$f" ] && . "$f" + done + unset f + fi + +-TWM & +-XCLOCK -geometry 50x50-1+1 & +-XTERM -geometry 80x50+494+51 & +-XTERM -geometry 80x20+494-0 & +-exec XTERM -geometry 80x66+0+0 -name login ++if [ -n "$failsafe" ]; then ++ TWM & ++ XCLOCK -geometry 50x50-1+1 & ++ XTERM -geometry 80x50+494+51 & ++ XTERM -geometry 80x20+494-0 & ++ exec XTERM -geometry 80x66+0+0 -name login ++else ++ exec $command ++fi +-- +1.7.3.1 + diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/Xsession b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/Xsession new file mode 100644 index 0000000000..c86ccee19f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/Xsession @@ -0,0 +1,107 @@ +#!/bin/sh +# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ + +case $# in +1) + case $1 in + failsafe) + exec xterm -geometry 80x24-0-0 + ;; + esac +esac + +# redirect errors to a file in user's home directory if we can +for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done + +# clean up after xbanner +if which freetemp 2> /dev/null ; then + freetemp +fi + +startup=$HOME/.xsession + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +userxkbmap=$HOME/.Xkbmap + +sysresources=/etc/X11/Xresources +sysmodmap=/etc/X11/Xmodmap +sysxkbmap=/etc/X11/Xkbmap + +rh6sysresources=/etc/X11/xinit/Xresources +rh6sysmodmap=/etc/X11/xinit/Xmodmap + + +# merge in defaults +if [ -f "$rh6sysresources" ]; then + xrdb -merge "$rh6sysresources" +fi + +if [ -f "$sysresources" ]; then + xrdb -merge "$sysresources" +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +# merge in keymaps +if [ -f "$sysxkbmap" ]; then + setxkbmap `cat "$sysxkbmap"` + XKB_IN_USE=yes +fi + +if [ -f "$userxkbmap" ]; then + setxkbmap `cat "$userxkbmap"` + XKB_IN_USE=yes +fi + +# +# Eeek, this seems like too much magic here +# +if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then + if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then + xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` + if [ -n "$xkbsymbols" ]; then + setxkbmap -symbols "$xkbsymbols" + XKB_IN_USE=yes + fi + fi +fi + +# xkb and xmodmap don't play nice together +if [ -z "$XKB_IN_USE" ]; then + if [ -f "$rh6sysmodmap" ]; then + xmodmap "$rh6sysmodmap" + fi + + if [ -f "$sysmodmap" ]; then + xmodmap "$sysmodmap" + fi + + if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" + fi +fi + +unset XKB_IN_USE + +if [ -x "$startup" ]; then + exec "$startup" +elif [ -x "$HOME/.Xclients" ]; then + exec "$HOME/.Xclients" +elif [ -x /etc/X11/xinit/Xclients ]; then + exec /etc/X11/xinit/Xclients +elif [ -x /etc/X11/Xclients ]; then + exec /etc/X11/Xclients +else + exec xsm +fi diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/chooser.sh b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/chooser.sh new file mode 100644 index 0000000000..f24be46dc4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/chooser.sh @@ -0,0 +1,52 @@ +#!/bin/sh +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# Author: Martin Schlemmer +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.5 2009/11/14 14:18:43 scarabeus Exp $ + +# Find a match for $XSESSION in /etc/X11/Sessions +GENTOO_SESSION="" +for x in /etc/X11/Sessions/* ; do + if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \ + = "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]; then + GENTOO_SESSION=${x} + break + fi +done + +GENTOO_EXEC="" + +if [ -n "${XSESSION}" ]; then + if [ -f /etc/X11/Sessions/${XSESSION} ]; then + if [ -x /etc/X11/Sessions/${XSESSION} ]; then + GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}" + else + GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}" + fi + elif [ -n "${GENTOO_SESSION}" ]; then + if [ -x "${GENTOO_SESSION}" ]; then + GENTOO_EXEC="${GENTOO_SESSION}" + else + GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}" + fi + else + x="" + y="" + + for x in "${XSESSION}" \ + "`echo ${XSESSION} | awk '{ print toupper($1) }'`" \ + "`echo ${XSESSION} | awk '{ print tolower($1) }'`" + do + # Fall through ... + if [ -x "`which ${x} 2>/dev/null`" ]; then + GENTOO_EXEC="`which ${x} 2>/dev/null`" + break + fi + done + fi +fi + +echo "${GENTOO_EXEC}" + + +# vim:ts=4 diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/startDM.sh b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/startDM.sh new file mode 100644 index 0000000000..ebb7970400 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/startDM.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.5 2011/01/22 15:35:49 lxnay Exp $ + +# We need to source /etc/profile for stuff like $LANG to work +# bug #10190. +. /etc/profile + +. /etc/init.d/functions.sh + +# baselayout-1 compat +if ! type get_options >/dev/null 2>/dev/null ; then + [ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh +fi + +# Great new Gnome2 feature, AA +# We enable this by default +export GDK_USE_XFT=1 + +export SVCNAME=xdm +EXEC="$(get_options service)" +NAME="$(get_options name)" +PIDFILE="$(get_options pidfile)" +START_STOP_ARGS="$(get_options start_stop_args)" + +start-stop-daemon --start --exec ${EXEC} \ +${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \ +eerror "ERROR: could not start the Display Manager" + +# vim:ts=4 diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch new file mode 100644 index 0000000000..838171bb67 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch @@ -0,0 +1,14 @@ +diff --git a/xinit.c b/xinit.c +index 42ff008..2ab817f 100644 +--- a/xinit.c ++++ b/xinit.c +@@ -49,10 +49,8 @@ in this Software without prior written authorization from The Open Group. + #endif + + /* For PRIO_PROCESS and setpriority() */ +-#ifdef __DragonFly__ + #include + #include +-#endif /* __DragonFly__ */ + + #include diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/xserverrc b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/xserverrc new file mode 100644 index 0000000000..b4de252874 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/files/xserverrc @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/X -nolisten tcp "$@" diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xinit/xinit-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/xinit-1.3.1.ebuild new file mode 100644 index 0000000000..a18f0ecfa6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xinit/xinit-1.3.1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.1.ebuild,v 1.6 2011/09/09 14:25:49 naota Exp $ + +EAPI=4 + +inherit xorg-2 + +DESCRIPTION="X Window System initializer" + +LICENSE="${LICENSE} GPL-2" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +IUSE="+minimal" + +RDEPEND=" + ! /etc/env.d/90xsession" + ewarn " env-update && source /etc/profile" +} diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild new file mode 100644 index 0000000000..069ea2a9bf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild,v 1.4 2011/09/05 19:20:51 maekke Exp $ + +EAPI=4 + +inherit xorg-2 + +DESCRIPTION="compile XKB keyboard description" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="" +RDEPEND="x11-libs/libX11 + x11-libs/libxkbfile" +DEPEND="${RDEPEND} + sys-devel/bison" diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xlsclients/xlsclients-1.1.1.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xlsclients/xlsclients-1.1.2.ebuild similarity index 76% rename from sdk_container/src/third_party/portage-stable/x11-apps/xlsclients/xlsclients-1.1.1.ebuild rename to sdk_container/src/third_party/portage-stable/x11-apps/xlsclients/xlsclients-1.1.2.ebuild index 43a269cdc2..0eadcf92b3 100644 --- a/sdk_container/src/third_party/portage-stable/x11-apps/xlsclients/xlsclients-1.1.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xlsclients/xlsclients-1.1.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-1.1.1.ebuild,v 1.10 2011/02/14 18:43:22 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-1.1.2.ebuild,v 1.8 2011/08/20 15:50:41 jer Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 @@ -11,7 +11,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="" RDEPEND=" - x11-libs/libxcb - x11-libs/xcb-util + >=x11-libs/libxcb-1.7 + >=x11-libs/xcb-util-0.3.8 " DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.0.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.0.ebuild deleted file mode 100644 index 6886ef6460..0000000000 --- a/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.0.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-1.2.0.ebuild,v 1.9 2011/02/14 18:54:49 xarthisius Exp $ - -EAPI=3 - -inherit xorg-2 - -DESCRIPTION="property displayer for X" - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.1.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.1.ebuild new file mode 100644 index 0000000000..fa4a2415ec --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.1.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-1.2.1.ebuild,v 1.6 2011/09/05 19:22:31 maekke Exp $ + +EAPI=4 +inherit xorg-2 + +DESCRIPTION="property displayer for X" + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND} + >=x11-proto/xproto-7.0.17 +" diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.4.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.5.ebuild similarity index 55% rename from sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.4.ebuild rename to sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.5.ebuild index 2d2187e0b3..596952eb0f 100644 --- a/sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.5.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.4.ebuild,v 1.9 2011/02/14 23:41:03 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.5.ebuild,v 1.4 2011/09/05 19:23:25 maekke Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 DESCRIPTION="primitive command line interface to RandR extension" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="" RDEPEND=">=x11-libs/libXrandr-1.3 @@ -18,5 +18,5 @@ DEPEND="${RDEPEND}" src_install() { xorg-2_src_install - rm -f "${ED}"/usr/bin/xkeystone + rm -f "${ED}"/usr/bin/xkeystone || die } diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.1-r1.ebuild deleted file mode 100644 index 0d66ed2e40..0000000000 --- a/sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.1-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/xset-1.2.1-r1.ebuild,v 1.7 -# 2011/04/16 17:57:06 armin76 Exp $ - -EAPI=3 - -inherit xorg-2 - -DESCRIPTION="X.Org xset application" - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXext" -DEPEND="${RDEPEND}" - -pkg_setup() { - CONFIGURE_OPTIONS="--without-xf86misc --without-fontcache" - xorg-2_pkg_setup -} diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.2.ebuild new file mode 100644 index 0000000000..a99124f1f4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/xset-1.2.2.ebuild,v 1.6 2011/09/05 19:24:17 maekke Exp $ + +EAPI=4 + +inherit xorg-2 + +DESCRIPTION="X.Org xset application" + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libXext" +DEPEND="${RDEPEND}" + +XORG_CONFIGURE_OPTIONS=( + --without-xf86misc + --without-fontcache +) diff --git a/sdk_container/src/third_party/portage-stable/x11-apps/xwininfo/xwininfo-1.1.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-apps/xwininfo/xwininfo-1.1.2.ebuild new file mode 100644 index 0000000000..05164aab05 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-apps/xwininfo/xwininfo-1.1.2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-1.1.2.ebuild,v 1.4 2011/09/05 19:25:11 maekke Exp $ + +EAPI=4 + +inherit xorg-2 flag-o-matic + +DESCRIPTION="window information utility for X" + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +RDEPEND=">=x11-libs/libxcb-1.6 + x11-libs/libX11" +DEPEND="${RDEPEND} + >=x11-proto/xproto-7.0.17" + +pkg_setup() { + # interix has a _very_ old iconv in libc, however, including + # iconv.h redefines those symbols to libiconv_*, which then + # are unresolved, as the configure check is old and dumb. + [[ ${CHOST} == *-interix* ]] && + append-libs -liconv +} diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch new file mode 100644 index 0000000000..c854e0b408 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig 2008-07-21 15:48:33 +0200 ++++ configure.ac 2008-07-21 15:49:23 +0200 +@@ -198,6 +198,8 @@ + XTHREADLIB="-pthread" ;; + solaris*) + XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;; ++ aix*) ++ XTHREAD_CFLAGS="-pthread" ;; + esac + fi + AC_SUBST(XTHREADLIB) diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-solaris.patch b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-solaris.patch new file mode 100644 index 0000000000..a7926a53d7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-solaris.patch @@ -0,0 +1,13 @@ +wchar_t is defined in /usr/include/stddef.h on Solaris + +--- include/X11/Xlib.h ++++ include/X11/Xlib.h +@@ -71,7 +71,7 @@ + #endif + #endif + +-#ifndef X_WCHAR ++#if !defined(X_WCHAR) || defined(__sun__) + #include + #else + #ifdef __UNIXOS2__ diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch new file mode 100644 index 0000000000..4539f111fa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch @@ -0,0 +1,13 @@ +diff -ru -x '*.Po' -x '*.Plo' -x '*.o' -x '*.lo' libX11-1.1.5/src/xlibi18n/Ximint.h libX11-1.1.5.orig/src/xlibi18n/Ximint.h +--- libX11-1.1.5/src/xlibi18n/Ximint.h 2009-01-16 10:14:37 +0100 ++++ libX11-1.1.5.orig/src/xlibi18n/Ximint.h 2009-01-16 09:39:48 +0100 +@@ -37,6 +37,9 @@ + + #include + #include ++#ifdef WIN32 ++# include ++#endif + + #define Public /**/ + #define Private static diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libX11/libX11-1.4.4.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/libX11-1.4.4.ebuild new file mode 100644 index 0000000000..747bf5d010 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libX11/libX11-1.4.4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.4.ebuild,v 1.5 2011/09/05 19:33:42 maekke Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 toolchain-funcs flag-o-matic + +DESCRIPTION="X.Org X11 library" + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="ipv6 test" + +RDEPEND=">=x11-libs/libxcb-1.1.92 + x11-libs/xtrans + >=x11-proto/xproto-7.0.17 + x11-proto/xf86bigfontproto + x11-proto/inputproto + x11-proto/kbproto + x11-proto/xextproto" +DEPEND="${RDEPEND} + test? ( dev-lang/perl )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch + "${FILESDIR}"/${PN}-1.1.5-winnt-private.patch + "${FILESDIR}"/${PN}-1.1.5-solaris.patch +) + +pkg_setup() { + xorg-2_pkg_setup + XORG_CONFIGURE_OPTIONS=( + $(use_with doc xmlto) + $(use_enable doc specs) + $(use_enable ipv6) + --without-fop + ) +} + +src_configure() { + [[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no + xorg-2_src_configure +} + +src_compile() { + # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys' + if tc-is-cross-compiler; then + ( + filter-flags -m* + emake -C "${AUTOTOOLS_BUILD_DIR}"/src/util CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all || die + ) + fi + xorg-2_src_compile +} diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libXau/libXau-1.0.6.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/libXau/libXau-1.0.6.ebuild new file mode 100644 index 0000000000..a54271e1e0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXau/libXau-1.0.6.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXau/libXau-1.0.6.ebuild,v 1.9 2011/02/14 14:36:21 xarthisius Exp $ + +EAPI=3 +inherit xorg-2 + +DESCRIPTION="X.Org Xau library" + +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +RDEPEND="x11-proto/xproto" +DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libXcursor/libXcursor-1.1.12.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/libXcursor/libXcursor-1.1.12.ebuild new file mode 100644 index 0000000000..973302daac --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXcursor/libXcursor-1.1.12.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.12.ebuild,v 1.4 2011/09/05 19:34:34 maekke Exp $ + +EAPI=4 +inherit xorg-2 + +DESCRIPTION="X.Org Xcursor library" + +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND=">=x11-libs/libXrender-0.8.2 + x11-libs/libXfixes + x11-libs/libX11" +DEPEND="${RDEPEND}" + +XORG_CONFIGURE_OPTIONS=( + --with-icondir=/usr/share/cursors/xorg-x11 + --with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps' +) diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libXext/libXext-1.3.0.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/libXext/libXext-1.3.0.ebuild new file mode 100644 index 0000000000..cd68355786 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXext/libXext-1.3.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.3.0.ebuild,v 1.8 2011/08/20 15:53:34 jer Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 + +DESCRIPTION="X.Org Xext library" + +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +RDEPEND=">=x11-libs/libX11-1.2 + >=x11-proto/xextproto-7.1.99" +DEPEND="${RDEPEND}" + +pkg_setup() { + XORG_CONFIGURE_OPTIONS=( + $(use_enable doc specs) + $(use_with doc xmlto) + --without-fop + ) +} diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libXrandr/libXrandr-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/libXrandr/libXrandr-1.3.2.ebuild similarity index 53% rename from sdk_container/src/third_party/portage-stable/x11-libs/libXrandr/libXrandr-1.3.1.ebuild rename to sdk_container/src/third_party/portage-stable/x11-libs/libXrandr/libXrandr-1.3.2.ebuild index 0db3e45ba3..f32d71d4e3 100644 --- a/sdk_container/src/third_party/portage-stable/x11-libs/libXrandr/libXrandr-1.3.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXrandr/libXrandr-1.3.2.ebuild @@ -1,19 +1,19 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.3.1.ebuild,v 1.9 2011/02/14 22:56:13 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.3.2.ebuild,v 1.5 2011/09/05 19:35:27 maekke Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 DESCRIPTION="X.Org Xrandr library" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXext x11-libs/libXrender - x11-proto/randrproto + >=x11-proto/randrproto-1.3.0 x11-proto/renderproto x11-proto/xextproto" DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/xcb-util/xcb-util-0.3.8.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/xcb-util/xcb-util-0.3.8.ebuild new file mode 100644 index 0000000000..01daca86b6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/xcb-util/xcb-util-0.3.8.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/xcb-util-0.3.8.ebuild,v 1.8 2011/08/20 15:50:12 jer Exp $ + +EAPI=4 + +XORG_MODULE=/ +XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist +XORG_DOC=doc +inherit xorg-2 + +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util" +EGIT_HAS_SUBMODULES=yes + +DESCRIPTION="X C-language Bindings sample implementations" +HOMEPAGE="http://xcb.freedesktop.org/" + +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" +IUSE="test" + +RDEPEND=">=x11-libs/libxcb-1.7 + x11-proto/xproto" +DEPEND="${RDEPEND} + >=dev-util/gperf-3.0.1 + test? ( >=dev-libs/check-0.9.4 )" + +PDEPEND=" + >=x11-libs/xcb-util-image-${PV} + >=x11-libs/xcb-util-keysyms-${PV} + >=x11-libs/xcb-util-renderutil-${PV} + >=x11-libs/xcb-util-wm-${PV} +" + +pkg_setup() { + XORG_CONFIGURE_OPTIONS=( + $(use_with doc doxygen) + ) + + xorg-2_pkg_setup +} diff --git a/sdk_container/src/third_party/portage-stable/x11-misc/util-macros/util-macros-1.13.0.ebuild b/sdk_container/src/third_party/portage-stable/x11-misc/util-macros/util-macros-1.15.0.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/x11-misc/util-macros/util-macros-1.13.0.ebuild rename to sdk_container/src/third_party/portage-stable/x11-misc/util-macros/util-macros-1.15.0.ebuild index d31e39079b..85d31c65c1 100644 --- a/sdk_container/src/third_party/portage-stable/x11-misc/util-macros/util-macros-1.13.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-misc/util-macros/util-macros-1.15.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.13.0.ebuild,v 1.3 2011/04/21 13:19:38 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/util-macros/util-macros-1.15.0.ebuild,v 1.2 2011/08/20 09:17:00 chithanh Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros" diff --git a/sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.1.1.ebuild b/sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.2.0.ebuild similarity index 86% rename from sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.1.1.ebuild rename to sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.2.0.ebuild index 7af8c292d8..7e002ed642 100644 --- a/sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.1.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.2.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/resourceproto/resourceproto-1.1.1.ebuild,v 1.7 2011/03/05 17:49:24 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-proto/resourceproto/resourceproto-1.2.0.ebuild,v 1.8 2011/08/20 15:55:26 jer Exp $ -EAPI=3 +EAPI=4 inherit xorg-2 DESCRIPTION="X.Org Resource protocol headers" diff --git a/sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.17.ebuild b/sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.17.ebuild deleted file mode 100644 index caa9a16a03..0000000000 --- a/sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.17.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.17.ebuild,v 1.10 2010/10/21 01:24:33 ranger Exp $ - -EAPI=3 -inherit xorg-2 - -DESCRIPTION="X.Org xproto protocol headers" -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/proto/x11proto" - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.22.ebuild b/sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.22.ebuild new file mode 100644 index 0000000000..33dc3b4dba --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-proto/xproto/xproto-7.0.22.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.22.ebuild,v 1.4 2011/09/05 19:39:48 maekke Exp $ + +EAPI=4 + +XORG_DOC=doc +inherit xorg-2 + +DESCRIPTION="X.Org xproto protocol headers" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" + +pkg_setup() { + xorg-2_pkg_setup + + XORG_CONFIGURE_OPTIONS=( + $(use_enable doc specs) + $(use_with doc xmlto) + --without-fop + ) +}