Everyone on modular should use the newer ebuild.
authorDonnie Berkholz <dberkholz@gentoo.org>
Fri, 17 Feb 2006 04:51:32 +0000 (04:51 +0000)
committerDonnie Berkholz <dberkholz@gentoo.org>
Fri, 17 Feb 2006 04:51:32 +0000 (04:51 +0000)
Package-Manager: portage-2.1_pre4-r1

x11-base/xorg-x11/ChangeLog
x11-base/xorg-x11/Manifest
x11-base/xorg-x11/files/digest-xorg-x11-7.0 [deleted file]
x11-base/xorg-x11/xorg-x11-7.0.ebuild [deleted file]

index e64d953d08983d9d0cf5f9cdbe03bc278023927d..36502f949bf144b4e1d8baf44d46b1c7b15012e7 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.521 2006/02/09 22:24:41 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.522 2006/02/17 04:51:32 spyderous Exp $
+
+  17 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; -xorg-x11-7.0.ebuild:
+  Everyone on modular should use the newer ebuild.
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.2-r6.ebuild:
   Mark 6.8.2-r6 stable on alpha
index 7e7d44b88dab22daecb974009c9e13c71f8acc52..8e08e73805c39ee03d5719bec6b0ff86a15315db 100644 (file)
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9a77ff7398077d20c5733517bfa9d41d ChangeLog 115592
-RMD160 27dbde76e7c5684471ddee84f82f394453c17988 ChangeLog 115592
-SHA256 ae1d4817b997e434a6a9016d3a93db0c58892fb829627663211e2dc844e9df49 ChangeLog 115592
+MD5 3c8e829fb1b80c398b5090ab48619c2b ChangeLog 115726
+RMD160 87a064fcc2d447fe578f43a99c5b09de4e0cffcf ChangeLog 115726
+SHA256 60a71ce77e4177f6543747433b9eb732f572b440f0d3c2a30606bf0d662489a4 ChangeLog 115726
 MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
 RMD160 15e40bf572842d9b01c60e30f47a19d66344b2fe files/digest-xorg-x11-6.8.2-r4 506
 SHA256 643219bb6d2a6956bf265c678ab16617d74415c1e70efd3b533090ad9ac0e5cb files/digest-xorg-x11-6.8.2-r4 506
@@ -13,9 +10,6 @@ SHA256 36f92eea9fd6b4345001fc67164120bcd885267f5ad1dbe81547ffe7230f2f28 files/di
 MD5 74c3f07657d69432f516175657c23ba0 files/digest-xorg-x11-6.8.99.15-r4 518
 RMD160 e58d7b79cb6f6dcf7912be78037a6222920b62ca files/digest-xorg-x11-6.8.99.15-r4 518
 SHA256 bdf7bc683158bf46d696a2388ae076444fc3c65516ac9019863c4a140e1ec07c files/digest-xorg-x11-6.8.99.15-r4 518
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.0 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.0 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.0-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.0-r1 0
@@ -34,13 +28,3 @@ SHA256 a776983eb4bd04de304af15a6bfb3a68ee558d48a164a26fd8aaadbb47d4be93 xorg-x11
 MD5 ff29d61490c049abfffc9cf524f090dd xorg-x11-7.0-r1.ebuild 17292
 RMD160 b2e19485fef178be8bf86336f158e31a7eb5525a xorg-x11-7.0-r1.ebuild 17292
 SHA256 3cf203ae96869e49b224a61bab1e51991e407551559ab9ee4000e67b61090243 xorg-x11-7.0-r1.ebuild 17292
-MD5 b8256074d549617ad13279d98fdaafb9 xorg-x11-7.0.ebuild 3726
-RMD160 04a4b2ec7794ef3f67a122e82a870d7487d8a8bc xorg-x11-7.0.ebuild 3726
-SHA256 4cf8b8fdb8e6391a98d099aa26ca3ce10155e1a3b869b4fd5226c71e25a6a4b7 xorg-x11-7.0.ebuild 3726
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD68E2V3J2n04EauwRAuW0AKDPC6snyQ+Ms8Z7Y5Pk49nx+4CVOACfXodB
-9dcDRRStbk7DBokVVug7jm4=
-=cPnX
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.0 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/x11-base/xorg-x11/xorg-x11-7.0.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.ebuild
deleted file mode 100644 (file)
index 62e42d9..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.4 2006/01/10 05:59:06 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="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="3dfx 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-1.0.1"
-
-# Common Applications
-RDEPEND="${RDEPEND}
-       >=x11-apps/mesa-progs-6.4.1
-       >=x11-apps/setxkbmap-1.0.1
-       >=x11-apps/xauth-1.0.1
-       >=x11-apps/xhost-1
-       >=x11-apps/xinit-1.0.1
-       >=x11-apps/xmodmap-1
-       >=x11-apps/xrandr-1.0.1"
-
-# Common Libraries - move these to eclass eventually
-RDEPEND="${RDEPEND}
-       >=x11-libs/libSM-1
-       >=x11-libs/libXcomposite-0.2.2.2
-       >=x11-libs/libXcursor-1.1.5.2
-       >=x11-libs/libXdamage-1.0.2.2
-       >=x11-libs/libXfixes-3.0.1.2
-       >=x11-libs/libXv-1.0.1
-       >=x11-libs/libXxf86dga-1
-       >=x11-libs/libXinerama-1.0.1
-       >=x11-libs/libXScrnSaver-1.0.1
-       xprint? ( >=x11-libs/libXp-1 )
-       3dfx? ( >=media-libs/glide-v3-3.10 )"
-
-# Some fonts
-RDEPEND="${RDEPEND}
-       >=media-fonts/font-bh-ttf-1
-       >=media-fonts/font-adobe-utopia-type1-1.0.1
-       >=media-fonts/font-bitstream-type1-1"
-
-# Documentation
-RDEPEND="${RDEPEND}
-       >=app-doc/xorg-docs-1.0.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://www.gentoo.org/proj/en/desktop/x/x11/modular-x-howto.xml"
-       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
-}