Remove old version.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

3 files changed, 19 insertions, 161 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index ab58d704c8ee..25466480638a 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.624 2012/05/15 14:24:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.625 2012/05/28 13:21:03 scarabeus Exp $
+
+  28 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -xorg-x11-7.4-r1.ebuild:
+  Remove old version.
 
   15 May 2012; Alexis Ballier <aballier@gentoo.org> xorg-x11-7.4-r2.ebuild:
   keyword ~amd64-fbsd
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 6efbe9dca429..b8bc2df81b7e 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,15 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD xorg-x11-7.4-r1.ebuild 3674 RMD160 b9ec65d3d1f30e6342ed4e2bf87154e4a13d1838 SHA1 a5d82478b179920bc57919575498b144a86ba72e SHA256 5e9309fc4bcb1a7a6c4a6ae17e9e709716368119366c42deb182db2e38d9de8f
 EBUILD xorg-x11-7.4-r2.ebuild 3669 RMD160 59b9cea4b9abfbe24ef5349f881c545b407ab047 SHA1 c39b355f3e6e05824dd7dace641d44254f4056d0 SHA256 6c79ba25bd930b494ffdbdfdfea5cc1efe410c1526211827e1f000b75503a0df
-MISC ChangeLog 18200 RMD160 00544cda164583ac413545d5ee40789000ed3739 SHA1 57c6d1798c5762ec3e87c282d0b1bbca09bed156 SHA256 1ea779c3ffe5491181419f856ba21d06d2b08ea3edc1a7db909d04eef5730c20
+MISC ChangeLog 18304 RMD160 65c7e951881479e7d48f0e3ce4c35a1a5879664f SHA1 d7700f2afbbf1d74ef9c8b5d38f0b79e6baf07e3 SHA256 8139058da34f9cef0ce7c835173dfaa9a12f843ad526af15d799a8658a126c68
 MISC ChangeLog-2005 112755 RMD160 0041fc93985e62ee7b74cca15465f63cb342b2eb SHA1 54838cac302d8133d7cce2f66fab9ac5bcabc906 SHA256 99fa41385441d093a976da579ef62d816f636660cf5e1936ae885f6099746b75
 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+yZwcACgkQvFcC4BYPU0oB+QCgzSCNOfy+0aHb8OUa8J/B2fBj
