summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/Manifest8
-rw-r--r--x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc10
-rw-r--r--x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc20
-rw-r--r--x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc2-r10
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild91
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.0.0_rc2-r1.ebuild115
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild91
8 files changed, 7 insertions, 305 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 5bc1b0d75218..507a6bee4431 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
# 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.490 2005/12/14 16:09:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.491 2005/12/14 16:10:28 spyderous Exp $
+
+ 14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ -xorg-x11-7.0.0_rc1.ebuild, -xorg-x11-7.0.0_rc2.ebuild,
+ -xorg-x11-7.0.0_rc2-r1.ebuild:
+ Drop old versions.
*xorg-x11-7.0.0_rc3-r1 (14 Dec 2005)
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 66682feaceed..acde2ee8eb2b 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,18 +1,12 @@
-MD5 8732c3c16569ac07822c1e43b9a5c817 ChangeLog 111047
+MD5 be06713eb806b5856e71d119d76719e2 ChangeLog 111215
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
-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
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_rc1 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc1
+++ /dev/null
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc2 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc2
+++ /dev/null
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc2-r1 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc2-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/xorg-x11/files/digest-xorg-x11-7.0.0_rc2-r1
+++ /dev/null
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild
deleted file mode 100644
index 6e8787c4d767..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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_rc1.ebuild,v 1.10 2005/11/16 05:03:33 joshuabaergen 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="~amd64 ~mips ~sparc ~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.2"
-
-# Common Applications
-RDEPEND="${RDEPEND}
- >=x11-apps/setxkbmap-0.99.1
- >=x11-apps/xauth-0.99.1
- >=x11-apps/xhost-0.99.1
- >=x11-apps/xinit-0.99.2
- >=x11-apps/xmodmap-0.99.1
- >=x11-apps/xrandr-0.99.1"
-
-# Common Libraries - move these to eclass eventually
-RDEPEND="${RDEPEND}
- >=x11-libs/libSM-0.99.1
- >=x11-libs/libXcomposite-0.2.1
- >=x11-libs/libXcursor-1.1.4
- >=x11-libs/libXdamage-1.0.1
- >=x11-libs/libXfixes-3.0.0
- >=x11-libs/libXv-0.99.1
- >=x11-libs/libXxf86dga-0.99.1
- >=x11-libs/libXinerama-0.99.1
- >=x11-libs/libXScrnSaver-0.99.2
- xprint? ( >=x11-libs/libXp-0.99.1 )"
-
-# Some fonts
-RDEPEND="${RDEPEND}
- >=media-fonts/font-bh-ttf-0.99.0
- >=media-fonts/font-adobe-utopia-type1-0.99.0
- >=media-fonts/font-bitstream-type1-0.99.0"
-
-DEPEND="${RDEPEND}"
-
-# We need some checks for weird symlinks on migrate
-# /usr/lib/X11/xdm -> ../../../etc/X11/xdm
-
-pkg_postinst() {
- 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
-}
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc2-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc2-r1.ebuild
deleted file mode 100644
index dd3e1c7b8907..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.0.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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_rc2-r1.ebuild,v 1.2 2005/11/29 04:53:09 joshuabaergen 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="~amd64 ~mips ~sparc ~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/setxkbmap-0.99.2
- >=x11-apps/xauth-0.99.2
- >=x11-apps/xhost-0.99.2
- >=x11-apps/xinit-0.99.3
- >=x11-apps/xmodmap-0.99.1
- >=x11-apps/xrandr-0.99.1"
-
-# Common Libraries - move these to eclass eventually
-RDEPEND="${RDEPEND}
- >=x11-libs/libSM-0.99.2
- >=x11-libs/libXcomposite-0.2.2
- >=x11-libs/libXcursor-1.1.5
- >=x11-libs/libXdamage-1.0.2
- >=x11-libs/libXfixes-3.0.1
- >=x11-libs/libXv-0.99.1
- >=x11-libs/libXxf86dga-0.99.2
- >=x11-libs/libXinerama-0.99.1
- >=x11-libs/libXScrnSaver-0.99.2
- xprint? ( >=x11-libs/libXp-0.99.1 )"
-
-# Some fonts
-RDEPEND="${RDEPEND}
- >=media-fonts/font-bh-ttf-0.99.0
- >=media-fonts/font-adobe-utopia-type1-0.99.0
- >=media-fonts/font-bitstream-type1-0.99.0"
-
-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
- XORGCONF="/etc/X11/xorg.conf"
- if [ -e ${XORGCONF} ]; then
- mkdir -p "${IMAGE}/etc/X11"
- sed "/ModulePath/d" ${XORGCONF} > ${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
-}
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild
deleted file mode 100644
index 284ac662962a..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.0.0_rc2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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_rc2.ebuild,v 1.2 2005/11/16 05:03:33 joshuabaergen 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="~amd64 ~mips ~sparc ~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/setxkbmap-0.99.2
- >=x11-apps/xauth-0.99.2
- >=x11-apps/xhost-0.99.2
- >=x11-apps/xinit-0.99.3
- >=x11-apps/xmodmap-0.99.1
- >=x11-apps/xrandr-0.99.1"
-
-# Common Libraries - move these to eclass eventually
-RDEPEND="${RDEPEND}
- >=x11-libs/libSM-0.99.2
- >=x11-libs/libXcomposite-0.2.2
- >=x11-libs/libXcursor-1.1.5
- >=x11-libs/libXdamage-1.0.2
- >=x11-libs/libXfixes-3.0.1
- >=x11-libs/libXv-0.99.1
- >=x11-libs/libXxf86dga-0.99.2
- >=x11-libs/libXinerama-0.99.1
- >=x11-libs/libXScrnSaver-0.99.2
- xprint? ( >=x11-libs/libXp-0.99.1 )"
-
-# Some fonts
-RDEPEND="${RDEPEND}
- >=media-fonts/font-bh-ttf-0.99.0
- >=media-fonts/font-adobe-utopia-type1-0.99.0
- >=media-fonts/font-bitstream-type1-0.99.0"
-
-DEPEND="${RDEPEND}"
-
-# We need some checks for weird symlinks on migrate
-# /usr/lib/X11/xdm -> ../../../etc/X11/xdm
-
-pkg_postinst() {
- 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
-}