diff options
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 4 | ||||
| -rw-r--r-- | x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc3-r1 | 0 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-7.0.0_rc3-r1.ebuild | 118 |
4 files changed, 129 insertions, 2 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index d2efea3e8a92..5bc1b0d75218 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.489 2005/12/14 06:29:05 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.490 2005/12/14 16:09:10 spyderous Exp $ + +*xorg-x11-7.0.0_rc3-r1 (14 Dec 2005) + + 14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; + +xorg-x11-7.0.0_rc3-r1.ebuild: + Added mesa-progs to deps, which provides glxinfo and glxgears. Drop all + non-x86 keywords because of this. 14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-7.0.0_rc3.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index de48bb913a1b..66682feaceed 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,4 +1,4 @@ -MD5 72a20819cdd3f11fd95d3935808bc177 ChangeLog 110810 +MD5 8732c3c16569ac07822c1e43b9a5c817 ChangeLog 111047 MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506 MD5 533a7a423e5c42c8448c535a3b114d9a files/digest-xorg-x11-6.8.2-r6 504 MD5 74c3f07657d69432f516175657c23ba0 files/digest-xorg-x11-6.8.99.15-r4 518 @@ -6,6 +6,7 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc1 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc2 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc2-r1 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc3 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0.0_rc3-r1 0 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 MD5 eb11b5ab5658f02b7b25a0cc0635cabb xorg-x11-6.8.2-r4.ebuild 55082 MD5 7702a5cb18439da7dd6c63c48e5e3f08 xorg-x11-6.8.2-r6.ebuild 55187 @@ -13,4 +14,5 @@ MD5 31ef14f437a07f8a95cd6c6dc15ce593 xorg-x11-6.8.99.15-r4.ebuild 54160 MD5 8252e5e7dfd036c4c26cc7e44bfd0e1f xorg-x11-7.0.0_rc1.ebuild 2761 MD5 0f5f17bb41c4972fe6c755c831f5bb36 xorg-x11-7.0.0_rc2-r1.ebuild 3508 MD5 b975e2d9781a47a6cf3c63d26b4a5bac xorg-x11-7.0.0_rc2.ebuild 2760 +MD5 d9abe29fb2dd9db2ba24c720444b58ef xorg-x11-7.0.0_rc3-r1.ebuild 3636 MD5 3378ccca638510440bf947351122923b xorg-x11-7.0.0_rc3.ebuild 3629 diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc3-r1 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc3-r1 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc3-r1 diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc3-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc3-r1.ebuild new file mode 100644 index 000000000000..3b8585047fb4 --- /dev/null +++ b/x11-base/xorg-x11/xorg-x11-7.0.0_rc3-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0.0_rc3-r1.ebuild,v 1.1 2005/12/14 16:09:10 spyderous Exp $ + +inherit eutils + +DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta +package)" +HOMEPAGE="http://xorg.freedesktop.org" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~x86" +IUSE="xprint" + +# Collision protect will scream bloody murder if we install over old versions +RDEPEND="!<=x11-base/xorg-x11-6.9" + +# Server +RDEPEND="${RDEPEND} + >=x11-base/xorg-server-0.99.3" + +# Common Applications +RDEPEND="${RDEPEND} + >=x11-apps/mesa-progs-6.4.1 + >=x11-apps/setxkbmap-0.99.3 + >=x11-apps/xauth-0.99.3 + >=x11-apps/xhost-0.99.3 + >=x11-apps/xinit-0.99.4 + >=x11-apps/xmodmap-0.99.2 + >=x11-apps/xrandr-0.99.2" + +# Common Libraries - move these to eclass eventually +RDEPEND="${RDEPEND} + >=x11-libs/libSM-0.99.3 + >=x11-libs/libXcomposite-0.2.2.1 + >=x11-libs/libXcursor-1.1.5.1 + >=x11-libs/libXdamage-1.0.2.1 + >=x11-libs/libXfixes-3.0.1.1 + >=x11-libs/libXv-0.99.2 + >=x11-libs/libXxf86dga-0.99.3 + >=x11-libs/libXinerama-0.99.2 + >=x11-libs/libXScrnSaver-0.99.3 + xprint? ( >=x11-libs/libXp-0.99.2 )" + +# Some fonts +RDEPEND="${RDEPEND} + >=media-fonts/font-bh-ttf-0.99.1 + >=media-fonts/font-adobe-utopia-type1-0.99.1 + >=media-fonts/font-bitstream-type1-0.99.1" + +DEPEND="${RDEPEND}" + +src_install() { + # Make /usr/X11R6 a symlink to ../usr. + dodir /usr + dosym ../usr /usr/X11R6 +} + +pkg_preinst() { + # Check for /usr/X11R6 -> /usr symlink + if [[ -e "/usr/X11R6" ]] && + [[ $(readlink "/usr/X11R6") != "../usr" ]]; then + eerror "/usr/X11R6 isn't a symlink to ../usr. Please delete it." + ewarn "First, save a list of all the packages installing there:" + ewarn " equery belongs /usr/X11R6 > usr-x11r6-packages" + ewarn "This requires gentoolkit to be installed." + die "/usr/X11R6 is not a symlink to ../usr." + fi + + # Filter out ModulePath line since it often holds a now-invalid path + # Bug #112924 + # For RC3 - filter out RgbPath line since it also seems to break things + XORGCONF="/etc/X11/xorg.conf" + if [ -e ${XORGCONF} ]; then + mkdir -p "${IMAGE}/etc/X11" + sed "/ModulePath/d" ${XORGCONF} > ${IMAGE}${XORGCONF} + sed -i "/RgbPath/d" ${IMAGE}${XORGCONF} + fi +} + +pkg_postinst() { + # I'm not sure why this was added, but we don't inherit x-modular + # x-modular_pkg_postinst + + echo + einfo "Please note that the xcursors are in /usr/share/cursors/${PN}." + einfo "Any custom cursor sets should be placed in that directory." + echo + einfo "If you wish to set system-wide default cursors, please create" + einfo "/usr/local/share/cursors/${PN}/default/index.theme" + einfo "with content: \"Inherits=theme_name\" so that future" + einfo "emerges will not overwrite those settings." + echo + einfo "Listening on TCP is disabled by default with startx." + einfo "To enable it, edit /usr/bin/startx." + echo + + ewarn "Please read the modular X migration guide at" + ewarn "http://dev.gentoo.org/~spyderous/xorg-x11/migrating_to_modular_x_howto.txt" + echo + einfo "If you encounter any non-configuration issues, please file a bug at" + einfo "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux" + einfo "and attach /etc/X11/xorg.conf, /var/log/Xorg.0.log and emerge info" + echo + einfo "In the future, you will be able to affect which drivers are installed" + einfo "with the VIDEO_CARDS and INPUT_DEVICES settings." + echo + + # (#76985) + einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop" + einfo "for more information on configuring X." + echo + + # Try to get people to read this, pending #11359 + ebeep 5 + epause 10 +} |