remove old

Package-Manager: portage-2.2_rc78/cvs/Linux x86_64

4 files changed, 10 insertions, 416 deletions

diff --git a/x11-base/xorg-drivers/ChangeLog b/x11-base/xorg-drivers/ChangeLog
index b4b251cd2293..32fde63ec386 100644
--- a/x11-base/xorg-drivers/ChangeLog
+++ b/x11-base/xorg-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-drivers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.29 2010/08/02 18:36:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.30 2010/09/11 10:26:45 scarabeus Exp $
+
+  11 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xorg-drivers-1.6.ebuild:
+  remove old
 
   02 Aug 2010; Raúl Porcel <armin76@gentoo.org> xorg-drivers-1.7.ebuild:
   alpha/ia64/sh/sparc stable wrt #308521
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.6.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.6.ebuild
deleted file mode 100644
index 5d8285c888e0..000000000000
--- a/x11-base/xorg-drivers/xorg-drivers-1.6.ebuild
+++ /dev/null
@@ -1,158 +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-drivers/xorg-drivers-1.6.ebuild,v 1.10 2009/12/15 19:23:30 ranger Exp $
-
-DESCRIPTION="Meta package containing deps on all xorg drivers"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-
-IUSE_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_citron
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_penmount
-	input_devices_tslib
-	input_devices_virtualbox
-	input_devices_vmmouse
-	input_devices_void
-	input_devices_synaptics
-	input_devices_wacom
-"
-IUSE_VIDEO_CARDS="
-	video_cards_apm
-	video_cards_ark
-	video_cards_ast
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_geode
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_intel
-	video_cards_impact
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_newport
-	video_cards_nv
-	video_cards_r128
-	video_cards_radeon
-	video_cards_radeonhd
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sis
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_v4l
-	video_cards_vesa
-	video_cards_via
-	video_cards_virtualbox
-	video_cards_vmware
-	video_cards_voodoo
-	video_cards_xgi
-	video_cards_fglrx
-	video_cards_nvidia
-"
-
-IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
-
-PDEPEND="
-	input_devices_acecad?      ( x11-drivers/xf86-input-acecad )
-	input_devices_aiptek?      ( x11-drivers/xf86-input-aiptek )
-	input_devices_citron?      ( x11-drivers/xf86-input-citron )
-	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-	input_devices_evdev?       ( x11-drivers/xf86-input-evdev )
-	input_devices_fpit?        ( x11-drivers/xf86-input-fpit )
-	input_devices_hyperpen?    ( x11-drivers/xf86-input-hyperpen )
-	input_devices_joystick?    ( x11-drivers/xf86-input-joystick )
-	input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
-	input_devices_mouse?       ( x11-drivers/xf86-input-mouse )
-	input_devices_mutouch?     ( x11-drivers/xf86-input-mutouch )
-	input_devices_penmount?    ( x11-drivers/xf86-input-penmount )
-	input_devices_tslib?       ( x11-drivers/xf86-input-tslib )
-	input_devices_virtualbox?  ( x11-drivers/xf86-input-virtualbox )
-	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
-	input_devices_void?        ( x11-drivers/xf86-input-void )
-	input_devices_synaptics?   ( x11-drivers/xf86-input-synaptics )
-	input_devices_wacom?       ( x11-drivers/linuxwacom )
-
-	video_cards_apm?           ( x11-drivers/xf86-video-apm )
-	video_cards_ark?           ( x11-drivers/xf86-video-ark )
-	video_cards_ast?           ( x11-drivers/xf86-video-ast )
-	video_cards_chips?         ( x11-drivers/xf86-video-chips )
-	video_cards_cirrus?        ( x11-drivers/xf86-video-cirrus )
-	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
-	video_cards_fbdev?         ( x11-drivers/xf86-video-fbdev )
-	video_cards_geode?         ( x11-drivers/xf86-video-geode )
-	video_cards_glint?         ( x11-drivers/xf86-video-glint )
-	video_cards_i128?          ( x11-drivers/xf86-video-i128 )
-	video_cards_i740?          ( x11-drivers/xf86-video-i740 )
-	video_cards_intel?         ( x11-drivers/xf86-video-intel )
-	video_cards_mach64?        ( x11-drivers/xf86-video-mach64 )
-	video_cards_mga?           ( x11-drivers/xf86-video-mga )
-	video_cards_neomagic?      ( x11-drivers/xf86-video-neomagic )
-	video_cards_newport?       ( x11-drivers/xf86-video-newport )
-	video_cards_nv?            ( x11-drivers/xf86-video-nv )
-	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
-	video_cards_fglrx?         ( x11-drivers/ati-drivers )
-	video_cards_r128?          ( x11-drivers/xf86-video-r128 )
-	video_cards_radeon?        ( x11-drivers/xf86-video-ati )
-	video_cards_radeonhd?      ( x11-drivers/xf86-video-radeonhd )
-	video_cards_rendition?     ( x11-drivers/xf86-video-rendition )
-	video_cards_s3?            ( x11-drivers/xf86-video-s3 )
-	video_cards_s3virge?       ( x11-drivers/xf86-video-s3virge )
-	video_cards_savage?        ( x11-drivers/xf86-video-savage )
-	video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
-	video_cards_sis?           ( x11-drivers/xf86-video-sis )
-	video_cards_sisusb?        ( x11-drivers/xf86-video-sisusb )
-	video_cards_sunffb?        ( x11-drivers/xf86-video-sunffb )
-	video_cards_sunleo?        ( x11-drivers/xf86-video-sunleo )
-	video_cards_tdfx?          ( x11-drivers/xf86-video-tdfx )
-	video_cards_tga?           ( x11-drivers/xf86-video-tga )
-	video_cards_trident?       ( x11-drivers/xf86-video-trident )
-	video_cards_tseng?         ( x11-drivers/xf86-video-tseng )
-	video_cards_v4l?           ( x11-drivers/xf86-video-v4l )
-	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
-	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
-	video_cards_virtualbox?    ( x11-drivers/xf86-video-virtualbox )
-	video_cards_vmware?        ( x11-drivers/xf86-video-vmware )
-	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
-	video_cards_xgi?           ( x11-drivers/xf86-video-xgi )
-
-	!x11-drivers/xf86-video-impact
-	!x11-drivers/xf86-video-sunbw2
-	!x11-drivers/xf86-video-suncg14
-	!x11-drivers/xf86-video-suncg3
-	!x11-drivers/xf86-video-suncg6
-	!x11-drivers/xf86-video-suntcx
-	!x11-drivers/xf86-video-cyrix
-	!x11-drivers/xf86-video-nsc
-"
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 3fee7d06d6a9..02dbf9156066 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.527 2010/09/05 11:59:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.528 2010/09/11 10:27:59 scarabeus Exp $
+
+  11 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xorg-server-1.6.5-r1.ebuild:
+  remove old
 
   05 Sep 2010; Rémi Cardona <remi@gentoo.org> xorg-server-1.7.6.ebuild,
   xorg-server-1.7.7-r1.ebuild, xorg-server-1.8.2.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.6.5-r1.ebuild b/x11-base/xorg-server/xorg-server-1.6.5-r1.ebuild
