summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-09-14 17:58:21 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-09-14 17:58:21 +0000
commit1d3dc395248f95b1a03cde1d6de4ab5df3cfa19f (patch)
tree0a1b2c450cc31ff1d1a527cb2ed985871a877a41 /x11-base
parentVersion bump (diff)
downloadhistorical-1d3dc395248f95b1a03cde1d6de4ab5df3cfa19f.tar.gz
historical-1d3dc395248f95b1a03cde1d6de4ab5df3cfa19f.tar.bz2
historical-1d3dc395248f95b1a03cde1d6de4ab5df3cfa19f.zip
remove old
Package-Manager: portage-2.2_rc81/cvs/Linux x86_64
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog5
-rw-r--r--x11-base/xorg-x11/Manifest13
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.2.ebuild119
3 files changed, 5 insertions, 132 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index b67098820114..be9ff88fb553 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.620 2010/09/13 01:03:56 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.621 2010/09/14 17:58:21 scarabeus Exp $
+
+ 14 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> -xorg-x11-7.2.ebuild:
+ remove old
13 Sep 2010; Joseph Jezak <josejx@gentoo.org> xorg-x11-7.4-r1.ebuild:
Marked ppc64 stable.
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 4ff310835bda..0172e20ec4bc 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,14 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-EBUILD xorg-x11-7.2.ebuild 3791 RMD160 92764b58f5a8c34d00f484abd19bd0c7b01bb8d2 SHA1 4af5f33bbb7f8a270f5d5505c2d9442d9b5ab2ee SHA256 83e4f03b99d3bda6af6ea35ecbd3b2823f57208e6ceb75a822d3915375252aa8
EBUILD xorg-x11-7.4-r1.ebuild 3674 RMD160 b9ec65d3d1f30e6342ed4e2bf87154e4a13d1838 SHA1 a5d82478b179920bc57919575498b144a86ba72e SHA256 5e9309fc4bcb1a7a6c4a6ae17e9e709716368119366c42deb182db2e38d9de8f
-MISC ChangeLog 130261 RMD160 700a9d3a825075b345566ae95d1aab0c3e066865 SHA1 f0dcb51b06f5d7948787ebb47547e511ed360734 SHA256 8dc4c4e8471e8fbfe88f13aaae4adc675c4757ddf0debe3b4b951e7a17cb6d86
+MISC ChangeLog 130355 RMD160 a71e98f272271a986bc94d0efd28f756102b7121 SHA1 0893f2938527530932fa22294efb0d69f0ac987e SHA256 936bdc3c1b09e9c9d72bb7f91ecd8196912d82a155a1f131c7cbb09682d19c3f
MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyNd4AACgkQcsIHjyDViGR/XwCePvYXqpihCTP47UbqUyYxysw9
-ycUAmgMqjHuwiz7mLpjzo+2K+E5Eq/Ho
-=RUlS
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-x11/xorg-x11-7.2.ebuild b/x11-base/xorg-x11/xorg-x11-7.2.ebuild
deleted file mode 100644
index e4d7b73b7b2f..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2009 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.2.ebuild,v 1.17 2009/09/19 18:38:10 remi 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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-# 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.2"
-
-# Common Applications
-RDEPEND="${RDEPEND}
- >=x11-apps/mesa-progs-6.5.2
- >=x11-apps/setxkbmap-1.0.2
- >=x11-apps/xauth-1.0.2
- >=x11-apps/xhost-1.0.1
- >=x11-apps/xinit-1.0.3
- >=x11-apps/xmodmap-1.0.2
- >=x11-apps/xrandr-1.0.2"
-
-# Common Libraries - move these to eclass eventually
-RDEPEND="${RDEPEND}
- >=x11-libs/libSM-1.0.2
- >=x11-libs/libXcomposite-0.3.1
- >=x11-libs/libXcursor-1.1.8
- >=x11-libs/libXdamage-1.1
- >=x11-libs/libXfixes-4.0.3
- >=x11-libs/libXp-1
- >=x11-libs/libXv-1.0.3
- >=x11-libs/libXxf86dga-1.0.1
- >=x11-libs/libXinerama-1.0.1
- >=x11-libs/libXScrnSaver-1.1.2"
-
-# Some fonts
-RDEPEND="${RDEPEND}
- media-fonts/ttf-bitstream-vera
- >=media-fonts/font-bh-type1-1
- >=media-fonts/font-adobe-utopia-type1-1.0.1
- >=media-fonts/font-adobe-100dpi-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 "${ROOT}usr/X11R6" ]] &&
- [[ $(readlink "${ROOT}usr/X11R6") != "../usr" ]]; then
- eerror "${ROOT}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 ${ROOT}usr/X11R6 > usr-x11r6-packages"
- ewarn "This requires gentoolkit to be installed."
- die "${ROOT}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 ${ROOT}${XORGCONF} ]]; then
- mkdir -p "${D}/etc/X11"
- sed "/ModulePath/d" "${ROOT}${XORGCONF}" > "${D}${XORGCONF}"
- sed -i "/RgbPath/d" "${D}${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 ${ROOT}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 "${ROOT}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 ${ROOT}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 ${ROOT}etc/X11/xorg.conf, ${ROOT}var/log/Xorg.0.log and emerge info"
- echo
- einfo "You can now choose which drivers are installed with the VIDEO_CARDS"
- einfo "and INPUT_DEVICES settings. Set these like any other Portage"
- einfo "variable in ${ROOT}etc/make.conf or on the command line."
- 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
-}