-rd4An2MObTj7qhHVQKOIIWyerC4RB8kV
-=xVi4
+iQIcBAEBAgAGBQJPw3vrAAoJEOSiRoyO7jvo2XEP/1EIU9ckmO7z9hHtRDIutF8j
+ZX0lw/qGl26HzY9HYQDARI2rj2AICp9BRnVYL0+6n/QZuhzXCCfI78fiTGsFLHYv
+XxbdiVX1OrapFF6cl8dYNqTvpR1pYQK1+/xZCIbuFx3AW2/R8g7fF4ZxsmUQ/iQL
+Gj/o7mgbzMAlLGNmLaCpuU0M0ytIEh6fIeWt5fh1TP0rJj4RwU574vJcp4GRognA
+enKvUDHnZ2Y1ZYXqf3SeNVWVew1iGR8vnwPpIgOY8/t6Un6RX86rTthHBsGa30+Z
+eO0Gzsfd4Eye/9ZAN77k8K/d9BA3tURnbMkU3XseDxFKviDCXUe2CG4zioJhCiHr
+3XixjtWR1UlewbEtJowhNeO2kHrTJw3DWQcQKTG0hgg1BtQK2fLUTUcaHtsz1MI3
+dev244TYGKzml9lWGnCy+tqmgkWfEw/cKliNocITHdTjNNoNPP+y9I06tCHpzegW
+N4vWw7u1B4ZGHkj3xccVfQ/ShPIzMYkUhK0h50CTevXqh0fQkpnjoVOHk3FE5CYT
+lLpG8UbsGQE6UYvB/eZbkJNUGlIdVyhhvq/WtZlZP0tl30rqFL79Yho4a3XJcP5y
+C2OFyb+RVvQpuerA3XPTk2PBluavqWSHToGP4F3P9sq5dmlzEfv8Q8AjVYYbATcZ
+y1CM9OFA6LnaRs9ATHMX
+=fT5R
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild
deleted file mode 100644
index d1f229156b01..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.4-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2010 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.4-r1.ebuild,v 1.9 2010/09/13 01:03:56 josejx Exp $
-
-EAPI="2"
-
-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=""
-
-# Server
-RDEPEND="${RDEPEND}
-	x11-base/xorg-server[-minimal]"
-
-# Applications
-RDEPEND="${RDEPEND}
-	x11-apps/appres
-	x11-apps/bitmap
-	x11-apps/iceauth
-	x11-apps/luit
-	x11-apps/mkfontdir
-	x11-apps/mkfontscale
-	x11-apps/sessreg
-	x11-apps/setxkbmap
-	x11-apps/smproxy
-	x11-apps/x11perf
-	x11-apps/xauth
-	x11-apps/xbacklight
-	x11-apps/xcmsdb
-	x11-apps/xcursorgen
-	x11-apps/xdpyinfo
-	x11-apps/xdriinfo
-	x11-apps/xev
-	x11-apps/xf86dga
-	x11-apps/xgamma
-	x11-apps/xhost
-	x11-apps/xinput
-	x11-apps/xkbcomp
-	x11-apps/xkbevd
-	x11-apps/xkbutils
-	x11-apps/xkill
-	x11-apps/xlsatoms
-	x11-apps/xlsclients
-	x11-apps/xmodmap
-	x11-apps/xpr
-	x11-apps/xprop
-	x11-apps/xrandr
-	x11-apps/xrdb
-	x11-apps/xrefresh
-	x11-apps/xset
-	x11-apps/xsetmode
-	x11-apps/xsetroot
-	x11-apps/xvinfo
-	x11-apps/xwd
-	x11-apps/xwininfo
-	x11-apps/xwud
-	"
-
-# Data
-RDEPEND="${RDEPEND}
-	x11-misc/xbitmaps
-	x11-themes/xcursor-themes
-	"
-
-# Utilities
-RDEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-misc/util-macros
-	"
-
-# Fonts
-RDEPEND="${RDEPEND}
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-adobe-utopia-100dpi
-	media-fonts/font-adobe-utopia-75dpi
-	media-fonts/font-adobe-utopia-type1
-	media-fonts/font-alias
-	media-fonts/font-arabic-misc
-	media-fonts/font-bh-100dpi
-	media-fonts/font-bh-75dpi
-	media-fonts/font-bh-lucidatypewriter-100dpi
-	media-fonts/font-bh-lucidatypewriter-75dpi
-	media-fonts/font-bh-ttf
-	media-fonts/font-bh-type1
-	media-fonts/font-bitstream-100dpi
-	media-fonts/font-bitstream-75dpi
-	media-fonts/font-bitstream-speedo
-	media-fonts/font-bitstream-type1
-	media-fonts/font-cronyx-cyrillic
-	media-fonts/font-cursor-misc
-	media-fonts/font-daewoo-misc
-	media-fonts/font-dec-misc
-	media-fonts/font-ibm-type1
-	media-fonts/font-isas-misc
-	media-fonts/font-jis-misc
-	media-fonts/font-micro-misc
-	media-fonts/font-misc-cyrillic
-	media-fonts/font-misc-ethiopic
-	media-fonts/font-misc-meltho
-	media-fonts/font-misc-misc
-	media-fonts/font-mutt-misc
-	media-fonts/font-schumacher-misc
-	media-fonts/font-screen-cyrillic
-	media-fonts/font-sony-misc
-	media-fonts/font-sun-misc
-	media-fonts/font-util
-	media-fonts/font-winitzki-cyrillic
-	media-fonts/font-xfree86-type1
-
-	media-fonts/font-alias
-	media-fonts/font-util
-	media-fonts/encodings
-	"
-
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	# Save xorg.conf because of bug #278268
-	if [[ -f "${ROOT}etc/X11/xorg.conf" ]]; then
-		cp "${ROOT}etc/X11/xorg.conf" "${T}"
-	fi
-}
-
-pkg_postinst() {
-	# Restore saved xorg.conf
-	if [[ -f "${T}/xorg.conf" ]]; then
-		cp "${T}/xorg.conf" "${ROOT}etc/X11/xorg.conf"
-	fi
-
-	elog
-	elog "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}."
-	elog "Any custom cursor sets should be placed in that directory."
-	elog
-	elog "If you wish to set system-wide default cursors, please create"
-	elog "${ROOT}usr/local/share/cursors/${PN}/default/index.theme"
-	elog "with content: \"Inherits=theme_name\" so that future"
-	elog "emerges will not overwrite those settings."
-	elog
-	elog "Listening on TCP is disabled by default with startx."
-	elog "To enable it, edit ${ROOT}usr/bin/startx."
-	elog
-
-	# (#76985)
-	elog "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop"
-	elog "for more information on configuring X."
-	elog
-}