deleted file mode 100644
index 1aae065ddc2e..000000000000
--- a/x11-base/xorg-server/xorg-server-1.6.5-r1.ebuild
+++ /dev/null
@@ -1,256 +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-server/xorg-server-1.6.5-r1.ebuild,v 1.10 2010/04/09 10:28:58 scarabeus Exp $
-
-EAPI="2"
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib versionator
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="X.Org X servers"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-
-IUSE_SERVERS="dmx kdrive xorg"
-IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl"
-
-RDEPEND="
-	hal? ( sys-apps/hal )
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	dev-libs/openssl
-	>=x11-libs/libXfont-1.4.0
-	>=x11-libs/xtrans-1.2.3
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXext-1.0.4
-	>=x11-libs/libX11-1.1.5
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXmu-1.0.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXi-1.2.1
-	>=x11-libs/pixman-0.14.0
-	media-libs/freetype
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-1.4
-	x11-apps/xkbcomp
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	<=x11-apps/xinit-1.2.1
-	>=app-admin/eselect-opengl-1.0.8
-	>=x11-libs/libXaw-1.0.5
-	>=x11-libs/libXpm-3.5.7
-	>=x11-libs/libpciaccess-0.10.3
-	dmx? (
-		>=x11-libs/libdmx-1.0.2
-		>=x11-libs/libXfixes-4.0.3
-	)
-	!minimal? (
-		>=x11-libs/libXtst-1.0.3
-		>=x11-libs/libXres-1.0.3
-		>=media-libs/mesa-7.3_rc1[nptl=]
-	)
-	>=x11-libs/libxkbui-1.0.2
-	kdrive? ( sdl? ( media-libs/libsdl ) )"
-	# Xres is dmx-dependent
-	# Xaw is dmx-dependent
-	# Xpm is dmx-dependent, pulls in Xt
-	# xkbcomp is launched at startup but not checked by ./configure
-DEPEND="${RDEPEND}
-	!net-dialup/dtrace
-	sys-devel/flex
-	>=x11-proto/randrproto-1.2.99.4
-	>=x11-proto/renderproto-0.9.3
-	>=x11-proto/fixesproto-4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/xextproto-7.0.4
-	>=x11-proto/xproto-7.0.14
-	>=x11-proto/xf86dgaproto-2.0.3
-	>=x11-proto/xf86rushproto-1.1.2
-	>=x11-proto/xf86vidmodeproto-2.2.2
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/recordproto-1.13.2
-	>=x11-proto/resourceproto-1.0.2
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/scrnsaverproto-1.1.0
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/xineramaproto-1.1.2
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/inputproto-1.5.0
-	>=x11-proto/bigreqsproto-1.0.2
-	>=x11-proto/xcmiscproto-1.1.2
-	>=x11-proto/glproto-1.4.9
-	dmx? ( >=x11-proto/dmxproto-2.2.2 )
-	!minimal? (
-		>=x11-proto/xf86driproto-2.0.4
-		>=x11-proto/dri2proto-2.1
-		>=x11-libs/libdrm-2.3
-	)"
-
-PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-LICENSE="${LICENSE} MIT"
-
-EPATCH_FORCE="yes"
-EPATCH_SUFFIX="patch"
-
-# These have been sent upstream
-UPSTREAMED_PATCHES=(
-	"${WORKDIR}/patches/"
-	)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	)
-
-pkg_setup() {
-	use minimal || ensure_a_server_is_building
-
-	# SDL only available in kdrive build
-	if use kdrive && use sdl; then
-		conf_opts="${conf_opts} --enable-xsdl"
-	else
-		conf_opts="${conf_opts} --disable-xsdl"
-	fi
-
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable dmx)
-		$(use_enable kdrive)
-		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal install-libxf86config)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xorg)
-		$(use_enable nptl glx-tls)
-		$(use_enable hal config-hal)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
-		--without-dtrace
-		${conf_opts}"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Incompatible with GCC 3.x SSP on x86, bug #244352
-	if use x86 ; then
-		if [[ $(gcc-major-version) -lt 4 ]]; then
-			filter-flags -fstack-protector
-		fi
-	fi
-
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set ${OPENGL_DIR}
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	server_based_install
-
-	# Install video mode files for system-config-display
-	insinto /usr/share/xorg
-	doins hw/xfree86/common/{extra,vesa}modes \
-		|| die "couldn't install extra modes"
-
-	# Bug #151421 - this file is not built with USE="minimal"
-	# Bug #151670 - this file is also not build if USE="-xorg"
-	if ! use minimal &&	use xorg; then
-		# Install xorg.conf.example
-		insinto /etc/X11
-		doins hw/xfree86/xorg.conf.example \
-			|| die "couldn't install xorg.conf.example"
-	fi
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-
-	# Bug #135544
-	ewarn "Users of reduced blanking now need:"
-	ewarn "   Option \"ReducedBlanking\""
-	ewarn "In the relevant Monitor section(s)."
-	ewarn "Make sure your reduced blanking modelines are safe!"
-
-	echo
-	ewarn "You must rebuild all drivers if upgrading from xorg-server 1.5"
-	ewarn "or earlier, because the ABI changed. If you cannot start X because"
-	ewarn "of module version mismatch errors, this is your problem."
-
-	echo
-	ewarn "You can generate a list of all installed packages in the x11-drivers"
-	ewarn "category using this command:"
-	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
-
-	ebeep 5
-	epause 10
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
-	fi
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-ensure_a_server_is_building() {
-	for server in ${IUSE_SERVERS}; do
-		use ${server} && return;
-	done
-	eerror "You need to specify at least one server to build."
-	eerror "Valid servers are: ${IUSE_SERVERS}."
-	die "No servers were specified to build."
-}